diff options
42 files changed, 112 insertions, 199 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 9b60d4396..4ce677183 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -26,8 +26,8 @@ endif ifeq ($(LINUX_VERSION),2.6.38.6) LINUX_KERNEL_MD5SUM:=e896a3bb3185b8a8af8e2f010f63c02e endif -ifeq ($(LINUX_VERSION),2.6.39) - LINUX_KERNEL_MD5SUM:=1aab7a741abe08d42e8eccf20de61e05 +ifeq ($(LINUX_VERSION),2.6.39.1) + LINUX_KERNEL_MD5SUM:=983834b0138e102a3fb0098367c17150 endif # disable the md5sum check for unknown kernel versions diff --git a/target/linux/au1000/Makefile b/target/linux/au1000/Makefile index f90116fe7..bc628728c 100644 --- a/target/linux/au1000/Makefile +++ b/target/linux/au1000/Makefile @@ -13,7 +13,7 @@ FEATURES:=jffs2 usb pci SUBTARGETS=au1500 au1550 MAINTAINER:=Florian Fainelli <florian@openwrt.org> -LINUX_VERSION:=2.6.39 +LINUX_VERSION:=2.6.39.1 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += wpad-mini yamonenv diff --git a/target/linux/au1000/patches-2.6.39/002-openwrt_rootfs.patch b/target/linux/au1000/patches-2.6.39/002-openwrt_rootfs.patch index e1056e93d..7d34a314d 100644 --- a/target/linux/au1000/patches-2.6.39/002-openwrt_rootfs.patch +++ b/target/linux/au1000/patches-2.6.39/002-openwrt_rootfs.patch @@ -1,6 +1,6 @@ --- a/arch/mips/alchemy/mtx-1/platform.c +++ b/arch/mips/alchemy/mtx-1/platform.c -@@ -90,7 +90,7 @@ static struct platform_device mtx1_gpio_ +@@ -92,7 +92,7 @@ static struct platform_device mtx1_gpio_ static struct mtd_partition mtx1_mtd_partitions[] = { { diff --git a/target/linux/au1000/patches-2.6.39/003-au1000_eth_ioctl.patch b/target/linux/au1000/patches-2.6.39/003-au1000_eth_ioctl.patch index c005cbc16..1bf875417 100644 --- a/target/linux/au1000/patches-2.6.39/003-au1000_eth_ioctl.patch +++ b/target/linux/au1000/patches-2.6.39/003-au1000_eth_ioctl.patch @@ -1,6 +1,6 @@ --- a/drivers/net/au1000_eth.c +++ b/drivers/net/au1000_eth.c -@@ -995,10 +995,14 @@ static void au1000_multicast_list(struct +@@ -993,10 +993,14 @@ static void au1000_multicast_list(struct writel(reg, &aup->mac->control); } diff --git a/target/linux/cns3xxx/Makefile b/target/linux/cns3xxx/Makefile index 86ca83a54..f52de2703 100644 --- a/target/linux/cns3xxx/Makefile +++ b/target/linux/cns3xxx/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs fpu gpio CFLAGS:=-Os -pipe -march=armv6k -mtune=mpcore -mfloat-abi=softfp -mfpu=vfp -fno-caller-saves MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> -LINUX_VERSION:=2.6.39 +LINUX_VERSION:=2.6.39.1 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/generic/patches-2.6.39/474-mtd_concat_sync_fix.patch b/target/linux/generic/patches-2.6.39/474-mtd_concat_sync_fix.patch index 4e3426b7b..ff3759e22 100644 --- a/target/linux/generic/patches-2.6.39/474-mtd_concat_sync_fix.patch +++ b/target/linux/generic/patches-2.6.39/474-mtd_concat_sync_fix.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/mtdconcat.c +++ b/drivers/mtd/mtdconcat.c -@@ -619,7 +619,8 @@ static void concat_sync(struct mtd_info +@@ -619,7 +619,8 @@ static void concat_sync(struct mtd_info for (i = 0; i < concat->num_subdev; i++) { struct mtd_info *subdev = concat->subdev[i]; diff --git a/target/linux/generic/patches-2.6.39/950-vm_exports.patch b/target/linux/generic/patches-2.6.39/950-vm_exports.patch index 874b81041..26b2da93a 100644 --- a/target/linux/generic/patches-2.6.39/950-vm_exports.patch +++ b/target/linux/generic/patches-2.6.39/950-vm_exports.patch @@ -1,6 +1,6 @@ --- a/mm/shmem.c +++ b/mm/shmem.c -@@ -2730,6 +2730,16 @@ out: +@@ -2731,6 +2731,16 @@ out: /* common code */ @@ -17,7 +17,7 @@ /** * shmem_file_setup - get an unlinked file living in tmpfs * @name: name for dentry (to be seen in /proc/<pid>/maps -@@ -2807,10 +2817,7 @@ int shmem_zero_setup(struct vm_area_stru +@@ -2808,10 +2818,7 @@ int shmem_zero_setup(struct vm_area_stru if (IS_ERR(file)) return PTR_ERR(file); diff --git a/target/linux/lantiq/Makefile b/target/linux/lantiq/Makefile index 412b7b19c..29da8a3c6 100644 --- a/target/linux/lantiq/Makefile +++ b/target/linux/lantiq/Makefile @@ -12,8 +12,7 @@ BOARDNAME:=Lantiq GPON/XWAY FEATURES:=squashfs jffs2 SUBTARGETS:=falcon xway ase -LINUX_VERSION:=2.6.39 -#LINUX_VERSION:=2.6.32.33 +LINUX_VERSION:=2.6.39.1 CFLAGS=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves diff --git a/target/linux/lantiq/patches-2.6.39/0001-MIPS-Lantiq-Add-initial-support-for-Lantiq-SoCs.patch b/target/linux/lantiq/patches-2.6.39/0001-MIPS-Lantiq-Add-initial-support-for-Lantiq-SoCs.patch index c7f96cdd3..7eecefcc1 100644 --- a/target/linux/lantiq/patches-2.6.39/0001-MIPS-Lantiq-Add-initial-support-for-Lantiq-SoCs.patch +++ b/target/linux/lantiq/patches-2.6.39/0001-MIPS-Lantiq-Add-initial-support-for-Lantiq-SoCs.patch @@ -48,7 +48,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -212,6 +212,23 @@ +@@ -212,6 +212,23 @@ config MACH_JZ4740 select HAVE_PWM select HAVE_CLK @@ -884,7 +884,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> +} --- a/arch/mips/Kbuild.platforms +++ b/arch/mips/Kbuild.platforms -@@ -11,6 +11,7 @@ +@@ -11,6 +11,7 @@ platforms += dec platforms += emma platforms += jazz platforms += jz4740 diff --git a/target/linux/lantiq/patches-2.6.39/0002-MIPS-Lantiq-add-SoC-specific-code-for-XWAY-family.patch b/target/linux/lantiq/patches-2.6.39/0002-MIPS-Lantiq-add-SoC-specific-code-for-XWAY-family.patch index 2f44b6659..8f5f92912 100644 --- a/target/linux/lantiq/patches-2.6.39/0002-MIPS-Lantiq-add-SoC-specific-code-for-XWAY-family.patch +++ b/target/linux/lantiq/patches-2.6.39/0002-MIPS-Lantiq-add-SoC-specific-code-for-XWAY-family.patch @@ -65,7 +65,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -760,6 +760,7 @@ +@@ -760,6 +760,7 @@ source "arch/mips/ath79/Kconfig" source "arch/mips/bcm63xx/Kconfig" source "arch/mips/jazz/Kconfig" source "arch/mips/jz4740/Kconfig" diff --git a/target/linux/lantiq/patches-2.6.39/0003-MIPS-Lantiq-Add-PCI-controller-support.patch b/target/linux/lantiq/patches-2.6.39/0003-MIPS-Lantiq-Add-PCI-controller-support.patch index 1757266f9..49cbc9b61 100644 --- a/target/linux/lantiq/patches-2.6.39/0003-MIPS-Lantiq-Add-PCI-controller-support.patch +++ b/target/linux/lantiq/patches-2.6.39/0003-MIPS-Lantiq-Add-PCI-controller-support.patch @@ -28,9 +28,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> create mode 100644 arch/mips/pci/pci-lantiq.c create mode 100644 arch/mips/pci/pci-lantiq.h -diff --git a/arch/mips/include/asm/mach-lantiq/lantiq_platform.h b/arch/mips/include/asm/mach-lantiq/lantiq_platform.h -new file mode 100644 -index 0000000..1f1dba6 --- /dev/null +++ b/arch/mips/include/asm/mach-lantiq/lantiq_platform.h @@ -0,0 +1,46 @@ @@ -80,11 +77,9 @@ index 0000000..1f1dba6 +}; + +#endif -diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile -index f0d5329..4df8799 100644 --- a/arch/mips/pci/Makefile +++ b/arch/mips/pci/Makefile -@@ -41,6 +41,7 @@ obj-$(CONFIG_SIBYTE_SB1250) += fixup-sb1250.o pci-sb1250.o +@@ -41,6 +41,7 @@ obj-$(CONFIG_SIBYTE_SB1250) += fixup-sb1 obj-$(CONFIG_SIBYTE_BCM112X) += fixup-sb1250.o pci-sb1250.o obj-$(CONFIG_SIBYTE_BCM1x80) += pci-bcm1480.o pci-bcm1480ht.o obj-$(CONFIG_SNI_RM) += fixup-sni.o ops-sni.o @@ -92,9 +87,6 @@ index f0d5329..4df8799 100644 obj-$(CONFIG_TANBAC_TB0219) += fixup-tb0219.o obj-$(CONFIG_TANBAC_TB0226) += fixup-tb0226.o obj-$(CONFIG_TANBAC_TB0287) += fixup-tb0287.o -diff --git a/arch/mips/pci/ops-lantiq.c b/arch/mips/pci/ops-lantiq.c -new file mode 100644 -index 0000000..1f2afb5 --- /dev/null +++ b/arch/mips/pci/ops-lantiq.c @@ -0,0 +1,116 @@ @@ -214,9 +206,6 @@ index 0000000..1f2afb5 + + return PCIBIOS_SUCCESSFUL; +} -diff --git a/arch/mips/pci/pci-lantiq.c b/arch/mips/pci/pci-lantiq.c -new file mode 100644 -index 0000000..603d749 --- /dev/null +++ b/arch/mips/pci/pci-lantiq.c @@ -0,0 +1,297 @@ @@ -517,9 +506,6 @@ index 0000000..603d749 +} + +arch_initcall(pcibios_init); -diff --git a/arch/mips/pci/pci-lantiq.h b/arch/mips/pci/pci-lantiq.h -new file mode 100644 -index 0000000..66bf6cd --- /dev/null +++ b/arch/mips/pci/pci-lantiq.h @@ -0,0 +1,18 @@ @@ -541,6 +527,3 @@ index 0000000..66bf6cd + unsigned int devfn, int where, int size, u32 val); + +#endif --- -1.7.2.3 - diff --git a/target/linux/lantiq/patches-2.6.39/0004-MIPS-Lantiq-Add-NOR-flash-support.patch b/target/linux/lantiq/patches-2.6.39/0004-MIPS-Lantiq-Add-NOR-flash-support.patch index 80efc1f4c..212a02077 100644 --- a/target/linux/lantiq/patches-2.6.39/0004-MIPS-Lantiq-Add-NOR-flash-support.patch +++ b/target/linux/lantiq/patches-2.6.39/0004-MIPS-Lantiq-Add-NOR-flash-support.patch @@ -24,7 +24,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig -@@ -260,6 +260,13 @@ +@@ -260,6 +260,13 @@ config MTD_BCM963XX Support for parsing CFE image tag and creating MTD partitions on Broadcom BCM63xx boards. @@ -40,7 +40,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> depends on X86 && MTD_PARTITIONS && MTD_CFI_INTELEXT && BROKEN --- a/drivers/mtd/maps/Makefile +++ b/drivers/mtd/maps/Makefile -@@ -60,3 +60,4 @@ +@@ -60,3 +60,4 @@ obj-$(CONFIG_MTD_VMU) += vmu-flash.o obj-$(CONFIG_MTD_GPIO_ADDR) += gpio-addr-flash.o obj-$(CONFIG_MTD_BCM963XX) += bcm963xx-flash.o obj-$(CONFIG_MTD_LATCH_ADDR) += latch-addr-flash.o diff --git a/target/linux/lantiq/patches-2.6.39/0005-MIPS-Lantiq-Add-platform-device-support.patch b/target/linux/lantiq/patches-2.6.39/0005-MIPS-Lantiq-Add-platform-device-support.patch index 917993fdb..ff376ea21 100644 --- a/target/linux/lantiq/patches-2.6.39/0005-MIPS-Lantiq-Add-platform-device-support.patch +++ b/target/linux/lantiq/patches-2.6.39/0005-MIPS-Lantiq-Add-platform-device-support.patch @@ -25,8 +25,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> create mode 100644 arch/mips/lantiq/xway/devices.c create mode 100644 arch/mips/lantiq/xway/devices.h -diff --git a/arch/mips/lantiq/Makefile b/arch/mips/lantiq/Makefile -index a268391..e5dae0e 100644 --- a/arch/mips/lantiq/Makefile +++ b/arch/mips/lantiq/Makefile @@ -4,7 +4,7 @@ @@ -38,9 +36,6 @@ index a268391..e5dae0e 100644 obj-$(CONFIG_EARLY_PRINTK) += early_printk.o -diff --git a/arch/mips/lantiq/devices.c b/arch/mips/lantiq/devices.c -new file mode 100644 -index 0000000..7b82c34 --- /dev/null +++ b/arch/mips/lantiq/devices.c @@ -0,0 +1,122 @@ @@ -166,9 +161,6 @@ index 0000000..7b82c34 + pr_err("kernel is compiled without PCI support\n"); +} +#endif -diff --git a/arch/mips/lantiq/devices.h b/arch/mips/lantiq/devices.h -new file mode 100644 -index 0000000..2947bb1 --- /dev/null +++ b/arch/mips/lantiq/devices.h @@ -0,0 +1,23 @@ @@ -195,8 +187,6 @@ index 0000000..2947bb1 +extern void ltq_register_pci(struct ltq_pci_data *data); + +#endif -diff --git a/arch/mips/lantiq/xway/Makefile b/arch/mips/lantiq/xway/Makefile -index 9c85ff9..74ce438 100644 --- a/arch/mips/lantiq/xway/Makefile +++ b/arch/mips/lantiq/xway/Makefile @@ -1,4 +1,4 @@ @@ -205,9 +195,6 @@ index 9c85ff9..74ce438 100644 obj-$(CONFIG_SOC_XWAY) += clk-xway.o prom-xway.o obj-$(CONFIG_SOC_AMAZON_SE) += clk-ase.o prom-ase.o -diff --git a/arch/mips/lantiq/xway/devices.c b/arch/mips/lantiq/xway/devices.c -new file mode 100644 -index 0000000..a71b3b5 --- /dev/null +++ b/arch/mips/lantiq/xway/devices.c @@ -0,0 +1,98 @@ @@ -309,9 +296,6 @@ index 0000000..a71b3b5 + platform_device_register_simple("ltq_asc", 0, + ltq_ase_asc_resources, ARRAY_SIZE(ltq_ase_asc_resources)); +} -diff --git a/arch/mips/lantiq/xway/devices.h b/arch/mips/lantiq/xway/devices.h -new file mode 100644 -index 0000000..51f56b5 --- /dev/null +++ b/arch/mips/lantiq/xway/devices.h @@ -0,0 +1,18 @@ @@ -333,6 +317,3 @@ index 0000000..51f56b5 +extern void ltq_register_ase_asc(void); + +#endif --- -1.7.2.3 - diff --git a/target/linux/lantiq/patches-2.6.39/0006-MIPS-Lantiq-Add-mips_machine-support.patch b/target/linux/lantiq/patches-2.6.39/0006-MIPS-Lantiq-Add-mips_machine-support.patch index 9e02b6a6c..0c1c0e778 100644 --- a/target/linux/lantiq/patches-2.6.39/0006-MIPS-Lantiq-Add-mips_machine-support.patch +++ b/target/linux/lantiq/patches-2.6.39/0006-MIPS-Lantiq-Add-mips_machine-support.patch @@ -27,7 +27,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -190,6 +190,7 @@ +@@ -228,6 +228,7 @@ config LANTIQ select SWAP_IO_SPACE select BOOT_RAW select HAVE_CLK @@ -58,7 +58,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> +#endif --- a/arch/mips/lantiq/prom.h +++ b/arch/mips/lantiq/prom.h -@@ -20,5 +20,6 @@ +@@ -20,5 +20,6 @@ struct ltq_soc_info { }; extern void ltq_soc_detect(struct ltq_soc_info *i); @@ -80,7 +80,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> void __init plat_mem_setup(void) { /* assume 16M as default incase uboot fails to pass proper ramsize */ -@@ -32,10 +38,32 @@ +@@ -32,10 +38,32 @@ void __init plat_mem_setup(void) if (!strncmp(e, "memsize=", 8)) { e += 8; if (strict_strtoul(e, 0, &memsize)) diff --git a/target/linux/lantiq/patches-2.6.39/0007-MIPS-Lantiq-Add-machtypes-for-lantiq-eval-kits.patch b/target/linux/lantiq/patches-2.6.39/0007-MIPS-Lantiq-Add-machtypes-for-lantiq-eval-kits.patch index e69558c56..9d4b5bc7b 100644 --- a/target/linux/lantiq/patches-2.6.39/0007-MIPS-Lantiq-Add-machtypes-for-lantiq-eval-kits.patch +++ b/target/linux/lantiq/patches-2.6.39/0007-MIPS-Lantiq-Add-machtypes-for-lantiq-eval-kits.patch @@ -24,8 +24,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> create mode 100644 arch/mips/lantiq/xway/mach-easy50601.c create mode 100644 arch/mips/lantiq/xway/mach-easy50712.c -diff --git a/arch/mips/lantiq/Kconfig b/arch/mips/lantiq/Kconfig -index 2780461..3fccf21 100644 --- a/arch/mips/lantiq/Kconfig +++ b/arch/mips/lantiq/Kconfig @@ -18,4 +18,6 @@ config SOC_XWAY @@ -35,8 +33,6 @@ index 2780461..3fccf21 100644 +source "arch/mips/lantiq/xway/Kconfig" + endif -diff --git a/arch/mips/lantiq/machtypes.h b/arch/mips/lantiq/machtypes.h -index ffcacfc..7e01b8c 100644 --- a/arch/mips/lantiq/machtypes.h +++ b/arch/mips/lantiq/machtypes.h @@ -13,6 +13,8 @@ @@ -48,9 +44,6 @@ index ffcacfc..7e01b8c 100644 }; #endif -diff --git a/arch/mips/lantiq/xway/Kconfig b/arch/mips/lantiq/xway/Kconfig -new file mode 100644 -index 0000000..2b857de --- /dev/null +++ b/arch/mips/lantiq/xway/Kconfig @@ -0,0 +1,23 @@ @@ -77,20 +70,15 @@ index 0000000..2b857de +endmenu + +endif -diff --git a/arch/mips/lantiq/xway/Makefile b/arch/mips/lantiq/xway/Makefile -index 8c06a97..b1d3640 100644 --- a/arch/mips/lantiq/xway/Makefile +++ b/arch/mips/lantiq/xway/Makefile -@@ -2,3 +2,6 @@ obj-y := pmu.o ebu.o reset.o gpio.o devices.o +@@ -2,3 +2,6 @@ obj-y := pmu.o ebu.o reset.o gpio.o devi obj-$(CONFIG_SOC_XWAY) += clk-xway.o prom-xway.o setup-xway.o obj-$(CONFIG_SOC_AMAZON_SE) += clk-ase.o prom-ase.o setup-ase.o + +obj-$(CONFIG_LANTIQ_MACH_EASY50712) += mach-easy50712.o +obj-$(CONFIG_LANTIQ_MACH_EASY50601) += mach-easy50601.o -diff --git a/arch/mips/lantiq/xway/mach-easy50601.c b/arch/mips/lantiq/xway/mach-easy50601.c -new file mode 100644 -index 0000000..d5aaf63 --- /dev/null +++ b/arch/mips/lantiq/xway/mach-easy50601.c @@ -0,0 +1,57 @@ @@ -151,9 +139,6 @@ index 0000000..d5aaf63 + "EASY50601", + "EASY50601 Eval Board", + easy50601_init); -diff --git a/arch/mips/lantiq/xway/mach-easy50712.c b/arch/mips/lantiq/xway/mach-easy50712.c -new file mode 100644 -index 0000000..e5e7e09 --- /dev/null +++ b/arch/mips/lantiq/xway/mach-easy50712.c @@ -0,0 +1,68 @@ @@ -225,6 +210,3 @@ index 0000000..e5e7e09 + "EASY50712", + "EASY50712 Eval Board", + easy50712_init); --- -1.7.2.3 - diff --git a/target/linux/lantiq/patches-2.6.39/0008-MIPS-Lantiq-Add-more-gpio-drivers.patch b/target/linux/lantiq/patches-2.6.39/0008-MIPS-Lantiq-Add-more-gpio-drivers.patch index 2daa9e0fe..810c89d96 100644 --- a/target/linux/lantiq/patches-2.6.39/0008-MIPS-Lantiq-Add-more-gpio-drivers.patch +++ b/target/linux/lantiq/patches-2.6.39/0008-MIPS-Lantiq-Add-more-gpio-drivers.patch @@ -20,8 +20,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> create mode 100644 arch/mips/lantiq/xway/gpio_ebu.c create mode 100644 arch/mips/lantiq/xway/gpio_stp.c -diff --git a/arch/mips/lantiq/xway/Makefile b/arch/mips/lantiq/xway/Makefile -index b1d3640..6b5e07e 100644 --- a/arch/mips/lantiq/xway/Makefile +++ b/arch/mips/lantiq/xway/Makefile @@ -1,4 +1,4 @@ @@ -30,9 +28,6 @@ index b1d3640..6b5e07e 100644 obj-$(CONFIG_SOC_XWAY) += clk-xway.o prom-xway.o setup-xway.o obj-$(CONFIG_SOC_AMAZON_SE) += clk-ase.o prom-ase.o setup-ase.o -diff --git a/arch/mips/lantiq/xway/gpio_ebu.c b/arch/mips/lantiq/xway/gpio_ebu.c -new file mode 100644 -index 0000000..a479355 --- /dev/null +++ b/arch/mips/lantiq/xway/gpio_ebu.c @@ -0,0 +1,126 @@ @@ -162,9 +157,6 @@ index 0000000..a479355 +} + +postcore_initcall(ltq_ebu_init); -diff --git a/arch/mips/lantiq/xway/gpio_stp.c b/arch/mips/lantiq/xway/gpio_stp.c -new file mode 100644 -index 0000000..67d59d6 --- /dev/null +++ b/arch/mips/lantiq/xway/gpio_stp.c @@ -0,0 +1,157 @@ @@ -325,6 +317,3 @@ index 0000000..67d59d6 +} + +postcore_initcall(ltq_stp_init); --- -1.7.2.3 - diff --git a/target/linux/lantiq/patches-2.6.39/0009-SERIAL-Lantiq-Add-driver-for-MIPS-Lantiq-SOCs.patch b/target/linux/lantiq/patches-2.6.39/0009-SERIAL-Lantiq-Add-driver-for-MIPS-Lantiq-SOCs.patch index 4877878b2..223621edf 100644 --- a/target/linux/lantiq/patches-2.6.39/0009-SERIAL-Lantiq-Add-driver-for-MIPS-Lantiq-SOCs.patch +++ b/target/linux/lantiq/patches-2.6.39/0009-SERIAL-Lantiq-Add-driver-for-MIPS-Lantiq-SOCs.patch @@ -780,7 +780,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> +MODULE_LICENSE("GPL"); --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig -@@ -1391,6 +1391,14 @@ +@@ -1391,6 +1391,14 @@ config SERIAL_OF_PLATFORM_NWPSERIAL_CONS help Support for Console on the NWP serial ports. @@ -797,7 +797,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> depends on QUICC_ENGINE --- a/drivers/tty/serial/Makefile +++ b/drivers/tty/serial/Makefile -@@ -94,3 +94,4 @@ +@@ -94,3 +94,4 @@ obj-$(CONFIG_SERIAL_IFX6X60) += ifx6x6 obj-$(CONFIG_SERIAL_PCH_UART) += pch_uart.o obj-$(CONFIG_SERIAL_MSM_SMD) += msm_smd_tty.o obj-$(CONFIG_SERIAL_MXS_AUART) += mxs-auart.o diff --git a/target/linux/lantiq/patches-2.6.39/0010-MIPS-Lantiq-Add-DMA-support.patch b/target/linux/lantiq/patches-2.6.39/0010-MIPS-Lantiq-Add-DMA-support.patch index fd9981a6a..7e2305386 100644 --- a/target/linux/lantiq/patches-2.6.39/0010-MIPS-Lantiq-Add-DMA-support.patch +++ b/target/linux/lantiq/patches-2.6.39/0010-MIPS-Lantiq-Add-DMA-support.patch @@ -21,8 +21,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> create mode 100644 arch/mips/include/asm/mach-lantiq/xway/xway_dma.h create mode 100644 arch/mips/lantiq/xway/dma.c -diff --git a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h -index 343e82c..4827afb 100644 --- a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h +++ b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h @@ -86,7 +86,8 @@ @@ -35,9 +33,6 @@ index 343e82c..4827afb 100644 /* PCI */ #define PCI_CR_BASE_ADDR 0x1E105400 -diff --git a/arch/mips/include/asm/mach-lantiq/xway/xway_dma.h b/arch/mips/include/asm/mach-lantiq/xway/xway_dma.h -new file mode 100644 -index 0000000..872943a --- /dev/null +++ b/arch/mips/include/asm/mach-lantiq/xway/xway_dma.h @@ -0,0 +1,60 @@ @@ -101,8 +96,6 @@ index 0000000..872943a +extern void ltq_dma_init_port(int p); + +#endif -diff --git a/arch/mips/lantiq/xway/Makefile b/arch/mips/lantiq/xway/Makefile -index 6b5e07e..c517f2e 100644 --- a/arch/mips/lantiq/xway/Makefile +++ b/arch/mips/lantiq/xway/Makefile @@ -1,4 +1,4 @@ @@ -111,8 +104,6 @@ index 6b5e07e..c517f2e 100644 obj-$(CONFIG_SOC_XWAY) += clk-xway.o prom-xway.o setup-xway.o obj-$(CONFIG_SOC_AMAZON_SE) += clk-ase.o prom-ase.o setup-ase.o -diff --git a/arch/mips/lantiq/xway/devices.h b/arch/mips/lantiq/xway/devices.h -index 51f56b5..d573084 100644 --- a/arch/mips/lantiq/xway/devices.h +++ b/arch/mips/lantiq/xway/devices.h @@ -10,6 +10,7 @@ @@ -123,9 +114,6 @@ index 51f56b5..d573084 100644 extern void ltq_register_gpio(void); extern void ltq_register_gpio_stp(void); -diff --git a/arch/mips/lantiq/xway/dma.c b/arch/mips/lantiq/xway/dma.c -new file mode 100644 -index 0000000..4278a45 --- /dev/null +++ b/arch/mips/lantiq/xway/dma.c @@ -0,0 +1,253 @@ @@ -382,6 +370,3 @@ index 0000000..4278a45 +} + +postcore_initcall(ltq_dma_init); --- -1.7.2.3 - diff --git a/target/linux/lantiq/patches-2.6.39/0011-MIPS-Lantiq-Add-ethernet-driver.patch b/target/linux/lantiq/patches-2.6.39/0011-MIPS-Lantiq-Add-ethernet-driver.patch index eac20d7e3..94100d024 100644 --- a/target/linux/lantiq/patches-2.6.39/0011-MIPS-Lantiq-Add-ethernet-driver.patch +++ b/target/linux/lantiq/patches-2.6.39/0011-MIPS-Lantiq-Add-ethernet-driver.patch @@ -36,7 +36,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> /* struct used to pass info to the pci core */ enum { -@@ -43,4 +44,10 @@ +@@ -43,4 +44,10 @@ struct ltq_pci_data { int irq[16]; }; @@ -62,7 +62,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> #define LTQ_DMA_BASE_ADDR 0x1E104100 --- a/arch/mips/lantiq/xway/devices.c +++ b/arch/mips/lantiq/xway/devices.c -@@ -96,3 +96,26 @@ +@@ -96,3 +96,26 @@ void __init ltq_register_ase_asc(void) platform_device_register_simple("ltq_asc", 0, ltq_ase_asc_resources, ARRAY_SIZE(ltq_ase_asc_resources)); } @@ -100,7 +100,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> #endif --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig -@@ -2017,6 +2017,13 @@ +@@ -2017,6 +2017,13 @@ config FTMAC100 from Faraday. It is used on Faraday A320, Andes AG101 and some other ARM/NDS32 SoC's. @@ -116,7 +116,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> source "drivers/net/octeon/Kconfig" --- a/drivers/net/Makefile +++ b/drivers/net/Makefile -@@ -259,6 +259,7 @@ +@@ -259,6 +259,7 @@ obj-$(CONFIG_MLX4_CORE) += mlx4/ obj-$(CONFIG_ENC28J60) += enc28j60.o obj-$(CONFIG_ETHOC) += ethoc.o obj-$(CONFIG_GRETH) += greth.o diff --git a/target/linux/lantiq/patches-2.6.39/0012-MIPS-Lantiq-Add-etop-board-support.patch b/target/linux/lantiq/patches-2.6.39/0012-MIPS-Lantiq-Add-etop-board-support.patch index 2bc4abd21..5004667a1 100644 --- a/target/linux/lantiq/patches-2.6.39/0012-MIPS-Lantiq-Add-etop-board-support.patch +++ b/target/linux/lantiq/patches-2.6.39/0012-MIPS-Lantiq-Add-etop-board-support.patch @@ -16,8 +16,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> arch/mips/lantiq/xway/mach-easy50712.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) -diff --git a/arch/mips/lantiq/xway/mach-easy50712.c b/arch/mips/lantiq/xway/mach-easy50712.c -index e5e7e09..ea5027b 100644 --- a/arch/mips/lantiq/xway/mach-easy50712.c +++ b/arch/mips/lantiq/xway/mach-easy50712.c @@ -12,6 +12,7 @@ @@ -28,7 +26,7 @@ index e5e7e09..ea5027b 100644 #include <lantiq_soc.h> #include <irq.h> -@@ -55,11 +56,16 @@ static struct ltq_pci_data ltq_pci_data = { +@@ -55,11 +56,16 @@ static struct ltq_pci_data ltq_pci_data }, }; @@ -45,6 +43,3 @@ index e5e7e09..ea5027b 100644 } MIPS_MACHINE(LTQ_MACH_EASY50712, --- -1.7.2.3 - diff --git a/target/linux/lantiq/patches-2.6.39/0013-MIPS-Lantiq-Add-watchdog-support.patch b/target/linux/lantiq/patches-2.6.39/0013-MIPS-Lantiq-Add-watchdog-support.patch index 5d07a63f7..c40707cd9 100644 --- a/target/linux/lantiq/patches-2.6.39/0013-MIPS-Lantiq-Add-watchdog-support.patch +++ b/target/linux/lantiq/patches-2.6.39/0013-MIPS-Lantiq-Add-watchdog-support.patch @@ -21,7 +21,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig -@@ -990,6 +990,12 @@ +@@ -990,6 +990,12 @@ config BCM63XX_WDT To compile this driver as a loadable module, choose M here. The module will be called bcm63xx_wdt. @@ -36,7 +36,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> # POWERPC Architecture --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile -@@ -123,6 +123,7 @@ +@@ -123,6 +123,7 @@ obj-$(CONFIG_AR7_WDT) += ar7_wdt.o obj-$(CONFIG_TXX9_WDT) += txx9wdt.o obj-$(CONFIG_OCTEON_WDT) += octeon-wdt.o octeon-wdt-y := octeon-wdt-main.o octeon-wdt-nmi.o diff --git a/target/linux/lantiq/patches-2.6.39/110-falcon_board.patch b/target/linux/lantiq/patches-2.6.39/110-falcon_board.patch index c6fb91034..9355dc686 100644 --- a/target/linux/lantiq/patches-2.6.39/110-falcon_board.patch +++ b/target/linux/lantiq/patches-2.6.39/110-falcon_board.patch @@ -1694,7 +1694,7 @@ +#endif --- a/arch/mips/lantiq/Kconfig +++ b/arch/mips/lantiq/Kconfig -@@ -16,8 +16,12 @@ +@@ -16,8 +16,12 @@ config SOC_XWAY bool "XWAY" select SOC_TYPE_XWAY select HW_HAS_PCI @@ -1709,21 +1709,21 @@ endif --- a/arch/mips/lantiq/Makefile +++ b/arch/mips/lantiq/Makefile -@@ -9,3 +9,4 @@ +@@ -9,3 +9,4 @@ obj-y := irq.o setup.o clk.o prom.o devi obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_SOC_TYPE_XWAY) += xway/ +obj-$(CONFIG_SOC_FALCON) += falcon/ --- a/arch/mips/lantiq/Platform +++ b/arch/mips/lantiq/Platform -@@ -6,3 +6,4 @@ +@@ -6,3 +6,4 @@ platform-$(CONFIG_LANTIQ) += lantiq/ cflags-$(CONFIG_LANTIQ) += -I$(srctree)/arch/mips/include/asm/mach-lantiq load-$(CONFIG_LANTIQ) = 0xffffffff80002000 cflags-$(CONFIG_SOC_TYPE_XWAY) += -I$(srctree)/arch/mips/include/asm/mach-lantiq/xway +cflags-$(CONFIG_SOC_FALCON) += -I$(srctree)/arch/mips/include/asm/mach-lantiq/falcon --- a/arch/mips/lantiq/machtypes.h +++ b/arch/mips/lantiq/machtypes.h -@@ -15,6 +15,11 @@ +@@ -15,6 +15,11 @@ enum lantiq_mach_type { LTQ_MACH_GENERIC = 0, LTQ_MACH_EASY50712, /* Danube evaluation board */ LTQ_MACH_EASY50601, /* Amazon SE evaluation board */ diff --git a/target/linux/lantiq/patches-2.6.39/120-falcon-i2c.patch b/target/linux/lantiq/patches-2.6.39/120-falcon-i2c.patch index 3dd873be7..c5d39c8c2 100644 --- a/target/linux/lantiq/patches-2.6.39/120-falcon-i2c.patch +++ b/target/linux/lantiq/patches-2.6.39/120-falcon-i2c.patch @@ -1,16 +1,15 @@ --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile -@@ -74,6 +74,7 @@ +@@ -82,5 +82,6 @@ obj-$(CONFIG_I2C_SIBYTE) += i2c-sibyte.o obj-$(CONFIG_I2C_STUB) += i2c-stub.o obj-$(CONFIG_SCx200_ACB) += scx200_acb.o obj-$(CONFIG_SCx200_I2C) += scx200_i2c.o +obj-$(CONFIG_I2C_FALCON) += i2c-falcon.o - ifeq ($(CONFIG_I2C_DEBUG_BUS),y) - EXTRA_CFLAGS += -DDEBUG + ccflags-$(CONFIG_I2C_DEBUG_BUS) := -DDEBUG --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig -@@ -278,6 +278,10 @@ +@@ -282,6 +282,10 @@ config I2C_POWERMAC comment "I2C system bus drivers (mostly embedded / system-on-chip)" diff --git a/target/linux/lantiq/patches-2.6.39/130-falcon-spi-flash.patch b/target/linux/lantiq/patches-2.6.39/130-falcon-spi-flash.patch index 10ff6057e..94f13c98b 100644 --- a/target/linux/lantiq/patches-2.6.39/130-falcon-spi-flash.patch +++ b/target/linux/lantiq/patches-2.6.39/130-falcon-spi-flash.patch @@ -1,6 +1,6 @@ --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile -@@ -55,6 +55,7 @@ +@@ -55,6 +55,7 @@ obj-$(CONFIG_SPI_SH_SCI) += spi_sh_sci. obj-$(CONFIG_SPI_SH_MSIOF) += spi_sh_msiof.o obj-$(CONFIG_SPI_STMP3XXX) += spi_stmp.o obj-$(CONFIG_SPI_NUC900) += spi_nuc900.o @@ -484,7 +484,7 @@ +MODULE_DESCRIPTION("Lantiq Falcon SPI controller driver"); --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig -@@ -210,6 +210,10 @@ +@@ -210,6 +210,10 @@ config SPI_MPC52xx This drivers supports the MPC52xx SPI controller in master SPI mode. diff --git a/target/linux/lantiq/patches-2.6.39/150-falcon-easy98020.patch b/target/linux/lantiq/patches-2.6.39/150-falcon-easy98020.patch index e9593c58c..7010d3517 100644 --- a/target/linux/lantiq/patches-2.6.39/150-falcon-easy98020.patch +++ b/target/linux/lantiq/patches-2.6.39/150-falcon-easy98020.patch @@ -100,7 +100,7 @@ + easy98020_init); --- a/arch/mips/lantiq/falcon/Kconfig +++ b/arch/mips/lantiq/falcon/Kconfig -@@ -6,6 +6,10 @@ +@@ -6,6 +6,10 @@ config LANTIQ_MACH_EASY98000 bool "Easy98000" default y @@ -113,7 +113,7 @@ endif --- a/arch/mips/lantiq/falcon/Makefile +++ b/arch/mips/lantiq/falcon/Makefile -@@ -2,3 +2,4 @@ +@@ -2,3 +2,4 @@ obj-y := clk-falcon.o devices.o gpio.o p obj-y += softdog_vpe.o obj-$(CONFIG_LANTIQ_MACH_EASY98000) += mach-easy98000.o obj-$(CONFIG_LANTIQ_MACH_EASY98000) += dev-leds-easy98000-cpld.o diff --git a/target/linux/lantiq/patches-2.6.39/160-falcon-95C3AM1.patch b/target/linux/lantiq/patches-2.6.39/160-falcon-95C3AM1.patch index 034703742..fbe858474 100644 --- a/target/linux/lantiq/patches-2.6.39/160-falcon-95C3AM1.patch +++ b/target/linux/lantiq/patches-2.6.39/160-falcon-95C3AM1.patch @@ -106,7 +106,7 @@ + board_95C3AM1_init); --- a/arch/mips/lantiq/falcon/Kconfig +++ b/arch/mips/lantiq/falcon/Kconfig -@@ -10,6 +10,10 @@ +@@ -10,6 +10,10 @@ config LANTIQ_MACH_EASY98020 bool "Easy98020" default y @@ -119,14 +119,14 @@ endif --- a/arch/mips/lantiq/falcon/Makefile +++ b/arch/mips/lantiq/falcon/Makefile -@@ -3,3 +3,4 @@ +@@ -3,3 +3,4 @@ obj-y += softdog_vpe.o obj-$(CONFIG_LANTIQ_MACH_EASY98000) += mach-easy98000.o obj-$(CONFIG_LANTIQ_MACH_EASY98000) += dev-leds-easy98000-cpld.o obj-$(CONFIG_LANTIQ_MACH_EASY98020) += mach-easy98020.o +obj-$(CONFIG_LANTIQ_MACH_95C3AM1) += mach-95C3AM1.o --- a/arch/mips/lantiq/machtypes.h +++ b/arch/mips/lantiq/machtypes.h -@@ -20,6 +20,7 @@ +@@ -20,6 +20,7 @@ enum lantiq_mach_type { LANTIQ_MACH_EASY98000, /* Falcon Eval Board, NOR Flash */ LANTIQ_MACH_EASY98000SF, /* Falcon Eval Board, Serial Flash */ LANTIQ_MACH_EASY98020, /* Falcon Reference Board */ diff --git a/target/linux/lantiq/patches-2.6.39/200-mach-arv45xx.patch b/target/linux/lantiq/patches-2.6.39/200-mach-arv45xx.patch index b82dadac9..a5fa58f1d 100644 --- a/target/linux/lantiq/patches-2.6.39/200-mach-arv45xx.patch +++ b/target/linux/lantiq/patches-2.6.39/200-mach-arv45xx.patch @@ -1,6 +1,6 @@ --- a/arch/mips/lantiq/xway/Kconfig +++ b/arch/mips/lantiq/xway/Kconfig -@@ -6,6 +6,10 @@ +@@ -6,6 +6,10 @@ config LANTIQ_MACH_EASY50712 bool "Easy50712 - Danube" default y @@ -13,7 +13,7 @@ endif --- a/arch/mips/lantiq/xway/Makefile +++ b/arch/mips/lantiq/xway/Makefile -@@ -5,3 +5,4 @@ +@@ -5,3 +5,4 @@ obj-$(CONFIG_SOC_AMAZON_SE) += clk-ase.o obj-$(CONFIG_LANTIQ_MACH_EASY50712) += mach-easy50712.o obj-$(CONFIG_LANTIQ_MACH_EASY50601) += mach-easy50601.o @@ -527,7 +527,7 @@ + arv752dpw22_init); --- a/arch/mips/lantiq/machtypes.h +++ b/arch/mips/lantiq/machtypes.h -@@ -21,6 +21,17 @@ +@@ -21,6 +21,17 @@ enum lantiq_mach_type { LANTIQ_MACH_EASY98000SF, /* Falcon Eval Board, Serial Flash */ LANTIQ_MACH_EASY98020, /* Falcon Reference Board */ LANTIQ_MACH_95C3AM1, /* Board 95C3AM1 */ diff --git a/target/linux/lantiq/patches-2.6.39/210-mtd_uimage_split.patch b/target/linux/lantiq/patches-2.6.39/210-mtd_uimage_split.patch index bca51a80d..16173a3d2 100644 --- a/target/linux/lantiq/patches-2.6.39/210-mtd_uimage_split.patch +++ b/target/linux/lantiq/patches-2.6.39/210-mtd_uimage_split.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig -@@ -63,6 +63,10 @@ +@@ -57,6 +57,10 @@ config MTD_ROOTFS_SPLIT depends on MTD_PARTITIONS default y @@ -10,10 +10,10 @@ + config MTD_REDBOOT_PARTS tristate "RedBoot partition table parsing" - depends on MTD_PARTITIONS + ---help--- --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -724,6 +724,82 @@ +@@ -860,6 +860,82 @@ static int refresh_rootfs_split(struct m } #endif /* CONFIG_MTD_ROOTFS_SPLIT */ @@ -96,9 +96,9 @@ /* * This function, given a master MTD object and a partition table, creates * and registers slave MTD objects which are bound to the master according to -@@ -748,6 +824,17 @@ - if (!slave) - return -ENOMEM; +@@ -893,6 +969,17 @@ int add_mtd_partitions(struct mtd_info * + + add_mtd_device(&slave->mtd); +#ifdef CONFIG_MTD_UIMAGE_SPLIT + if (!strcmp(parts[i].name, "linux")) { diff --git a/target/linux/lantiq/patches-2.6.39/220-atm_hack.patch b/target/linux/lantiq/patches-2.6.39/220-atm_hack.patch index ef19643cf..7552b1d0c 100644 --- a/target/linux/lantiq/patches-2.6.39/220-atm_hack.patch +++ b/target/linux/lantiq/patches-2.6.39/220-atm_hack.patch @@ -1,6 +1,6 @@ --- a/arch/mips/mm/cache.c +++ b/arch/mips/mm/cache.c -@@ -52,6 +52,8 @@ +@@ -52,6 +52,8 @@ void (*_dma_cache_wback)(unsigned long s void (*_dma_cache_inv)(unsigned long start, unsigned long size); EXPORT_SYMBOL(_dma_cache_wback_inv); @@ -11,7 +11,7 @@ --- a/net/atm/proc.c +++ b/net/atm/proc.c -@@ -154,7 +154,7 @@ +@@ -154,7 +154,7 @@ static void *vcc_seq_next(struct seq_fil static void pvc_info(struct seq_file *seq, struct atm_vcc *vcc) { static const char *const class_name[] = { @@ -22,7 +22,7 @@ "???", "5", "???", "???", /* 4- 7 */ --- a/net/atm/common.c +++ b/net/atm/common.c -@@ -62,11 +62,17 @@ +@@ -62,11 +62,17 @@ static void vcc_remove_socket(struct soc write_unlock_irq(&vcc_sklist_lock); } diff --git a/target/linux/lantiq/patches-2.6.39/230-cmdline_hack.patch b/target/linux/lantiq/patches-2.6.39/230-cmdline_hack.patch index df232869f..3b8c58176 100644 --- a/target/linux/lantiq/patches-2.6.39/230-cmdline_hack.patch +++ b/target/linux/lantiq/patches-2.6.39/230-cmdline_hack.patch @@ -1,6 +1,6 @@ --- a/arch/mips/lantiq/prom.c +++ b/arch/mips/lantiq/prom.c -@@ -39,6 +39,34 @@ +@@ -39,6 +39,34 @@ void prom_free_prom_memory(void) { } @@ -35,7 +35,7 @@ static void __init prom_init_cmdline(void) { int argc = fw_arg0; -@@ -53,6 +81,7 @@ +@@ -53,6 +81,7 @@ static void __init prom_init_cmdline(voi strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline)); } } diff --git a/target/linux/lantiq/patches-2.6.39/240-udp_redirect.patch b/target/linux/lantiq/patches-2.6.39/240-udp_redirect.patch index 286dce810..d66ca55cc 100644 --- a/target/linux/lantiq/patches-2.6.39/240-udp_redirect.patch +++ b/target/linux/lantiq/patches-2.6.39/240-udp_redirect.patch @@ -249,7 +249,7 @@ +#endif /* CONFIG_IFX_UDP_REDIRECT* */ --- a/net/ipv4/Makefile +++ b/net/ipv4/Makefile -@@ -14,6 +14,9 @@ +@@ -14,6 +14,9 @@ obj-y := route.o inetpeer.o protocol inet_fragment.o obj-$(CONFIG_SYSCTL) += sysctl_net_ipv4.o @@ -272,7 +272,7 @@ struct udp_table udp_table __read_mostly; EXPORT_SYMBOL(udp_table); -@@ -802,7 +806,7 @@ +@@ -802,7 +806,7 @@ int udp_sendmsg(struct kiocb *iocb, stru u8 tos; int err, is_udplite = IS_UDPLITE(sk); int corkreq = up->corkflag || msg->msg_flags&MSG_MORE; @@ -281,7 +281,7 @@ struct sk_buff *skb; if (len > 0xFFFF) -@@ -818,7 +822,13 @@ +@@ -818,7 +822,13 @@ int udp_sendmsg(struct kiocb *iocb, stru ipc.opt = NULL; ipc.tx_flags = 0; @@ -296,7 +296,7 @@ if (up->pending) { /* -@@ -1608,6 +1618,7 @@ +@@ -1608,6 +1618,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct rtable *rt = skb_rtable(skb); __be32 saddr, daddr; struct net *net = dev_net(skb->dev); @@ -304,7 +304,7 @@ /* * Validate the packet. -@@ -1640,7 +1651,16 @@ +@@ -1640,7 +1651,16 @@ int __udp4_lib_rcv(struct sk_buff *skb, sk = __udp4_lib_lookup_skb(skb, uh->source, uh->dest, udptable); if (sk != NULL) { @@ -322,7 +322,7 @@ sock_put(sk); /* a return value > 0 means to resubmit the input, but -@@ -1937,7 +1957,7 @@ +@@ -1937,7 +1957,7 @@ struct proto udp_prot = { .clear_sk = sk_prot_clear_portaddr_nulls, }; EXPORT_SYMBOL(udp_prot); @@ -333,7 +333,7 @@ --- a/net/Kconfig +++ b/net/Kconfig -@@ -72,6 +72,12 @@ +@@ -72,6 +72,12 @@ config INET Short answer: say Y. diff --git a/target/linux/lantiq/patches-2.6.39/250-mt-vpe.patch b/target/linux/lantiq/patches-2.6.39/250-mt-vpe.patch index 0a1928929..6bb38b44c 100644 --- a/target/linux/lantiq/patches-2.6.39/250-mt-vpe.patch +++ b/target/linux/lantiq/patches-2.6.39/250-mt-vpe.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -1871,6 +1871,28 @@ +@@ -1871,6 +1871,28 @@ config MIPS_VPE_LOADER Includes a loader for loading an elf relocatable object onto another VPE and running it. @@ -110,7 +110,7 @@ /* TCStatus fields (per TC) */ #define TCSTATUS_TASID (_ULCAST_(0xff)) #define TCSTATUS_IXMT_SHIFT 10 -@@ -350,6 +390,14 @@ +@@ -350,6 +390,14 @@ do { \ #define write_vpe_c0_vpecontrol(val) mttc0(1, 1, val) #define read_vpe_c0_vpeconf0() mftc0(1, 2) #define write_vpe_c0_vpeconf0(val) mttc0(1, 2, val) @@ -125,7 +125,7 @@ #define read_vpe_c0_count() mftc0(9, 0) #define write_vpe_c0_count(val) mttc0(9, 0, val) #define read_vpe_c0_status() mftc0(12, 0) -@@ -381,6 +429,12 @@ +@@ -381,6 +429,12 @@ do { \ #define write_tc_c0_tchalt(val) mttc0(2, 4, val) #define read_tc_c0_tccontext() mftc0(2, 5) #define write_tc_c0_tccontext(val) mttc0(2, 5, val) @@ -140,7 +140,7 @@ #define read_tc_gpr_sp() mftgpr(29) --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile -@@ -85,7 +85,8 @@ +@@ -85,7 +85,8 @@ obj-$(CONFIG_MIPS32_O32) += binfmt_elfo3 obj-$(CONFIG_KGDB) += kgdb.o obj-$(CONFIG_PROC_FS) += proc.o @@ -254,7 +254,7 @@ /* * Dump new MIPS MT state for the core. Does not leave TCs halted. -@@ -78,18 +148,18 @@ +@@ -78,18 +148,18 @@ void mips_mt_regdump(unsigned long mvpct if ((read_tc_c0_tcbind() & TCBIND_CURVPE) == i) { printk(" VPE %d\n", i); printk(" VPEControl : %08lx\n", @@ -280,7 +280,7 @@ break; /* Next VPE */ } } -@@ -287,6 +357,9 @@ +@@ -287,6 +357,9 @@ void mips_mt_set_cpuoptions(void) printk("Mapped %ld ITC cells starting at 0x%08x\n", ((itcblkgrn & 0x7fe00000) >> 20), itc_base); } @@ -300,7 +300,7 @@ #include <asm/bootinfo.h> #include <asm/cpu.h> #include <asm/cpu-features.h> -@@ -110,3 +111,19 @@ +@@ -110,3 +111,19 @@ const struct seq_operations cpuinfo_op = .stop = c_stop, .show = show_cpuinfo, }; @@ -322,7 +322,7 @@ +} --- a/arch/mips/kernel/smtc.c +++ b/arch/mips/kernel/smtc.c -@@ -1334,6 +1334,13 @@ +@@ -1334,6 +1334,13 @@ void smtc_get_new_mmu_context(struct mm_ asid = asid_cache(cpu); do { @@ -338,7 +338,7 @@ flush_icache_all(); --- a/arch/mips/kernel/vpe.c +++ b/arch/mips/kernel/vpe.c -@@ -76,6 +76,58 @@ +@@ -76,6 +76,58 @@ static struct kspd_notifications kspd_ev static int kspd_events_reqd; #endif @@ -397,7 +397,7 @@ /* grab the likely amount of memory we will need. */ #ifdef CONFIG_MIPS_VPE_LOADER_TOM #define P_SIZE (2 * 1024 * 1024) -@@ -268,6 +320,13 @@ +@@ -268,6 +320,13 @@ static void *alloc_progmem(unsigned long void *addr; #ifdef CONFIG_MIPS_VPE_LOADER_TOM @@ -411,7 +411,7 @@ /* * This means you must tell Linux to use less memory than you * physically have, for example by passing a mem= boot argument. -@@ -746,6 +805,12 @@ +@@ -746,6 +805,12 @@ static int vpe_run(struct vpe * v) } /* Write the address we want it to start running from in the TCPC register. */ @@ -424,7 +424,7 @@ write_tc_c0_tcrestart((unsigned long)v->__start); write_tc_c0_tccontext((unsigned long)0); -@@ -759,6 +824,20 @@ +@@ -759,6 +824,20 @@ static int vpe_run(struct vpe * v) write_tc_c0_tchalt(read_tc_c0_tchalt() & ~TCHALT_H); @@ -445,7 +445,7 @@ /* * The sde-kit passes 'memsize' to __start in $a3, so set something * here... Or set $a3 to zero and define DFLT_STACK_SIZE and -@@ -833,6 +912,9 @@ +@@ -833,6 +912,9 @@ static int find_vpe_symbols(struct vpe * if ( (v->__start == 0) || (v->shared_ptr == NULL)) return -1; @@ -455,7 +455,7 @@ return 0; } -@@ -994,6 +1076,15 @@ +@@ -994,6 +1076,15 @@ static int vpe_elfload(struct vpe * v) (unsigned long)v->load_addr + v->len); if ((find_vpe_symbols(v, sechdrs, symindex, strtab, &mod)) < 0) { @@ -471,7 +471,7 @@ if (v->__start == 0) { printk(KERN_WARNING "VPE loader: program does not contain " "a __start symbol\n"); -@@ -1064,6 +1155,9 @@ +@@ -1064,6 +1155,9 @@ static int vpe_open(struct inode *inode, struct vpe_notifications *not; struct vpe *v; int ret; @@ -481,7 +481,7 @@ if (minor != iminor(inode)) { /* assume only 1 device at the moment. */ -@@ -1089,7 +1183,12 @@ +@@ -1089,7 +1183,12 @@ static int vpe_open(struct inode *inode, release_progmem(v->load_addr); cleanup_tc(get_tc(tclimit)); } @@ -495,7 +495,7 @@ /* this of-course trashes what was there before... */ v->pbuffer = vmalloc(P_SIZE); if (!v->pbuffer) { -@@ -1097,11 +1196,14 @@ +@@ -1097,11 +1196,14 @@ static int vpe_open(struct inode *inode, return -ENOMEM; } v->plen = P_SIZE; @@ -510,7 +510,7 @@ #ifdef CONFIG_MIPS_APSP_KSPD /* get kspd to tell us when a syscall_exit happens */ -@@ -1349,6 +1451,133 @@ +@@ -1349,6 +1451,133 @@ static void kspd_sp_exit( int sp_id) cleanup_tc(get_tc(sp_id)); } #endif @@ -644,7 +644,7 @@ static ssize_t store_kill(struct device *dev, struct device_attribute *attr, const char *buf, size_t len) -@@ -1430,6 +1659,18 @@ +@@ -1430,6 +1659,18 @@ static int __init vpe_module_init(void) printk("VPE loader: not a MIPS MT capable processor\n"); return -ENODEV; } @@ -663,7 +663,7 @@ if (vpelimit == 0) { printk(KERN_WARNING "No VPEs reserved for AP/SP, not " -@@ -1474,10 +1715,12 @@ +@@ -1474,10 +1715,12 @@ static int __init vpe_module_init(void) mtflags = dmt(); vpflags = dvpe(); @@ -677,7 +677,7 @@ val = read_c0_mvpconf0(); hw_tcs = (val & MVPCONF0_PTC) + 1; -@@ -1489,6 +1732,7 @@ +@@ -1489,6 +1732,7 @@ static int __init vpe_module_init(void) * reschedule send IPIs or similar we might hang. */ clear_c0_mvpcontrol(MVPCONTROL_VPC); @@ -685,7 +685,7 @@ evpe(vpflags); emt(mtflags); local_irq_restore(flags); -@@ -1514,6 +1758,7 @@ +@@ -1514,6 +1758,7 @@ static int __init vpe_module_init(void) } v->ntcs = hw_tcs - tclimit; @@ -693,7 +693,7 @@ /* add the tc to the list of this vpe's tc's. */ list_add(&t->tc, &v->tc); -@@ -1582,6 +1827,7 @@ +@@ -1582,6 +1827,7 @@ static int __init vpe_module_init(void) out_reenable: /* release config state */ clear_c0_mvpcontrol(MVPCONTROL_VPC); diff --git a/target/linux/lantiq/patches-2.6.39/260-ar9-cache-split.patch b/target/linux/lantiq/patches-2.6.39/260-ar9-cache-split.patch index 88d2a61f9..254fc61aa 100644 --- a/target/linux/lantiq/patches-2.6.39/260-ar9-cache-split.patch +++ b/target/linux/lantiq/patches-2.6.39/260-ar9-cache-split.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -1653,6 +1653,28 @@ +@@ -1878,6 +1878,28 @@ config IFX_VPE_EXT help IFX included extensions in APRP @@ -31,7 +31,7 @@ depends on MIPS_MT && PROC_FS --- a/arch/mips/kernel/vpe.c +++ b/arch/mips/kernel/vpe.c -@@ -129,6 +129,13 @@ +@@ -128,6 +128,13 @@ __setup("vpe1_wdog_timeout=", wdog_timeo EXPORT_SYMBOL(vpe1_wdog_timeout); #endif @@ -45,7 +45,7 @@ /* grab the likely amount of memory we will need. */ #ifdef CONFIG_MIPS_VPE_LOADER_TOM #define P_SIZE (2 * 1024 * 1024) -@@ -867,6 +874,65 @@ +@@ -866,6 +873,65 @@ static int vpe_run(struct vpe * v) /* enable this VPE */ write_vpe_c0_vpeconf0(read_vpe_c0_vpeconf0() | VPECONF0_VPA); @@ -113,7 +113,7 @@ write_vpe_c0_cause(0); --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c -@@ -1348,6 +1348,106 @@ +@@ -1345,6 +1345,106 @@ static int __init setcoherentio(char *st __setup("coherentio", setcoherentio); #endif @@ -220,7 +220,7 @@ void __cpuinit r4k_cache_init(void) { extern void build_clear_page(void); -@@ -1367,6 +1467,78 @@ +@@ -1364,6 +1464,78 @@ void __cpuinit r4k_cache_init(void) break; } diff --git a/target/linux/lantiq/patches-2.6.39/400-spi1.patch b/target/linux/lantiq/patches-2.6.39/400-spi1.patch index 61bfa2e18..c3c933021 100644 --- a/target/linux/lantiq/patches-2.6.39/400-spi1.patch +++ b/target/linux/lantiq/patches-2.6.39/400-spi1.patch @@ -10,7 +10,7 @@ Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com> --- a/arch/mips/include/asm/mach-lantiq/lantiq_platform.h +++ b/arch/mips/include/asm/mach-lantiq/lantiq_platform.h -@@ -50,4 +50,13 @@ +@@ -50,4 +50,13 @@ struct ltq_eth_data { int mii_mode; }; diff --git a/target/linux/lantiq/patches-2.6.39/410-spi2.patch b/target/linux/lantiq/patches-2.6.39/410-spi2.patch index d291e09ba..e37790a81 100644 --- a/target/linux/lantiq/patches-2.6.39/410-spi2.patch +++ b/target/linux/lantiq/patches-2.6.39/410-spi2.patch @@ -10,7 +10,7 @@ Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com> --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig -@@ -133,6 +133,14 @@ +@@ -193,6 +193,14 @@ config SPI_IMX This enables using the Freescale i.MX SPI controllers in master mode. @@ -27,14 +27,14 @@ Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com> depends on PARPORT && EXPERIMENTAL --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile -@@ -20,6 +20,7 @@ +@@ -26,6 +26,7 @@ obj-$(CONFIG_SPI_EP93XX) += ep93xx_spi. obj-$(CONFIG_SPI_GPIO) += spi_gpio.o obj-$(CONFIG_SPI_GPIO_OLD) += spi_gpio_old.o obj-$(CONFIG_SPI_IMX) += spi_imx.o +obj-$(CONFIG_SPI_LANTIQ) += spi_lantiq.o obj-$(CONFIG_SPI_LM70_LLP) += spi_lm70llp.o obj-$(CONFIG_SPI_PXA2XX) += pxa2xx_spi.o - obj-$(CONFIG_SPI_OMAP_UWIRE) += omap_uwire.o + obj-$(CONFIG_SPI_PXA2XX_PCI) += pxa2xx_spi_pci.o --- /dev/null +++ b/drivers/spi/spi_lantiq.c @@ -0,0 +1,1063 @@ diff --git a/target/linux/lantiq/patches-2.6.39/420-spi3.patch b/target/linux/lantiq/patches-2.6.39/420-spi3.patch index 31cf3c1a8..f89886fb7 100644 --- a/target/linux/lantiq/patches-2.6.39/420-spi3.patch +++ b/target/linux/lantiq/patches-2.6.39/420-spi3.patch @@ -18,7 +18,7 @@ Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com> #include <asm/bootinfo.h> #include <asm/irq.h> -@@ -119,3 +120,28 @@ +@@ -119,3 +120,28 @@ ltq_register_etop(struct ltq_eth_data *e platform_device_register(<q_etop); } } diff --git a/target/linux/lantiq/patches-2.6.39/500-register_ebu.patch b/target/linux/lantiq/patches-2.6.39/500-register_ebu.patch index 613cb69dc..3c2fb2b68 100644 --- a/target/linux/lantiq/patches-2.6.39/500-register_ebu.patch +++ b/target/linux/lantiq/patches-2.6.39/500-register_ebu.patch @@ -1,6 +1,6 @@ --- a/arch/mips/lantiq/xway/devices.c +++ b/arch/mips/lantiq/xway/devices.c -@@ -121,6 +121,29 @@ +@@ -121,6 +121,29 @@ ltq_register_etop(struct ltq_eth_data *e } } @@ -32,7 +32,7 @@ .start = LTQ_SSC_BASE_ADDR, --- a/arch/mips/lantiq/xway/devices.h +++ b/arch/mips/lantiq/xway/devices.h -@@ -16,5 +16,6 @@ +@@ -16,5 +16,6 @@ extern void ltq_register_gpio(void); extern void ltq_register_gpio_stp(void); extern void ltq_register_ase_asc(void); extern void ltq_register_etop(struct ltq_eth_data *eth); diff --git a/target/linux/lantiq/patches-2.6.39/510-register_madwifi.patch b/target/linux/lantiq/patches-2.6.39/510-register_madwifi.patch index 678f0f569..64c13b067 100644 --- a/target/linux/lantiq/patches-2.6.39/510-register_madwifi.patch +++ b/target/linux/lantiq/patches-2.6.39/510-register_madwifi.patch @@ -1,6 +1,6 @@ --- a/arch/mips/lantiq/xway/devices.c +++ b/arch/mips/lantiq/xway/devices.c -@@ -144,6 +144,16 @@ +@@ -144,6 +144,16 @@ ltq_register_gpio_ebu(unsigned int value platform_device_register(<q_ebu); } @@ -19,7 +19,7 @@ .start = LTQ_SSC_BASE_ADDR, --- a/arch/mips/lantiq/xway/devices.h +++ b/arch/mips/lantiq/xway/devices.h -@@ -17,5 +17,6 @@ +@@ -17,5 +17,6 @@ extern void ltq_register_gpio_stp(void); extern void ltq_register_ase_asc(void); extern void ltq_register_etop(struct ltq_eth_data *eth); extern void ltq_register_gpio_ebu(unsigned int value); diff --git a/target/linux/lantiq/patches-2.6.39/520-register_buttons.patch b/target/linux/lantiq/patches-2.6.39/520-register_buttons.patch index 0d8d58ea5..442df5d5c 100644 --- a/target/linux/lantiq/patches-2.6.39/520-register_buttons.patch +++ b/target/linux/lantiq/patches-2.6.39/520-register_buttons.patch @@ -1,6 +1,6 @@ --- a/arch/mips/lantiq/xway/devices.c +++ b/arch/mips/lantiq/xway/devices.c -@@ -154,6 +154,26 @@ +@@ -154,6 +154,26 @@ ltq_register_madwifi_eep(void) lantiq_emulate_madwifi_eep = 1; } @@ -37,7 +37,7 @@ extern void ltq_register_gpio(void); extern void ltq_register_gpio_stp(void); -@@ -18,5 +19,6 @@ +@@ -18,5 +19,6 @@ extern void ltq_register_ase_asc(void); extern void ltq_register_etop(struct ltq_eth_data *eth); extern void ltq_register_gpio_ebu(unsigned int value); extern void ltq_register_madwifi_eep(void); diff --git a/target/linux/lantiq/patches-2.6.39/530-register_tapi.patch b/target/linux/lantiq/patches-2.6.39/530-register_tapi.patch index a58106444..a525313ea 100644 --- a/target/linux/lantiq/patches-2.6.39/530-register_tapi.patch +++ b/target/linux/lantiq/patches-2.6.39/530-register_tapi.patch @@ -1,6 +1,6 @@ --- a/arch/mips/lantiq/devices.c +++ b/arch/mips/lantiq/devices.c -@@ -120,3 +120,20 @@ +@@ -120,3 +120,20 @@ void __init ltq_register_pci(struct ltq_ pr_err("kernel is compiled without PCI support\n"); } #endif @@ -23,7 +23,7 @@ +} --- a/arch/mips/lantiq/devices.h +++ b/arch/mips/lantiq/devices.h -@@ -19,5 +19,6 @@ +@@ -19,5 +19,6 @@ extern void ltq_register_nor(struct phys extern void ltq_register_wdt(void); extern void ltq_register_asc(int port); extern void ltq_register_pci(struct ltq_pci_data *data); @@ -32,7 +32,7 @@ #endif --- a/arch/mips/lantiq/xway/mach-easy50712.c +++ b/arch/mips/lantiq/xway/mach-easy50712.c -@@ -66,6 +66,7 @@ +@@ -66,6 +66,7 @@ static void __init easy50712_init(void) ltq_register_nor(&easy50712_flash_data); ltq_register_pci(<q_pci_data); ltq_register_etop(<q_eth_data); diff --git a/target/linux/lantiq/patches-2.6.39/550-dwc_otg.patch b/target/linux/lantiq/patches-2.6.39/550-dwc_otg.patch index 7747b8058..88955934b 100644 --- a/target/linux/lantiq/patches-2.6.39/550-dwc_otg.patch +++ b/target/linux/lantiq/patches-2.6.39/550-dwc_otg.patch @@ -1,6 +1,6 @@ --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig -@@ -114,6 +114,8 @@ +@@ -114,6 +114,8 @@ source "drivers/usb/wusbcore/Kconfig" source "drivers/usb/host/Kconfig" @@ -11,7 +11,7 @@ source "drivers/usb/class/Kconfig" --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile -@@ -27,6 +27,8 @@ +@@ -27,6 +27,8 @@ obj-$(CONFIG_USB_C67X00_HCD) += c67x00/ obj-$(CONFIG_USB_WUSB) += wusbcore/ @@ -15513,7 +15513,7 @@ +#endif --- a/arch/mips/lantiq/xway/Makefile +++ b/arch/mips/lantiq/xway/Makefile -@@ -6,3 +6,4 @@ +@@ -6,3 +6,4 @@ obj-$(CONFIG_SOC_AMAZON_SE) += clk-ase.o obj-$(CONFIG_LANTIQ_MACH_EASY50712) += mach-easy50712.o obj-$(CONFIG_LANTIQ_MACH_EASY50601) += mach-easy50601.o obj-$(CONFIG_LANTIQ_MACH_ARV45XX) += mach-arv45xx.o @@ -15613,7 +15613,7 @@ +#endif --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -2812,11 +2812,11 @@ +@@ -2812,11 +2812,11 @@ hub_port_init (struct usb_hub *hub, stru udev->ttport = hdev->ttport; } else if (udev->speed != USB_SPEED_HIGH && hdev->speed == USB_SPEED_HIGH) { diff --git a/target/linux/lantiq/patches-2.6.39/570-gpio_fix.patch b/target/linux/lantiq/patches-2.6.39/570-gpio_fix.patch index a05835599..6295f7899 100644 --- a/target/linux/lantiq/patches-2.6.39/570-gpio_fix.patch +++ b/target/linux/lantiq/patches-2.6.39/570-gpio_fix.patch @@ -1,6 +1,6 @@ --- a/arch/mips/lantiq/xway/gpio_ebu.c +++ b/arch/mips/lantiq/xway/gpio_ebu.c -@@ -63,7 +63,6 @@ +@@ -63,7 +63,6 @@ static struct gpio_chip ltq_ebu_chip = { .set = ltq_ebu_set, .base = 72, .ngpio = 16, @@ -10,7 +10,7 @@ --- a/arch/mips/lantiq/xway/gpio_stp.c +++ b/arch/mips/lantiq/xway/gpio_stp.c -@@ -72,7 +72,6 @@ +@@ -72,7 +72,6 @@ static struct gpio_chip ltq_stp_chip = { .set = ltq_stp_set, .base = 48, .ngpio = 24, |