diff options
| author | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-01-28 17:44:20 +0000 |
|---|---|---|
| committer | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-01-28 17:44:20 +0000 |
| commit | 8fe271d96f670b86e0d77659edbb769cb3bee49d (patch) | |
| tree | c55fc9e7d219aea4cc04c9be3b2e663b5481ed65 /target/linux | |
| parent | 2883efeff7bb4b7aad1ff37ba7be22ae7b099f7b (diff) | |
[lantiq] refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35355 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
53 files changed, 212 insertions, 545 deletions
diff --git a/target/linux/generic/patches-3.7/230-openwrt_lzma_options.patch b/target/linux/generic/patches-3.7/230-openwrt_lzma_options.patch index 972b876df..b09c24d4c 100644 --- a/target/linux/generic/patches-3.7/230-openwrt_lzma_options.patch +++ b/target/linux/generic/patches-3.7/230-openwrt_lzma_options.patch @@ -1,6 +1,6 @@ --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib -@@ -296,7 +296,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) +@@ -296,7 +296,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) quiet_cmd_lzma = LZMA $@ cmd_lzma = (cat $(filter-out FORCE,$^) | \ diff --git a/target/linux/generic/patches-3.7/306-mips_mem_functions_performance.patch b/target/linux/generic/patches-3.7/306-mips_mem_functions_performance.patch index e6056fa5c..981867742 100644 --- a/target/linux/generic/patches-3.7/306-mips_mem_functions_performance.patch +++ b/target/linux/generic/patches-3.7/306-mips_mem_functions_performance.patch @@ -1,6 +1,6 @@ --- a/arch/mips/include/asm/string.h +++ b/arch/mips/include/asm/string.h -@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__ +@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__ #define __HAVE_ARCH_MEMSET extern void *memset(void *__s, int __c, size_t __count); diff --git a/target/linux/generic/patches-3.7/340-module_alloc_size_check.patch b/target/linux/generic/patches-3.7/340-module_alloc_size_check.patch index e48c0d2c1..2459b6183 100644 --- a/target/linux/generic/patches-3.7/340-module_alloc_size_check.patch +++ b/target/linux/generic/patches-3.7/340-module_alloc_size_check.patch @@ -1,6 +1,6 @@ --- a/kernel/module.c +++ b/kernel/module.c -@@ -2378,12 +2378,15 @@ static void dynamic_debug_remove(struct +@@ -2378,12 +2378,15 @@ static void dynamic_debug_remove(struct void * __weak module_alloc(unsigned long size) { diff --git a/target/linux/generic/patches-3.7/504-yaffs-Mods-for-Linux-3.0-and-fix-a-typo.patch b/target/linux/generic/patches-3.7/504-yaffs-Mods-for-Linux-3.0-and-fix-a-typo.patch index 4767e769b..1b814e97f 100644 --- a/target/linux/generic/patches-3.7/504-yaffs-Mods-for-Linux-3.0-and-fix-a-typo.patch +++ b/target/linux/generic/patches-3.7/504-yaffs-Mods-for-Linux-3.0-and-fix-a-typo.patch @@ -26,7 +26,7 @@ Signed-off-by: Charles Manning <cdhmanning@gmail.com> #include <linux/pagemap.h> #include <linux/mtd/mtd.h> #include <linux/interrupt.h> -@@ -236,7 +238,9 @@ static int yaffs_file_flush(struct file +@@ -236,7 +238,9 @@ static int yaffs_file_flush(struct file static int yaffs_file_flush(struct file *file); #endif diff --git a/target/linux/generic/patches-3.7/512-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch b/target/linux/generic/patches-3.7/512-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch index 7787d500a..1ca189d2e 100644 --- a/target/linux/generic/patches-3.7/512-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch +++ b/target/linux/generic/patches-3.7/512-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch @@ -216,7 +216,7 @@ result = yaffs_rd_chunk_tags_nand(dev,nand_chunk,buffer,&tempTags); if(memcmp(buffer,data,dev->data_bytes_per_chunk) || tempTags.obj_id != tags->obj_id || -@@ -424,7 +424,7 @@ static int yaffs_write_new_chunk(struct +@@ -424,7 +424,7 @@ static int yaffs_write_new_chunk(struct * lot of checks that are most likely not needed. * * Mods to the above @@ -225,7 +225,7 @@ * rest of the block. */ -@@ -486,7 +486,7 @@ static int yaffs_write_new_chunk(struct +@@ -486,7 +486,7 @@ static int yaffs_write_new_chunk(struct } @@ -279,7 +279,7 @@ /* Free chunks already includes softdeleted chunks. * How ever this chunk is going to soon be really deleted * which will increment free chunks. -@@ -2752,7 +2752,7 @@ int yaffs_put_chunk_in_file(yaffs_obj_t +@@ -2752,7 +2752,7 @@ int yaffs_put_chunk_in_file(yaffs_obj_t NULL); if (!tn) return YAFFS_FAIL; @@ -455,7 +455,7 @@ #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM else if (obj->short_name[0]) { yaffs_strcpy(name, obj->short_name); -@@ -4861,9 +4861,9 @@ int yaffs_set_attribs(yaffs_obj_t *obj, +@@ -4861,9 +4861,9 @@ int yaffs_set_attribs(yaffs_obj_t *obj, if (valid & ATTR_MODE) obj->yst_mode = attr->ia_mode; if (valid & ATTR_UID) @@ -467,7 +467,7 @@ if (valid & ATTR_ATIME) obj->yst_atime = Y_TIME_CONVERT(attr->ia_atime); -@@ -4886,9 +4886,9 @@ int yaffs_get_attribs(yaffs_obj_t *obj, +@@ -4886,9 +4886,9 @@ int yaffs_get_attribs(yaffs_obj_t *obj, attr->ia_mode = obj->yst_mode; valid |= ATTR_MODE; diff --git a/target/linux/generic/patches-3.7/531-debloat_lzma.patch b/target/linux/generic/patches-3.7/531-debloat_lzma.patch index 18e4a51ee..1e41661eb 100644 --- a/target/linux/generic/patches-3.7/531-debloat_lzma.patch +++ b/target/linux/generic/patches-3.7/531-debloat_lzma.patch @@ -124,7 +124,7 @@ /* LzmaDecode --- a/lib/lzma/LzmaDec.c +++ b/lib/lzma/LzmaDec.c -@@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p, +@@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p, p->needFlush = 0; } @@ -194,7 +194,7 @@ { CLzmaProps propNew; RINOK(LzmaProps_Decode(&propNew, props, propsSize)); -@@ -944,7 +944,7 @@ SRes LzmaDec_AllocateProbs(CLzmaDec *p, +@@ -944,7 +944,7 @@ SRes LzmaDec_AllocateProbs(CLzmaDec *p, return SZ_OK; } @@ -375,7 +375,7 @@ void MatchFinder_Construct(CMatchFinder *p); /* Conditions: -@@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p, +@@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p, UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter, ISzAlloc *alloc); void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc); diff --git a/target/linux/generic/patches-3.7/600-netfilter_layer7_2.22.patch b/target/linux/generic/patches-3.7/600-netfilter_layer7_2.22.patch index dcec3791b..0c8c5e890 100644 --- a/target/linux/generic/patches-3.7/600-netfilter_layer7_2.22.patch +++ b/target/linux/generic/patches-3.7/600-netfilter_layer7_2.22.patch @@ -30,7 +30,7 @@ depends on NETFILTER_ADVANCED --- a/net/netfilter/Makefile +++ b/net/netfilter/Makefile -@@ -131,6 +131,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) +@@ -131,6 +131,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o diff --git a/target/linux/generic/patches-3.7/604-netfilter_conntrack_flush.patch b/target/linux/generic/patches-3.7/604-netfilter_conntrack_flush.patch index cbcd29ac3..3ee5e4982 100644 --- a/target/linux/generic/patches-3.7/604-netfilter_conntrack_flush.patch +++ b/target/linux/generic/patches-3.7/604-netfilter_conntrack_flush.patch @@ -1,6 +1,6 @@ --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c -@@ -267,10 +267,34 @@ static int ct_open(struct inode *inode, +@@ -267,10 +267,34 @@ static int ct_open(struct inode *inode, sizeof(struct ct_iter_state)); } diff --git a/target/linux/generic/patches-3.7/610-netfilter_match_bypass_default_checks.patch b/target/linux/generic/patches-3.7/610-netfilter_match_bypass_default_checks.patch index ded6f5f15..0081da01d 100644 --- a/target/linux/generic/patches-3.7/610-netfilter_match_bypass_default_checks.patch +++ b/target/linux/generic/patches-3.7/610-netfilter_match_bypass_default_checks.patch @@ -76,10 +76,11 @@ counters = alloc_counters(table); if (IS_ERR(counters)) -@@ -961,6 +990,14 @@ copy_entries_to_user(unsigned int total_ +@@ -960,6 +989,14 @@ copy_entries_to_user(unsigned int total_ + ret = -EFAULT; goto free_counters; } - ++ + flags = e->ip.flags & IPT_F_MASK; + if (copy_to_user(userptr + off + + offsetof(struct ipt_entry, ip.flags), @@ -87,7 +88,6 @@ + ret = -EFAULT; + goto free_counters; + } -+ + for (i = sizeof(struct ipt_entry); i < e->target_offset; - i += m->u.match_size) { diff --git a/target/linux/generic/patches-3.7/653-disable_netlink_trim.patch b/target/linux/generic/patches-3.7/653-disable_netlink_trim.patch index 2a0a51a55..654d92e31 100644 --- a/target/linux/generic/patches-3.7/653-disable_netlink_trim.patch +++ b/target/linux/generic/patches-3.7/653-disable_netlink_trim.patch @@ -1,6 +1,6 @@ --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c -@@ -895,25 +895,7 @@ void netlink_detachskb(struct sock *sk, +@@ -895,25 +895,7 @@ void netlink_detachskb(struct sock *sk, static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation) { diff --git a/target/linux/generic/patches-3.7/750-hostap_txpower.patch b/target/linux/generic/patches-3.7/750-hostap_txpower.patch index a111c8127..814406df1 100644 --- a/target/linux/generic/patches-3.7/750-hostap_txpower.patch +++ b/target/linux/generic/patches-3.7/750-hostap_txpower.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/hostap/hostap_ap.c +++ b/drivers/net/wireless/hostap/hostap_ap.c -@@ -2340,13 +2340,13 @@ int prism2_ap_get_sta_qual(local_info_t +@@ -2340,13 +2340,13 @@ int prism2_ap_get_sta_qual(local_info_t addr[count].sa_family = ARPHRD_ETHER; memcpy(addr[count].sa_data, sta->addr, ETH_ALEN); if (sta->last_rx_silence == 0) diff --git a/target/linux/generic/patches-3.7/901-debloat_sock_diag.patch b/target/linux/generic/patches-3.7/901-debloat_sock_diag.patch index 119760648..4065f8aea 100644 --- a/target/linux/generic/patches-3.7/901-debloat_sock_diag.patch +++ b/target/linux/generic/patches-3.7/901-debloat_sock_diag.patch @@ -12,7 +12,7 @@ help --- a/net/core/Makefile +++ b/net/core/Makefile -@@ -8,9 +8,9 @@ obj-y := sock.o request_sock.o skbuff.o +@@ -8,9 +8,9 @@ obj-y := sock.o request_sock.o skbuff.o obj-$(CONFIG_SYSCTL) += sysctl_net_core.o obj-y += dev.o ethtool.o dev_addr_lists.o dst.o netevent.o \ diff --git a/target/linux/generic/patches-3.7/941-ocf_20120127.patch b/target/linux/generic/patches-3.7/941-ocf_20120127.patch index 1f3b581b7..326471421 100644 --- a/target/linux/generic/patches-3.7/941-ocf_20120127.patch +++ b/target/linux/generic/patches-3.7/941-ocf_20120127.patch @@ -24,7 +24,7 @@ * All of these routines try to estimate how many bits of randomness a * particular randomness source. They do this by keeping track of the * first and second order deltas of the event timings. -@@ -799,6 +809,63 @@ void add_disk_randomness(struct gendisk +@@ -799,6 +809,63 @@ void add_disk_randomness(struct gendisk } #endif diff --git a/target/linux/generic/patches-3.7/992-mpcore_wdt_fix_watchdog_counter_loading.patch b/target/linux/generic/patches-3.7/992-mpcore_wdt_fix_watchdog_counter_loading.patch index 315d9ac10..26bb9b8b2 100644 --- a/target/linux/generic/patches-3.7/992-mpcore_wdt_fix_watchdog_counter_loading.patch +++ b/target/linux/generic/patches-3.7/992-mpcore_wdt_fix_watchdog_counter_loading.patch @@ -55,7 +55,7 @@ Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com> { .compatible = "arm,cortex-a9-twd-timer", }, --- a/drivers/watchdog/mpcore_wdt.c +++ b/drivers/watchdog/mpcore_wdt.c -@@ -102,9 +102,7 @@ static void mpcore_wdt_keepalive(struct +@@ -102,9 +102,7 @@ static void mpcore_wdt_keepalive(struct spin_lock(&wdt_lock); /* Assume prescale is set to 256 */ diff --git a/target/linux/lantiq/patches-3.7/0001-MIPS-lantiq-unbreak-devicetree-init.patch b/target/linux/lantiq/patches-3.7/0001-MIPS-lantiq-unbreak-devicetree-init.patch index e3ffdc190..e4581cf35 100644 --- a/target/linux/lantiq/patches-3.7/0001-MIPS-lantiq-unbreak-devicetree-init.patch +++ b/target/linux/lantiq/patches-3.7/0001-MIPS-lantiq-unbreak-devicetree-init.patch @@ -13,8 +13,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/4518 arch/mips/lantiq/prom.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) -diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c -index 6cfd611..9f9e875 100644 --- a/arch/mips/lantiq/prom.c +++ b/arch/mips/lantiq/prom.c @@ -87,9 +87,6 @@ void __init device_tree_init(void) @@ -36,6 +34,3 @@ index 6cfd611..9f9e875 100644 } arch_initcall(plat_of_setup); --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.7/0002-MIPS-lantiq-fix-bootselect-bits-on-XRX200-SoC.patch b/target/linux/lantiq/patches-3.7/0002-MIPS-lantiq-fix-bootselect-bits-on-XRX200-SoC.patch index 2a305b4af..5bedd9136 100644 --- a/target/linux/lantiq/patches-3.7/0002-MIPS-lantiq-fix-bootselect-bits-on-XRX200-SoC.patch +++ b/target/linux/lantiq/patches-3.7/0002-MIPS-lantiq-fix-bootselect-bits-on-XRX200-SoC.patch @@ -12,8 +12,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/4519 arch/mips/lantiq/xway/reset.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) -diff --git a/arch/mips/lantiq/xway/reset.c b/arch/mips/lantiq/xway/reset.c -index 22c55f7..2799212 100644 --- a/arch/mips/lantiq/xway/reset.c +++ b/arch/mips/lantiq/xway/reset.c @@ -34,11 +34,12 @@ @@ -66,6 +64,3 @@ index 22c55f7..2799212 100644 panic("Failed to get rcu memory range"); if (request_mem_region(res.start, resource_size(&res), res.name) < 0) --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.7/0003-MIPS-lantiq-verbose-init-of-dma-core.patch b/target/linux/lantiq/patches-3.7/0003-MIPS-lantiq-verbose-init-of-dma-core.patch index 597cbc6f0..3b2e57334 100644 --- a/target/linux/lantiq/patches-3.7/0003-MIPS-lantiq-verbose-init-of-dma-core.patch +++ b/target/linux/lantiq/patches-3.7/0003-MIPS-lantiq-verbose-init-of-dma-core.patch @@ -11,8 +11,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/4520 arch/mips/lantiq/xway/dma.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -diff --git a/arch/mips/lantiq/xway/dma.c b/arch/mips/lantiq/xway/dma.c -index 55d2c4f..b5d76d1 100644 --- a/arch/mips/lantiq/xway/dma.c +++ b/arch/mips/lantiq/xway/dma.c @@ -25,6 +25,7 @@ @@ -23,7 +21,7 @@ index 55d2c4f..b5d76d1 100644 #define LTQ_DMA_CTRL 0x10 #define LTQ_DMA_CPOLL 0x14 #define LTQ_DMA_CS 0x18 -@@ -214,6 +215,7 @@ ltq_dma_init(struct platform_device *pdev) +@@ -214,6 +215,7 @@ ltq_dma_init(struct platform_device *pde { struct clk *clk; struct resource *res; @@ -31,7 +29,7 @@ index 55d2c4f..b5d76d1 100644 int i; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -@@ -243,7 +245,12 @@ ltq_dma_init(struct platform_device *pdev) +@@ -243,7 +245,12 @@ ltq_dma_init(struct platform_device *pde ltq_dma_w32(DMA_POLL | DMA_CLK_DIV4, LTQ_DMA_CPOLL); ltq_dma_w32_mask(DMA_CHAN_ON, 0, LTQ_DMA_CCTRL); } @@ -45,6 +43,3 @@ index 55d2c4f..b5d76d1 100644 return 0; } --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.7/0004-MIPS-lantiq-adds-xrx200-ethernet-clock-definition.patch b/target/linux/lantiq/patches-3.7/0004-MIPS-lantiq-adds-xrx200-ethernet-clock-definition.patch index 771dd4f1b..fec136ea3 100644 --- a/target/linux/lantiq/patches-3.7/0004-MIPS-lantiq-adds-xrx200-ethernet-clock-definition.patch +++ b/target/linux/lantiq/patches-3.7/0004-MIPS-lantiq-adds-xrx200-ethernet-clock-definition.patch @@ -9,8 +9,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/4521 arch/mips/lantiq/xway/sysctrl.c | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/arch/mips/lantiq/xway/sysctrl.c b/arch/mips/lantiq/xway/sysctrl.c -index 2917b56..3925e66 100644 --- a/arch/mips/lantiq/xway/sysctrl.c +++ b/arch/mips/lantiq/xway/sysctrl.c @@ -370,6 +370,10 @@ void __init ltq_soc_init(void) @@ -24,6 +22,3 @@ index 2917b56..3925e66 100644 } else if (of_machine_is_compatible("lantiq,ar9")) { clkdev_add_static(ltq_ar9_cpu_hz(), ltq_ar9_fpi_hz(), ltq_ar9_fpi_hz()); --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.7/0005-MIPS-lantiq-adds-code-for-booting-GPHY.patch b/target/linux/lantiq/patches-3.7/0005-MIPS-lantiq-adds-code-for-booting-GPHY.patch index 84aa96523..deb5016aa 100644 --- a/target/linux/lantiq/patches-3.7/0005-MIPS-lantiq-adds-code-for-booting-GPHY.patch +++ b/target/linux/lantiq/patches-3.7/0005-MIPS-lantiq-adds-code-for-booting-GPHY.patch @@ -13,8 +13,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/4522 arch/mips/lantiq/xway/reset.c | 36 ++++++++++++++++++++ 2 files changed, 39 insertions(+) -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 6a2df70..133336b 100644 --- a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h +++ b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h @@ -82,6 +82,9 @@ extern __iomem void *ltq_cgu_membase; @@ -27,8 +25,6 @@ index 6a2df70..133336b 100644 /* request a non-gpio and set the PIO config */ #define PMU_PPE BIT(13) extern void ltq_pmu_enable(unsigned int module); -diff --git a/arch/mips/lantiq/xway/reset.c b/arch/mips/lantiq/xway/reset.c -index 2799212..544dbb7 100644 --- a/arch/mips/lantiq/xway/reset.c +++ b/arch/mips/lantiq/xway/reset.c @@ -28,9 +28,15 @@ @@ -84,6 +80,3 @@ index 2799212..544dbb7 100644 /* reset a io domain for u micro seconds */ void ltq_reset_once(unsigned int module, ulong u) { --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.7/0006-MIPS-lantiq-adds-GPHY-firmware-loader.patch b/target/linux/lantiq/patches-3.7/0006-MIPS-lantiq-adds-GPHY-firmware-loader.patch index 56e43d552..b8ff6b844 100644 --- a/target/linux/lantiq/patches-3.7/0006-MIPS-lantiq-adds-GPHY-firmware-loader.patch +++ b/target/linux/lantiq/patches-3.7/0006-MIPS-lantiq-adds-GPHY-firmware-loader.patch @@ -15,8 +15,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/4523 3 files changed, 103 insertions(+) create mode 100644 arch/mips/lantiq/xway/xrx200_phy_fw.c -diff --git a/arch/mips/lantiq/Kconfig b/arch/mips/lantiq/Kconfig -index d84f361..c002191 100644 --- a/arch/mips/lantiq/Kconfig +++ b/arch/mips/lantiq/Kconfig @@ -36,4 +36,8 @@ config PCI_LANTIQ @@ -28,17 +26,12 @@ index d84f361..c002191 100644 + depends on SOC_XWAY + endif -diff --git a/arch/mips/lantiq/xway/Makefile b/arch/mips/lantiq/xway/Makefile -index 70a58c7..7a13660 100644 --- a/arch/mips/lantiq/xway/Makefile +++ b/arch/mips/lantiq/xway/Makefile @@ -1 +1,3 @@ obj-y := prom.o sysctrl.o clk.o reset.o dma.o gptu.o + +obj-$(CONFIG_XRX200_PHY_FW) += xrx200_phy_fw.o -diff --git a/arch/mips/lantiq/xway/xrx200_phy_fw.c b/arch/mips/lantiq/xway/xrx200_phy_fw.c -new file mode 100644 -index 0000000..fe808bf --- /dev/null +++ b/arch/mips/lantiq/xway/xrx200_phy_fw.c @@ -0,0 +1,97 @@ @@ -139,6 +132,3 @@ index 0000000..fe808bf +MODULE_AUTHOR("John Crispin <blogic@openwrt.org>"); +MODULE_DESCRIPTION("Lantiq XRX200 PHY Firmware Loader"); +MODULE_LICENSE("GPL"); --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.7/0100-MIPS-lantiq-honour-model-property-inside-devicetree-.patch b/target/linux/lantiq/patches-3.7/0100-MIPS-lantiq-honour-model-property-inside-devicetree-.patch index cef266fbc..6ab00c1ef 100644 --- a/target/linux/lantiq/patches-3.7/0100-MIPS-lantiq-honour-model-property-inside-devicetree-.patch +++ b/target/linux/lantiq/patches-3.7/0100-MIPS-lantiq-honour-model-property-inside-devicetree-.patch @@ -8,11 +8,9 @@ Subject: [PATCH 100/123] MIPS: lantiq: honour model property inside arch/mips/lantiq/prom.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) -diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c -index 9f9e875..fa12dc1 100644 --- a/arch/mips/lantiq/prom.c +++ b/arch/mips/lantiq/prom.c -@@ -57,6 +57,21 @@ static void __init prom_init_cmdline(void) +@@ -57,6 +57,21 @@ static void __init prom_init_cmdline(voi } } @@ -54,6 +52,3 @@ index 9f9e875..fa12dc1 100644 pr_info("SoC: %s\n", soc_info.sys_type); prom_init_cmdline(); --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.7/0101-MIPS-lantiq-adds-support-for-SVIP-SoC-Family.patch b/target/linux/lantiq/patches-3.7/0101-MIPS-lantiq-adds-support-for-SVIP-SoC-Family.patch index 0de4005d6..4d263cb75 100644 --- a/target/linux/lantiq/patches-3.7/0101-MIPS-lantiq-adds-support-for-SVIP-SoC-Family.patch +++ b/target/linux/lantiq/patches-3.7/0101-MIPS-lantiq-adds-support-for-SVIP-SoC-Family.patch @@ -22,8 +22,6 @@ Subject: [PATCH 101/123] MIPS: lantiq: adds support for SVIP SoC Family create mode 100644 arch/mips/lantiq/svip/reset.c create mode 100644 arch/mips/lantiq/svip/sysctrl.c -diff --git a/arch/mips/kernel/cevt-r4k.c b/arch/mips/kernel/cevt-r4k.c -index 7532392..06b45e4 100644 --- a/arch/mips/kernel/cevt-r4k.c +++ b/arch/mips/kernel/cevt-r4k.c @@ -176,8 +176,10 @@ int __cpuinit r4k_clockevent_init(void) @@ -38,8 +36,6 @@ index 7532392..06b45e4 100644 /* * With vectored interrupts things are getting platform specific. -diff --git a/arch/mips/lantiq/Kconfig b/arch/mips/lantiq/Kconfig -index c002191..edeb58c 100644 --- a/arch/mips/lantiq/Kconfig +++ b/arch/mips/lantiq/Kconfig @@ -22,6 +22,10 @@ config SOC_FALCON @@ -53,26 +49,20 @@ index c002191..edeb58c 100644 endchoice choice -diff --git a/arch/mips/lantiq/Makefile b/arch/mips/lantiq/Makefile -index d6bdc57..edeb30b 100644 --- a/arch/mips/lantiq/Makefile +++ b/arch/mips/lantiq/Makefile -@@ -12,3 +12,4 @@ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o +@@ -12,3 +12,4 @@ obj-$(CONFIG_EARLY_PRINTK) += early_prin obj-$(CONFIG_SOC_TYPE_XWAY) += xway/ obj-$(CONFIG_SOC_FALCON) += falcon/ +obj-$(CONFIG_SOC_SVIP) += svip/ -diff --git a/arch/mips/lantiq/Platform b/arch/mips/lantiq/Platform -index b3ec498..857548c 100644 --- a/arch/mips/lantiq/Platform +++ b/arch/mips/lantiq/Platform -@@ -7,3 +7,4 @@ cflags-$(CONFIG_LANTIQ) += -I$(srctree)/arch/mips/include/asm/mach-lantiq +@@ -7,3 +7,4 @@ cflags-$(CONFIG_LANTIQ) += -I$(srctree) 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 +cflags-$(CONFIG_SOC_SVIP) += -I$(srctree)/arch/mips/include/asm/mach-lantiq/svip -diff --git a/arch/mips/lantiq/clk.c b/arch/mips/lantiq/clk.c -index ce2f129..9128ff8 100644 --- a/arch/mips/lantiq/clk.c +++ b/arch/mips/lantiq/clk.c @@ -163,8 +163,15 @@ void __init plat_time_init(void) @@ -91,11 +81,9 @@ index ce2f129..9128ff8 100644 pr_info("CPU Clock: %ldMHz\n", clk_get_rate(clk) / 1000000); clk_put(clk); } -diff --git a/arch/mips/lantiq/clk.h b/arch/mips/lantiq/clk.h -index fa67060..c169e2b 100644 --- a/arch/mips/lantiq/clk.h +++ b/arch/mips/lantiq/clk.h -@@ -75,4 +75,8 @@ extern unsigned long ltq_ar9_fpi_hz(void); +@@ -75,4 +75,8 @@ extern unsigned long ltq_ar9_fpi_hz(void extern unsigned long ltq_vr9_cpu_hz(void); extern unsigned long ltq_vr9_fpi_hz(void); @@ -104,16 +92,10 @@ index fa67060..c169e2b 100644 +extern unsigned long ltq_svip_io_hz(void); + #endif -diff --git a/arch/mips/lantiq/svip/Makefile b/arch/mips/lantiq/svip/Makefile -new file mode 100644 -index 0000000..74308b2 --- /dev/null +++ b/arch/mips/lantiq/svip/Makefile @@ -0,0 +1 @@ +obj-y := prom.o reset.o sysctrl.o clk.o -diff --git a/arch/mips/lantiq/svip/clk.c b/arch/mips/lantiq/svip/clk.c -new file mode 100644 -index 0000000..3a7b665 --- /dev/null +++ b/arch/mips/lantiq/svip/clk.c @@ -0,0 +1,70 @@ @@ -187,9 +169,6 @@ index 0000000..3a7b665 + div = SYS1_FPICR_FPIDIV_GET(ltq_sys1_r32(SYS1_FPICR)); + return ltq_svip_cpu_hz() / fbs0_div[div]; +} -diff --git a/arch/mips/lantiq/svip/prom.c b/arch/mips/lantiq/svip/prom.c -new file mode 100644 -index 0000000..01d2018 --- /dev/null +++ b/arch/mips/lantiq/svip/prom.c @@ -0,0 +1,43 @@ @@ -236,9 +215,6 @@ index 0000000..01d2018 + break; + } +} -diff --git a/arch/mips/lantiq/svip/reset.c b/arch/mips/lantiq/svip/reset.c -new file mode 100644 -index 0000000..4b41dd1 --- /dev/null +++ b/arch/mips/lantiq/svip/reset.c @@ -0,0 +1,105 @@ @@ -347,9 +323,6 @@ index 0000000..4b41dd1 +} + +arch_initcall(mips_reboot_setup); -diff --git a/arch/mips/lantiq/svip/sysctrl.c b/arch/mips/lantiq/svip/sysctrl.c -new file mode 100644 -index 0000000..d2b636b --- /dev/null +++ b/arch/mips/lantiq/svip/sysctrl.c @@ -0,0 +1,81 @@ @@ -434,6 +407,3 @@ index 0000000..d2b636b + clkdev_add_static(ltq_svip_cpu_hz(), ltq_svip_fpi_hz(), + ltq_svip_io_hz()); +} --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.7/0102-MIPS-lantiq-add-GPHY-clock-gate-bits.patch b/target/linux/lantiq/patches-3.7/0102-MIPS-lantiq-add-GPHY-clock-gate-bits.patch index e979e1e11..48ac7d419 100644 --- a/target/linux/lantiq/patches-3.7/0102-MIPS-lantiq-add-GPHY-clock-gate-bits.patch +++ b/target/linux/lantiq/patches-3.7/0102-MIPS-lantiq-add-GPHY-clock-gate-bits.patch @@ -11,8 +11,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org> arch/mips/lantiq/xway/sysctrl.c | 1 + 2 files changed, 10 insertions(+) -diff --git a/arch/mips/lantiq/xway/reset.c b/arch/mips/lantiq/xway/reset.c -index 544dbb7..1fa0f17 100644 --- a/arch/mips/lantiq/xway/reset.c +++ b/arch/mips/lantiq/xway/reset.c @@ -78,10 +78,19 @@ static struct ltq_xrx200_gphy_reset { @@ -35,8 +33,6 @@ index 544dbb7..1fa0f17 100644 if (id > 1) { dev_err(dev, "%u is an invalid gphy id\n", id); return -EINVAL; -diff --git a/arch/mips/lantiq/xway/sysctrl.c b/arch/mips/lantiq/xway/sysctrl.c -index 3925e66..6e0e135 100644 --- a/arch/mips/lantiq/xway/sysctrl.c +++ b/arch/mips/lantiq/xway/sysctrl.c @@ -374,6 +374,7 @@ void __init ltq_soc_init(void) @@ -47,6 +43,3 @@ index 3925e66..6e0e135 100644 } else if (of_machine_is_compatible("lantiq,ar9")) { clkdev_add_static(ltq_ar9_cpu_hz(), ltq_ar9_fpi_hz(), ltq_ar9_fpi_hz()); --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.7/0103-MIPS-lantiq-adds-static-clock-for-PP32.patch b/target/linux/lantiq/patches-3.7/0103-MIPS-lantiq-adds-static-clock-for-PP32.patch index 1ab7b07da..788024d83 100644 --- a/target/linux/lantiq/patches-3.7/0103-MIPS-lantiq-adds-static-clock-for-PP32.patch +++ b/target/linux/lantiq/patches-3.7/0103-MIPS-lantiq-adds-static-clock-for-PP32.patch @@ -16,11 +16,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org> arch/mips/lantiq/xway/sysctrl.c | 12 ++++---- 6 files changed, 69 insertions(+), 10 deletions(-) -diff --git a/arch/mips/include/asm/mach-lantiq/lantiq.h b/arch/mips/include/asm/mach-lantiq/lantiq.h -index 5e8a6e9..76be7a0 100644 --- a/arch/mips/include/asm/mach-lantiq/lantiq.h +++ b/arch/mips/include/asm/mach-lantiq/lantiq.h -@@ -41,6 +41,7 @@ extern void clk_deactivate(struct clk *clk); +@@ -41,6 +41,7 @@ extern void clk_deactivate(struct clk *c extern struct clk *clk_get_cpu(void); extern struct clk *clk_get_fpi(void); extern struct clk *clk_get_io(void); @@ -28,8 +26,6 @@ index 5e8a6e9..76be7a0 100644 /* find out what bootsource we have */ extern unsigned char ltq_boot_select(void); -diff --git a/arch/mips/lantiq/clk.c b/arch/mips/lantiq/clk.c -index 9128ff8..292ef1a 100644 --- a/arch/mips/lantiq/clk.c +++ b/arch/mips/lantiq/clk.c @@ -26,13 +26,15 @@ @@ -63,8 +59,6 @@ index 9128ff8..292ef1a 100644 static inline int clk_good(struct clk *clk) { return clk && !IS_ERR(clk); -diff --git a/arch/mips/lantiq/clk.h b/arch/mips/lantiq/clk.h -index c169e2b..4739366 100644 --- a/arch/mips/lantiq/clk.h +++ b/arch/mips/lantiq/clk.h @@ -27,12 +27,15 @@ @@ -103,8 +97,6 @@ index c169e2b..4739366 100644 extern unsigned long ltq_svip_cpu_hz(void); extern unsigned long ltq_svip_fpi_hz(void); -diff --git a/arch/mips/lantiq/falcon/sysctrl.c b/arch/mips/lantiq/falcon/sysctrl.c -index 2d4ced3..ff4894a 100644 --- a/arch/mips/lantiq/falcon/sysctrl.c +++ b/arch/mips/lantiq/falcon/sysctrl.c @@ -241,9 +241,9 @@ void __init ltq_soc_init(void) @@ -119,8 +111,6 @@ index 2d4ced3..ff4894a 100644 /* add our clock domains */ clkdev_add_sys("1d810000.gpio", SYSCTL_SYSETH, ACTS_P0); -diff --git a/arch/mips/lantiq/xway/clk.c b/arch/mips/lantiq/xway/clk.c -index 9aa17f7..1ab576d 100644 --- a/arch/mips/lantiq/xway/clk.c +++ b/arch/mips/lantiq/xway/clk.c @@ -53,6 +53,29 @@ unsigned long ltq_danube_cpu_hz(void) @@ -153,10 +143,12 @@ index 9aa17f7..1ab576d 100644 unsigned long ltq_ar9_sys_hz(void) { if (((ltq_cgu_r32(CGU_SYS) >> 3) & 0x3) == 0x2) -@@ -149,3 +172,23 @@ unsigned long ltq_vr9_fpi_hz(void) +@@ -147,5 +170,25 @@ unsigned long ltq_vr9_fpi_hz(void) + break; + } - return clk; - } ++ return clk; ++} + +unsigned long ltq_vr9_pp32_hz(void) +{ @@ -175,10 +167,8 @@ index 9aa17f7..1ab576d 100644 + break; + } + -+ return clk; -+} -diff --git a/arch/mips/lantiq/xway/sysctrl.c b/arch/mips/lantiq/xway/sysctrl.c -index 6e0e135..75e1b7d 100644 + return clk; + } --- a/arch/mips/lantiq/xway/sysctrl.c +++ b/arch/mips/lantiq/xway/sysctrl.c @@ -356,14 +356,16 @@ void __init ltq_soc_init(void) @@ -214,6 +204,3 @@ index 6e0e135..75e1b7d 100644 + ltq_danube_fpi_hz(), ltq_danube_pp32_hz()); } } --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.7/0104-MIPS-lantiq-adds-4dword-burst-length-for-dma.patch b/target/linux/lantiq/patches-3.7/0104-MIPS-lantiq-adds-4dword-burst-length-for-dma.patch index 5ef0249c6..16b3604b1 100644 --- a/target/linux/lantiq/patches-3.7/0104-MIPS-lantiq-adds-4dword-burst-length-for-dma.patch +++ b/target/linux/lantiq/patches-3.7/0104-MIPS-lantiq-adds-4dword-burst-length-for-dma.patch @@ -7,8 +7,6 @@ Subject: [PATCH 104/123] MIPS: lantiq: adds 4dword burst length for dma arch/mips/lantiq/xway/dma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/arch/mips/lantiq/xway/dma.c b/arch/mips/lantiq/xway/dma.c -index b5d76d1..986fbce 100644 --- a/arch/mips/lantiq/xway/dma.c +++ b/arch/mips/lantiq/xway/dma.c @@ -47,6 +47,7 @@ @@ -29,6 +27,3 @@ index b5d76d1..986fbce 100644 LTQ_DMA_PCTRL); break; --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.7/0105-MIPS-lantiq-rework-external-irq-code.patch b/target/linux/lantiq/patches-3.7/0105-MIPS-lantiq-rework-external-irq-code.patch index 88659c244..6f5ea2c76 100644 --- a/target/linux/lantiq/patches-3.7/0105-MIPS-lantiq-rework-external-irq-code.patch +++ b/target/linux/lantiq/patches-3.7/0105-MIPS-lantiq-rework-external-irq-code.patch @@ -13,8 +13,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org> arch/mips/lantiq/irq.c | 104 +++++++++++++++++++--------- 2 files changed, 73 insertions(+), 32 deletions(-) -diff --git a/arch/mips/include/asm/mach-lantiq/lantiq.h b/arch/mips/include/asm/mach-lantiq/lantiq.h -index 76be7a0..f196cce 100644 --- a/arch/mips/include/asm/mach-lantiq/lantiq.h +++ b/arch/mips/include/asm/mach-lantiq/lantiq.h @@ -34,6 +34,7 @@ extern spinlock_t ebu_lock; @@ -25,8 +23,6 @@ index 76be7a0..f196cce 100644 /* clock handling */ extern int clk_activate(struct clk *clk); -diff --git a/arch/mips/lantiq/irq.c b/arch/mips/lantiq/irq.c -index f36acd1..48407f6 100644 --- a/arch/mips/lantiq/irq.c +++ b/arch/mips/lantiq/irq.c @@ -33,17 +33,10 @@ @@ -149,7 +145,7 @@ index f36acd1..48407f6 100644 /* enable */ ltq_eiu_w32(ltq_eiu_r32(LTQ_EIU_EXIN_INEN) | BIT(i), LTQ_EIU_EXIN_INEN); -@@ -157,7 +194,7 @@ static void ltq_shutdown_eiu_irq(struct irq_data *d) +@@ -157,7 +194,7 @@ static void ltq_shutdown_eiu_irq(struct ltq_disable_irq(d); for (i = 0; i < MAX_EIU; i++) { @@ -166,7 +162,7 @@ index f36acd1..48407f6 100644 }; static void ltq_hw_irqdispatch(int module) -@@ -301,7 +339,7 @@ static int icu_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw) +@@ -301,7 +339,7 @@ static int icu_map(struct irq_domain *d, return 0; for (i = 0; i < exin_avail; i++) @@ -175,7 +171,7 @@ index f36acd1..48407f6 100644 chip = <q_eiu_type; irq_set_chip_and_handler(hw, chip, handle_level_irq); -@@ -323,7 +361,7 @@ int __init icu_of_init(struct device_node *node, struct device_node *parent) +@@ -323,7 +361,7 @@ int __init icu_of_init(struct device_nod { struct device_node *eiu_node; struct resource res; @@ -184,7 +180,7 @@ index f36acd1..48407f6 100644 for (i = 0; i < MAX_IM; i++) { if (of_address_to_resource(node, i, &res)) -@@ -340,17 +378,19 @@ int __init icu_of_init(struct device_node *node, struct device_node *parent) +@@ -340,17 +378,19 @@ int __init icu_of_init(struct device_nod } /* the external interrupts are optional and xway only */ @@ -209,6 +205,3 @@ index f36acd1..48407f6 100644 if (request_mem_region(res.start, resource_size(&res), res.name) < 0) pr_err("Failed to request eiu memory"); --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.7/0106-MIPS-lantiq-adds-minimal-dcdc-driver.patch b/target/linux/lantiq/patches-3.7/0106-MIPS-lantiq-adds-minimal-dcdc-driver.patch index 78967efd4..7835e2c17 100644 --- a/target/linux/lantiq/patches-3.7/0106-MIPS-lantiq-adds-minimal-dcdc-driver.patch +++ b/target/linux/lantiq/patches-3.7/0106-MIPS-lantiq-adds-minimal-dcdc-driver.patch @@ -12,8 +12,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org> 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 arch/mips/lantiq/xway/dcdc.c -diff --git a/arch/mips/lantiq/xway/Makefile b/arch/mips/lantiq/xway/Makefile -index 7a13660..087497d 100644 --- a/arch/mips/lantiq/xway/Makefile +++ b/arch/mips/lantiq/xway/Makefile @@ -1,3 +1,3 @@ @@ -21,9 +19,6 @@ index 7a13660..087497d 100644 +obj-y := prom.o sysctrl.o clk.o reset.o dma.o gptu.o dcdc.o obj-$(CONFIG_XRX200_PHY_FW) += xrx200_phy_fw.o -diff --git a/arch/mips/lantiq/xway/dcdc.c b/arch/mips/lantiq/xway/dcdc.c -new file mode 100644 -index 0000000..0ac73a5 --- /dev/null +++ b/arch/mips/lantiq/xway/dcdc.c @@ -0,0 +1,74 @@ @@ -101,6 +96,3 @@ index 0000000..0ac73a5 +} + +arch_initcall(dcdc_init); --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.7/0107-PINCTRL-lantiq-pinconf-uses-port-instead-of-pin.patch b/target/linux/lantiq/patches-3.7/0107-PINCTRL-lantiq-pinconf-uses-port-instead-of-pin.patch index 5d9e5a308..3f12cedf2 100644 --- a/target/linux/lantiq/patches-3.7/0107-PINCTRL-lantiq-pinconf-uses-port-instead-of-pin.patch +++ b/target/linux/lantiq/patches-3.7/0107-PINCTRL-lantiq-pinconf-uses-port-instead-of-pin.patch @@ -12,11 +12,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org> drivers/pinctrl/pinctrl-xway.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) -diff --git a/drivers/pinctrl/pinctrl-xway.c b/drivers/pinctrl/pinctrl-xway.c -index b9bcaec..48ab09b 100644 --- a/drivers/pinctrl/pinctrl-xway.c +++ b/drivers/pinctrl/pinctrl-xway.c -@@ -441,17 +441,17 @@ static int xway_pinconf_get(struct pinctrl_dev *pctldev, +@@ -441,17 +441,17 @@ static int xway_pinconf_get(struct pinct if (port == PORT3) reg = GPIO3_OD; else @@ -38,7 +36,7 @@ index b9bcaec..48ab09b 100644 *config = LTQ_PINCONF_PACK(param, 0); break; } -@@ -459,8 +459,8 @@ static int xway_pinconf_get(struct pinctrl_dev *pctldev, +@@ -459,8 +459,8 @@ static int xway_pinconf_get(struct pinct if (port == PORT3) reg = GPIO3_PUDSEL; else @@ -49,7 +47,7 @@ index b9bcaec..48ab09b 100644 *config = LTQ_PINCONF_PACK(param, 2); else *config = LTQ_PINCONF_PACK(param, 1); -@@ -488,29 +488,29 @@ static int xway_pinconf_set(struct pinctrl_dev *pctldev, +@@ -488,29 +488,29 @@ static int xway_pinconf_set(struct pinct if (port == PORT3) reg = GPIO3_OD; else @@ -87,6 +85,3 @@ index b9bcaec..48ab09b 100644 else dev_err(pctldev->dev, "Invalid pull value %d\n", arg); break; --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.7/0108-PINCTRL-lantiq-fixes.patch b/target/linux/lantiq/patches-3.7/0108-PINCTRL-lantiq-fixes.patch index 9ce8a785f..db9662bef 100644 --- a/target/linux/lantiq/patches-3.7/0108-PINCTRL-lantiq-fixes.patch +++ b/target/linux/lantiq/patches-3.7/0108-PINCTRL-lantiq-fixes.patch @@ -9,11 +9,9 @@ Subject: [PATCH] PINCTRL: lantiq: fixes drivers/pinctrl/pinctrl-xway.c | 70 ++++++++++++++++++++++++++++++++++---- 3 files changed, 99 insertions(+), 26 deletions(-) -Index: linux-3.7-rc8/drivers/pinctrl/pinctrl-lantiq.c -=================================================================== ---- linux-3.7-rc8.orig/drivers/pinctrl/pinctrl-lantiq.c 2012-12-03 20:22:37.000000000 +0100 -+++ linux-3.7-rc8/drivers/pinctrl/pinctrl-lantiq.c 2012-12-14 22:59:40.687563565 +0100 -@@ -64,11 +64,13 @@ +--- a/drivers/pinctrl/pinctrl-lantiq.c ++++ b/drivers/pinctrl/pinctrl-lantiq.c +@@ -64,11 +64,13 @@ static void ltq_pinctrl_pin_dbg_show(str seq_printf(s, " %s", dev_name(pctldev->dev)); } @@ -28,7 +26,7 @@ Index: linux-3.7-rc8/drivers/pinctrl/pinctrl-lantiq.c unsigned long configs[3]; unsigned num_configs = 0; struct property *prop; -@@ -76,8 +78,20 @@ +@@ -76,8 +78,20 @@ static int ltq_pinctrl_dt_subnode_to_map const char *function; int ret, i; @@ -50,7 +48,7 @@ Index: linux-3.7-rc8/drivers/pinctrl/pinctrl-lantiq.c of_property_for_each_string(np, "lantiq,groups", prop, group) { (*map)->type = PIN_MAP_TYPE_MUX_GROUP; (*map)->name = function; -@@ -85,11 +99,6 @@ +@@ -85,11 +99,6 @@ static int ltq_pinctrl_dt_subnode_to_map (*map)->data.mux.function = function; (*map)++; } @@ -62,7 +60,7 @@ Index: linux-3.7-rc8/drivers/pinctrl/pinctrl-lantiq.c } for (i = 0; i < info->num_params; i++) { -@@ -103,7 +112,7 @@ +@@ -103,7 +112,7 @@ static int ltq_pinctrl_dt_subnode_to_map } if (!num_configs) @@ -71,7 +69,7 @@ Index: linux-3.7-rc8/drivers/pinctrl/pinctrl-lantiq.c of_property_for_each_string(np, "lantiq,pins", prop, pin) { (*map)->data.configs.configs = kmemdup(configs, -@@ -115,7 +124,16 @@ +@@ -115,7 +124,16 @@ static int ltq_pinctrl_dt_subnode_to_map (*map)->data.configs.num_configs = num_configs; (*map)++; } @@ -89,7 +87,7 @@ Index: linux-3.7-rc8/drivers/pinctrl/pinctrl-lantiq.c } static int ltq_pinctrl_dt_subnode_size(struct device_node *np) -@@ -135,23 +153,19 @@ +@@ -135,23 +153,19 @@ int ltq_pinctrl_dt_node_to_map(struct pi { struct pinctrl_map *tmp; struct device_node *np; @@ -120,11 +118,9 @@ Index: linux-3.7-rc8/drivers/pinctrl/pinctrl-lantiq.c return 0; } -Index: linux-3.7-rc8/drivers/pinctrl/pinctrl-lantiq.h -=================================================================== ---- linux-3.7-rc8.orig/drivers/pinctrl/pinctrl-lantiq.h 2012-12-03 20:22:37.000000000 +0100 -+++ linux-3.7-rc8/drivers/pinctrl/pinctrl-lantiq.h 2012-12-14 22:55:26.591557194 +0100 -@@ -34,6 +34,7 @@ +--- a/drivers/pinctrl/pinctrl-lantiq.h ++++ b/drivers/pinctrl/pinctrl-lantiq.h +@@ -34,6 +34,7 @@ enum ltq_pinconf_param { LTQ_PINCONF_PARAM_OPEN_DRAIN, LTQ_PINCONF_PARAM_DRIVE_CURRENT, LTQ_PINCONF_PARAM_SLEW_RATE, @@ -132,11 +128,9 @@ Index: linux-3.7-rc8/drivers/pinctrl/pinctrl-lantiq.h }; struct ltq_cfg_param { -Index: linux-3.7-rc8/drivers/pinctrl/pinctrl-xway.c -=================================================================== ---- linux-3.7-rc8.orig/drivers/pinctrl/pinctrl-xway.c 2012-12-14 22:55:26.567557195 +0100 -+++ linux-3.7-rc8/drivers/pinctrl/pinctrl-xway.c 2012-12-14 22:55:26.595557195 +0100 -@@ -443,7 +443,7 @@ +--- a/drivers/pinctrl/pinctrl-xway.c ++++ b/drivers/pinctrl/pinctrl-xway.c +@@ -443,7 +443,7 @@ static int xway_pinconf_get(struct pinct else reg = GPIO_OD(pin); *config = LTQ_PINCONF_PACK(param, @@ -145,7 +139,7 @@ Index: linux-3.7-rc8/drivers/pinctrl/pinctrl-xway.c break; case LTQ_PINCONF_PARAM_PULL: -@@ -466,6 +466,11 @@ +@@ -466,6 +466,11 @@ static int xway_pinconf_get(struct pinct *config = LTQ_PINCONF_PACK(param, 1); break; @@ -157,7 +151,7 @@ Index: linux-3.7-rc8/drivers/pinctrl/pinctrl-xway.c default: dev_err(pctldev->dev, "Invalid config param %04x\n", param); return -ENOTSUPP; -@@ -489,7 +494,10 @@ +@@ -489,7 +494,10 @@ static int xway_pinconf_set(struct pinct reg = GPIO3_OD; else reg = GPIO_OD(pin); @@ -169,7 +163,7 @@ Index: linux-3.7-rc8/drivers/pinctrl/pinctrl-xway.c break; case LTQ_PINCONF_PARAM_PULL: -@@ -515,6 +523,14 @@ +@@ -515,6 +523,14 @@ static int xway_pinconf_set(struct pinct dev_err(pctldev->dev, "Invalid pull value %d\n", arg); break; @@ -184,7 +178,7 @@ Index: linux-3.7-rc8/drivers/pinctrl/pinctrl-xway.c default: dev_err(pctldev->dev, "Invalid config param %04x\n", param); return -ENOTSUPP; -@@ -522,9 +538,25 @@ +@@ -522,9 +538,25 @@ static int xway_pinconf_set(struct pinct return 0; } @@ -210,7 +204,7 @@ Index: linux-3.7-rc8/drivers/pinctrl/pinctrl-xway.c }; static struct pinctrl_desc xway_pctrl_desc = { -@@ -532,10 +564,9 @@ +@@ -532,10 +564,9 @@ static struct pinctrl_desc xway_pctrl_de .confops = &xway_pinconf_ops, }; @@ -222,7 +216,7 @@ Index: linux-3.7-rc8/drivers/pinctrl/pinctrl-xway.c int port = PORT(pin); u32 alt1_reg = GPIO_ALT1(pin); -@@ -555,9 +586,18 @@ +@@ -555,9 +586,18 @@ static inline int xway_mux_apply(struct return 0; } @@ -241,7 +235,7 @@ Index: linux-3.7-rc8/drivers/pinctrl/pinctrl-xway.c }; static struct ltq_pinmux_info xway_info = { -@@ -598,6 +638,10 @@ +@@ -598,6 +638,10 @@ static int xway_gpio_dir_out(struct gpio { struct ltq_pinmux_info *info = dev_get_drvdata(chip->dev); @@ -252,7 +246,7 @@ Index: linux-3.7-rc8/drivers/pinctrl/pinctrl-xway.c gpio_setbit(info->membase[0], GPIO_DIR(pin), PORT_PIN(pin)); xway_gpio_set(chip, pin, val); -@@ -618,6 +662,18 @@ +@@ -618,6 +662,18 @@ static void xway_gpio_free(struct gpio_c pinctrl_free_gpio(gpio); } @@ -271,7 +265,7 @@ Index: linux-3.7-rc8/drivers/pinctrl/pinctrl-xway.c static struct gpio_chip xway_chip = { .label = "gpio-xway", .direction_input = xway_gpio_dir_in, -@@ -626,6 +682,7 @@ +@@ -626,6 +682,7 @@ static struct gpio_chip xway_chip = { .set = xway_gpio_set, .request = xway_gpio_req, .free = xway_gpio_free, diff --git a/target/linux/lantiq/patches-3.7/0109-GPIO-MIPS-add-gpio-driver-for-falcon-SoC.patch b/target/linux/lantiq/patches-3.7/0109-GPIO-MIPS-add-gpio-driver-for-falcon-SoC.patch index c76a2a146..3d9e13b29 100644 --- a/target/linux/lantiq/patches-3.7/0109-GPIO-MIPS-add-gpio-driver-for-falcon-SoC.patch +++ b/target/linux/lantiq/patches-3.7/0109-GPIO-MIPS-add-gpio-driver-for-falcon-SoC.patch @@ -16,8 +16,6 @@ Cc: linux-kernel@vger.kernel.org 3 files changed, 355 insertions(+) create mode 100644 drivers/gpio/gpio-falcon.c -diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig -index 47150f5..0647e07 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -114,6 +114,11 @@ config GPIO_EP93XX @@ -32,11 +30,9 @@ index 47150f5..0647e07 100644 config GPIO_MM_LANTIQ bool "Lantiq Memory mapped GPIOs" depends on LANTIQ && SOC_XWAY -diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile -index 9aeed67..2a9e4a2 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile -@@ -21,6 +21,7 @@ obj-$(CONFIG_GPIO_DA9052) += gpio-da9052.o +@@ -21,6 +21,7 @@ obj-$(CONFIG_GPIO_DA9052) += gpio-da9052 obj-$(CONFIG_ARCH_DAVINCI) += gpio-davinci.o obj-$(CONFIG_GPIO_EM) += gpio-em.o obj-$(CONFIG_GPIO_EP93XX) += gpio-ep93xx.o @@ -44,9 +40,6 @@ index 9aeed67..2a9e4a2 100644 obj-$(CONFIG_GPIO_GE_FPGA) += gpio-ge.o obj-$(CONFIG_GPIO_ICH) += gpio-ich.o obj-$(CONFIG_GPIO_IT8761E) += gpio-it8761e.o -diff --git a/drivers/gpio/gpio-falcon.c b/drivers/gpio/gpio-falcon.c -new file mode 100644 -index 0000000..ae8b55d --- /dev/null +++ b/drivers/gpio/gpio-falcon.c @@ -0,0 +1,349 @@ @@ -399,6 +392,3 @@ index 0000000..ae8b55d +} + +subsys_initcall(falcon_gpio_init); --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.7/0110-Document-devicetree-add-OF-documents-for-lantiq-seri.patch b/target/linux/lantiq/patches-3.7/0110-Document-devicetree-add-OF-documents-for-lantiq-seri.patch index a553f49a0..8afa6151d 100644 --- a/target/linux/lantiq/patches-3.7/0110-Document-devicetree-add-OF-documents-for-lantiq-seri.patch +++ b/target/linux/lantiq/patches-3.7/0110-Document-devicetree-add-OF-documents-for-lantiq-seri.patch @@ -12,9 +12,6 @@ Cc: devicetree-discuss@lists.ozlabs.org 1 file changed, 16 insertions(+) create mode 100644 Documentation/devicetree/bindings/serial/lantiq_asc.txt -diff --git a/Documentation/devicetree/bindings/serial/lantiq_asc.txt b/Documentation/devicetree/bindings/serial/lantiq_asc.txt -new file mode 100644 -index 0000000..5b78591 --- /dev/null +++ b/Documentation/devicetree/bindings/serial/lantiq_asc.txt @@ -0,0 +1,16 @@ @@ -34,6 +31,3 @@ index 0000000..5b78591 + interrupt-parent = <&icu0>; + interrupts = <112 113 114>; +}; --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.7/0111-MTD-MIPS-lantiq-Add-NAND-support-on-Lantiq-FALCON-So.patch b/target/linux/lantiq/patches-3.7/0111-MTD-MIPS-lantiq-Add-NAND-support-on-Lantiq-FALCON-So.patch index 3f15b2180..03f0e15d5 100644 --- a/target/linux/lantiq/patches-3.7/0111-MTD-MIPS-lantiq-Add-NAND-support-on-Lantiq-FALCON-So.patch +++ b/target/linux/lantiq/patches-3.7/0111-MTD-MIPS-lantiq-Add-NAND-support-on-Lantiq-FALCON-So.patch @@ -18,8 +18,6 @@ Cc: linux-mtd@lists.infradead.org 3 files changed, 91 insertions(+) create mode 100644 drivers/mtd/nand/falcon_nand.c -diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig -index 4883139..a3b05be 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -572,4 +572,12 @@ config MTD_NAND_XWAY @@ -35,8 +33,6 @@ index 4883139..a3b05be 100644 + attached to the External Bus Unit (EBU). + endif # MTD_NAND -diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile -index 2cbd091..a97e1b5 100644 --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile @@ -53,5 +53,6 @@ obj-$(CONFIG_MTD_NAND_RICOH) += r852.o @@ -46,9 +42,6 @@ index 2cbd091..a97e1b5 100644 +obj-$(CONFIG_MTD_NAND_FALCON) += falcon_nand.o nand-objs := nand_base.o nand_bbt.o -diff --git a/drivers/mtd/nand/falcon_nand.c b/drivers/mtd/nand/falcon_nand.c -new file mode 100644 -index 0000000..b3b850c --- /dev/null +++ b/drivers/mtd/nand/falcon_nand.c @@ -0,0 +1,82 @@ @@ -134,6 +127,3 @@ index 0000000..b3b850c +} + +arch_initcall(falcon_register_nand); --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.7/0112-MTD-lantiq-xway-fix-NAND-reset-timeout-handling.patch b/target/linux/lantiq/patches-3.7/0112-MTD-lantiq-xway-fix-NAND-reset-timeout-handling.patch index 447c0615c..ac837e4ff 100644 --- a/target/linux/lantiq/patches-3.7/0112-MTD-lantiq-xway-fix-NAND-reset-timeout-handling.patch +++ b/target/linux/lantiq/patches-3.7/0112-MTD-lantiq-xway-fix-NAND-reset-timeout-handling.patch @@ -12,11 +12,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org> drivers/mtd/nand/xway_nand.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) -diff --git a/drivers/mtd/nand/xway_nand.c b/drivers/mtd/nand/xway_nand.c -index 3f81dc8..4731300 100644 --- a/drivers/mtd/nand/xway_nand.c +++ b/drivers/mtd/nand/xway_nand.c -@@ -58,15 +58,23 @@ static void xway_reset_chip(struct nand_chip *chip) +@@ -58,15 +58,23 @@ static void xway_reset_chip(struct nand_ { unsigned long nandaddr = (unsigned long) chip->IO_ADDR_W; unsigned long flags; @@ -42,6 +40,3 @@ index 3f81dc8..4731300 100644 spin_unlock_irqrestore(&ebu_lock, flags); } --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.7/0113-I2C-MIPS-lantiq-add-FALC-ON-i2c-bus-master.patch b/target/linux/lantiq/patches-3.7/0113-I2C-MIPS-lantiq-add-FALC-ON-i2c-bus-master.patch index 863f79053..45db21e8e 100644 --- a/target/linux/lantiq/patches-3.7/0113-I2C-MIPS-lantiq-add-FALC-ON-i2c-bus-master.patch +++ b/target/linux/lantiq/patches-3.7/0113-I2C-MIPS-lantiq-add-FALC-ON-i2c-bus-master.patch @@ -16,8 +16,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org> create mode 100644 drivers/i2c/busses/i2c-lantiq.c create mode 100644 drivers/i2c/busses/i2c-lantiq.h -diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig -index e9df461..e03f821 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -460,6 +460,16 @@ config I2C_IOP3XX @@ -37,11 +35,9 @@ index e9df461..e03f821 100644 config I2C_MPC tristate "MPC107/824x/85xx/512x/52xx/83xx/86xx" depends on PPC -diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile -index 395b516..74a789a 100644 --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile -@@ -45,6 +45,7 @@ obj-$(CONFIG_I2C_IBM_IIC) += i2c-ibm_iic.o +@@ -45,6 +45,7 @@ obj-$(CONFIG_I2C_IBM_IIC) += i2c-ibm_iic obj-$(CONFIG_I2C_IMX) += i2c-imx.o obj-$(CONFIG_I2C_INTEL_MID) += i2c-intel-mid.o obj-$(CONFIG_I2C_IOP3XX) += i2c-iop3xx.o @@ -49,9 +45,6 @@ index 395b516..74a789a 100644 obj-$(CONFIG_I2C_MPC) += i2c-mpc.o obj-$(CONFIG_I2C_MV64XXX) += i2c-mv64xxx.o obj-$(CONFIG_I2C_MXS) += i2c-mxs.o -diff --git a/drivers/i2c/busses/i2c-lantiq.c b/drivers/i2c/busses/i2c-lantiq.c -new file mode 100644 -index 0000000..9a5f58b --- /dev/null +++ b/drivers/i2c/busses/i2c-lantiq.c @@ -0,0 +1,747 @@ @@ -802,9 +795,6 @@ index 0000000..9a5f58b +MODULE_ALIAS("platform:" DRV_NAME); +MODULE_LICENSE("GPL"); +MODULE_VERSION(DRV_VERSION); -diff --git a/drivers/i2c/busses/i2c-lantiq.h b/drivers/i2c/busses/i2c-lantiq.h -new file mode 100644 -index 0000000..7a86b89 --- /dev/null +++ b/drivers/i2c/busses/i2c-lantiq.h @@ -0,0 +1,234 @@ @@ -1042,6 +1032,3 @@ index 0000000..7a86b89 + + +#endif /* I2C_LANTIQ_H */ --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.7/0114-SPI-MIPS-lantiq-adds-spi-xway.patch b/target/linux/lantiq/patches-3.7/0114-SPI-MIPS-lantiq-adds-spi-xway.patch index d8c6dd08d..42b3a575b 100644 --- a/target/linux/lantiq/patches-3.7/0114-SPI-MIPS-lantiq-adds-spi-xway.patch +++ b/target/linux/lantiq/patches-3.7/0114-SPI-MIPS-lantiq-adds-spi-xway.patch @@ -16,11 +16,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org> 3 files changed, 986 insertions(+) create mode 100644 drivers/spi/spi-xway.c -diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig -index 1acae35..d79a587 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig -@@ -434,6 +434,14 @@ config SPI_NUC900 +@@ -443,6 +443,14 @@ config SPI_NUC900 help SPI driver for Nuvoton NUC900 series ARM SoCs @@ -35,19 +33,14 @@ index 1acae35..d79a587 100644 # # Add new SPI master controllers in alphabetical order above this line # -diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile -index c48df47..7e344a9 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile -@@ -66,4 +66,5 @@ obj-$(CONFIG_SPI_TOPCLIFF_PCH) += spi-topcliff-pch.o +@@ -67,4 +67,5 @@ obj-$(CONFIG_SPI_TOPCLIFF_PCH) += spi-t obj-$(CONFIG_SPI_TXX9) += spi-txx9.o obj-$(CONFIG_SPI_XCOMM) += spi-xcomm.o obj-$(CONFIG_SPI_XILINX) += spi-xilinx.o +obj-$(CONFIG_SPI_XWAY) += spi-xway.o -diff --git a/drivers/spi/spi-xway.c b/drivers/spi/spi-xway.c -new file mode 100644 -index 0000000..8441085 --- /dev/null +++ b/drivers/spi/spi-xway.c @@ -0,0 +1,977 @@ @@ -1028,6 +1021,3 @@ index 0000000..8441085 +MODULE_AUTHOR("Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:spi-xway"); --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.7/0115-NET-PHY-adds-driver-for-lantiq-PHY11G.patch b/target/linux/lantiq/patches-3.7/0115-NET-PHY-adds-driver-for-lantiq-PHY11G.patch index 18d6bb8d3..15b2ebf64 100644 --- a/target/linux/lantiq/patches-3.7/0115-NET-PHY-adds-driver-for-lantiq-PHY11G.patch +++ b/target/linux/lantiq/patches-3.7/0115-NET-PHY-adds-driver-for-lantiq-PHY11G.patch @@ -11,11 +11,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org> 3 files changed, 184 insertions(+) create mode 100644 drivers/net/phy/lantiq.c -Index: linux-3.7.1/drivers/net/phy/Kconfig -=================================================================== ---- linux-3.7.1.orig/drivers/net/phy/Kconfig 2012-12-21 10:30:28.953462268 +0100 -+++ linux-3.7.1/drivers/net/phy/Kconfig 2012-12-21 10:30:29.609462283 +0100 -@@ -150,6 +150,11 @@ +--- a/drivers/net/phy/Kconfig ++++ b/drivers/net/phy/Kconfig +@@ -150,6 +150,11 @@ config MICREL_PHY ---help--- Currently has a driver for the KSZ8041 @@ -27,11 +25,9 @@ Index: linux-3.7.1/drivers/net/phy/Kconfig config FIXED_PHY bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs" depends on PHYLIB=y -Index: linux-3.7.1/drivers/net/phy/Makefile -=================================================================== ---- linux-3.7.1.orig/drivers/net/phy/Makefile 2012-12-21 10:30:28.953462268 +0100 -+++ linux-3.7.1/drivers/net/phy/Makefile 2012-12-21 10:30:29.609462283 +0100 -@@ -38,6 +38,7 @@ +--- a/drivers/net/phy/Makefile ++++ b/drivers/net/phy/Makefile +@@ -39,6 +39,7 @@ obj-$(CONFIG_NATIONAL_PHY) += national.o obj-$(CONFIG_DP83640_PHY) += dp83640.o obj-$(CONFIG_STE10XP) += ste10Xp.o obj-$(CONFIG_MICREL_PHY) += micrel.o @@ -39,10 +35,8 @@ Index: linux-3.7.1/drivers/net/phy/Makefile obj-$(CONFIG_MDIO_OCTEON) += mdio-octeon.o obj-$(CONFIG_MICREL_KS8995MA) += spi_ks8995.o obj-$(CONFIG_AT803X_PHY) += at803x.o -Index: linux-3.7.1/drivers/net/phy/lantiq.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1/drivers/net/phy/lantiq.c 2012-12-21 11:47:10.721571920 +0100 +--- /dev/null ++++ b/drivers/net/phy/lantiq.c @@ -0,0 +1,220 @@ +/* + * This program is free software; you can redistribute it and/or modify diff --git a/target/linux/lantiq/patches-3.7/0116-NET-MIPS-lantiq-update-etop-driver-for-devicetree.patch b/target/linux/lantiq/patches-3.7/0116-NET-MIPS-lantiq-update-etop-driver-for-devicetree.patch index cf93292e7..218a43d57 100644 --- a/target/linux/lantiq/patches-3.7/0116-NET-MIPS-lantiq-update-etop-driver-for-devicetree.patch +++ b/target/linux/lantiq/patches-3.7/0116-NET-MIPS-lantiq-update-etop-driver-for-devicetree.patch @@ -7,8 +7,6 @@ Subject: [PATCH 116/123] NET: MIPS: lantiq: update etop driver for devicetree drivers/net/ethernet/lantiq_etop.c | 470 +++++++++++++++++++++++++----------- 1 file changed, 333 insertions(+), 137 deletions(-) -diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c -index 003c5bc..dc5457a 100644 --- a/drivers/net/ethernet/lantiq_etop.c +++ b/drivers/net/ethernet/lantiq_etop.c @@ -12,7 +12,7 @@ @@ -35,15 +33,13 @@ index 003c5bc..dc5457a 100644 #define ETOP_MII_REVERSE 0xe #define ETOP_PLEN_UNDER 0x40 #define ETOP_CGEN 0x800 -- ++#define ETOP_CFG_MII0 0x01 + -/* use 2 static channels for TX/RX */ -#define LTQ_ETOP_TX_CHANNEL 1 -#define LTQ_ETOP_RX_CHANNEL 6 -#define IS_TX(x) (x == LTQ_ETOP_TX_CHANNEL) -#define IS_RX(x) (x == LTQ_ETOP_RX_CHANNEL) -- -+#define ETOP_CFG_MII0 0x01 -+ +#define LTQ_GBIT_MDIO_CTL 0xCC +#define LTQ_GBIT_MDIO_DATA 0xd0 +#define LTQ_GBIT_GCTL0 0x68 @@ -69,7 +65,7 @@ index 003c5bc..dc5457a 100644 +#define MDIO_XR9_REG_OFFSET 0 +#define MDIO_XR9_ADDR_OFFSET 5 +#define MDIO_XR9_WR_OFFSET 16 -+ + +#define LTQ_DMA_ETOP ((of_machine_is_compatible("lantiq,ase")) ? \ + (INT_NUM_IM3_IRL0) : (INT_NUM_IM2_IRL0)) + @@ -137,7 +133,7 @@ index 003c5bc..dc5457a 100644 if (!ch->skb[ch->dma.desc]) return -ENOMEM; ch->dma.desc_base[ch->dma.desc].addr = dma_map_single(NULL, -@@ -149,8 +197,11 @@ ltq_etop_hw_receive(struct ltq_etop_chan *ch) +@@ -149,8 +197,11 @@ ltq_etop_hw_receive(struct ltq_etop_chan spin_unlock_irqrestore(&priv->lock, flags); skb_put(skb, len); @@ -149,7 +145,7 @@ index 003c5bc..dc5457a 100644 } static int -@@ -158,8 +209,10 @@ ltq_etop_poll_rx(struct napi_struct *napi, int budget) +@@ -158,8 +209,10 @@ ltq_etop_poll_rx(struct napi_struct *nap { struct ltq_etop_chan *ch = container_of(napi, struct ltq_etop_chan, napi); @@ -160,7 +156,7 @@ index 003c5bc..dc5457a 100644 while ((rx < budget) && !complete) { struct ltq_dma_desc *desc = &ch->dma.desc_base[ch->dma.desc]; -@@ -173,7 +226,9 @@ ltq_etop_poll_rx(struct napi_struct *napi, int budget) +@@ -173,7 +226,9 @@ ltq_etop_poll_rx(struct napi_struct *nap } if (complete || !rx) { napi_complete(&ch->napi); @@ -170,7 +166,7 @@ index 003c5bc..dc5457a 100644 } return rx; } -@@ -185,12 +240,14 @@ ltq_etop_poll_tx(struct napi_struct *napi, int budget) +@@ -185,12 +240,14 @@ ltq_etop_poll_tx(struct napi_struct *nap container_of(napi, struct ltq_etop_chan, napi); struct ltq_etop_priv *priv = netdev_priv(ch->netdev); struct netdev_queue *txq = @@ -186,7 +182,7 @@ index 003c5bc..dc5457a 100644 dev_kfree_skb_any(ch->skb[ch->tx_free]); ch->skb[ch->tx_free] = NULL; memset(&ch->dma.desc_base[ch->tx_free], 0, -@@ -203,7 +260,9 @@ ltq_etop_poll_tx(struct napi_struct *napi, int budget) +@@ -203,7 +260,9 @@ ltq_etop_poll_tx(struct napi_struct *nap if (netif_tx_queue_stopped(txq)) netif_tx_start_queue(txq); napi_complete(&ch->napi); @@ -210,7 +206,7 @@ index 003c5bc..dc5457a 100644 return IRQ_HANDLED; } -@@ -225,7 +285,7 @@ ltq_etop_free_channel(struct net_device *dev, struct ltq_etop_chan *ch) +@@ -225,7 +285,7 @@ ltq_etop_free_channel(struct net_device ltq_dma_free(&ch->dma); if (ch->dma.irq) free_irq(ch->dma.irq, priv); @@ -271,14 +267,14 @@ index 003c5bc..dc5457a 100644 - ltq_pmu_enable(PMU_PPE); + clk_enable(priv->clk_ppe); - -- switch (priv->pldata->mii_mode) { ++ + if (of_machine_is_compatible("lantiq,ar9")) { + ltq_etop_gbit_init(dev); + /* force the etops link to the gbit to MII */ + priv->mii_mode = PHY_INTERFACE_MODE_MII; + } -+ + +- switch (priv->pldata->mii_mode) { + switch (priv->mii_mode) { case PHY_INTERFACE_MODE_RMII: ltq_etop_w32_mask(ETOP_MII_MASK, @@ -374,7 +370,7 @@ index 003c5bc..dc5457a 100644 } static void -@@ -312,7 +433,10 @@ ltq_etop_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) +@@ -312,7 +433,10 @@ ltq_etop_get_settings(struct net_device { struct ltq_etop_priv *priv = netdev_priv(dev); @@ -386,7 +382,7 @@ index 003c5bc..dc5457a 100644 } static int -@@ -320,7 +444,10 @@ ltq_etop_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) +@@ -320,7 +444,10 @@ ltq_etop_set_settings(struct net_device { struct ltq_etop_priv *priv = netdev_priv(dev); @@ -398,7 +394,7 @@ index 003c5bc..dc5457a 100644 } static int -@@ -328,7 +455,10 @@ ltq_etop_nway_reset(struct net_device *dev) +@@ -328,7 +455,10 @@ ltq_etop_nway_reset(struct net_device *d { struct ltq_etop_priv *priv = netdev_priv(dev); @@ -410,7 +406,7 @@ index 003c5bc..dc5457a 100644 } static const struct ethtool_ops ltq_etop_ethtool_ops = { -@@ -339,6 +469,39 @@ static const struct ethtool_ops ltq_etop_ethtool_ops = { +@@ -339,6 +469,39 @@ static const struct ethtool_ops ltq_etop }; static int @@ -450,7 +446,7 @@ index 003c5bc..dc5457a 100644 ltq_etop_mdio_wr(struct mii_bus *bus, int phy_addr, int phy_reg, u16 phy_data) { u32 val = MDIO_REQUEST | -@@ -379,14 +542,11 @@ ltq_etop_mdio_probe(struct net_device *dev) +@@ -379,14 +542,11 @@ ltq_etop_mdio_probe(struct net_device *d { struct ltq_etop_priv *priv = netdev_priv(dev); struct phy_device *phydev = NULL; @@ -469,7 +465,7 @@ index 003c5bc..dc5457a 100644 if (!phydev) { netdev_err(dev, "no PHY found\n"); -@@ -394,7 +554,7 @@ ltq_etop_mdio_probe(struct net_device *dev) +@@ -394,7 +554,7 @@ ltq_etop_mdio_probe(struct net_device *d } phydev = phy_connect(dev, dev_name(&phydev->dev), <q_etop_mdio_link, @@ -478,7 +474,7 @@ index 003c5bc..dc5457a 100644 if (IS_ERR(phydev)) { netdev_err(dev, "Could not attach to PHY\n"); -@@ -408,6 +568,9 @@ ltq_etop_mdio_probe(struct net_device *dev) +@@ -408,6 +568,9 @@ ltq_etop_mdio_probe(struct net_device *d | SUPPORTED_Autoneg | SUPPORTED_MII | SUPPORTED_TP); @@ -488,7 +484,7 @@ index 003c5bc..dc5457a 100644 phydev->advertising = phydev->supported; priv->phydev = phydev; -@@ -433,8 +596,13 @@ ltq_etop_mdio_init(struct net_device *dev) +@@ -433,8 +596,13 @@ ltq_etop_mdio_init(struct net_device *de } priv->mii_bus->priv = dev; @@ -544,6 +540,12 @@ index 003c5bc..dc5457a 100644 - phy_stop(priv->phydev); - for (i = 0; i < MAX_DMA_CHAN; i++) { - struct ltq_etop_chan *ch = &priv->ch[i]; +- +- if (!IS_RX(i) && !IS_TX(i)) +- continue; +- napi_disable(&ch->napi); +- ltq_dma_close(&ch->dma); +- } + if (priv->phydev) + phy_stop(priv->phydev); + napi_disable(&priv->txch.napi); @@ -553,16 +555,11 @@ index 003c5bc..dc5457a 100644 + ltq_dma_close(&priv->txch.dma); + ltq_dma_close(&priv->rxch.dma); + spin_unlock_irqrestore(&priv->lock, flags); - -- if (!IS_RX(i) && !IS_TX(i)) -- continue; -- napi_disable(&ch->napi); -- ltq_dma_close(&ch->dma); -- } ++ return 0; } -@@ -523,16 +694,16 @@ ltq_etop_tx(struct sk_buff *skb, struct net_device *dev) +@@ -523,16 +694,16 @@ ltq_etop_tx(struct sk_buff *skb, struct int queue = skb_get_queue_mapping(skb); struct netdev_queue *txq = netdev_get_tx_queue(dev, queue); struct ltq_etop_priv *priv = netdev_priv(dev); @@ -584,7 +581,7 @@ index 003c5bc..dc5457a 100644 netdev_err(dev, "tx ring full\n"); netif_tx_stop_queue(txq); return NETDEV_TX_BUSY; -@@ -540,7 +711,7 @@ ltq_etop_tx(struct sk_buff *skb, struct net_device *dev) +@@ -540,7 +711,7 @@ ltq_etop_tx(struct sk_buff *skb, struct /* dma needs to start on a 16 byte aligned address */ byte_offset = CPHYSADDR(skb->data) % 16; @@ -593,7 +590,7 @@ index 003c5bc..dc5457a 100644 dev->trans_start = jiffies; -@@ -550,11 +721,11 @@ ltq_etop_tx(struct sk_buff *skb, struct net_device *dev) +@@ -550,11 +721,11 @@ ltq_etop_tx(struct sk_buff *skb, struct wmb(); desc->ctl = LTQ_DMA_OWN | LTQ_DMA_SOP | LTQ_DMA_EOP | LTQ_DMA_TX_OFFSET(byte_offset) | (len & LTQ_DMA_SIZE_MASK); @@ -653,7 +650,7 @@ index 003c5bc..dc5457a 100644 return 0; err_netdev: -@@ -680,6 +849,9 @@ ltq_etop_tx_timeout(struct net_device *dev) +@@ -680,6 +849,9 @@ ltq_etop_tx_timeout(struct net_device *d err = ltq_etop_hw_init(dev); if (err) goto err_hw; @@ -663,7 +660,7 @@ index 003c5bc..dc5457a 100644 dev->trans_start = jiffies; netif_wake_queue(dev); return; -@@ -703,14 +875,19 @@ static const struct net_device_ops ltq_eth_netdev_ops = { +@@ -703,14 +875,19 @@ static const struct net_device_ops ltq_e .ndo_tx_timeout = ltq_etop_tx_timeout, }; @@ -686,7 +683,7 @@ index 003c5bc..dc5457a 100644 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { -@@ -736,30 +913,58 @@ ltq_etop_probe(struct platform_device *pdev) +@@ -736,30 +913,58 @@ ltq_etop_probe(struct platform_device *p goto err_out; } @@ -760,7 +757,7 @@ index 003c5bc..dc5457a 100644 err = register_netdev(dev); if (err) -@@ -788,32 +993,23 @@ ltq_etop_remove(struct platform_device *pdev) +@@ -788,32 +993,23 @@ ltq_etop_remove(struct platform_device * return 0; } @@ -802,6 +799,3 @@ index 003c5bc..dc5457a 100644 MODULE_AUTHOR("John Crispin <blogic@openwrt.org>"); MODULE_DESCRIPTION("Lantiq SoC ETOP"); --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.7/0117-NET-MIPS-lantiq-adds-xrx200-net.patch b/target/linux/lantiq/patches-3.7/0117-NET-MIPS-lantiq-adds-xrx200-net.patch index eb3ed5f47..478e05d06 100644 --- a/target/linux/lantiq/patches-3.7/0117-NET-MIPS-lantiq-adds-xrx200-net.patch +++ b/target/linux/lantiq/patches-3.7/0117-NET-MIPS-lantiq-adds-xrx200-net.patch @@ -12,11 +12,9 @@ Subject: [PATCH 117/123] NET: MIPS: lantiq: adds xrx200-net create mode 100644 drivers/net/ethernet/lantiq_pce.h create mode 100644 drivers/net/ethernet/lantiq_xrx200.c -Index: linux-3.7.1/drivers/net/ethernet/Kconfig -=================================================================== ---- linux-3.7.1.orig/drivers/net/ethernet/Kconfig 2012-12-17 20:14:54.000000000 +0100 -+++ linux-3.7.1/drivers/net/ethernet/Kconfig 2012-12-21 10:30:29.629462283 +0100 -@@ -83,7 +83,13 @@ +--- a/drivers/net/ethernet/Kconfig ++++ b/drivers/net/ethernet/Kconfig +@@ -83,7 +83,13 @@ config LANTIQ_ETOP tristate "Lantiq SoC ETOP driver" depends on SOC_TYPE_XWAY ---help--- @@ -31,11 +29,9 @@ Index: linux-3.7.1/drivers/net/ethernet/Kconfig source "drivers/net/ethernet/marvell/Kconfig" source "drivers/net/ethernet/mellanox/Kconfig" -Index: linux-3.7.1/drivers/net/ethernet/Makefile -=================================================================== ---- linux-3.7.1.orig/drivers/net/ethernet/Makefile 2012-12-17 20:14:54.000000000 +0100 -+++ linux-3.7.1/drivers/net/ethernet/Makefile 2012-12-21 10:30:29.629462283 +0100 -@@ -36,6 +36,7 @@ +--- a/drivers/net/ethernet/Makefile ++++ b/drivers/net/ethernet/Makefile +@@ -36,6 +36,7 @@ obj-$(CONFIG_IP1000) += icplus/ obj-$(CONFIG_JME) += jme.o obj-$(CONFIG_KORINA) += korina.o obj-$(CONFIG_LANTIQ_ETOP) += lantiq_etop.o @@ -43,10 +39,8 @@ Index: linux-3.7.1/drivers/net/ethernet/Makefile obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/ obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/ obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/ -Index: linux-3.7.1/drivers/net/ethernet/lantiq_pce.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1/drivers/net/ethernet/lantiq_pce.h 2012-12-21 10:30:29.629462283 +0100 +--- /dev/null ++++ b/drivers/net/ethernet/lantiq_pce.h @@ -0,0 +1,163 @@ +/* + * This program is free software; you can redistribute it and/or modify it @@ -211,10 +205,8 @@ Index: linux-3.7.1/drivers/net/ethernet/lantiq_pce.h + MC_ENTRY(0x0000, 0x0000, 39, OUT_NONE, 0, INSTR, FLAG_END, 0), + MC_ENTRY(0x0000, 0x0000, 39, OUT_NONE, 0, INSTR, FLAG_END, 0), +}; -Index: linux-3.7.1/drivers/net/ethernet/lantiq_xrx200.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1/drivers/net/ethernet/lantiq_xrx200.c 2012-12-21 12:06:26.473599462 +0100 +--- /dev/null ++++ b/drivers/net/ethernet/lantiq_xrx200.c @@ -0,0 +1,1203 @@ +/* + * This program is free software; you can redistribute it and/or modify it diff --git a/target/linux/lantiq/patches-3.7/0118-owrt-adds-PHY11G-firmware-blobs.patch b/target/linux/lantiq/patches-3.7/0118-owrt-adds-PHY11G-firmware-blobs.patch index 137094e08..2bae7b359 100644 --- a/target/linux/lantiq/patches-3.7/0118-owrt-adds-PHY11G-firmware-blobs.patch +++ b/target/linux/lantiq/patches-3.7/0118-owrt-adds-PHY11G-firmware-blobs.patch @@ -20,11 +20,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org> create mode 100644 firmware/lantiq/vr9_phy22f_a1x.bin create mode 100644 firmware/lantiq/vr9_phy22f_a2x.bin -Index: linux-3.7.1/firmware/Makefile -=================================================================== ---- linux-3.7.1.orig/firmware/Makefile 2012-12-17 20:14:54.000000000 +0100 -+++ linux-3.7.1/firmware/Makefile 2012-12-20 23:52:05.900549560 +0100 -@@ -135,6 +135,8 @@ +--- a/firmware/Makefile ++++ b/firmware/Makefile +@@ -135,6 +135,8 @@ fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_P fw-shipped-$(CONFIG_USB_SERIAL_XIRCOM) += keyspan_pda/xircom_pgs.fw fw-shipped-$(CONFIG_USB_VICAM) += vicam/firmware.fw fw-shipped-$(CONFIG_VIDEO_CPIA2) += cpia2/stv0672_vp4.bin @@ -33,10 +31,8 @@ Index: linux-3.7.1/firmware/Makefile fw-shipped-$(CONFIG_YAM) += yam/1200.bin yam/9600.bin fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-) -Index: linux-3.7.1/firmware/lantiq/COPYING -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1/firmware/lantiq/COPYING 2012-12-20 23:36:38.452527458 +0100 +--- /dev/null ++++ b/firmware/lantiq/COPYING @@ -0,0 +1,286 @@ +All firmware files are copyrighted by Lantiq Deutschland GmbH. +The files have been extracted from header files found in Lantiq BSPs. @@ -324,10 +320,8 @@ Index: linux-3.7.1/firmware/lantiq/COPYING +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS -Index: linux-3.7.1/firmware/lantiq/README -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1/firmware/lantiq/README 2012-12-20 23:36:38.452527458 +0100 +--- /dev/null ++++ b/firmware/lantiq/README @@ -0,0 +1,45 @@ +# +# This program is free software; you can redistribute it and/or diff --git a/target/linux/lantiq/patches-3.7/0119-owrt-ATM-adds-lantiq-specific-hacks.patch b/target/linux/lantiq/patches-3.7/0119-owrt-ATM-adds-lantiq-specific-hacks.patch index 6dbbb21ec..f3a2c3127 100644 --- a/target/linux/lantiq/patches-3.7/0119-owrt-ATM-adds-lantiq-specific-hacks.patch +++ b/target/linux/lantiq/patches-3.7/0119-owrt-ATM-adds-lantiq-specific-hacks.patch @@ -10,10 +10,8 @@ Subject: [PATCH 20/25] owrt atm net/atm/proc.c | 2 +- 4 files changed, 11 insertions(+), 1 deletions(-) -Index: linux-3.7-rc6/arch/mips/lantiq/irq.c -=================================================================== ---- linux-3.7-rc6.orig/arch/mips/lantiq/irq.c 2012-12-06 21:02:42.000000000 +0100 -+++ linux-3.7-rc6/arch/mips/lantiq/irq.c 2012-12-06 21:03:13.850060387 +0100 +--- a/arch/mips/lantiq/irq.c ++++ b/arch/mips/lantiq/irq.c @@ -14,6 +14,7 @@ #include <linux/of_platform.h> #include <linux/of_address.h> @@ -22,7 +20,7 @@ Index: linux-3.7-rc6/arch/mips/lantiq/irq.c #include <asm/bootinfo.h> #include <asm/irq_cpu.h> -@@ -99,6 +100,7 @@ +@@ -99,6 +100,7 @@ void ltq_mask_and_ack_irq(struct irq_dat ltq_icu_w32(im, ltq_icu_r32(im, ier) & ~BIT(offset), ier); ltq_icu_w32(im, BIT(offset), isr); } @@ -30,11 +28,9 @@ Index: linux-3.7-rc6/arch/mips/lantiq/irq.c static void ltq_ack_irq(struct irq_data *d) { -Index: linux-3.7-rc6/arch/mips/mm/cache.c -=================================================================== ---- linux-3.7-rc6.orig/arch/mips/mm/cache.c 2012-12-06 21:02:40.000000000 +0100 -+++ linux-3.7-rc6/arch/mips/mm/cache.c 2012-12-06 21:03:13.850060387 +0100 -@@ -58,6 +58,8 @@ +--- a/arch/mips/mm/cache.c ++++ b/arch/mips/mm/cache.c +@@ -58,6 +58,8 @@ void (*_dma_cache_wback)(unsigned long s void (*_dma_cache_inv)(unsigned long start, unsigned long size); EXPORT_SYMBOL(_dma_cache_wback_inv); @@ -43,11 +39,9 @@ Index: linux-3.7-rc6/arch/mips/mm/cache.c #endif /* CONFIG_DMA_NONCOHERENT */ -Index: linux-3.7-rc6/net/atm/common.c -=================================================================== ---- linux-3.7-rc6.orig/net/atm/common.c 2012-11-17 02:42:40.000000000 +0100 -+++ linux-3.7-rc6/net/atm/common.c 2012-12-06 21:03:13.850060387 +0100 -@@ -62,11 +62,17 @@ +--- a/net/atm/common.c ++++ b/net/atm/common.c +@@ -62,11 +62,17 @@ static void vcc_remove_socket(struct soc write_unlock_irq(&vcc_sklist_lock); } @@ -65,11 +59,9 @@ Index: linux-3.7-rc6/net/atm/common.c if (sk_wmem_alloc_get(sk) && !atm_may_send(vcc, size)) { pr_debug("Sorry: wmem_alloc = %d, size = %d, sndbuf = %d\n", sk_wmem_alloc_get(sk), size, sk->sk_sndbuf); -Index: linux-3.7-rc6/net/atm/proc.c -=================================================================== ---- linux-3.7-rc6.orig/net/atm/proc.c 2012-11-17 02:42:40.000000000 +0100 -+++ linux-3.7-rc6/net/atm/proc.c 2012-12-06 21:03:13.850060387 +0100 -@@ -154,7 +154,7 @@ +--- a/net/atm/proc.c ++++ b/net/atm/proc.c +@@ -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[] = { @@ -78,10 +70,8 @@ Index: linux-3.7-rc6/net/atm/proc.c static const char *const aal_name[] = { "---", "1", "2", "3/4", /* 0- 3 */ "???", "5", "???", "???", /* 4- 7 */ -Index: linux-3.7-rc6/arch/mips/include/asm/mach-lantiq/lantiq_atm.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-rc6/arch/mips/include/asm/mach-lantiq/lantiq_atm.h 2012-12-06 21:03:13.850060387 +0100 +--- /dev/null ++++ b/arch/mips/include/asm/mach-lantiq/lantiq_atm.h @@ -0,0 +1,196 @@ +/****************************************************************************** +** @@ -279,10 +269,8 @@ Index: linux-3.7-rc6/arch/mips/include/asm/mach-lantiq/lantiq_atm.h + +#endif // IFX_ATM_H + -Index: linux-3.7-rc6/arch/mips/include/asm/mach-lantiq/lantiq_ptm.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-rc6/arch/mips/include/asm/mach-lantiq/lantiq_ptm.h 2012-12-06 21:03:13.854060387 +0100 +--- /dev/null ++++ b/arch/mips/include/asm/mach-lantiq/lantiq_ptm.h @@ -0,0 +1,203 @@ +/****************************************************************************** +** @@ -487,10 +475,8 @@ Index: linux-3.7-rc6/arch/mips/include/asm/mach-lantiq/lantiq_ptm.h + +#endif // IFX_PTM_H + -Index: linux-3.7-rc6/include/uapi/linux/atm.h -=================================================================== ---- linux-3.7-rc6.orig/include/uapi/linux/atm.h 2012-12-06 21:02:41.458059575 +0100 -+++ linux-3.7-rc6/include/uapi/linux/atm.h 2012-12-06 21:04:21.282062078 +0100 +--- a/include/uapi/linux/atm.h ++++ b/include/uapi/linux/atm.h @@ -130,8 +130,14 @@ #define ATM_ABR 4 #define ATM_ANYCLASS 5 /* compatible with everything */ diff --git a/target/linux/lantiq/patches-3.7/0120-owrt-generic-dtb-image-hack.patch b/target/linux/lantiq/patches-3.7/0120-owrt-generic-dtb-image-hack.patch index aed000913..5a005729f 100644 --- a/target/linux/lantiq/patches-3.7/0120-owrt-generic-dtb-image-hack.patch +++ b/target/linux/lantiq/patches-3.7/0120-owrt-generic-dtb-image-hack.patch @@ -7,13 +7,11 @@ Subject: [PATCH 120/123] owrt: generic dtb image hack arch/mips/kernel/head.S | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S -index ea695d9..be87456 100644 --- a/arch/mips/kernel/head.S +++ b/arch/mips/kernel/head.S -@@ -141,6 +141,9 @@ FEXPORT(__kernel_entry) - j kernel_entry - #endif +@@ -147,6 +147,9 @@ EXPORT(__image_cmdline) + .fill 0x400 + #endif /* CONFIG_IMAGE_CMDLINE_HACK */ + .ascii "OWRTDTB:" + EXPORT(__image_dtb) @@ -21,6 +19,3 @@ index ea695d9..be87456 100644 __REF NESTED(kernel_entry, 16, sp) # kernel entry point --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.7/0121-owrt-lantiq-dtb-image-hack.patch b/target/linux/lantiq/patches-3.7/0121-owrt-lantiq-dtb-image-hack.patch index eef7da47b..981b86c2b 100644 --- a/target/linux/lantiq/patches-3.7/0121-owrt-lantiq-dtb-image-hack.patch +++ b/target/linux/lantiq/patches-3.7/0121-owrt-lantiq-dtb-image-hack.patch @@ -7,11 +7,9 @@ Subject: [PATCH 121/123] owrt: lantiq dtb image hack arch/mips/lantiq/prom.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -Index: linux-3.7-rc8/arch/mips/lantiq/prom.c -=================================================================== ---- linux-3.7-rc8.orig/arch/mips/lantiq/prom.c 2012-12-14 23:08:36.451576994 +0100 -+++ linux-3.7-rc8/arch/mips/lantiq/prom.c 2012-12-14 23:08:36.607576999 +0100 -@@ -72,6 +72,8 @@ +--- a/arch/mips/lantiq/prom.c ++++ b/arch/mips/lantiq/prom.c +@@ -72,6 +72,8 @@ int __init early_init_dt_scan_model(unsi return 0; } @@ -20,7 +18,7 @@ Index: linux-3.7-rc8/arch/mips/lantiq/prom.c void __init plat_mem_setup(void) { ioport_resource.start = IOPORT_RESOURCE_START; -@@ -85,7 +87,7 @@ +@@ -85,7 +87,7 @@ void __init plat_mem_setup(void) * Load the builtin devicetree. This causes the chosen node to be * parsed resulting in our memory appearing */ @@ -29,10 +27,8 @@ Index: linux-3.7-rc8/arch/mips/lantiq/prom.c of_scan_flat_dt(early_init_dt_scan_model, NULL); } -Index: linux-3.7-rc8/arch/mips/lantiq/Makefile -=================================================================== ---- linux-3.7-rc8.orig/arch/mips/lantiq/Makefile 2012-12-14 23:08:36.459576996 +0100 -+++ linux-3.7-rc8/arch/mips/lantiq/Makefile 2012-12-15 01:40:16.519805129 +0100 +--- a/arch/mips/lantiq/Makefile ++++ b/arch/mips/lantiq/Makefile @@ -6,8 +6,6 @@ obj-y := irq.o clk.o prom.o diff --git a/target/linux/lantiq/patches-3.7/0122-MIPS-lantiq-adds-pcie-driver.patch b/target/linux/lantiq/patches-3.7/0122-MIPS-lantiq-adds-pcie-driver.patch index 9319858f5..18422607b 100644 --- a/target/linux/lantiq/patches-3.7/0122-MIPS-lantiq-adds-pcie-driver.patch +++ b/target/linux/lantiq/patches-3.7/0122-MIPS-lantiq-adds-pcie-driver.patch @@ -36,8 +36,6 @@ Subject: [PATCH 122/123] MIPS: lantiq: adds pcie driver create mode 100644 arch/mips/pci/ifxmips_pcie_reg.h create mode 100644 arch/mips/pci/ifxmips_pcie_vr9.h -diff --git a/arch/mips/lantiq/Kconfig b/arch/mips/lantiq/Kconfig -index edeb58c..116765a 100644 --- a/arch/mips/lantiq/Kconfig +++ b/arch/mips/lantiq/Kconfig @@ -17,6 +17,7 @@ config SOC_XWAY @@ -64,8 +62,6 @@ index edeb58c..116765a 100644 config XRX200_PHY_FW bool "XRX200 PHY firmware loader" depends on SOC_XWAY -diff --git a/arch/mips/lantiq/xway/sysctrl.c b/arch/mips/lantiq/xway/sysctrl.c -index 75e1b7d..b077d49 100644 --- a/arch/mips/lantiq/xway/sysctrl.c +++ b/arch/mips/lantiq/xway/sysctrl.c @@ -377,6 +377,8 @@ void __init ltq_soc_init(void) @@ -77,11 +73,9 @@ index 75e1b7d..b077d49 100644 } else if (of_machine_is_compatible("lantiq,ar9")) { clkdev_add_static(ltq_ar9_cpu_hz(), ltq_ar9_fpi_hz(), ltq_ar9_fpi_hz(), CLOCK_250M); -diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile -index e13a71c..46d7096 100644 --- a/arch/mips/pci/Makefile +++ b/arch/mips/pci/Makefile -@@ -44,6 +44,8 @@ obj-$(CONFIG_SIBYTE_BCM1x80) += pci-bcm1480.o pci-bcm1480ht.o +@@ -44,6 +44,8 @@ obj-$(CONFIG_SIBYTE_BCM1x80) += pci-bcm1 obj-$(CONFIG_SNI_RM) += fixup-sni.o ops-sni.o obj-$(CONFIG_LANTIQ) += fixup-lantiq.o obj-$(CONFIG_PCI_LANTIQ) += pci-lantiq.o ops-lantiq.o @@ -90,9 +84,6 @@ index e13a71c..46d7096 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/fixup-lantiq-pcie.c b/arch/mips/pci/fixup-lantiq-pcie.c -new file mode 100644 -index 0000000..50a1c3b --- /dev/null +++ b/arch/mips/pci/fixup-lantiq-pcie.c @@ -0,0 +1,82 @@ @@ -178,8 +169,6 @@ index 0000000..50a1c3b + +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_LANTIQ, PCI_DEVICE_ID_LANTIQ_PCIE, + ifx_pcie_rc_class_early_fixup); -diff --git a/arch/mips/pci/fixup-lantiq.c b/arch/mips/pci/fixup-lantiq.c -index 6c829df..cf5c4e0 100644 --- a/arch/mips/pci/fixup-lantiq.c +++ b/arch/mips/pci/fixup-lantiq.c @@ -11,6 +11,7 @@ @@ -190,7 +179,7 @@ index 6c829df..cf5c4e0 100644 int pcibios_plat_dev_init(struct pci_dev *dev) { -@@ -28,6 +29,8 @@ int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) +@@ -28,6 +29,8 @@ int __init pcibios_map_irq(const struct struct of_irq dev_irq; int irq; @@ -199,9 +188,6 @@ index 6c829df..cf5c4e0 100644 if (of_irq_map_pci(dev, &dev_irq)) { dev_err(&dev->dev, "trying to map irq for unknown slot:%d pin:%d\n", slot, pin); -diff --git a/arch/mips/pci/ifxmips_pci_common.h b/arch/mips/pci/ifxmips_pci_common.h -new file mode 100755 -index 0000000..5f6ab83 --- /dev/null +++ b/arch/mips/pci/ifxmips_pci_common.h @@ -0,0 +1,57 @@ @@ -262,9 +248,6 @@ index 0000000..5f6ab83 +
+#endif /* IFXMIPS_PCI_COMMON_H */
+
-diff --git a/arch/mips/pci/ifxmips_pcie.c b/arch/mips/pci/ifxmips_pcie.c -new file mode 100644 -index 0000000..de6e2fa --- /dev/null +++ b/arch/mips/pci/ifxmips_pcie.c @@ -0,0 +1,1607 @@ @@ -1875,9 +1858,6 @@ index 0000000..de6e2fa +MODULE_SUPPORTED_DEVICE("Infineon builtin PCIe RC module");
+MODULE_DESCRIPTION("Infineon builtin PCIe RC driver");
+
-diff --git a/arch/mips/pci/ifxmips_pcie.h b/arch/mips/pci/ifxmips_pcie.h -new file mode 100644 -index 0000000..49a4d2f --- /dev/null +++ b/arch/mips/pci/ifxmips_pcie.h @@ -0,0 +1,135 @@ @@ -2016,9 +1996,6 @@ index 0000000..49a4d2f +
+#endif /* IFXMIPS_PCIE_H */
+
-diff --git a/arch/mips/pci/ifxmips_pcie_ar10.h b/arch/mips/pci/ifxmips_pcie_ar10.h -new file mode 100644 -index 0000000..99ff463 --- /dev/null +++ b/arch/mips/pci/ifxmips_pcie_ar10.h @@ -0,0 +1,290 @@ @@ -2312,9 +2289,6 @@ index 0000000..99ff463 +} + +#endif /* IFXMIPS_PCIE_AR10_H */ -diff --git a/arch/mips/pci/ifxmips_pcie_msi.c b/arch/mips/pci/ifxmips_pcie_msi.c -new file mode 100644 -index 0000000..5bee7f8 --- /dev/null +++ b/arch/mips/pci/ifxmips_pcie_msi.c @@ -0,0 +1,392 @@ @@ -2710,9 +2684,6 @@ index 0000000..5bee7f8 +MODULE_SUPPORTED_DEVICE("Infineon PCIe IP builtin MSI PIC module");
+MODULE_DESCRIPTION("Infineon PCIe IP builtin MSI PIC driver");
+
-diff --git a/arch/mips/pci/ifxmips_pcie_phy.c b/arch/mips/pci/ifxmips_pcie_phy.c -new file mode 100644 -index 0000000..a4171a7 --- /dev/null +++ b/arch/mips/pci/ifxmips_pcie_phy.c @@ -0,0 +1,478 @@ @@ -3194,9 +3165,6 @@ index 0000000..a4171a7 +#endif
+}
+
-diff --git a/arch/mips/pci/ifxmips_pcie_pm.c b/arch/mips/pci/ifxmips_pcie_pm.c -new file mode 100644 -index 0000000..a10ecad --- /dev/null +++ b/arch/mips/pci/ifxmips_pcie_pm.c @@ -0,0 +1,176 @@ @@ -3376,9 +3344,6 @@ index 0000000..a10ecad + ifx_pmcu_unregister(&pmcuUnRegister); +} + -diff --git a/arch/mips/pci/ifxmips_pcie_pm.h b/arch/mips/pci/ifxmips_pcie_pm.h -new file mode 100644 -index 0000000..6ece20d --- /dev/null +++ b/arch/mips/pci/ifxmips_pcie_pm.h @@ -0,0 +1,36 @@ @@ -3418,9 +3383,6 @@ index 0000000..6ece20d + +#endif /* IFXMIPS_PCIE_PM_H */ + -diff --git a/arch/mips/pci/ifxmips_pcie_reg.h b/arch/mips/pci/ifxmips_pcie_reg.h -new file mode 100644 -index 0000000..e7e4b6c --- /dev/null +++ b/arch/mips/pci/ifxmips_pcie_reg.h @@ -0,0 +1,1001 @@ @@ -4425,9 +4387,6 @@ index 0000000..e7e4b6c + +#endif /* IFXMIPS_PCIE_REG_H */ + -diff --git a/arch/mips/pci/ifxmips_pcie_vr9.h b/arch/mips/pci/ifxmips_pcie_vr9.h -new file mode 100644 -index 0000000..57d9368 --- /dev/null +++ b/arch/mips/pci/ifxmips_pcie_vr9.h @@ -0,0 +1,271 @@ @@ -4702,8 +4661,6 @@ index 0000000..57d9368 + +#endif /* IFXMIPS_PCIE_VR9_H */ + -diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c -index 04e35bc..2e85529 100644 --- a/arch/mips/pci/pci.c +++ b/arch/mips/pci/pci.c @@ -250,6 +250,31 @@ static int __init pcibios_init(void) @@ -4738,8 +4695,6 @@ index 04e35bc..2e85529 100644 static int pcibios_enable_resources(struct pci_dev *dev, int mask) { u16 cmd, old_cmd; -diff --git a/drivers/pci/pcie/aer/Kconfig b/drivers/pci/pcie/aer/Kconfig -index 50e94e0..4bf848f 100644 --- a/drivers/pci/pcie/aer/Kconfig +++ b/drivers/pci/pcie/aer/Kconfig @@ -5,7 +5,7 @@ @@ -4751,11 +4706,9 @@ index 50e94e0..4bf848f 100644 help This enables PCI Express Root Port Advanced Error Reporting (AER) driver support. Error reporting messages sent to Root -diff --git a/include/linux/pci.h b/include/linux/pci.h -index ee21795..0d08026 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h -@@ -1038,6 +1038,8 @@ void pci_walk_bus(struct pci_bus *top, int (*cb)(struct pci_dev *, void *), +@@ -1038,6 +1038,8 @@ void pci_walk_bus(struct pci_bus *top, i int pci_cfg_space_size_ext(struct pci_dev *dev); int pci_cfg_space_size(struct pci_dev *dev); unsigned char pci_bus_max_busnr(struct pci_bus *bus); @@ -4764,8 +4717,6 @@ index ee21795..0d08026 100644 void pci_setup_bridge(struct pci_bus *bus); resource_size_t pcibios_window_alignment(struct pci_bus *bus, unsigned long type); -diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h -index 9d36b82..493ada4 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1040,6 +1040,12 @@ @@ -4781,6 +4732,3 @@ index 9d36b82..493ada4 100644 #define PCI_VENDOR_ID_WINBOND 0x10ad #define PCI_DEVICE_ID_WINBOND_82C105 0x0105 #define PCI_DEVICE_ID_WINBOND_83C553 0x0565 --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.7/0123-USB-fix-roothub-for-IFXHCD.patch b/target/linux/lantiq/patches-3.7/0123-USB-fix-roothub-for-IFXHCD.patch index 0d1feb59a..d4eae8ba4 100644 --- a/target/linux/lantiq/patches-3.7/0123-USB-fix-roothub-for-IFXHCD.patch +++ b/target/linux/lantiq/patches-3.7/0123-USB-fix-roothub-for-IFXHCD.patch @@ -7,11 +7,9 @@ Subject: [PATCH 123/123] USB: fix roothub for IFXHCD drivers/usb/core/hub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-3.7-rc8/drivers/usb/core/hub.c -=================================================================== ---- linux-3.7-rc8.orig/drivers/usb/core/hub.c 2012-12-03 20:22:37.000000000 +0100 -+++ linux-3.7-rc8/drivers/usb/core/hub.c 2012-12-10 23:37:16.658956109 +0100 -@@ -3839,7 +3839,7 @@ +--- a/drivers/usb/core/hub.c ++++ b/drivers/usb/core/hub.c +@@ -3906,7 +3906,7 @@ hub_port_init (struct usb_hub *hub, stru udev->ttport = hdev->ttport; } else if (udev->speed != USB_SPEED_HIGH && hdev->speed == USB_SPEED_HIGH) { @@ -20,11 +18,9 @@ Index: linux-3.7-rc8/drivers/usb/core/hub.c dev_err(&udev->dev, "parent hub has no TT\n"); retval = -EINVAL; goto fail; -Index: linux-3.7-rc8/arch/mips/lantiq/Kconfig -=================================================================== ---- linux-3.7-rc8.orig/arch/mips/lantiq/Kconfig 2012-12-10 23:37:16.622956108 +0100 -+++ linux-3.7-rc8/arch/mips/lantiq/Kconfig 2012-12-11 13:58:10.816251053 +0100 -@@ -3,6 +3,7 @@ +--- a/arch/mips/lantiq/Kconfig ++++ b/arch/mips/lantiq/Kconfig +@@ -3,6 +3,7 @@ if LANTIQ config SOC_TYPE_XWAY bool select PINCTRL_XWAY diff --git a/target/linux/lantiq/patches-3.7/0124-pci_fix.patch b/target/linux/lantiq/patches-3.7/0124-pci_fix.patch index 013dac76c..831989e16 100644 --- a/target/linux/lantiq/patches-3.7/0124-pci_fix.patch +++ b/target/linux/lantiq/patches-3.7/0124-pci_fix.patch @@ -1,8 +1,6 @@ -Index: linux-3.7-rc8/arch/mips/pci/pci-lantiq.c -=================================================================== ---- linux-3.7-rc8.orig/arch/mips/pci/pci-lantiq.c 2012-12-03 20:22:37.000000000 +0100 -+++ linux-3.7-rc8/arch/mips/pci/pci-lantiq.c 2012-12-14 23:28:24.355606776 +0100 -@@ -129,8 +129,15 @@ +--- a/arch/mips/pci/pci-lantiq.c ++++ b/arch/mips/pci/pci-lantiq.c +@@ -129,8 +129,15 @@ static int __devinit ltq_pci_startup(str /* setup reset gpio used by pci */ reset_gpio = of_get_named_gpio(node, "gpio-reset", 0); diff --git a/target/linux/lantiq/patches-3.7/0125-falcon-pad.patch b/target/linux/lantiq/patches-3.7/0125-falcon-pad.patch index 5aa390ec4..2fbe0c7be 100644 --- a/target/linux/lantiq/patches-3.7/0125-falcon-pad.patch +++ b/target/linux/lantiq/patches-3.7/0125-falcon-pad.patch @@ -1,8 +1,6 @@ -Index: linux-3.7-rc8/drivers/pinctrl/pinctrl-falcon.c -=================================================================== ---- linux-3.7-rc8.orig/drivers/pinctrl/pinctrl-falcon.c 2012-12-03 20:22:37.000000000 +0100 -+++ linux-3.7-rc8/drivers/pinctrl/pinctrl-falcon.c 2012-12-16 10:57:21.454809078 +0100 -@@ -398,6 +398,9 @@ +--- a/drivers/pinctrl/pinctrl-falcon.c ++++ b/drivers/pinctrl/pinctrl-falcon.c +@@ -398,6 +398,9 @@ static int pinctrl_falcon_probe(struct p u32 avail; int pins; diff --git a/target/linux/lantiq/patches-3.7/0126-lantiq_etop-Change-MDIO-clock.patch b/target/linux/lantiq/patches-3.7/0126-lantiq_etop-Change-MDIO-clock.patch index 79fdd2bc5..b9488a125 100644 --- a/target/linux/lantiq/patches-3.7/0126-lantiq_etop-Change-MDIO-clock.patch +++ b/target/linux/lantiq/patches-3.7/0126-lantiq_etop-Change-MDIO-clock.patch @@ -9,8 +9,6 @@ with the ar8316 switch. drivers/net/ethernet/lantiq_etop.c | 8 ++++++++ 1 file changed, 8 insertions(+) -diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c -index e695f71..fc963f6 100644 --- a/drivers/net/ethernet/lantiq_etop.c +++ b/drivers/net/ethernet/lantiq_etop.c @@ -83,6 +83,7 @@ @@ -32,7 +30,7 @@ index e695f71..fc963f6 100644 /* register information for the gbit's MDIO bus */ #define MDIO_XR9_REQUEST 0x00008000 #define MDIO_XR9_READ 0x00000800 -@@ -329,6 +334,9 @@ ltq_etop_gbit_init(struct net_device *dev) +@@ -329,6 +334,9 @@ ltq_etop_gbit_init(struct net_device *de /* Due to traffic halt when burst length 8, replace default IPG value with 0x3B */ ltq_gbit_w32(0x3B, LTQ_GBIT_PMAC_RX_IPG); @@ -42,6 +40,3 @@ index e695f71..fc963f6 100644 } static int --- -1.7.11.7 - diff --git a/target/linux/lantiq/patches-3.7/0127-lantiq_etop-Fix-supported-modes-flag.patch b/target/linux/lantiq/patches-3.7/0127-lantiq_etop-Fix-supported-modes-flag.patch index 73394fc60..20e1a7556 100644 --- a/target/linux/lantiq/patches-3.7/0127-lantiq_etop-Fix-supported-modes-flag.patch +++ b/target/linux/lantiq/patches-3.7/0127-lantiq_etop-Fix-supported-modes-flag.patch @@ -7,11 +7,9 @@ Subject: [PATCH 2/2] lantiq_etop: Fix supported modes flag drivers/net/ethernet/lantiq_etop.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) -diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c -index fc963f6..b50b91e 100644 --- a/drivers/net/ethernet/lantiq_etop.c +++ b/drivers/net/ethernet/lantiq_etop.c -@@ -551,6 +551,13 @@ ltq_etop_mdio_probe(struct net_device *dev) +@@ -550,6 +550,13 @@ ltq_etop_mdio_probe(struct net_device *d { struct ltq_etop_priv *priv = netdev_priv(dev); struct phy_device *phydev = NULL; @@ -25,7 +23,7 @@ index fc963f6..b50b91e 100644 if (of_machine_is_compatible("lantiq,ase")) phydev = priv->mii_bus->phy_map[8]; -@@ -570,17 +577,11 @@ ltq_etop_mdio_probe(struct net_device *dev) +@@ -569,17 +576,11 @@ ltq_etop_mdio_probe(struct net_device *d return PTR_ERR(phydev); } @@ -46,6 +44,3 @@ index fc963f6..b50b91e 100644 phydev->advertising = phydev->supported; priv->phydev = phydev; pr_info("%s: attached PHY [%s] (phy_addr=%s, irq=%d)\n", --- -1.7.11.7 - diff --git a/target/linux/lantiq/patches-3.7/0300-owrt-mtd-split.patch b/target/linux/lantiq/patches-3.7/0300-owrt-mtd-split.patch index 4f69ef96b..ee5fa7346 100644 --- a/target/linux/lantiq/patches-3.7/0300-owrt-mtd-split.patch +++ b/target/linux/lantiq/patches-3.7/0300-owrt-mtd-split.patch @@ -10,10 +10,6 @@ Subject: [PATCH 19/25] owrt mtd split drivers/mtd/mtdpart.c | 173 +++++++++++++++++++- 4 files changed, 184 insertions(+), 1 deletions(-) -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 1ec8f2a..1ff93cc 100644 -diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig -index 982a98b..e2f3f3e 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig @@ -31,6 +31,10 @@ config MTD_ROOTFS_SPLIT @@ -27,11 +23,9 @@ index 982a98b..e2f3f3e 100644 config MTD_REDBOOT_PARTS tristate "RedBoot partition table parsing" ---help--- -diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c -index 855b70b..93711e2 100644 --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -867,6 +867,168 @@ static int refresh_rootfs_split(struct mtd_info *mtd) +@@ -844,6 +844,168 @@ static int refresh_rootfs_split(struct m } #endif /* CONFIG_MTD_ROOTFS_SPLIT */ @@ -200,7 +194,7 @@ index 855b70b..93711e2 100644 /* * 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 -@@ -883,7 +1045,7 @@ int add_mtd_partitions(struct mtd_info *master, +@@ -860,7 +1022,7 @@ int add_mtd_partitions(struct mtd_info * struct mtd_part *slave; uint64_t cur_offset = 0; int i; @@ -209,7 +203,7 @@ index 855b70b..93711e2 100644 int ret; #endif -@@ -900,6 +1062,15 @@ int add_mtd_partitions(struct mtd_info *master, +@@ -877,6 +1039,15 @@ int add_mtd_partitions(struct mtd_info * add_mtd_device(&slave->mtd); @@ -225,6 +219,3 @@ index 855b70b..93711e2 100644 if (!strcmp(parts[i].name, "rootfs")) { #ifdef CONFIG_MTD_ROOTFS_ROOT_DEV if (ROOT_DEV == 0) { --- -1.7.9.1 - diff --git a/target/linux/lantiq/patches-3.7/0301-gptu.patch b/target/linux/lantiq/patches-3.7/0301-gptu.patch index 33fb0fb86..77fcb68f4 100644 --- a/target/linux/lantiq/patches-3.7/0301-gptu.patch +++ b/target/linux/lantiq/patches-3.7/0301-gptu.patch @@ -1,7 +1,5 @@ -Index: linux-3.7.1/arch/mips/lantiq/xway/timer.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1/arch/mips/lantiq/xway/timer.c 2012-12-18 22:24:36.133175326 +0100 +--- /dev/null ++++ b/arch/mips/lantiq/xway/timer.c @@ -0,0 +1,841 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -844,10 +842,8 @@ Index: linux-3.7.1/arch/mips/lantiq/xway/timer.c + +module_init(lq_gptu_init); +module_exit(lq_gptu_exit); -Index: linux-3.7.1/arch/mips/include/asm/mach-lantiq/lantiq_timer.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.1/arch/mips/include/asm/mach-lantiq/lantiq_timer.h 2012-12-18 20:47:56.625037132 +0100 +--- /dev/null ++++ b/arch/mips/include/asm/mach-lantiq/lantiq_timer.h @@ -0,0 +1,155 @@ +#ifndef __DANUBE_GPTU_DEV_H__2005_07_26__10_19__ +#define __DANUBE_GPTU_DEV_H__2005_07_26__10_19__ @@ -1004,10 +1000,8 @@ Index: linux-3.7.1/arch/mips/include/asm/mach-lantiq/lantiq_timer.h + u32 reload, unsigned long arg1, unsigned long arg2); + +#endif /* __DANUBE_GPTU_DEV_H__2005_07_26__10_19__ */ -Index: linux-3.7.1/arch/mips/lantiq/xway/Makefile -=================================================================== ---- linux-3.7.1.orig/arch/mips/lantiq/xway/Makefile 2012-12-18 20:48:40.717038183 +0100 -+++ linux-3.7.1/arch/mips/lantiq/xway/Makefile 2012-12-18 22:24:48.965175632 +0100 +--- a/arch/mips/lantiq/xway/Makefile ++++ b/arch/mips/lantiq/xway/Makefile @@ -1,3 +1,3 @@ -obj-y := prom.o sysctrl.o clk.o reset.o dma.o gptu.o dcdc.o +obj-y := prom.o sysctrl.o clk.o reset.o dma.o timer.o dcdc.o diff --git a/target/linux/lantiq/patches-3.7/0302-wifi-eep.patch b/target/linux/lantiq/patches-3.7/0302-wifi-eep.patch index 429d0e92c..7233e52fd 100644 --- a/target/linux/lantiq/patches-3.7/0302-wifi-eep.patch +++ b/target/linux/lantiq/patches-3.7/0302-wifi-eep.patch @@ -1,7 +1,5 @@ -Index: linux-3.7.4/arch/mips/lantiq/xway/Makefile -=================================================================== ---- linux-3.7.4.orig/arch/mips/lantiq/xway/Makefile 2013-01-28 18:08:39.000000000 +0100 -+++ linux-3.7.4/arch/mips/lantiq/xway/Makefile 2013-01-28 18:10:31.416141818 +0100 +--- a/arch/mips/lantiq/xway/Makefile ++++ b/arch/mips/lantiq/xway/Makefile @@ -1,3 +1,6 @@ obj-y := prom.o sysctrl.o clk.o reset.o dma.o timer.o dcdc.o @@ -9,10 +7,8 @@ Index: linux-3.7.4/arch/mips/lantiq/xway/Makefile +obj-$(CONFIG_PCI) += ath_eep.o rt_eep.o pci-ath-fixup.o + obj-$(CONFIG_XRX200_PHY_FW) += xrx200_phy_fw.o -Index: linux-3.7.4/arch/mips/lantiq/xway/ath_eep.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.4/arch/mips/lantiq/xway/ath_eep.c 2013-01-28 18:13:43.256146389 +0100 +--- /dev/null ++++ b/arch/mips/lantiq/xway/ath_eep.c @@ -0,0 +1,206 @@ +/* + * Copyright (C) 2011 Luca Olivetti <luca@ventoso.org> @@ -220,11 +216,9 @@ Index: linux-3.7.4/arch/mips/lantiq/xway/ath_eep.c + return platform_driver_probe(&ath5k_eeprom_driver, of_ath5k_eeprom_probe); +} +device_initcall(of_ath5k_eeprom_init); -Index: linux-3.7.4/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h -=================================================================== ---- linux-3.7.4.orig/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h 2013-01-28 18:08:38.000000000 +0100 -+++ linux-3.7.4/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h 2013-01-28 18:10:03.616141155 +0100 -@@ -90,5 +90,8 @@ +--- a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h ++++ b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h +@@ -90,5 +90,8 @@ int xrx200_gphy_boot(struct device *dev, extern void ltq_pmu_enable(unsigned int module); extern void ltq_pmu_disable(unsigned int module); @@ -233,10 +227,8 @@ Index: linux-3.7.4/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h + #endif /* CONFIG_SOC_TYPE_XWAY */ #endif /* _LTQ_XWAY_H__ */ -Index: linux-3.7.4/arch/mips/lantiq/xway/eth_mac.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.4/arch/mips/lantiq/xway/eth_mac.c 2013-01-28 18:10:03.620141154 +0100 +--- /dev/null ++++ b/arch/mips/lantiq/xway/eth_mac.c @@ -0,0 +1,76 @@ +/* + * Copyright (C) 2012 John Crispin <blogic@openwrt.org> @@ -314,11 +306,9 @@ Index: linux-3.7.4/arch/mips/lantiq/xway/eth_mac.c + return platform_driver_probe(ð_mac_driver, of_eth_mac_probe); +} +device_initcall(of_eth_mac_init); -Index: linux-3.7.4/drivers/net/ethernet/lantiq_etop.c -=================================================================== ---- linux-3.7.4.orig/drivers/net/ethernet/lantiq_etop.c 2013-01-28 18:08:39.000000000 +0100 -+++ linux-3.7.4/drivers/net/ethernet/lantiq_etop.c 2013-01-28 18:10:03.620141154 +0100 -@@ -825,7 +825,8 @@ +--- a/drivers/net/ethernet/lantiq_etop.c ++++ b/drivers/net/ethernet/lantiq_etop.c +@@ -825,7 +825,8 @@ ltq_etop_init(struct net_device *dev) ltq_etop_change_mtu(dev, 1500); @@ -328,7 +318,7 @@ Index: linux-3.7.4/drivers/net/ethernet/lantiq_etop.c if (!is_valid_ether_addr(mac.sa_data)) { pr_warn("etop: invalid MAC, using random\n"); random_ether_addr(mac.sa_data); -@@ -949,7 +950,9 @@ +@@ -949,7 +950,9 @@ ltq_etop_probe(struct platform_device *p priv->tx_irq = irqres[0].start; priv->rx_irq = irqres[1].start; priv->mii_mode = of_get_phy_mode(pdev->dev.of_node); @@ -339,10 +329,8 @@ Index: linux-3.7.4/drivers/net/ethernet/lantiq_etop.c priv->clk_ppe = clk_get(&pdev->dev, NULL); if (IS_ERR(priv->clk_ppe)) -Index: linux-3.7.4/arch/mips/lantiq/xway/rt_eep.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.4/arch/mips/lantiq/xway/rt_eep.c 2013-01-28 18:10:03.620141154 +0100 +--- /dev/null ++++ b/arch/mips/lantiq/xway/rt_eep.c @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2011 John Crispin <blogic@openwrt.org> @@ -404,10 +392,8 @@ Index: linux-3.7.4/arch/mips/lantiq/xway/rt_eep.c + return platform_driver_probe(&ralink_eeprom_driver, of_ralink_eeprom_probe); +} +device_initcall(of_ralink_eeprom_init); -Index: linux-3.7.4/arch/mips/include/asm/mach-lantiq/pci-ath-fixup.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.4/arch/mips/include/asm/mach-lantiq/pci-ath-fixup.h 2013-01-28 18:10:03.620141154 +0100 +--- /dev/null ++++ b/arch/mips/include/asm/mach-lantiq/pci-ath-fixup.h @@ -0,0 +1,6 @@ +#ifndef _PCI_ATH_FIXUP +#define _PCI_ATH_FIXUP @@ -415,10 +401,8 @@ Index: linux-3.7.4/arch/mips/include/asm/mach-lantiq/pci-ath-fixup.h +void ltq_pci_ath_fixup(unsigned slot, u16 *cal_data) __init; + +#endif /* _PCI_ATH_FIXUP */ -Index: linux-3.7.4/arch/mips/lantiq/xway/pci-ath-fixup.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.4/arch/mips/lantiq/xway/pci-ath-fixup.c 2013-01-28 18:10:03.624141153 +0100 +--- /dev/null ++++ b/arch/mips/lantiq/xway/pci-ath-fixup.c @@ -0,0 +1,109 @@ +/* + * Atheros AP94 reference board PCI initialization diff --git a/target/linux/lantiq/patches-3.7/0303-vmmc.patch b/target/linux/lantiq/patches-3.7/0303-vmmc.patch index c9af85bc8..0d6d0e841 100644 --- a/target/linux/lantiq/patches-3.7/0303-vmmc.patch +++ b/target/linux/lantiq/patches-3.7/0303-vmmc.patch @@ -1,7 +1,5 @@ -Index: linux-3.7.4/arch/mips/lantiq/xway/Makefile -=================================================================== ---- linux-3.7.4.orig/arch/mips/lantiq/xway/Makefile 2013-01-28 18:10:31.000000000 +0100 -+++ linux-3.7.4/arch/mips/lantiq/xway/Makefile 2013-01-28 18:14:12.224147075 +0100 +--- a/arch/mips/lantiq/xway/Makefile ++++ b/arch/mips/lantiq/xway/Makefile @@ -1,6 +1,6 @@ obj-y := prom.o sysctrl.o clk.o reset.o dma.o timer.o dcdc.o @@ -10,10 +8,8 @@ Index: linux-3.7.4/arch/mips/lantiq/xway/Makefile obj-$(CONFIG_PCI) += ath_eep.o rt_eep.o pci-ath-fixup.o obj-$(CONFIG_XRX200_PHY_FW) += xrx200_phy_fw.o -Index: linux-3.7.4/arch/mips/lantiq/xway/vmmc.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7.4/arch/mips/lantiq/xway/vmmc.c 2013-01-28 18:13:53.128146621 +0100 +--- /dev/null ++++ b/arch/mips/lantiq/xway/vmmc.c @@ -0,0 +1,63 @@ +/* + * This program is free software; you can redistribute it and/or modify it diff --git a/target/linux/lantiq/patches-3.7/0304-etop.patch b/target/linux/lantiq/patches-3.7/0304-etop.patch index df6989457..9d17649f4 100644 --- a/target/linux/lantiq/patches-3.7/0304-etop.patch +++ b/target/linux/lantiq/patches-3.7/0304-etop.patch @@ -1,8 +1,6 @@ -Index: linux-3.7.1/drivers/net/ethernet/lantiq_etop.c -=================================================================== ---- linux-3.7.1.orig/drivers/net/ethernet/lantiq_etop.c 2012-12-19 17:06:46.282857707 +0100 -+++ linux-3.7.1/drivers/net/ethernet/lantiq_etop.c 2012-12-19 17:09:26.710861534 +0100 -@@ -335,16 +335,17 @@ +--- a/drivers/net/ethernet/lantiq_etop.c ++++ b/drivers/net/ethernet/lantiq_etop.c +@@ -343,16 +343,17 @@ static int ltq_etop_hw_init(struct net_device *dev) { struct ltq_etop_priv *priv = netdev_priv(dev); @@ -22,7 +20,7 @@ Index: linux-3.7.1/drivers/net/ethernet/lantiq_etop.c case PHY_INTERFACE_MODE_RMII: ltq_etop_w32_mask(ETOP_MII_MASK, ETOP_MII_REVERSE, LTQ_ETOP_CFG); -@@ -369,7 +370,7 @@ +@@ -377,7 +378,7 @@ ltq_etop_hw_init(struct net_device *dev) break; } netdev_err(dev, "unknown mii mode %d\n", |