qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-28 05:18:58 +02:00
Code

refresh xburst patches

Browse Source
This commit is contained in:
Florian Fainelli 2009-10-08 14:42:39 +02:00 committed by Xiangfu Liu
parent 767987c14e
commit 7df7bde3ac
22 changed files with 92 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
target/linux/xburst/patches-2.6.31/001-core.patch
View File

@ -1,5 +1,3 @@
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index f19dff6..b1c0b9f 100644
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -158,6 +158,9 @@ config MACH_JAZZ @@ -158,6 +158,9 @@ config MACH_JAZZ
@ -59,11 +57,9 @@ index f19dff6..b1c0b9f 100644
menu "Power management options" menu "Power management options"
config ARCH_HIBERNATION_POSSIBLE config ARCH_HIBERNATION_POSSIBLE
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 791f1db..0f1129d 100644
--- a/arch/mips/Makefile --- a/arch/mips/Makefile
+++ b/arch/mips/Makefile +++ b/arch/mips/Makefile
@@ -180,6 +180,14 @@ cflags-$(CONFIG_AR7) += -I$(srctree)/arch/mips/include/asm/mach-ar7 @@ -180,6 +180,14 @@ cflags-$(CONFIG_AR7) += -I$(srctree)/ar
load-$(CONFIG_AR7) += 0xffffffff94100000 load-$(CONFIG_AR7) += 0xffffffff94100000
# #
@ -78,7 +74,7 @@ index 791f1db..0f1129d 100644
# Acer PICA 61, Mips Magnum 4000 and Olivetti M700. # Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
# #
core-$(CONFIG_MACH_JAZZ) += arch/mips/jazz/ core-$(CONFIG_MACH_JAZZ) += arch/mips/jazz/
@@ -714,6 +722,12 @@ makeboot =$(Q)$(MAKE) $(build)=arch/mips/boot VMLINUX=$(vmlinux-32) $(1) @@ -714,6 +722,12 @@ makeboot =$(Q)$(MAKE) $(build)=arch/mips
all: $(all-y) all: $(all-y)
@ -109,8 +105,6 @@ index 791f1db..0f1129d 100644
echo echo
echo ' These will be default as apropriate for a configured platform.' echo ' These will be default as apropriate for a configured platform.'
endef endef
diff --git a/arch/mips/boot/Makefile b/arch/mips/boot/Makefile
index 2a209d7..1cfce3e 100644
--- a/arch/mips/boot/Makefile --- a/arch/mips/boot/Makefile
+++ b/arch/mips/boot/Makefile +++ b/arch/mips/boot/Makefile
@@ -7,6 +7,9 @@ @@ -7,6 +7,9 @@
@ -123,7 +117,7 @@ index 2a209d7..1cfce3e 100644
# #
# Some DECstations need all possible sections of an ECOFF executable # Some DECstations need all possible sections of an ECOFF executable
# #
@@ -25,7 +28,7 @@ strip-flags = $(addprefix --remove-section=,$(drop-sections)) @@ -25,7 +28,7 @@ strip-flags = $(addprefix --remove-secti
VMLINUX = vmlinux VMLINUX = vmlinux
@ -158,8 +152,6 @@ index 2a209d7..1cfce3e 100644
+ vmlinux.bin.gz \ + vmlinux.bin.gz \
+ uImage \ + uImage \
+ zImage + zImage
diff --git a/arch/mips/include/asm/bootinfo.h b/arch/mips/include/asm/bootinfo.h
index 610fe3a..8451d28 100644
--- a/arch/mips/include/asm/bootinfo.h --- a/arch/mips/include/asm/bootinfo.h
+++ b/arch/mips/include/asm/bootinfo.h +++ b/arch/mips/include/asm/bootinfo.h
@@ -57,6 +57,12 @@ @@ -57,6 +57,12 @@
@ -175,8 +167,6 @@ index 610fe3a..8451d28 100644
#define CL_SIZE COMMAND_LINE_SIZE #define CL_SIZE COMMAND_LINE_SIZE
extern char *system_type; extern char *system_type;
diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h
index 3bdc0e3..904c574 100644
--- a/arch/mips/include/asm/cpu.h --- a/arch/mips/include/asm/cpu.h
+++ b/arch/mips/include/asm/cpu.h +++ b/arch/mips/include/asm/cpu.h
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
@ -213,8 +203,6 @@ index 3bdc0e3..904c574 100644
CPU_LAST CPU_LAST
}; };
diff --git a/arch/mips/include/asm/mach-generic/irq.h b/arch/mips/include/asm/mach-generic/irq.h
index 70d9a25..73b7a83 100644
--- a/arch/mips/include/asm/mach-generic/irq.h --- a/arch/mips/include/asm/mach-generic/irq.h
+++ b/arch/mips/include/asm/mach-generic/irq.h +++ b/arch/mips/include/asm/mach-generic/irq.h
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
@ -226,8 +214,6 @@ index 70d9a25..73b7a83 100644
#endif #endif
#ifdef CONFIG_I8259 #ifdef CONFIG_I8259
diff --git a/arch/mips/include/asm/r4kcache.h b/arch/mips/include/asm/r4kcache.h
index 387bf59..b500056 100644
--- a/arch/mips/include/asm/r4kcache.h --- a/arch/mips/include/asm/r4kcache.h
+++ b/arch/mips/include/asm/r4kcache.h +++ b/arch/mips/include/asm/r4kcache.h
@@ -17,6 +17,58 @@ @@ -17,6 +17,58 @@
@ -289,7 +275,7 @@ index 387bf59..b500056 100644
/* /*
* This macro return a properly sign-extended address suitable as base address * This macro return a properly sign-extended address suitable as base address
* for indexed cache operations. Two issues here: * for indexed cache operations. Two issues here:
@@ -144,6 +196,7 @@ static inline void flush_icache_line_indexed(unsigned long addr) @@ -144,6 +196,7 @@ static inline void flush_icache_line_ind
{ {
__iflush_prologue __iflush_prologue
cache_op(Index_Invalidate_I, addr); cache_op(Index_Invalidate_I, addr);
@ -297,7 +283,7 @@ index 387bf59..b500056 100644
__iflush_epilogue __iflush_epilogue
} }
@@ -151,6 +204,7 @@ static inline void flush_dcache_line_indexed(unsigned long addr) @@ -151,6 +204,7 @@ static inline void flush_dcache_line_ind
{ {
__dflush_prologue __dflush_prologue
cache_op(Index_Writeback_Inv_D, addr); cache_op(Index_Writeback_Inv_D, addr);
@ -305,7 +291,7 @@ index 387bf59..b500056 100644
__dflush_epilogue __dflush_epilogue
} }
@@ -163,6 +217,7 @@ static inline void flush_icache_line(unsigned long addr) @@ -163,6 +217,7 @@ static inline void flush_icache_line(uns
{ {
__iflush_prologue __iflush_prologue
cache_op(Hit_Invalidate_I, addr); cache_op(Hit_Invalidate_I, addr);
@ -313,7 +299,7 @@ index 387bf59..b500056 100644
__iflush_epilogue __iflush_epilogue
} }
@@ -170,6 +225,7 @@ static inline void flush_dcache_line(unsigned long addr) @@ -170,6 +225,7 @@ static inline void flush_dcache_line(uns
{ {
__dflush_prologue __dflush_prologue
cache_op(Hit_Writeback_Inv_D, addr); cache_op(Hit_Writeback_Inv_D, addr);
@ -321,7 +307,7 @@ index 387bf59..b500056 100644
__dflush_epilogue __dflush_epilogue
} }
@@ -177,6 +233,7 @@ static inline void invalidate_dcache_line(unsigned long addr) @@ -177,6 +233,7 @@ static inline void invalidate_dcache_lin
{ {
__dflush_prologue __dflush_prologue
cache_op(Hit_Invalidate_D, addr); cache_op(Hit_Invalidate_D, addr);
@ -329,7 +315,7 @@ index 387bf59..b500056 100644
__dflush_epilogue __dflush_epilogue
} }
@@ -209,6 +266,7 @@ static inline void flush_scache_line(unsigned long addr) @@ -209,6 +266,7 @@ static inline void flush_scache_line(uns
static inline void protected_flush_icache_line(unsigned long addr) static inline void protected_flush_icache_line(unsigned long addr)
{ {
protected_cache_op(Hit_Invalidate_I, addr); protected_cache_op(Hit_Invalidate_I, addr);
@ -337,7 +323,7 @@ index 387bf59..b500056 100644
} }
/* /*
@@ -220,6 +278,7 @@ static inline void protected_flush_icache_line(unsigned long addr) @@ -220,6 +278,7 @@ static inline void protected_flush_icach
static inline void protected_writeback_dcache_line(unsigned long addr) static inline void protected_writeback_dcache_line(unsigned long addr)
{ {
protected_cache_op(Hit_Writeback_Inv_D, addr); protected_cache_op(Hit_Writeback_Inv_D, addr);
@ -345,7 +331,7 @@ index 387bf59..b500056 100644
} }
static inline void protected_writeback_scache_line(unsigned long addr) static inline void protected_writeback_scache_line(unsigned long addr)
@@ -396,8 +455,10 @@ static inline void blast_##pfx##cache##lsize##_page_indexed(unsigned long page) @@ -396,8 +455,10 @@ static inline void blast_##pfx##cache##l
__BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 16) __BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 16)
__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 16) __BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 16)
__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 16) __BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 16)
@ -356,7 +342,7 @@ index 387bf59..b500056 100644
__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 32) __BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 32)
__BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 64) __BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 64)
__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 64) __BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 64)
@@ -405,12 +466,122 @@ __BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 64) @@ -405,12 +466,122 @@ __BUILD_BLAST_CACHE(s, scache, Index_Wri
__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 128) __BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 128)
__BUILD_BLAST_CACHE(inv_d, dcache, Index_Writeback_Inv_D, Hit_Invalidate_D, 16) __BUILD_BLAST_CACHE(inv_d, dcache, Index_Writeback_Inv_D, Hit_Invalidate_D, 16)
@ -479,7 +465,7 @@ index 387bf59..b500056 100644
/* build blast_xxx_range, protected_blast_xxx_range */ /* build blast_xxx_range, protected_blast_xxx_range */
#define __BUILD_BLAST_CACHE_RANGE(pfx, desc, hitop, prot) \ #define __BUILD_BLAST_CACHE_RANGE(pfx, desc, hitop, prot) \
static inline void prot##blast_##pfx##cache##_range(unsigned long start, \ static inline void prot##blast_##pfx##cache##_range(unsigned long start, \
@@ -432,13 +603,73 @@ static inline void prot##blast_##pfx##cache##_range(unsigned long start, \ @@ -432,13 +603,73 @@ static inline void prot##blast_##pfx##ca
__##pfx##flush_epilogue \ __##pfx##flush_epilogue \
} }
@ -553,8 +539,6 @@ index 387bf59..b500056 100644
+#endif /* CONFIG_JZRISC */ +#endif /* CONFIG_JZRISC */
+ +
#endif /* _ASM_R4KCACHE_H */ #endif /* _ASM_R4KCACHE_H */
diff --git a/arch/mips/include/asm/suspend.h b/arch/mips/include/asm/suspend.h
index 294cdb6..94dc597 100644
--- a/arch/mips/include/asm/suspend.h --- a/arch/mips/include/asm/suspend.h
+++ b/arch/mips/include/asm/suspend.h +++ b/arch/mips/include/asm/suspend.h
@@ -2,6 +2,9 @@ @@ -2,6 +2,9 @@
@ -567,8 +551,6 @@ index 294cdb6..94dc597 100644
/* References to section boundaries */ /* References to section boundaries */
extern const void __nosave_begin, __nosave_end; extern const void __nosave_begin, __nosave_end;
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 1abe990..1315cff 100644
--- a/arch/mips/kernel/cpu-probe.c --- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c
@@ -160,6 +160,7 @@ void __init check_wait(void) @@ -160,6 +160,7 @@ void __init check_wait(void)
@ -579,7 +561,7 @@ index 1abe990..1315cff 100644
cpu_wait = r4k_wait; cpu_wait = r4k_wait;
break; break;
@@ -888,6 +889,23 @@ static inline void cpu_probe_cavium(struct cpuinfo_mips *c, unsigned int cpu) @@ -888,6 +889,23 @@ static inline void cpu_probe_cavium(stru
} }
} }
@ -613,8 +595,6 @@ index 1abe990..1315cff 100644
} }
BUG_ON(!__cpu_name[cpu]); BUG_ON(!__cpu_name[cpu]);
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index 6721ee2..dd4b70b 100644
--- a/arch/mips/mm/c-r4k.c --- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c
@@ -928,6 +928,36 @@ static void __cpuinit probe_pcache(void) @@ -928,6 +928,36 @@ static void __cpuinit probe_pcache(void)
@ -654,11 +634,9 @@ index 6721ee2..dd4b70b 100644
default: default:
if (!(config & MIPS_CONF_M)) if (!(config & MIPS_CONF_M))
panic("Don't know how to probe P-caches on this cpu."); panic("Don't know how to probe P-caches on this cpu.");
diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c
index 694d51f..4b2bc95 100644
--- a/arch/mips/mm/cache.c --- a/arch/mips/mm/cache.c
+++ b/arch/mips/mm/cache.c +++ b/arch/mips/mm/cache.c
@@ -52,6 +52,8 @@ void (*_dma_cache_wback)(unsigned long start, unsigned long size); @@ -52,6 +52,8 @@ void (*_dma_cache_wback)(unsigned long s
void (*_dma_cache_inv)(unsigned long start, unsigned long size); void (*_dma_cache_inv)(unsigned long start, unsigned long size);
EXPORT_SYMBOL(_dma_cache_wback_inv); EXPORT_SYMBOL(_dma_cache_wback_inv);
@ -667,11 +645,9 @@ index 694d51f..4b2bc95 100644
#endif /* CONFIG_DMA_NONCOHERENT */ #endif /* CONFIG_DMA_NONCOHERENT */
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 9a17bf8..9b80053 100644
--- a/arch/mips/mm/tlbex.c --- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c
@@ -385,6 +385,11 @@ static void __cpuinit build_tlb_write_entry(u32 **p, struct uasm_label **l, @@ -385,6 +385,11 @@ static void __cpuinit build_tlb_write_en
tlbw(p); tlbw(p);
break; break;

12
target/linux/xburst/patches-2.6.31/050-nand.patch
View File

@ -1,5 +1,3 @@
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index ce96c09..818bce0 100644
--- a/drivers/mtd/nand/Kconfig --- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig
@@ -452,4 +452,10 @@ config MTD_NAND_SOCRATES @@ -452,4 +452,10 @@ config MTD_NAND_SOCRATES
@ -13,22 +11,18 @@ index ce96c09..818bce0 100644
+ Support NAND Flash device on Jz4740 board + Support NAND Flash device on Jz4740 board
+ +
endif # MTD_NAND endif # MTD_NAND
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index f3a786b..ef4590b 100644
--- a/drivers/mtd/nand/Makefile --- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile
@@ -40,5 +40,6 @@ obj-$(CONFIG_MTD_NAND_SH_FLCTL) += sh_flctl.o @@ -40,5 +40,6 @@ obj-$(CONFIG_MTD_NAND_SH_FLCTL) += sh_f
obj-$(CONFIG_MTD_NAND_MXC) += mxc_nand.o obj-$(CONFIG_MTD_NAND_MXC) += mxc_nand.o
obj-$(CONFIG_MTD_NAND_SOCRATES) += socrates_nand.o obj-$(CONFIG_MTD_NAND_SOCRATES) += socrates_nand.o
obj-$(CONFIG_MTD_NAND_TXX9NDFMC) += txx9ndfmc.o obj-$(CONFIG_MTD_NAND_TXX9NDFMC) += txx9ndfmc.o
+obj-$(CONFIG_MTD_NAND_JZ4740) += jz4740_nand.o +obj-$(CONFIG_MTD_NAND_JZ4740) += jz4740_nand.o
nand-objs := nand_base.o nand_bbt.o nand-objs := nand_base.o nand_bbt.o
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 8c21b89..1749f31 100644
--- a/drivers/mtd/nand/nand_base.c --- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c
@@ -953,29 +953,22 @@ static int nand_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip, @@ -953,29 +953,22 @@ static int nand_read_page_hwecc(struct m
uint8_t *ecc_calc = chip->buffers->ecccalc; uint8_t *ecc_calc = chip->buffers->ecccalc;
uint8_t *ecc_code = chip->buffers->ecccode; uint8_t *ecc_code = chip->buffers->ecccode;
uint32_t *eccpos = chip->ecc.layout->eccpos; uint32_t *eccpos = chip->ecc.layout->eccpos;
@ -63,7 +57,7 @@ index 8c21b89..1749f31 100644
return 0; return 0;
} }
@@ -1125,6 +1118,8 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from, @@ -1125,6 +1118,8 @@ static int nand_do_read_ops(struct mtd_i
bufpoi = aligned ? buf : chip->buffers->databuf; bufpoi = aligned ? buf : chip->buffers->databuf;
if (likely(sndcmd)) { if (likely(sndcmd)) {

6
target/linux/xburst/patches-2.6.31/051-fb.patch
View File

@ -1,5 +1,3 @@
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 3b54b39..2b08352 100644
--- a/drivers/video/Kconfig --- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig +++ b/drivers/video/Kconfig
@@ -2148,6 +2148,15 @@ config FB_BROADSHEET @@ -2148,6 +2148,15 @@ config FB_BROADSHEET
@ -18,11 +16,9 @@ index 3b54b39..2b08352 100644
source "drivers/video/omap/Kconfig" source "drivers/video/omap/Kconfig"
source "drivers/video/backlight/Kconfig" source "drivers/video/backlight/Kconfig"
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 01a819f..5af158f 100644
--- a/drivers/video/Makefile --- a/drivers/video/Makefile
+++ b/drivers/video/Makefile +++ b/drivers/video/Makefile
@@ -126,6 +126,7 @@ obj-$(CONFIG_FB_OMAP) += omap/ @@ -126,6 +126,7 @@ obj-$(CONFIG_FB_OMAP) += oma
obj-$(CONFIG_XEN_FBDEV_FRONTEND) += xen-fbfront.o obj-$(CONFIG_XEN_FBDEV_FRONTEND) += xen-fbfront.o
obj-$(CONFIG_FB_CARMINE) += carminefb.o obj-$(CONFIG_FB_CARMINE) += carminefb.o
obj-$(CONFIG_FB_MB862XX) += mb862xx/ obj-$(CONFIG_FB_MB862XX) += mb862xx/

4
target/linux/xburst/patches-2.6.31/052-rtc.patch
View File

@ -1,5 +1,3 @@
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 1b5ea99..2a6a267 100644
--- a/drivers/rtc/Kconfig --- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig
@@ -460,6 +460,17 @@ config RTC_DRV_EFI @@ -460,6 +460,17 @@ config RTC_DRV_EFI
@ -20,8 +18,6 @@ index 1b5ea99..2a6a267 100644
config RTC_DRV_STK17TA8 config RTC_DRV_STK17TA8
tristate "Simtek STK17TA8" tristate "Simtek STK17TA8"
depends on RTC_CLASS depends on RTC_CLASS
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 828cb64..013a6d2 100644
--- a/drivers/rtc/Makefile --- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile
@@ -40,6 +40,7 @@ obj-$(CONFIG_RTC_DRV_EFI) += rtc-efi.o @@ -40,6 +40,7 @@ obj-$(CONFIG_RTC_DRV_EFI) += rtc-efi.o

12
target/linux/xburst/patches-2.6.31/053-adc.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/misc/Kconfig 2009-09-02 16:48:02.000000000 +0200 --- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig 2009-09-21 22:06:56.000000000 +0200 +++ b/drivers/misc/Kconfig
@@ -233,6 +233,17 @@ @@ -233,6 +233,17 @@ config ISL29003
This driver can also be built as a module. If so, the module This driver can also be built as a module. If so, the module
will be called isl29003. will be called isl29003.
@ -18,9 +18,9 @@
source "drivers/misc/c2port/Kconfig" source "drivers/misc/c2port/Kconfig"
source "drivers/misc/eeprom/Kconfig" source "drivers/misc/eeprom/Kconfig"
source "drivers/misc/cb710/Kconfig" source "drivers/misc/cb710/Kconfig"
--- a/linux-2.6/drivers/misc/Makefile 2009-09-02 16:48:02.000000000 +0200 --- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile 2009-09-21 16:47:41.000000000 +0200 +++ b/drivers/misc/Makefile
@@ -20,5 +20,6 @@ @@ -20,5 +20,6 @@ obj-$(CONFIG_SGI_GRU) += sgi-gru/
obj-$(CONFIG_HP_ILO) += hpilo.o obj-$(CONFIG_HP_ILO) += hpilo.o
obj-$(CONFIG_ISL29003) += isl29003.o obj-$(CONFIG_ISL29003) += isl29003.o
obj-$(CONFIG_C2PORT) += c2port/ obj-$(CONFIG_C2PORT) += c2port/

6
target/linux/xburst/patches-2.6.31/100-battery.patch
View File

@ -1,5 +1,3 @@
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index bdbc4f7..3942136 100644
--- a/drivers/power/Kconfig --- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig +++ b/drivers/power/Kconfig
@@ -103,4 +103,15 @@ config CHARGER_PCF50633 @@ -103,4 +103,15 @@ config CHARGER_PCF50633
@ -18,11 +16,9 @@ index bdbc4f7..3942136 100644
+ called jz4740-battery. + called jz4740-battery.
+ +
endif # POWER_SUPPLY endif # POWER_SUPPLY
diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index 380d17c..4eebbf5 100644
--- a/drivers/power/Makefile --- a/drivers/power/Makefile
+++ b/drivers/power/Makefile +++ b/drivers/power/Makefile
@@ -28,3 +28,4 @@ obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o @@ -28,3 +28,4 @@ obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00
obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o
obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o
obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o

4
target/linux/xburst/patches-2.6.31/101-mmc.patch
View File

@ -1,5 +1,3 @@
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index b4e1c22..a2e6ac1 100644
--- a/drivers/mmc/host/Kconfig --- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig
@@ -66,6 +66,15 @@ config MMC_RICOH_MMC @@ -66,6 +66,15 @@ config MMC_RICOH_MMC
@ -18,8 +16,6 @@ index b4e1c22..a2e6ac1 100644
To compile this driver as a module, choose M here: To compile this driver as a module, choose M here:
the module will be called ricoh_mmc. the module will be called ricoh_mmc.
diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
index 4cce976..a3d336a 100644
--- a/drivers/mmc/host/Makefile --- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile
@@ -6,6 +6,7 @@ ifeq ($(CONFIG_MMC_DEBUG),y) @@ -6,6 +6,7 @@ ifeq ($(CONFIG_MMC_DEBUG),y)

6
target/linux/xburst/patches-2.6.31/102-video.patch
View File

@ -1,5 +1,3 @@
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 2b08352..d25c6f6 100644
--- a/drivers/video/Kconfig --- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig +++ b/drivers/video/Kconfig
@@ -237,6 +237,119 @@ config FB_TILEBLITTING @@ -237,6 +237,119 @@ config FB_TILEBLITTING
@ -122,11 +120,9 @@ index 2b08352..d25c6f6 100644
config FB_CIRRUS config FB_CIRRUS
tristate "Cirrus Logic support" tristate "Cirrus Logic support"
depends on FB && (ZORRO || PCI) depends on FB && (ZORRO || PCI)
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 5af158f..c037677 100644
--- a/drivers/video/Makefile --- a/drivers/video/Makefile
+++ b/drivers/video/Makefile +++ b/drivers/video/Makefile
@@ -28,6 +28,9 @@ obj-$(CONFIG_FB_DDC) += fb_ddc.o @@ -28,6 +28,9 @@ obj-$(CONFIG_FB_DDC) += fb_ddc
obj-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o obj-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o
# Hardware specific drivers go first # Hardware specific drivers go first

6
target/linux/xburst/patches-2.6.31/103-lcm.patch
View File

@ -1,5 +1,3 @@
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index f9d19be..4299648 100644
--- a/drivers/video/backlight/Kconfig --- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig +++ b/drivers/video/backlight/Kconfig
@@ -93,6 +93,13 @@ config LCD_HP700 @@ -93,6 +93,13 @@ config LCD_HP700
@ -16,11 +14,9 @@ index f9d19be..4299648 100644
# #
# Backlight # Backlight
# #
diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
index 4eb178c..c2fd42c 100644
--- a/drivers/video/backlight/Makefile --- a/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile +++ b/drivers/video/backlight/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_LCD_PLATFORM) += platform_lcd.o @@ -9,6 +9,7 @@ obj-$(CONFIG_LCD_PLATFORM) += platfor
obj-$(CONFIG_LCD_VGG2432A4) += vgg2432a4.o obj-$(CONFIG_LCD_VGG2432A4) += vgg2432a4.o
obj-$(CONFIG_LCD_TDO24M) += tdo24m.o obj-$(CONFIG_LCD_TDO24M) += tdo24m.o
obj-$(CONFIG_LCD_TOSA) += tosa_lcd.o obj-$(CONFIG_LCD_TOSA) += tosa_lcd.o

18
target/linux/xburst/patches-2.6.31/103-serial.patch
View File

@ -1,8 +1,6 @@
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index fb867a9..2ecd7f4 100644
--- a/drivers/serial/8250.c --- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c +++ b/drivers/serial/8250.c
@@ -194,7 +194,7 @@ static const struct serial8250_config uart_config[] = { @@ -194,7 +194,7 @@ static const struct serial8250_config ua
[PORT_16550A] = { [PORT_16550A] = {
.name = "16550A", .name = "16550A",
.fifo_size = 16, .fifo_size = 16,
@ -11,7 +9,7 @@ index fb867a9..2ecd7f4 100644
.fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10, .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
.flags = UART_CAP_FIFO, .flags = UART_CAP_FIFO,
}, },
@@ -401,6 +401,10 @@ static unsigned int mem_serial_in(struct uart_port *p, int offset) @@ -401,6 +401,10 @@ static unsigned int mem_serial_in(struct
static void mem_serial_out(struct uart_port *p, int offset, int value) static void mem_serial_out(struct uart_port *p, int offset, int value)
{ {
offset = map_8250_out_reg(p, offset) << p->regshift; offset = map_8250_out_reg(p, offset) << p->regshift;
@ -22,7 +20,7 @@ index fb867a9..2ecd7f4 100644
writeb(value, p->membase + offset); writeb(value, p->membase + offset);
} }
@@ -2213,6 +2217,83 @@ static void serial8250_shutdown(struct uart_port *port) @@ -2213,6 +2217,83 @@ static void serial8250_shutdown(struct u
serial_unlink_irq_chain(up); serial_unlink_irq_chain(up);
} }
@ -106,7 +104,7 @@ index fb867a9..2ecd7f4 100644
static unsigned int serial8250_get_divisor(struct uart_port *port, unsigned int baud) static unsigned int serial8250_get_divisor(struct uart_port *port, unsigned int baud)
{ {
unsigned int quot; unsigned int quot;
@@ -2232,6 +2313,7 @@ static unsigned int serial8250_get_divisor(struct uart_port *port, unsigned int @@ -2232,6 +2313,7 @@ static unsigned int serial8250_get_divis
return quot; return quot;
} }
@ -114,7 +112,7 @@ index fb867a9..2ecd7f4 100644
static void static void
serial8250_set_termios(struct uart_port *port, struct ktermios *termios, serial8250_set_termios(struct uart_port *port, struct ktermios *termios,
@@ -2241,6 +2323,9 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios, @@ -2241,6 +2323,9 @@ serial8250_set_termios(struct uart_port
unsigned char cval, fcr = 0; unsigned char cval, fcr = 0;
unsigned long flags; unsigned long flags;
unsigned int baud, quot; unsigned int baud, quot;
@ -124,7 +122,7 @@ index fb867a9..2ecd7f4 100644
switch (termios->c_cflag & CSIZE) { switch (termios->c_cflag & CSIZE) {
case CS5: case CS5:
@@ -2273,7 +2358,12 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios, @@ -2273,7 +2358,12 @@ serial8250_set_termios(struct uart_port
* Ask the core to calculate the divisor for us. * Ask the core to calculate the divisor for us.
*/ */
baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
@ -137,7 +135,7 @@ index fb867a9..2ecd7f4 100644
/* /*
* Oxford Semi 952 rev B workaround * Oxford Semi 952 rev B workaround
@@ -2351,6 +2441,10 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios, @@ -2351,6 +2441,10 @@ serial8250_set_termios(struct uart_port
if (up->capabilities & UART_CAP_UUE) if (up->capabilities & UART_CAP_UUE)
up->ier |= UART_IER_UUE | UART_IER_RTOIE; up->ier |= UART_IER_UUE | UART_IER_RTOIE;
@ -148,7 +146,7 @@ index fb867a9..2ecd7f4 100644
serial_out(up, UART_IER, up->ier); serial_out(up, UART_IER, up->ier);
if (up->capabilities & UART_CAP_EFR) { if (up->capabilities & UART_CAP_EFR) {
@@ -2385,7 +2479,15 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios, @@ -2385,7 +2479,15 @@ serial8250_set_termios(struct uart_port
serial_outp(up, UART_LCR, cval | UART_LCR_DLAB);/* set DLAB */ serial_outp(up, UART_LCR, cval | UART_LCR_DLAB);/* set DLAB */
} }

16
target/linux/xburst/patches-2.6.31/104-usb.patch
View File

@ -1,5 +1,3 @@
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index dcd49f1..a520bed 100644
--- a/drivers/usb/Kconfig --- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig
@@ -44,6 +44,7 @@ config USB_ARCH_HAS_OHCI @@ -44,6 +44,7 @@ config USB_ARCH_HAS_OHCI
@ -10,11 +8,9 @@ index dcd49f1..a520bed 100644
# SH: # SH:
default y if CPU_SUBTYPE_SH7720 default y if CPU_SUBTYPE_SH7720
default y if CPU_SUBTYPE_SH7721 default y if CPU_SUBTYPE_SH7721
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 71f86c6..d3f9344 100644
--- a/drivers/usb/core/hub.c --- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c
@@ -1857,6 +1857,25 @@ static int hub_port_reset(struct usb_hub *hub, int port1, @@ -1857,6 +1857,25 @@ static int hub_port_reset(struct usb_hub
{ {
int i, status; int i, status;
@ -40,7 +36,7 @@ index 71f86c6..d3f9344 100644
/* Block EHCI CF initialization during the port reset. /* Block EHCI CF initialization during the port reset.
* Some companion controllers don't like it when they mix. * Some companion controllers don't like it when they mix.
*/ */
@@ -2818,11 +2837,35 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1, @@ -2818,11 +2837,35 @@ static void hub_port_connect_change(stru
le16_to_cpu(hub->descriptor->wHubCharacteristics); le16_to_cpu(hub->descriptor->wHubCharacteristics);
struct usb_device *udev; struct usb_device *udev;
int status, i; int status, i;
@ -76,8 +72,6 @@ index 71f86c6..d3f9344 100644
if (hub->has_indicators) { if (hub->has_indicators) {
set_port_led(hub, port1, HUB_LED_AUTO); set_port_led(hub, port1, HUB_LED_AUTO);
hub->indicator[port1-1] = INDICATOR_AUTO; hub->indicator[port1-1] = INDICATOR_AUTO;
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 7f8e83a..1c99cd2 100644
--- a/drivers/usb/gadget/Kconfig --- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig
@@ -121,11 +121,25 @@ choice @@ -121,11 +121,25 @@ choice
@ -125,8 +119,6 @@ index 7f8e83a..1c99cd2 100644
# #
# USB Gadget Drivers # USB Gadget Drivers
# #
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index e6017e6..b758686 100644
--- a/drivers/usb/gadget/Makefile --- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile
@@ -27,6 +27,9 @@ obj-$(CONFIG_USB_FSL_QE) += fsl_qe_udc.o @@ -27,6 +27,9 @@ obj-$(CONFIG_USB_FSL_QE) += fsl_qe_udc.o
@ -139,8 +131,6 @@ index e6017e6..b758686 100644
# #
# USB gadget drivers # USB gadget drivers
diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h
index 8e0e9a0..d9c0990 100644
--- a/drivers/usb/gadget/gadget_chips.h --- a/drivers/usb/gadget/gadget_chips.h
+++ b/drivers/usb/gadget/gadget_chips.h +++ b/drivers/usb/gadget/gadget_chips.h
@@ -15,6 +15,12 @@ @@ -15,6 +15,12 @@
@ -156,7 +146,7 @@ index 8e0e9a0..d9c0990 100644
#ifdef CONFIG_USB_GADGET_NET2280 #ifdef CONFIG_USB_GADGET_NET2280
#define gadget_is_net2280(g) !strcmp("net2280", (g)->name) #define gadget_is_net2280(g) !strcmp("net2280", (g)->name)
#else #else
@@ -239,6 +245,9 @@ static inline int usb_gadget_controller_number(struct usb_gadget *gadget) @@ -239,6 +245,9 @@ static inline int usb_gadget_controller_
return 0x23; return 0x23;
else if (gadget_is_langwell(gadget)) else if (gadget_is_langwell(gadget))
return 0x24; return 0x24;

16
target/linux/xburst/patches-2.6.31/105-sound.patch
View File

@ -1,5 +1,3 @@
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index 2389352..24dcb18 100644
--- a/include/sound/pcm.h --- a/include/sound/pcm.h
+++ b/include/sound/pcm.h +++ b/include/sound/pcm.h
@@ -113,23 +113,23 @@ struct snd_pcm_ops { @@ -113,23 +113,23 @@ struct snd_pcm_ops {
@ -39,11 +37,9 @@ index 2389352..24dcb18 100644
#define SNDRV_PCM_RATE_8000_48000 (SNDRV_PCM_RATE_8000_44100|SNDRV_PCM_RATE_48000) #define SNDRV_PCM_RATE_8000_48000 (SNDRV_PCM_RATE_8000_44100|SNDRV_PCM_RATE_48000)
#define SNDRV_PCM_RATE_8000_96000 (SNDRV_PCM_RATE_8000_48000|SNDRV_PCM_RATE_64000|\ #define SNDRV_PCM_RATE_8000_96000 (SNDRV_PCM_RATE_8000_48000|SNDRV_PCM_RATE_64000|\
SNDRV_PCM_RATE_88200|SNDRV_PCM_RATE_96000) SNDRV_PCM_RATE_88200|SNDRV_PCM_RATE_96000)
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index ac2150e..3b3183f 100644
--- a/sound/core/pcm_native.c --- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c
@@ -1748,12 +1748,13 @@ static int snd_pcm_hw_rule_sample_bits(struct snd_pcm_hw_params *params, @@ -1748,12 +1748,13 @@ static int snd_pcm_hw_rule_sample_bits(s
return snd_interval_refine(hw_param_interval(params, rule->var), &t); return snd_interval_refine(hw_param_interval(params, rule->var), &t);
} }
@ -60,8 +56,6 @@ index ac2150e..3b3183f 100644
const struct snd_pcm_hw_constraint_list snd_pcm_known_rates = { const struct snd_pcm_hw_constraint_list snd_pcm_known_rates = {
.count = ARRAY_SIZE(rates), .count = ARRAY_SIZE(rates),
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index d3e786a..a5335f4 100644
--- a/sound/soc/Kconfig --- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig +++ b/sound/soc/Kconfig
@@ -35,6 +35,7 @@ source "sound/soc/s3c24xx/Kconfig" @@ -35,6 +35,7 @@ source "sound/soc/s3c24xx/Kconfig"
@ -72,8 +66,6 @@ index d3e786a..a5335f4 100644
# Supported codecs # Supported codecs
source "sound/soc/codecs/Kconfig" source "sound/soc/codecs/Kconfig"
diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index 6f1e28d..132772d 100644
--- a/sound/soc/Makefile --- a/sound/soc/Makefile
+++ b/sound/soc/Makefile +++ b/sound/soc/Makefile
@@ -13,3 +13,4 @@ obj-$(CONFIG_SND_SOC) += s3c24xx/ @@ -13,3 +13,4 @@ obj-$(CONFIG_SND_SOC) += s3c24xx/
@ -81,8 +73,6 @@ index 6f1e28d..132772d 100644
obj-$(CONFIG_SND_SOC) += sh/ obj-$(CONFIG_SND_SOC) += sh/
obj-$(CONFIG_SND_SOC) += txx9/ obj-$(CONFIG_SND_SOC) += txx9/
+obj-$(CONFIG_SND_SOC) += jz4740/ +obj-$(CONFIG_SND_SOC) += jz4740/
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index bbc97fd..f28a1a4 100644
--- a/sound/soc/codecs/Kconfig --- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig
@@ -176,3 +176,10 @@ config SND_SOC_WM9712 @@ -176,3 +176,10 @@ config SND_SOC_WM9712
@ -96,8 +86,6 @@ index bbc97fd..f28a1a4 100644
+ help + help
+ Say Y if you want to use internal codec on Ingenic JZ4720/JZ4740 based + Say Y if you want to use internal codec on Ingenic JZ4720/JZ4740 based
+ boards. + boards.
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 8b75305..d7bd0a4 100644
--- a/sound/soc/codecs/Makefile --- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile
@@ -34,6 +34,7 @@ snd-soc-wm9081-objs := wm9081.o @@ -34,6 +34,7 @@ snd-soc-wm9081-objs := wm9081.o
@ -108,7 +96,7 @@ index 8b75305..d7bd0a4 100644
obj-$(CONFIG_SND_SOC_AC97_CODEC) += snd-soc-ac97.o obj-$(CONFIG_SND_SOC_AC97_CODEC) += snd-soc-ac97.o
obj-$(CONFIG_SND_SOC_AD1980) += snd-soc-ad1980.o obj-$(CONFIG_SND_SOC_AD1980) += snd-soc-ad1980.o
@@ -71,3 +72,4 @@ obj-$(CONFIG_SND_SOC_WM9081) += snd-soc-wm9081.o @@ -71,3 +72,4 @@ obj-$(CONFIG_SND_SOC_WM9081) += snd-soc-
obj-$(CONFIG_SND_SOC_WM9705) += snd-soc-wm9705.o obj-$(CONFIG_SND_SOC_WM9705) += snd-soc-wm9705.o
obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-wm9712.o obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-wm9712.o
obj-$(CONFIG_SND_SOC_WM9713) += snd-soc-wm9713.o obj-$(CONFIG_SND_SOC_WM9713) += snd-soc-wm9713.o

16
target/linux/xburst/patches-2.6.31/200-qi_lb60.patch
View File

@ -1,6 +1,3 @@
diff --git a/arch/mips/include/asm/mach-jz4740/board-qi_lb60.h b/arch/mips/include/asm/mach-jz4740/board-qi_lb60.h
new file mode 100644
index 0000000..b2f02f4
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/mach-jz4740/board-qi_lb60.h +++ b/arch/mips/include/asm/mach-jz4740/board-qi_lb60.h
@@ -0,0 +1,79 @@ @@ -0,0 +1,79 @@
@ -83,8 +80,6 @@ index 0000000..b2f02f4
+}) +})
+ +
+#endif /* __ASM_JZ4740_QI_LB60_H__ */ +#endif /* __ASM_JZ4740_QI_LB60_H__ */
diff --git a/arch/mips/include/asm/mach-jz4740/jz4740.h b/arch/mips/include/asm/mach-jz4740/jz4740.h
index 437caf4..d38d5f1 100644
--- a/arch/mips/include/asm/mach-jz4740/jz4740.h --- a/arch/mips/include/asm/mach-jz4740/jz4740.h
+++ b/arch/mips/include/asm/mach-jz4740/jz4740.h +++ b/arch/mips/include/asm/mach-jz4740/jz4740.h
@@ -43,6 +43,10 @@ @@ -43,6 +43,10 @@
@ -98,8 +93,6 @@ index 437caf4..d38d5f1 100644
/* Add other platform definition here ... */ /* Add other platform definition here ... */
diff --git a/arch/mips/jz4740/Makefile b/arch/mips/jz4740/Makefile
index 99ba3e0..efdb654 100644
--- a/arch/mips/jz4740/Makefile --- a/arch/mips/jz4740/Makefile
+++ b/arch/mips/jz4740/Makefile +++ b/arch/mips/jz4740/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_JZ4740_LEO) += board-leo.o @@ -16,6 +16,7 @@ obj-$(CONFIG_JZ4740_LEO) += board-leo.o
@ -110,9 +103,6 @@ index 99ba3e0..efdb654 100644
# PM support # PM support
diff --git a/arch/mips/jz4740/board-qi_lb60.c b/arch/mips/jz4740/board-qi_lb60.c
new file mode 100644
index 0000000..127fad8
--- /dev/null --- /dev/null
+++ b/arch/mips/jz4740/board-qi_lb60.c +++ b/arch/mips/jz4740/board-qi_lb60.c
@@ -0,0 +1,110 @@ @@ -0,0 +1,110 @@
@ -226,8 +216,6 @@ index 0000000..127fad8
+ +
+ jz_timer_callback = pi_timer_callback; + jz_timer_callback = pi_timer_callback;
+} +}
diff --git a/drivers/video/jzlcd.c b/drivers/video/jzlcd.c
index 6df9439..2cb7114 100755
--- a/drivers/video/jzlcd.c --- a/drivers/video/jzlcd.c
+++ b/drivers/video/jzlcd.c +++ b/drivers/video/jzlcd.c
@@ -127,15 +127,18 @@ static struct jzfb_info jzfb = { @@ -127,15 +127,18 @@ static struct jzfb_info jzfb = {
@ -258,7 +246,7 @@ index 6df9439..2cb7114 100755
#if defined(CONFIG_JZLCD_INNOLUX_PT035TN01_SERIAL) #if defined(CONFIG_JZLCD_INNOLUX_PT035TN01_SERIAL)
MODE_8BIT_SERIAL_TFT | PCLK_N | HSYNC_N | VSYNC_N, MODE_8BIT_SERIAL_TFT | PCLK_N | HSYNC_N | VSYNC_N,
320, 240, 32, 60, 1, 1, 10, 50, 10, 13 320, 240, 32, 60, 1, 1, 10, 50, 10, 13
@@ -1487,7 +1490,7 @@ static int __init jzfb_probe(struct platform_device *pdev) @@ -1487,7 +1490,7 @@ static int __init jzfb_probe(struct plat
printk("fb%d: %s frame buffer device, using %dK of video memory\n", printk("fb%d: %s frame buffer device, using %dK of video memory\n",
cfb->fb.node, cfb->fb.fix.id, cfb->fb.fix.smem_len>>10); cfb->fb.node, cfb->fb.fix.id, cfb->fb.fix.smem_len>>10);
@ -267,8 +255,6 @@ index 6df9439..2cb7114 100755
return 0; return 0;
diff --git a/drivers/video/jzlcd.h b/drivers/video/jzlcd.h
index 8a3d855..e2e6978 100755
--- a/drivers/video/jzlcd.h --- a/drivers/video/jzlcd.h
+++ b/drivers/video/jzlcd.h +++ b/drivers/video/jzlcd.h
@@ -363,7 +363,11 @@ do { \ @@ -363,7 +363,11 @@ do { \

6
target/linux/xburst/patches-2.6.31/210-qi_lb60_lcd.patch
View File

@ -1,5 +1,3 @@
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index d25c6f6..5dc3d4c 100644
--- a/drivers/video/Kconfig --- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig +++ b/drivers/video/Kconfig
@@ -281,6 +281,42 @@ config FB_JZLCD_4730_4740 @@ -281,6 +281,42 @@ config FB_JZLCD_4730_4740
@ -45,11 +43,9 @@ index d25c6f6..5dc3d4c 100644
choice choice
depends on FB_JZLCD_4730_4740 depends on FB_JZLCD_4730_4740
prompt "LCD Panel" prompt "LCD Panel"
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index c037677..c8db3fc 100644
--- a/drivers/video/Makefile --- a/drivers/video/Makefile
+++ b/drivers/video/Makefile +++ b/drivers/video/Makefile
@@ -28,7 +28,7 @@ obj-$(CONFIG_FB_DDC) += fb_ddc.o @@ -28,7 +28,7 @@ obj-$(CONFIG_FB_DDC) += fb_ddc
obj-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o obj-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o
# Hardware specific drivers go first # Hardware specific drivers go first

13
target/linux/xburst/patches-2.6.31/220-add-2gb-nand-support.patch
View File

@ -1,8 +1,6 @@
diff --git a/arch/mips/jz4740/platform.c b/arch/mips/jz4740/platform.c
index 5cf3c38..04024d2 100644
--- a/arch/mips/jz4740/platform.c --- a/arch/mips/jz4740/platform.c
+++ b/arch/mips/jz4740/platform.c +++ b/arch/mips/jz4740/platform.c
@@ -170,6 +170,8 @@ static struct resource jz_nand_resources[] = { @@ -170,6 +170,8 @@ static struct resource jz_nand_resources
}, },
}; };
@ -11,7 +9,7 @@ index 5cf3c38..04024d2 100644
static struct nand_ecclayout qi_lb60_ecclayout = { static struct nand_ecclayout qi_lb60_ecclayout = {
.eccbytes = 36, .eccbytes = 36,
.eccpos = { .eccpos = {
@@ -186,23 +188,62 @@ static struct nand_ecclayout qi_lb60_ecclayout = { @@ -186,23 +188,62 @@ static struct nand_ecclayout qi_lb60_ecc
}; };
static struct mtd_partition qi_lb60_partitions[] = { static struct mtd_partition qi_lb60_partitions[] = {
@ -31,7 +29,6 @@ index 5cf3c38..04024d2 100644
- .offset = 100 * 0x100000, - .offset = 100 * 0x100000,
- .size = 20 * 0x100000, - .size = 20 * 0x100000,
- }, - },
-};
+ { .name = "NAND BOOT partition", + { .name = "NAND BOOT partition",
+ .offset = 0 * 0x100000, + .offset = 0 * 0x100000,
+ .size = 4 * 0x100000, + .size = 4 * 0x100000,
@ -86,12 +83,12 @@ index 5cf3c38..04024d2 100644
+ .offset = 512 * 0x100000, + .offset = 512 * 0x100000,
+ .size = (512 + 1024) * 0x100000, + .size = (512 + 1024) * 0x100000,
+ }, + },
+}; };
+#endif /* QI_LB60_1GB_NAND */ +#endif /* QI_LB60_1GB_NAND */
static struct jz_nand_platform_data jz_nand_platform_data = { static struct jz_nand_platform_data jz_nand_platform_data = {
.num_partitions = ARRAY_SIZE(qi_lb60_partitions), .num_partitions = ARRAY_SIZE(qi_lb60_partitions),
@@ -219,7 +260,9 @@ static struct platform_device jz_nand_device = { @@ -219,7 +260,9 @@ static struct platform_device jz_nand_de
.platform_data = &jz_nand_platform_data, .platform_data = &jz_nand_platform_data,
} }
}; };
@ -102,8 +99,6 @@ index 5cf3c38..04024d2 100644
#define KEY_QI_QI KEY_F13 #define KEY_QI_QI KEY_F13
#define KEY_QI_UPRED KEY_F14 #define KEY_QI_UPRED KEY_F14
diff --git a/include/mtd/mtd-abi.h b/include/mtd/mtd-abi.h
index f86db5a..b19fffa 100644
--- a/include/mtd/mtd-abi.h --- a/include/mtd/mtd-abi.h
+++ b/include/mtd/mtd-abi.h +++ b/include/mtd/mtd-abi.h
@@ -135,7 +135,7 @@ struct nand_oobfree { @@ -135,7 +135,7 @@ struct nand_oobfree {

16
target/linux/xburst/patches-2.6.31/230-cleanup-qi_lb60.h.patch
View File

@ -1,5 +1,3 @@
diff --git a/arch/mips/include/asm/mach-jz4740/board-qi_lb60.h b/arch/mips/include/asm/mach-jz4740/board-qi_lb60.h
index b2f02f4..2c3260f 100644
--- a/arch/mips/include/asm/mach-jz4740/board-qi_lb60.h --- a/arch/mips/include/asm/mach-jz4740/board-qi_lb60.h
+++ b/arch/mips/include/asm/mach-jz4740/board-qi_lb60.h +++ b/arch/mips/include/asm/mach-jz4740/board-qi_lb60.h
@@ -1,49 +1,57 @@ @@ -1,49 +1,57 @@
@ -47,19 +45,21 @@ index b2f02f4..2c3260f 100644
-#define GPIO_LCD_CS (2 * 32 + 21) -#define GPIO_LCD_CS (2 * 32 + 21)
-#define GPIO_DISP_OFF_N (3 * 32 + 21) -#define GPIO_DISP_OFF_N (3 * 32 + 21)
-#define GPIO_PWM (3 * 32 + 27) -#define GPIO_PWM (3 * 32 + 27)
-
-#define GPIO_AMP_EN (3 * 32 + 4)
-
-#define GPIO_SD_CD_N (3 * 32 + 0)
-#define GPIO_SD_VCC_EN_N (3 * 32 + 2)
-#define GPIO_SD_WP (3 * 32 + 16)
+#define GPIO_DC_DETE_N JZ_GPIO_PORTC(26) +#define GPIO_DC_DETE_N JZ_GPIO_PORTC(26)
+#define GPIO_CHARG_STAT_N JZ_GPIO_PORTC(27) +#define GPIO_CHARG_STAT_N JZ_GPIO_PORTC(27)
+#define GPIO_LED_EN JZ_GPIO_PORTC(28) +#define GPIO_LED_EN JZ_GPIO_PORTC(28)
+#define GPIO_LCD_CS JZ_GPIO_PORTC(21) +#define GPIO_LCD_CS JZ_GPIO_PORTC(21)
+#define GPIO_DISP_OFF_N JZ_GPIO_PORTD(21) +#define GPIO_DISP_OFF_N JZ_GPIO_PORTD(21)
+#define GPIO_PWM JZ_GPIO_PORTD(27) +#define GPIO_PWM JZ_GPIO_PORTD(27)
+
-#define GPIO_AMP_EN (3 * 32 + 4)
+#define GPIO_AMP_EN JZ_GPIO_PORTD(4) +#define GPIO_AMP_EN JZ_GPIO_PORTD(4)
+
-#define GPIO_SD_CD_N (3 * 32 + 0)
-#define GPIO_SD_VCC_EN_N (3 * 32 + 2)
-#define GPIO_SD_WP (3 * 32 + 16)
+#define GPIO_SD_CD_N JZ_GPIO_PORTD(0) +#define GPIO_SD_CD_N JZ_GPIO_PORTD(0)
+#define GPIO_SD_VCC_EN_N JZ_GPIO_PORTD(2) +#define GPIO_SD_VCC_EN_N JZ_GPIO_PORTD(2)
+#define GPIO_SD_WP JZ_GPIO_PORTD(16) +#define GPIO_SD_WP JZ_GPIO_PORTD(16)

6
target/linux/xburst/patches-2.6.31/300-jffs2-summery-vmalloc.patch
View File

@ -1,8 +1,6 @@
diff --git a/fs/jffs2/summary.c b/fs/jffs2/summary.c
index 6caf1e1..b4882c6 100644
--- a/fs/jffs2/summary.c --- a/fs/jffs2/summary.c
+++ b/fs/jffs2/summary.c +++ b/fs/jffs2/summary.c
@@ -32,7 +32,7 @@ int jffs2_sum_init(struct jffs2_sb_info *c) @@ -32,7 +32,7 @@ int jffs2_sum_init(struct jffs2_sb_info
return -ENOMEM; return -ENOMEM;
} }
@ -11,7 +9,7 @@ index 6caf1e1..b4882c6 100644
if (!c->summary->sum_buf) { if (!c->summary->sum_buf) {
JFFS2_WARNING("Can't allocate buffer for writing out summary information!\n"); JFFS2_WARNING("Can't allocate buffer for writing out summary information!\n");
@@ -51,7 +51,7 @@ void jffs2_sum_exit(struct jffs2_sb_info *c) @@ -51,7 +51,7 @@ void jffs2_sum_exit(struct jffs2_sb_info
jffs2_sum_disable_collecting(c->summary); jffs2_sum_disable_collecting(c->summary);

8
target/linux/xburst/patches-2.6.31/400-spi-gpio-3wire.patch
View File

@ -1,8 +1,6 @@
diff --git a/drivers/spi/spi_gpio.c b/drivers/spi/spi_gpio.c
index a128338..0ca5365 100644
--- a/drivers/spi/spi_gpio.c --- a/drivers/spi/spi_gpio.c
+++ b/drivers/spi/spi_gpio.c +++ b/drivers/spi/spi_gpio.c
@@ -254,9 +254,11 @@ spi_gpio_request(struct spi_gpio_platform_data *pdata, const char *label) @@ -254,9 +254,11 @@ spi_gpio_request(struct spi_gpio_platfor
if (value) if (value)
goto done; goto done;
@ -17,7 +15,7 @@ index a128338..0ca5365 100644
value = spi_gpio_alloc(SPI_SCK_GPIO, label, false); value = spi_gpio_alloc(SPI_SCK_GPIO, label, false);
if (value) if (value)
@@ -319,7 +321,8 @@ static int __devinit spi_gpio_probe(struct platform_device *pdev) @@ -319,7 +321,8 @@ static int __devinit spi_gpio_probe(stru
if (status < 0) { if (status < 0) {
spi_master_put(spi_gpio->bitbang.master); spi_master_put(spi_gpio->bitbang.master);
gpio_free: gpio_free:
@ -27,7 +25,7 @@ index a128338..0ca5365 100644
gpio_free(SPI_MOSI_GPIO); gpio_free(SPI_MOSI_GPIO);
gpio_free(SPI_SCK_GPIO); gpio_free(SPI_SCK_GPIO);
spi_master_put(master); spi_master_put(master);
@@ -343,7 +346,8 @@ static int __devexit spi_gpio_remove(struct platform_device *pdev) @@ -343,7 +346,8 @@ static int __devexit spi_gpio_remove(str
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);

48
target/linux/xburst/patches-2.6.31/410-soc-32bit-regs.patch
View File

@ -1,8 +1,6 @@
diff --git a/include/sound/soc.h b/include/sound/soc.h
index cf6111d..c457b74 100644
--- a/include/sound/soc.h --- a/include/sound/soc.h
+++ b/include/sound/soc.h +++ b/include/sound/soc.h
@@ -215,10 +215,10 @@ void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count, @@ -215,10 +215,10 @@ void snd_soc_jack_free_gpios(struct snd_
#endif #endif
/* codec register bit access */ /* codec register bit access */
@ -28,11 +26,9 @@ index cf6111d..c457b74 100644
unsigned char shift_l; unsigned char shift_l;
unsigned char shift_r; unsigned char shift_r;
unsigned int max; unsigned int max;
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 1d70829..4e1d1c4 100644
--- a/sound/soc/soc-core.c --- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c
@@ -500,8 +500,8 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, @@ -500,8 +500,8 @@ static int soc_pcm_hw_params(struct snd_
if (cpu_dai->ops->hw_params) { if (cpu_dai->ops->hw_params) {
ret = cpu_dai->ops->hw_params(substream, params, cpu_dai); ret = cpu_dai->ops->hw_params(substream, params, cpu_dai);
if (ret < 0) { if (ret < 0) {
@ -43,7 +39,7 @@ index 1d70829..4e1d1c4 100644
goto interface_err; goto interface_err;
} }
} }
@@ -842,7 +842,7 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card) @@ -842,7 +842,7 @@ static void snd_soc_instantiate_card(str
* DAIs currently; we can't do this per link since some AC97 * DAIs currently; we can't do this per link since some AC97
* codecs have non-AC97 DAIs. * codecs have non-AC97 DAIs.
*/ */
@ -52,7 +48,7 @@ index 1d70829..4e1d1c4 100644
for (i = 0; i < card->num_links; i++) { for (i = 0; i < card->num_links; i++) {
found = 0; found = 0;
list_for_each_entry(dai, &dai_list, list) list_for_each_entry(dai, &dai_list, list)
@@ -856,6 +856,7 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card) @@ -856,6 +856,7 @@ static void snd_soc_instantiate_card(str
return; return;
} }
} }
@ -60,7 +56,7 @@ index 1d70829..4e1d1c4 100644
/* Note that we do not current check for codec components */ /* Note that we do not current check for codec components */
@@ -1263,11 +1264,11 @@ EXPORT_SYMBOL_GPL(snd_soc_free_ac97_codec); @@ -1263,11 +1264,11 @@ EXPORT_SYMBOL_GPL(snd_soc_free_ac97_code
* *
* Returns 1 for change else 0. * Returns 1 for change else 0.
*/ */
@ -90,7 +86,7 @@ index 1d70829..4e1d1c4 100644
mutex_lock(&io_mutex); mutex_lock(&io_mutex);
old = snd_soc_read(codec, reg); old = snd_soc_read(codec, reg);
@@ -1586,7 +1587,7 @@ int snd_soc_get_enum_double(struct snd_kcontrol *kcontrol, @@ -1586,7 +1587,7 @@ int snd_soc_get_enum_double(struct snd_k
{ {
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
@ -99,7 +95,7 @@ index 1d70829..4e1d1c4 100644
for (bitmask = 1; bitmask < e->max; bitmask <<= 1) for (bitmask = 1; bitmask < e->max; bitmask <<= 1)
; ;
@@ -1615,8 +1616,8 @@ int snd_soc_put_enum_double(struct snd_kcontrol *kcontrol, @@ -1615,8 +1616,8 @@ int snd_soc_put_enum_double(struct snd_k
{ {
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
@ -110,7 +106,7 @@ index 1d70829..4e1d1c4 100644
for (bitmask = 1; bitmask < e->max; bitmask <<= 1) for (bitmask = 1; bitmask < e->max; bitmask <<= 1)
; ;
@@ -1652,7 +1653,7 @@ int snd_soc_get_value_enum_double(struct snd_kcontrol *kcontrol, @@ -1652,7 +1653,7 @@ int snd_soc_get_value_enum_double(struct
{ {
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
@ -119,7 +115,7 @@ index 1d70829..4e1d1c4 100644
reg_val = snd_soc_read(codec, e->reg); reg_val = snd_soc_read(codec, e->reg);
val = (reg_val >> e->shift_l) & e->mask; val = (reg_val >> e->shift_l) & e->mask;
@@ -1691,8 +1692,8 @@ int snd_soc_put_value_enum_double(struct snd_kcontrol *kcontrol, @@ -1691,8 +1692,8 @@ int snd_soc_put_value_enum_double(struct
{ {
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
@ -130,7 +126,7 @@ index 1d70829..4e1d1c4 100644
if (ucontrol->value.enumerated.item[0] > e->max - 1) if (ucontrol->value.enumerated.item[0] > e->max - 1)
return -EINVAL; return -EINVAL;
@@ -1852,7 +1853,7 @@ int snd_soc_put_volsw(struct snd_kcontrol *kcontrol, @@ -1852,7 +1853,7 @@ int snd_soc_put_volsw(struct snd_kcontro
int max = mc->max; int max = mc->max;
unsigned int mask = (1 << fls(max)) - 1; unsigned int mask = (1 << fls(max)) - 1;
unsigned int invert = mc->invert; unsigned int invert = mc->invert;
@ -139,7 +135,7 @@ index 1d70829..4e1d1c4 100644
val = (ucontrol->value.integer.value[0] & mask); val = (ucontrol->value.integer.value[0] & mask);
if (invert) if (invert)
@@ -1958,7 +1959,7 @@ int snd_soc_put_volsw_2r(struct snd_kcontrol *kcontrol, @@ -1958,7 +1959,7 @@ int snd_soc_put_volsw_2r(struct snd_kcon
unsigned int mask = (1 << fls(max)) - 1; unsigned int mask = (1 << fls(max)) - 1;
unsigned int invert = mc->invert; unsigned int invert = mc->invert;
int err; int err;
@ -148,7 +144,7 @@ index 1d70829..4e1d1c4 100644
val_mask = mask << shift; val_mask = mask << shift;
val = (ucontrol->value.integer.value[0] & mask); val = (ucontrol->value.integer.value[0] & mask);
@@ -2050,7 +2051,7 @@ int snd_soc_put_volsw_s8(struct snd_kcontrol *kcontrol, @@ -2050,7 +2051,7 @@ int snd_soc_put_volsw_s8(struct snd_kcon
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
unsigned int reg = mc->reg; unsigned int reg = mc->reg;
int min = mc->min; int min = mc->min;
@ -157,7 +153,7 @@ index 1d70829..4e1d1c4 100644
val = (ucontrol->value.integer.value[0]+min) & 0xff; val = (ucontrol->value.integer.value[0]+min) & 0xff;
val |= ((ucontrol->value.integer.value[1]+min) & 0xff) << 8; val |= ((ucontrol->value.integer.value[1]+min) & 0xff) << 8;
@@ -2251,6 +2252,7 @@ int snd_soc_register_dai(struct snd_soc_dai *dai) @@ -2251,6 +2252,7 @@ int snd_soc_register_dai(struct snd_soc_
if (!dai->ops) if (!dai->ops)
dai->ops = &null_dai_ops; dai->ops = &null_dai_ops;
@ -165,11 +161,9 @@ index 1d70829..4e1d1c4 100644
INIT_LIST_HEAD(&dai->list); INIT_LIST_HEAD(&dai->list);
mutex_lock(&client_mutex); mutex_lock(&client_mutex);
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 21c6907..543c9d0 100644
--- a/sound/soc/soc-dapm.c --- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c
@@ -268,7 +268,7 @@ static int dapm_connect_mixer(struct snd_soc_codec *codec, @@ -268,7 +268,7 @@ static int dapm_connect_mixer(struct snd
static int dapm_update_bits(struct snd_soc_dapm_widget *widget) static int dapm_update_bits(struct snd_soc_dapm_widget *widget)
{ {
int change, power; int change, power;
@ -178,7 +172,7 @@ index 21c6907..543c9d0 100644
struct snd_soc_codec *codec = widget->codec; struct snd_soc_codec *codec = widget->codec;
/* check for valid widgets */ /* check for valid widgets */
@@ -1246,7 +1246,6 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_add_routes); @@ -1246,7 +1246,6 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_add_route
/** /**
* snd_soc_dapm_new_widgets - add new dapm widgets * snd_soc_dapm_new_widgets - add new dapm widgets
* @codec: audio codec * @codec: audio codec
@ -186,7 +180,7 @@ index 21c6907..543c9d0 100644
* Checks the codec for any new dapm widgets and creates them if found. * Checks the codec for any new dapm widgets and creates them if found.
* *
* Returns 0 for success. * Returns 0 for success.
@@ -1336,7 +1335,8 @@ int snd_soc_dapm_get_volsw(struct snd_kcontrol *kcontrol, @@ -1336,7 +1335,8 @@ int snd_soc_dapm_get_volsw(struct snd_kc
ucontrol->value.integer.value[0] = ucontrol->value.integer.value[0] =
(snd_soc_read(widget->codec, reg) >> shift) & mask; (snd_soc_read(widget->codec, reg) >> shift) & mask;
@ -196,7 +190,7 @@ index 21c6907..543c9d0 100644
ucontrol->value.integer.value[1] = ucontrol->value.integer.value[1] =
(snd_soc_read(widget->codec, reg) >> rshift) & mask; (snd_soc_read(widget->codec, reg) >> rshift) & mask;
if (invert) { if (invert) {
@@ -1372,7 +1372,7 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol, @@ -1372,7 +1372,7 @@ int snd_soc_dapm_put_volsw(struct snd_kc
int max = mc->max; int max = mc->max;
unsigned int mask = (1 << fls(max)) - 1; unsigned int mask = (1 << fls(max)) - 1;
unsigned int invert = mc->invert; unsigned int invert = mc->invert;
@ -205,7 +199,7 @@ index 21c6907..543c9d0 100644
int ret; int ret;
val = (ucontrol->value.integer.value[0] & mask); val = (ucontrol->value.integer.value[0] & mask);
@@ -1436,7 +1436,7 @@ int snd_soc_dapm_get_enum_double(struct snd_kcontrol *kcontrol, @@ -1436,7 +1436,7 @@ int snd_soc_dapm_get_enum_double(struct
{ {
struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol); struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol);
struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
@ -214,7 +208,7 @@ index 21c6907..543c9d0 100644
for (bitmask = 1; bitmask < e->max; bitmask <<= 1) for (bitmask = 1; bitmask < e->max; bitmask <<= 1)
; ;
@@ -1464,8 +1464,8 @@ int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol, @@ -1464,8 +1464,8 @@ int snd_soc_dapm_put_enum_double(struct
{ {
struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol); struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol);
struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
@ -225,7 +219,7 @@ index 21c6907..543c9d0 100644
int ret = 0; int ret = 0;
for (bitmask = 1; bitmask < e->max; bitmask <<= 1) for (bitmask = 1; bitmask < e->max; bitmask <<= 1)
@@ -1523,7 +1523,7 @@ int snd_soc_dapm_get_value_enum_double(struct snd_kcontrol *kcontrol, @@ -1523,7 +1523,7 @@ int snd_soc_dapm_get_value_enum_double(s
{ {
struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol); struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol);
struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
@ -234,7 +228,7 @@ index 21c6907..543c9d0 100644
reg_val = snd_soc_read(widget->codec, e->reg); reg_val = snd_soc_read(widget->codec, e->reg);
val = (reg_val >> e->shift_l) & e->mask; val = (reg_val >> e->shift_l) & e->mask;
@@ -1563,8 +1563,8 @@ int snd_soc_dapm_put_value_enum_double(struct snd_kcontrol *kcontrol, @@ -1563,8 +1563,8 @@ int snd_soc_dapm_put_value_enum_double(s
{ {
struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol); struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol);
struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;

14
target/linux/xburst/patches-2.6.31/500-modifier-keys.patch
View File

@ -1,8 +1,6 @@
diff --git a/arch/mips/jz4740/platform.c b/arch/mips/jz4740/platform.c
index 4575a50..dc7a832 100644
--- a/arch/mips/jz4740/platform.c --- a/arch/mips/jz4740/platform.c
+++ b/arch/mips/jz4740/platform.c +++ b/arch/mips/jz4740/platform.c
@@ -264,10 +264,11 @@ static struct platform_device jz_nand_device = { @@ -264,10 +264,11 @@ static struct platform_device jz_nand_de
* don't define this. the keyboard and keyboard both work * don't define this. the keyboard and keyboard both work
*/ */
@ -16,7 +14,7 @@ index 4575a50..dc7a832 100644
static const uint32_t qi_lb60_keymap[] = { static const uint32_t qi_lb60_keymap[] = {
KEY(0, 0, KEY_F1), /* S2 */ KEY(0, 0, KEY_F1), /* S2 */
@@ -330,7 +331,7 @@ static const uint32_t qi_lb60_keymap[] = { @@ -330,7 +331,7 @@ static const uint32_t qi_lb60_keymap[] =
#ifndef KEEP_UART_ALIVE #ifndef KEEP_UART_ALIVE
KEY(7, 0, KEY_LEFTSHIFT), /* S58 */ KEY(7, 0, KEY_LEFTSHIFT), /* S58 */
KEY(7, 1, KEY_LEFTALT), /* S59 */ KEY(7, 1, KEY_LEFTALT), /* S59 */
@ -25,8 +23,6 @@ index 4575a50..dc7a832 100644
#endif #endif
}; };
diff --git a/drivers/char/defkeymap.map b/drivers/char/defkeymap.map
index 50b30ca..153f026 100644
--- a/drivers/char/defkeymap.map --- a/drivers/char/defkeymap.map
+++ b/drivers/char/defkeymap.map +++ b/drivers/char/defkeymap.map
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
@ -36,7 +32,7 @@ index 50b30ca..153f026 100644
# Change the above line into # Change the above line into
# keymaps 0-2,4-6,8,12 # keymaps 0-2,4-6,8,12
# in case you want the entries # in case you want the entries
@@ -45,24 +45,38 @@ keycode 12 = minus underscore backslash @@ -45,24 +45,38 @@ keycode 12 = minus underscor
control keycode 12 = Control_underscore control keycode 12 = Control_underscore
shift control keycode 12 = Control_underscore shift control keycode 12 = Control_underscore
alt keycode 12 = Meta_minus alt keycode 12 = Meta_minus
@ -77,7 +73,7 @@ index 50b30ca..153f026 100644
keycode 26 = bracketleft braceleft keycode 26 = bracketleft braceleft
control keycode 26 = Escape control keycode 26 = Escape
alt keycode 26 = Meta_bracketleft alt keycode 26 = Meta_bracketleft
@@ -73,17 +87,26 @@ keycode 28 = Return @@ -73,17 +87,26 @@ keycode 28 = Return
alt keycode 28 = Meta_Control_m alt keycode 28 = Meta_Control_m
keycode 29 = Control keycode 29 = Control
keycode 30 = a keycode 30 = a
@ -107,7 +103,7 @@ index 50b30ca..153f026 100644
keycode 39 = semicolon colon keycode 39 = semicolon colon
alt keycode 39 = Meta_semicolon alt keycode 39 = Meta_semicolon
keycode 40 = apostrophe quotedbl keycode 40 = apostrophe quotedbl
@@ -97,58 +120,65 @@ keycode 43 = backslash bar @@ -97,58 +120,65 @@ keycode 43 = backslash bar
control keycode 43 = Control_backslash control keycode 43 = Control_backslash
alt keycode 43 = Meta_backslash alt keycode 43 = Meta_backslash
keycode 44 = z keycode 44 = z

8
target/linux/xburst/patches-2.6.31/510-power-button.patch
View File

@ -1,5 +1,3 @@
diff --git a/arch/mips/include/asm/mach-jz4740/board-qi_lb60.h b/arch/mips/include/asm/mach-jz4740/board-qi_lb60.h
index 2c3260f..aa461bd 100644
--- a/arch/mips/include/asm/mach-jz4740/board-qi_lb60.h --- a/arch/mips/include/asm/mach-jz4740/board-qi_lb60.h
+++ b/arch/mips/include/asm/mach-jz4740/board-qi_lb60.h +++ b/arch/mips/include/asm/mach-jz4740/board-qi_lb60.h
@@ -35,6 +35,7 @@ @@ -35,6 +35,7 @@
@ -10,8 +8,6 @@ index 2c3260f..aa461bd 100644
#define GPIO_AMP_EN JZ_GPIO_PORTD(4) #define GPIO_AMP_EN JZ_GPIO_PORTD(4)
diff --git a/arch/mips/jz4740/platform.c b/arch/mips/jz4740/platform.c
index 81cfcb4..9cace99 100644
--- a/arch/mips/jz4740/platform.c --- a/arch/mips/jz4740/platform.c
+++ b/arch/mips/jz4740/platform.c +++ b/arch/mips/jz4740/platform.c
@@ -21,6 +21,8 @@ @@ -21,6 +21,8 @@
@ -23,7 +19,7 @@ index 81cfcb4..9cace99 100644
#include <asm/jzsoc.h> #include <asm/jzsoc.h>
#include <asm/gpio.h> #include <asm/gpio.h>
@@ -513,6 +515,29 @@ static struct platform_device jz_battery_device = { @@ -513,6 +515,29 @@ static struct platform_device jz_battery
}, },
}; };
@ -53,7 +49,7 @@ index 81cfcb4..9cace99 100644
/* All */ /* All */
static struct platform_device *jz_platform_devices[] __initdata = { static struct platform_device *jz_platform_devices[] __initdata = {
&jz_usb_ohci_device, &jz_usb_ohci_device,
@@ -528,6 +553,7 @@ static struct platform_device *jz_platform_devices[] __initdata = { @@ -528,6 +553,7 @@ static struct platform_device *jz_platfo
&jz_rtc_device, &jz_rtc_device,
&jz_adc_device, &jz_adc_device,
&jz_battery_device, &jz_battery_device,

17
target/linux/xburst/patches-2.6.31/900-add-openwrt-logo.patch
View File

@ -1,5 +1,3 @@
diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig
index 39ac49e..03da067 100644
--- a/drivers/video/logo/Kconfig --- a/drivers/video/logo/Kconfig
+++ b/drivers/video/logo/Kconfig +++ b/drivers/video/logo/Kconfig
@@ -82,4 +82,8 @@ config LOGO_M32R_CLUT224 @@ -82,4 +82,8 @@ config LOGO_M32R_CLUT224
@ -11,11 +9,9 @@ index 39ac49e..03da067 100644
+ default y + default y
+ +
endif # LOGO endif # LOGO
diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile
index 3b43781..cbed3a5 100644
--- a/drivers/video/logo/Makefile --- a/drivers/video/logo/Makefile
+++ b/drivers/video/logo/Makefile +++ b/drivers/video/logo/Makefile
@@ -15,6 +15,7 @@ obj-$(CONFIG_LOGO_SUPERH_MONO) += logo_superh_mono.o @@ -15,6 +15,7 @@ obj-$(CONFIG_LOGO_SUPERH_MONO) += logo_
obj-$(CONFIG_LOGO_SUPERH_VGA16) += logo_superh_vga16.o obj-$(CONFIG_LOGO_SUPERH_VGA16) += logo_superh_vga16.o
obj-$(CONFIG_LOGO_SUPERH_CLUT224) += logo_superh_clut224.o obj-$(CONFIG_LOGO_SUPERH_CLUT224) += logo_superh_clut224.o
obj-$(CONFIG_LOGO_M32R_CLUT224) += logo_m32r_clut224.o obj-$(CONFIG_LOGO_M32R_CLUT224) += logo_m32r_clut224.o
@ -23,11 +19,9 @@ index 3b43781..cbed3a5 100644
obj-$(CONFIG_SPU_BASE) += logo_spe_clut224.o obj-$(CONFIG_SPU_BASE) += logo_spe_clut224.o
diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c
index ea7a8cc..7208830 100644
--- a/drivers/video/logo/logo.c --- a/drivers/video/logo/logo.c
+++ b/drivers/video/logo/logo.c +++ b/drivers/video/logo/logo.c
@@ -100,6 +100,10 @@ const struct linux_logo * __init_refok fb_find_logo(int depth) @@ -100,6 +100,10 @@ const struct linux_logo * __init_refok f
/* M32R Linux logo */ /* M32R Linux logo */
logo = &logo_m32r_clut224; logo = &logo_m32r_clut224;
#endif #endif
@ -38,9 +32,6 @@ index ea7a8cc..7208830 100644
} }
return logo; return logo;
} }
diff --git a/drivers/video/logo/logo_openwrt_clut224.ppm b/drivers/video/logo/logo_openwrt_clut224.ppm
new file mode 100644
index 0000000..97f7282
--- /dev/null --- /dev/null
+++ b/drivers/video/logo/logo_openwrt_clut224.ppm +++ b/drivers/video/logo/logo_openwrt_clut224.ppm
@@ -0,0 +1,9669 @@ @@ -0,0 +1,9669 @@
@ -9713,11 +9704,9 @@ index 0000000..97f7282
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 +0 0 0 0 0 0
diff --git a/include/linux/linux_logo.h b/include/linux/linux_logo.h
index ca5bd91..67166f3 100644
--- a/include/linux/linux_logo.h --- a/include/linux/linux_logo.h
+++ b/include/linux/linux_logo.h +++ b/include/linux/linux_logo.h
@@ -47,6 +47,7 @@ extern const struct linux_logo logo_superh_vga16; @@ -47,6 +47,7 @@ extern const struct linux_logo logo_supe
extern const struct linux_logo logo_superh_clut224; extern const struct linux_logo logo_superh_clut224;
extern const struct linux_logo logo_m32r_clut224; extern const struct linux_logo logo_m32r_clut224;
extern const struct linux_logo logo_spe_clut224; extern const struct linux_logo logo_spe_clut224;