From: Jonas Gorski Date: Sun, 30 Jun 2013 13:10:12 +0000 (+0000) Subject: kernel: update linux 3.9 to 3.9.8 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0d9f760f272f3ccb3abcaca8e678734b666e234c;p=openwrt%2Fstaging%2Fadrian.git kernel: update linux 3.9 to 3.9.8 Includes memory allocation fixes as well as several networking fixes. Signed-off-by: Jonas Gorski SVN-Revision: 37103 --- diff --git a/include/kernel-version.mk b/include/kernel-version.mk index c5940f6ff6..1911176a6e 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -14,8 +14,8 @@ endif ifeq ($(LINUX_VERSION),3.8.13) LINUX_KERNEL_MD5SUM:=2af19d06cd47ec459519159cdd10542d endif -ifeq ($(LINUX_VERSION),3.9.4) - LINUX_KERNEL_MD5SUM:=053095dfe88fbd52e7cc8db302631d99 +ifeq ($(LINUX_VERSION),3.9.8) + LINUX_KERNEL_MD5SUM:=04d74575ef1c484ad00be61f32bb4557 endif # disable the md5sum check for unknown kernel versions diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile index 5c8bb43b4c..d875a7a5bb 100644 --- a/target/linux/ar7/Makefile +++ b/target/linux/ar7/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs atm MAINTAINER:=Florian Fainelli SUBTARGETS:=generic ac49x -LINUX_VERSION:=3.9.4 +LINUX_VERSION:=3.9.8 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile index 0d2389ab49..f47b505ca8 100644 --- a/target/linux/brcm63xx/Makefile +++ b/target/linux/brcm63xx/Makefile @@ -11,7 +11,7 @@ BOARD:=brcm63xx BOARDNAME:=Broadcom BCM63xx SUBTARGETS:=generic smp FEATURES:=squashfs usb atm pci pcmcia -LINUX_VERSION:=3.9.4 +LINUX_VERSION:=3.9.8 MAINTAINER:=Florian Fainelli include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/gemini/Makefile b/target/linux/gemini/Makefile index 0fcc13ae2c..9da59cbc5f 100644 --- a/target/linux/gemini/Makefile +++ b/target/linux/gemini/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs pci CFLAGS:=-Os -pipe -march=armv4 -mtune=fa526 -fno-caller-saves MAINTAINER:=Imre Kaloz -LINUX_VERSION:=3.9.4 +LINUX_VERSION:=3.9.8 KERNELNAME:="zImage" diff --git a/target/linux/generic/patches-3.9/220-gc_sections.patch b/target/linux/generic/patches-3.9/220-gc_sections.patch index 59bdac50b9..4150d7ceaa 100644 --- a/target/linux/generic/patches-3.9/220-gc_sections.patch +++ b/target/linux/generic/patches-3.9/220-gc_sections.patch @@ -513,4 +513,4 @@ +KBUILD_CFLAGS_KERNEL := $(patsubst -f%-sections,,$(KBUILD_CFLAGS_KERNEL)) ccflags-y := -fpic -mno-single-pic-base -fno-builtin -I$(obj) - asflags-y := -Wa,-march=all -DZIMAGE + asflags-y := -DZIMAGE diff --git a/target/linux/generic/patches-3.9/630-packet_socket_type.patch b/target/linux/generic/patches-3.9/630-packet_socket_type.patch index 394eb2f50d..9b700f5150 100644 --- a/target/linux/generic/patches-3.9/630-packet_socket_type.patch +++ b/target/linux/generic/patches-3.9/630-packet_socket_type.patch @@ -26,7 +26,7 @@ Signed-off-by: Felix Fietkau #define PACKET_FANOUT_LB 1 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c -@@ -1266,6 +1266,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1267,6 +1267,7 @@ static int packet_rcv_spkt(struct sk_buf { struct sock *sk; struct sockaddr_pkt *spkt; @@ -34,7 +34,7 @@ Signed-off-by: Felix Fietkau /* * When we registered the protocol we saved the socket in the data -@@ -1273,6 +1274,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1274,6 +1275,7 @@ static int packet_rcv_spkt(struct sk_buf */ sk = pt->af_packet_priv; @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau /* * Yank back the headers [hope the device set this -@@ -1285,7 +1287,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1286,7 +1288,7 @@ static int packet_rcv_spkt(struct sk_buf * so that this procedure is noop. */ @@ -51,7 +51,7 @@ Signed-off-by: Felix Fietkau goto out; if (!net_eq(dev_net(dev), sock_net(sk))) -@@ -1491,12 +1493,12 @@ static int packet_rcv(struct sk_buff *sk +@@ -1498,12 +1500,12 @@ static int packet_rcv(struct sk_buff *sk int skb_len = skb->len; unsigned int snaplen, res; @@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -1615,12 +1617,12 @@ static int tpacket_rcv(struct sk_buff *s +@@ -1622,12 +1624,12 @@ static int tpacket_rcv(struct sk_buff *s struct timespec ts; struct skb_shared_hwtstamps *shhwtstamps = skb_hwtstamps(skb); @@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -2532,6 +2534,7 @@ static int packet_create(struct net *net +@@ -2553,6 +2555,7 @@ static int packet_create(struct net *net spin_lock_init(&po->bind_lock); mutex_init(&po->pg_vec_lock); po->prot_hook.func = packet_rcv; @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -3145,6 +3148,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3165,6 +3168,16 @@ packet_setsockopt(struct socket *sock, i po->tp_tx_has_off = !!val; return 0; } @@ -108,7 +108,7 @@ Signed-off-by: Felix Fietkau default: return -ENOPROTOOPT; } -@@ -3199,6 +3212,13 @@ static int packet_getsockopt(struct sock +@@ -3219,6 +3232,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; diff --git a/target/linux/generic/patches-3.9/643-bridge_remove_ipv6_dependency.patch b/target/linux/generic/patches-3.9/643-bridge_remove_ipv6_dependency.patch index 428713b530..c42c57ccf7 100644 --- a/target/linux/generic/patches-3.9/643-bridge_remove_ipv6_dependency.patch +++ b/target/linux/generic/patches-3.9/643-bridge_remove_ipv6_dependency.patch @@ -49,7 +49,7 @@ int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr, unsigned char banned_flags) -@@ -4947,6 +4946,9 @@ int __init addrconf_init(void) +@@ -4949,6 +4948,9 @@ int __init addrconf_init(void) ipv6_addr_label_rtnl_register(); @@ -59,7 +59,7 @@ return 0; errout: rtnl_af_unregister(&inet6_ops); -@@ -4965,6 +4967,9 @@ void addrconf_cleanup(void) +@@ -4967,6 +4969,9 @@ void addrconf_cleanup(void) struct net_device *dev; int i; diff --git a/target/linux/generic/patches-3.9/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/patches-3.9/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch index 254ab670f9..60448e2ac4 100644 --- a/target/linux/generic/patches-3.9/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch +++ b/target/linux/generic/patches-3.9/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch @@ -1,5 +1,3 @@ -diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h -index 005e2c2..a6a1df4 100644 --- a/include/net/netns/ipv6.h +++ b/include/net/netns/ipv6.h @@ -55,6 +55,7 @@ struct netns_ipv6 { @@ -10,8 +8,6 @@ index 005e2c2..a6a1df4 100644 struct rt6_info *ip6_blk_hole_entry; struct fib6_table *fib6_local_tbl; struct fib_rules_ops *fib6_rules_ops; -diff --git a/include/uapi/linux/fib_rules.h b/include/uapi/linux/fib_rules.h -index 51da65b..1429852 100644 --- a/include/uapi/linux/fib_rules.h +++ b/include/uapi/linux/fib_rules.h @@ -64,6 +64,10 @@ enum { @@ -25,8 +21,6 @@ index 51da65b..1429852 100644 __FR_ACT_MAX, }; -diff --git a/include/uapi/linux/icmpv6.h b/include/uapi/linux/icmpv6.h -index e0133c7..dabfa1a 100644 --- a/include/uapi/linux/icmpv6.h +++ b/include/uapi/linux/icmpv6.h @@ -115,6 +115,7 @@ struct icmp6hdr { @@ -37,8 +31,6 @@ index e0133c7..dabfa1a 100644 /* * Codes for Time Exceeded -diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h -index 7a2144e..8f643f1 100644 --- a/include/uapi/linux/rtnetlink.h +++ b/include/uapi/linux/rtnetlink.h @@ -203,6 +203,7 @@ enum { @@ -49,11 +41,9 @@ index 7a2144e..8f643f1 100644 __RTN_MAX }; -diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c -index 26aa65d..2f66341 100644 --- a/net/ipv4/fib_rules.c +++ b/net/ipv4/fib_rules.c -@@ -84,6 +84,10 @@ static int fib4_rule_action(struct fib_rule *rule, struct flowi *flp, +@@ -84,6 +84,10 @@ static int fib4_rule_action(struct fib_r err = -EACCES; goto errout; @@ -64,11 +54,9 @@ index 26aa65d..2f66341 100644 case FR_ACT_BLACKHOLE: default: err = -EINVAL; -diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c -index 8f6cb7a..dbae75d 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c -@@ -138,6 +138,10 @@ const struct fib_prop fib_props[RTN_MAX + 1] = { +@@ -138,6 +138,10 @@ const struct fib_prop fib_props[RTN_MAX .error = -EINVAL, .scope = RT_SCOPE_NOWHERE, }, @@ -79,11 +67,9 @@ index 8f6cb7a..dbae75d 100644 }; static void rt_fibinfo_free(struct rtable __rcu **rtp) -diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c -index 49616fe..e2845bd 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c -@@ -2343,6 +2343,7 @@ static const char *const rtn_type_names[__RTN_MAX] = { +@@ -2343,6 +2343,7 @@ static const char *const rtn_type_names[ [RTN_THROW] = "THROW", [RTN_NAT] = "NAT", [RTN_XRESOLVE] = "XRESOLVE", @@ -91,11 +77,9 @@ index 49616fe..e2845bd 100644 }; static inline const char *rtn_type(char *buf, size_t len, unsigned int t) -diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c -index df97f0a..2bd33cc 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c -@@ -181,6 +181,7 @@ static int ipmr_rule_action(struct fib_rule *rule, struct flowi *flp, +@@ -181,6 +181,7 @@ static int ipmr_rule_action(struct fib_r case FR_ACT_UNREACHABLE: return -ENETUNREACH; case FR_ACT_PROHIBIT: @@ -103,11 +87,9 @@ index df97f0a..2bd33cc 100644 return -EACCES; case FR_ACT_BLACKHOLE: default: -diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c -index 2e1a432..c4413b2 100644 --- a/net/ipv6/fib6_rules.c +++ b/net/ipv6/fib6_rules.c -@@ -69,6 +69,9 @@ static int fib6_rule_action(struct fib_rule *rule, struct flowi *flp, +@@ -69,6 +69,9 @@ static int fib6_rule_action(struct fib_r case FR_ACT_PROHIBIT: rt = net->ipv6.ip6_prohibit_entry; goto discard_pkt; @@ -117,11 +99,9 @@ index 2e1a432..c4413b2 100644 } table = fib6_get_table(net, rule->table); -diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c -index 583e8d4..1e524da 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c -@@ -166,6 +166,8 @@ static int ip6mr_rule_action(struct fib_rule *rule, struct flowi *flp, +@@ -166,6 +166,8 @@ static int ip6mr_rule_action(struct fib_ return -ENETUNREACH; case FR_ACT_PROHIBIT: return -EACCES; @@ -130,11 +110,9 @@ index 583e8d4..1e524da 100644 case FR_ACT_BLACKHOLE: default: return -EINVAL; -diff --git a/net/ipv6/route.c b/net/ipv6/route.c -index 2b87418..864f5fe 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c -@@ -245,6 +245,24 @@ static const struct rt6_info ip6_prohibit_entry_template = { +@@ -245,6 +245,24 @@ static const struct rt6_info ip6_prohibi .rt6i_ref = ATOMIC_INIT(1), }; @@ -159,7 +137,7 @@ index 2b87418..864f5fe 100644 static const struct rt6_info ip6_blk_hole_entry_template = { .dst = { .__refcnt = ATOMIC_INIT(1), -@@ -1459,6 +1477,9 @@ int ip6_route_add(struct fib6_config *cfg) +@@ -1459,6 +1477,9 @@ int ip6_route_add(struct fib6_config *cf case RTN_THROW: rt->dst.error = -EAGAIN; break; @@ -169,7 +147,7 @@ index 2b87418..864f5fe 100644 default: rt->dst.error = -ENETUNREACH; break; -@@ -2035,6 +2056,17 @@ static int ip6_pkt_prohibit_out(struct sk_buff *skb) +@@ -2035,6 +2056,17 @@ static int ip6_pkt_prohibit_out(struct s return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES); } @@ -187,7 +165,7 @@ index 2b87418..864f5fe 100644 #endif /* -@@ -2240,7 +2272,8 @@ static int rtm_to_fib6_config(struct sk_buff *skb, struct nlmsghdr *nlh, +@@ -2240,7 +2272,8 @@ static int rtm_to_fib6_config(struct sk_ if (rtm->rtm_type == RTN_UNREACHABLE || rtm->rtm_type == RTN_BLACKHOLE || rtm->rtm_type == RTN_PROHIBIT || @@ -197,7 +175,7 @@ index 2b87418..864f5fe 100644 cfg->fc_flags |= RTF_REJECT; if (rtm->rtm_type == RTN_LOCAL) -@@ -2442,6 +2475,9 @@ static int rt6_fill_node(struct net *net, +@@ -2442,6 +2475,9 @@ static int rt6_fill_node(struct net *net case -EACCES: rtm->rtm_type = RTN_PROHIBIT; break; @@ -207,7 +185,7 @@ index 2b87418..864f5fe 100644 case -EAGAIN: rtm->rtm_type = RTN_THROW; break; -@@ -2692,6 +2728,8 @@ static int ip6_route_dev_notify(struct notifier_block *this, +@@ -2692,6 +2728,8 @@ static int ip6_route_dev_notify(struct n #ifdef CONFIG_IPV6_MULTIPLE_TABLES net->ipv6.ip6_prohibit_entry->dst.dev = dev; net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev); @@ -216,7 +194,7 @@ index 2b87418..864f5fe 100644 net->ipv6.ip6_blk_hole_entry->dst.dev = dev; net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev); #endif -@@ -2952,6 +2990,17 @@ static int __net_init ip6_route_net_init(struct net *net) +@@ -2952,6 +2990,17 @@ static int __net_init ip6_route_net_init net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops; dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst, ip6_template_metrics, true); @@ -243,7 +221,7 @@ index 2b87418..864f5fe 100644 out_ip6_prohibit_entry: kfree(net->ipv6.ip6_prohibit_entry); out_ip6_null_entry: -@@ -2987,6 +3038,7 @@ static void __net_exit ip6_route_net_exit(struct net *net) +@@ -2987,6 +3038,7 @@ static void __net_exit ip6_route_net_exi #ifdef CONFIG_IPV6_MULTIPLE_TABLES kfree(net->ipv6.ip6_prohibit_entry); kfree(net->ipv6.ip6_blk_hole_entry); diff --git a/target/linux/generic/patches-3.9/800-usb-ohci-multiple-platform-driver-fix.patch b/target/linux/generic/patches-3.9/800-usb-ohci-multiple-platform-driver-fix.patch index d691c5156a..95e9b6a028 100644 --- a/target/linux/generic/patches-3.9/800-usb-ohci-multiple-platform-driver-fix.patch +++ b/target/linux/generic/patches-3.9/800-usb-ohci-multiple-platform-driver-fix.patch @@ -1,6 +1,6 @@ --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c -@@ -1188,7 +1188,7 @@ MODULE_LICENSE ("GPL"); +@@ -1192,7 +1192,7 @@ MODULE_LICENSE ("GPL"); #ifdef CONFIG_USB_OHCI_HCD_PLATFORM #include "ohci-platform.c" @@ -9,7 +9,7 @@ #endif #if !defined(PCI_DRIVER) && \ -@@ -1199,7 +1199,8 @@ MODULE_LICENSE ("GPL"); +@@ -1203,7 +1203,8 @@ MODULE_LICENSE ("GPL"); !defined(SA1111_DRIVER) && \ !defined(PS3_SYSTEM_BUS_DRIVER) && \ !defined(SM501_OHCI_DRIVER) && \ @@ -19,7 +19,7 @@ #error "missing bus glue for ohci-hcd" #endif -@@ -1277,9 +1278,19 @@ static int __init ohci_hcd_mod_init(void +@@ -1281,9 +1282,19 @@ static int __init ohci_hcd_mod_init(void goto error_tmio; #endif @@ -39,7 +39,7 @@ #ifdef TMIO_OHCI_DRIVER platform_driver_unregister(&TMIO_OHCI_DRIVER); error_tmio: -@@ -1329,6 +1340,9 @@ module_init(ohci_hcd_mod_init); +@@ -1333,6 +1344,9 @@ module_init(ohci_hcd_mod_init); static void __exit ohci_hcd_mod_exit(void) { diff --git a/target/linux/generic/patches-3.9/902-debloat_proc.patch b/target/linux/generic/patches-3.9/902-debloat_proc.patch index 948b73d0ef..bae40afde3 100644 --- a/target/linux/generic/patches-3.9/902-debloat_proc.patch +++ b/target/linux/generic/patches-3.9/902-debloat_proc.patch @@ -184,7 +184,7 @@ --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c -@@ -2598,10 +2598,12 @@ static const struct file_operations fib_ +@@ -2599,10 +2599,12 @@ static const struct file_operations fib_ int __net_init fib_proc_init(struct net *net) { @@ -199,7 +199,7 @@ &fib_triestat_fops)) goto out2; -@@ -2611,17 +2613,21 @@ int __net_init fib_proc_init(struct net +@@ -2612,17 +2614,21 @@ int __net_init fib_proc_init(struct net return 0; out3: diff --git a/target/linux/imx23/Makefile b/target/linux/imx23/Makefile index 4aacb4918b..0315b273ae 100644 --- a/target/linux/imx23/Makefile +++ b/target/linux/imx23/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Olinuxino i.MX233 FEATURES:=ext4 rtc usb gpio CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s -fno-caller-saves MAINTAINER:=Zoltan HERPAI -LINUX_VERSION:=3.9.4 +LINUX_VERSION:=3.9.8 KERNELNAME:="zImage dtbs" DEPENDS:=+imx-bootlets diff --git a/target/linux/imx23/patches/100-imx23-i2c.patch b/target/linux/imx23/patches/100-imx23-i2c.patch index 096d0acfb6..2a3fa1e3c1 100644 --- a/target/linux/imx23/patches/100-imx23-i2c.patch +++ b/target/linux/imx23/patches/100-imx23-i2c.patch @@ -1,6 +1,5 @@ -diff -ruN linux-3.8.11.orig/arch/arm/boot/dts/imx23.dtsi linux-3.8.11/arch/arm/boot/dts/imx23.dtsi ---- linux-3.8.11.orig/arch/arm/boot/dts/imx23.dtsi 2013-05-01 18:56:10.000000000 +0200 -+++ linux-3.8.11/arch/arm/boot/dts/imx23.dtsi 2013-05-07 01:17:33.000000000 +0200 +--- a/arch/arm/boot/dts/imx23.dtsi ++++ b/arch/arm/boot/dts/imx23.dtsi @@ -292,8 +292,42 @@ fsl,voltage = <1>; fsl,pull-up = <1>; @@ -45,7 +44,7 @@ diff -ruN linux-3.8.11.orig/arch/arm/boot/dts/imx23.dtsi linux-3.8.11/arch/arm/b digctl@8001c000 { reg = <0x8001c000 2000>; status = "disabled"; -@@ -400,8 +434,14 @@ +@@ -402,8 +436,14 @@ status = "disabled"; }; @@ -61,9 +60,8 @@ diff -ruN linux-3.8.11.orig/arch/arm/boot/dts/imx23.dtsi linux-3.8.11/arch/arm/b status = "disabled"; }; -diff -ruN linux-3.8.11.orig/arch/arm/boot/dts/imx23-olinuxino.dts linux-3.8.11/arch/arm/boot/dts/imx23-olinuxino.dts ---- linux-3.8.11.orig/arch/arm/boot/dts/imx23-olinuxino.dts 2013-05-01 18:56:10.000000000 +0200 -+++ linux-3.8.11/arch/arm/boot/dts/imx23-olinuxino.dts 2013-05-07 01:16:41.000000000 +0200 +--- a/arch/arm/boot/dts/imx23-olinuxino.dts ++++ b/arch/arm/boot/dts/imx23-olinuxino.dts @@ -68,6 +68,12 @@ }; diff --git a/target/linux/lantiq/patches-3.9/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch b/target/linux/lantiq/patches-3.9/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch index 927e5e910b..f1ba885df3 100644 --- a/target/linux/lantiq/patches-3.9/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch +++ b/target/linux/lantiq/patches-3.9/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch @@ -12,11 +12,9 @@ Signed-off-by: John Crispin drivers/mtd/devices/m25p80.c | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c -index 5b6b072..3a7a8f7 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -904,10 +904,13 @@ static int m25p_probe(struct spi_device *spi) +@@ -922,10 +922,13 @@ static int m25p_probe(struct spi_device unsigned i; struct mtd_part_parser_data ppdata; struct device_node __maybe_unused *np = spi->dev.of_node; @@ -30,7 +28,7 @@ index 5b6b072..3a7a8f7 100644 #endif /* Platform data helps sort out which chip type we have, as -@@ -983,6 +986,8 @@ static int m25p_probe(struct spi_device *spi) +@@ -1001,6 +1004,8 @@ static int m25p_probe(struct spi_device if (data && data->name) flash->mtd.name = data->name; @@ -39,6 +37,3 @@ index 5b6b072..3a7a8f7 100644 else flash->mtd.name = dev_name(&spi->dev); --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.9/0002-MIPS-lantiq-adds-4dword-burst-length-for-dma.patch b/target/linux/lantiq/patches-3.9/0002-MIPS-lantiq-adds-4dword-burst-length-for-dma.patch index 56e6b4c3dc..102e2d91ad 100644 --- a/target/linux/lantiq/patches-3.9/0002-MIPS-lantiq-adds-4dword-burst-length-for-dma.patch +++ b/target/linux/lantiq/patches-3.9/0002-MIPS-lantiq-adds-4dword-burst-length-for-dma.patch @@ -7,8 +7,6 @@ Subject: [PATCH 02/22] 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 08f7ebd..ccf1451 100644 --- a/arch/mips/lantiq/xway/dma.c +++ b/arch/mips/lantiq/xway/dma.c @@ -48,6 +48,7 @@ @@ -29,6 +27,3 @@ index 08f7ebd..ccf1451 100644 LTQ_DMA_PCTRL); break; --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.9/0003-GPIO-MIPS-add-gpio-driver-for-falcon-SoC.patch b/target/linux/lantiq/patches-3.9/0003-GPIO-MIPS-add-gpio-driver-for-falcon-SoC.patch index 5a1281c302..82f20b7319 100644 --- a/target/linux/lantiq/patches-3.9/0003-GPIO-MIPS-add-gpio-driver-for-falcon-SoC.patch +++ b/target/linux/lantiq/patches-3.9/0003-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 93aaadf..8cc0e74 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -136,6 +136,11 @@ config GPIO_EP93XX @@ -32,11 +30,9 @@ index 93aaadf..8cc0e74 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 22e07bc..f1762be 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile -@@ -24,6 +24,7 @@ obj-$(CONFIG_GPIO_DA9055) += gpio-da9055.o +@@ -24,6 +24,7 @@ obj-$(CONFIG_GPIO_DA9055) += gpio-da9055 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 22e07bc..f1762be 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.9/0004-I2C-MIPS-lantiq-add-FALC-ON-i2c-bus-master.patch b/target/linux/lantiq/patches-3.9/0004-I2C-MIPS-lantiq-add-FALC-ON-i2c-bus-master.patch index 25b2bce58d..fc57b8b0b0 100644 --- a/target/linux/lantiq/patches-3.9/0004-I2C-MIPS-lantiq-add-FALC-ON-i2c-bus-master.patch +++ b/target/linux/lantiq/patches-3.9/0004-I2C-MIPS-lantiq-add-FALC-ON-i2c-bus-master.patch @@ -16,8 +16,6 @@ Signed-off-by: John Crispin 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 adfee98..83d3147 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -494,6 +494,16 @@ config I2C_IOP3XX @@ -37,11 +35,9 @@ index adfee98..83d3147 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 8f4fc23..3273061 100644 --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile -@@ -48,6 +48,7 @@ obj-$(CONFIG_I2C_IBM_IIC) += i2c-ibm_iic.o +@@ -48,6 +48,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 8f4fc23..3273061 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.9/0005-USB-fix-roothub-for-IFXHCD.patch b/target/linux/lantiq/patches-3.9/0005-USB-fix-roothub-for-IFXHCD.patch index 8a4fd09c95..1bc361d731 100644 --- a/target/linux/lantiq/patches-3.9/0005-USB-fix-roothub-for-IFXHCD.patch +++ b/target/linux/lantiq/patches-3.9/0005-USB-fix-roothub-for-IFXHCD.patch @@ -8,8 +8,6 @@ Subject: [PATCH 05/22] USB: fix roothub for IFXHCD drivers/usb/core/hub.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -diff --git a/arch/mips/lantiq/Kconfig b/arch/mips/lantiq/Kconfig -index c002191..675310a 100644 --- a/arch/mips/lantiq/Kconfig +++ b/arch/mips/lantiq/Kconfig @@ -3,6 +3,7 @@ if LANTIQ @@ -20,11 +18,9 @@ index c002191..675310a 100644 default n choice -diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 5480352..9763b0d 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -4016,7 +4016,7 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1, +@@ -4016,7 +4016,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) { @@ -33,6 +29,3 @@ index 5480352..9763b0d 100644 dev_err(&udev->dev, "parent hub has no TT\n"); retval = -EINVAL; goto fail; --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.9/0006-SPI-MIPS-lantiq-adds-spi-xway.patch b/target/linux/lantiq/patches-3.9/0006-SPI-MIPS-lantiq-adds-spi-xway.patch index 008f6ab69d..1c32947fe5 100644 --- a/target/linux/lantiq/patches-3.9/0006-SPI-MIPS-lantiq-adds-spi-xway.patch +++ b/target/linux/lantiq/patches-3.9/0006-SPI-MIPS-lantiq-adds-spi-xway.patch @@ -16,11 +16,9 @@ Signed-off-by: John Crispin 3 files changed, 986 insertions(+) create mode 100644 drivers/spi/spi-xway.c -diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig -index 2be0de9..2c8cd63 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig -@@ -461,6 +461,14 @@ config SPI_NUC900 +@@ -470,6 +470,14 @@ config SPI_NUC900 help SPI driver for Nuvoton NUC900 series ARM SoCs @@ -35,18 +33,13 @@ index 2be0de9..2c8cd63 100644 # # Add new SPI master controllers in alphabetical order above this line # -diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile -index e53c309..f65578d 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile -@@ -71,3 +71,4 @@ obj-$(CONFIG_SPI_TOPCLIFF_PCH) += spi-topcliff-pch.o +@@ -72,3 +72,4 @@ 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..61532e3 --- /dev/null +++ b/drivers/spi/spi-xway.c @@ -0,0 +1,977 @@ @@ -1027,6 +1020,3 @@ index 0000000..61532e3 +MODULE_AUTHOR("Daniel Schwierzeck "); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:spi-xway"); --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.9/0007-NET-MIPS-lantiq-adds-xrx200-net.patch b/target/linux/lantiq/patches-3.9/0007-NET-MIPS-lantiq-adds-xrx200-net.patch index 5f674d22c3..d9f95aba37 100644 --- a/target/linux/lantiq/patches-3.9/0007-NET-MIPS-lantiq-adds-xrx200-net.patch +++ b/target/linux/lantiq/patches-3.9/0007-NET-MIPS-lantiq-adds-xrx200-net.patch @@ -12,8 +12,6 @@ Subject: [PATCH 07/22] NET: MIPS: lantiq: adds xrx200-net create mode 100644 drivers/net/ethernet/lantiq_pce.h create mode 100644 drivers/net/ethernet/lantiq_xrx200.c -diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig -index ed956e0..9261fe4 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -83,7 +83,13 @@ config LANTIQ_ETOP @@ -31,8 +29,6 @@ index ed956e0..9261fe4 100644 source "drivers/net/ethernet/marvell/Kconfig" source "drivers/net/ethernet/mellanox/Kconfig" -diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile -index 8268d85..e8410d8 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -36,6 +36,7 @@ obj-$(CONFIG_IP1000) += icplus/ @@ -43,9 +39,6 @@ index 8268d85..e8410d8 100644 obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/ obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/ obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/ -diff --git a/drivers/net/ethernet/lantiq_pce.h b/drivers/net/ethernet/lantiq_pce.h -new file mode 100644 -index 0000000..0c38efe --- /dev/null +++ b/drivers/net/ethernet/lantiq_pce.h @@ -0,0 +1,163 @@ @@ -212,9 +205,6 @@ index 0000000..0c38efe + MC_ENTRY(0x0000, 0x0000, 39, OUT_NONE, 0, INSTR, FLAG_END, 0), + MC_ENTRY(0x0000, 0x0000, 39, OUT_NONE, 0, INSTR, FLAG_END, 0), +}; -diff --git a/drivers/net/ethernet/lantiq_xrx200.c b/drivers/net/ethernet/lantiq_xrx200.c -new file mode 100644 -index 0000000..ed892d0 --- /dev/null +++ b/drivers/net/ethernet/lantiq_xrx200.c @@ -0,0 +1,1203 @@ @@ -1421,6 +1411,3 @@ index 0000000..ed892d0 +MODULE_AUTHOR("John Crispin "); +MODULE_DESCRIPTION("Lantiq SoC XRX200 ethernet"); +MODULE_LICENSE("GPL"); --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.9/0008-NET-lantiq-adds-PHY11G-firmware-blobs.patch b/target/linux/lantiq/patches-3.9/0008-NET-lantiq-adds-PHY11G-firmware-blobs.patch index fa219306fc..449926a820 100644 --- a/target/linux/lantiq/patches-3.9/0008-NET-lantiq-adds-PHY11G-firmware-blobs.patch +++ b/target/linux/lantiq/patches-3.9/0008-NET-lantiq-adds-PHY11G-firmware-blobs.patch @@ -12,11 +12,9 @@ Signed-off-by: John Crispin create mode 100644 firmware/lantiq/COPYING create mode 100644 firmware/lantiq/README -diff --git a/firmware/Makefile b/firmware/Makefile -index cbb09ce..f4a315c 100644 --- a/firmware/Makefile +++ b/firmware/Makefile -@@ -134,6 +134,9 @@ fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_PDA) += keyspan_pda/keyspan_pda.fw +@@ -134,6 +134,9 @@ 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 @@ -26,9 +24,6 @@ index cbb09ce..f4a315c 100644 fw-shipped-$(CONFIG_YAM) += yam/1200.bin yam/9600.bin fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-) -diff --git a/firmware/lantiq/COPYING b/firmware/lantiq/COPYING -new file mode 100644 -index 0000000..5ec70b2 --- /dev/null +++ b/firmware/lantiq/COPYING @@ -0,0 +1,286 @@ @@ -318,9 +313,6 @@ index 0000000..5ec70b2 +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS -diff --git a/firmware/lantiq/README b/firmware/lantiq/README -new file mode 100644 -index 0000000..cb1a10a --- /dev/null +++ b/firmware/lantiq/README @@ -0,0 +1,45 @@ @@ -369,6 +361,3 @@ index 0000000..cb1a10a +# GPHY core on Lantiq XWAY VR9 v1.1 +lantiq/vr9_phy11g_a2x.bin +lantiq/vr9_phy22f_a2x.bin --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.9/0009-NET-PHY-adds-driver-for-lantiq-PHY11G.patch b/target/linux/lantiq/patches-3.9/0009-NET-PHY-adds-driver-for-lantiq-PHY11G.patch index 3184ebf19b..810ea5dafd 100644 --- a/target/linux/lantiq/patches-3.9/0009-NET-PHY-adds-driver-for-lantiq-PHY11G.patch +++ b/target/linux/lantiq/patches-3.9/0009-NET-PHY-adds-driver-for-lantiq-PHY11G.patch @@ -11,13 +11,11 @@ Signed-off-by: John Crispin 3 files changed, 226 insertions(+) create mode 100644 drivers/net/phy/lantiq.c -diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig -index 4503452..edc61b0 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -106,6 +106,11 @@ config MICREL_PHY +@@ -149,6 +149,11 @@ config MICREL_PHY ---help--- - Supports the KSZ9021, VSC8201, KS8001 PHYs. + Currently has a driver for the KSZ8041 +config LANTIQ_PHY + tristate "Driver for Lantiq PHYs" @@ -27,11 +25,9 @@ index 4503452..edc61b0 100644 config FIXED_PHY bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs" depends on PHYLIB=y -diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile -index 9645e38..e2eeee3 100644 --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile -@@ -23,6 +23,7 @@ obj-$(CONFIG_NATIONAL_PHY) += national.o +@@ -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,9 +35,6 @@ index 9645e38..e2eeee3 100644 obj-$(CONFIG_MDIO_OCTEON) += mdio-octeon.o obj-$(CONFIG_MICREL_KS8995MA) += spi_ks8995.o obj-$(CONFIG_AT803X_PHY) += at803x.o -diff --git a/drivers/net/phy/lantiq.c b/drivers/net/phy/lantiq.c -new file mode 100644 -index 0000000..418dff0 --- /dev/null +++ b/drivers/net/phy/lantiq.c @@ -0,0 +1,220 @@ @@ -265,6 +258,3 @@ index 0000000..418dff0 +MODULE_DESCRIPTION("Lantiq PHY drivers"); +MODULE_AUTHOR("Daniel Schwierzeck "); +MODULE_LICENSE("GPL"); --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.9/0010-NET-MIPS-lantiq-update-etop-driver-for-devicetree.patch b/target/linux/lantiq/patches-3.9/0010-NET-MIPS-lantiq-update-etop-driver-for-devicetree.patch index 75e0521e8a..692a2abb5e 100644 --- a/target/linux/lantiq/patches-3.9/0010-NET-MIPS-lantiq-update-etop-driver-for-devicetree.patch +++ b/target/linux/lantiq/patches-3.9/0010-NET-MIPS-lantiq-update-etop-driver-for-devicetree.patch @@ -7,8 +7,6 @@ Subject: [PATCH 10/22] NET: MIPS: lantiq: update etop driver for devicetree drivers/net/ethernet/lantiq_etop.c | 500 +++++++++++++++++++++++++----------- 1 file changed, 354 insertions(+), 146 deletions(-) -diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c -index bfdb0686..c711787 100644 --- a/drivers/net/ethernet/lantiq_etop.c +++ b/drivers/net/ethernet/lantiq_etop.c @@ -12,7 +12,7 @@ @@ -35,15 +33,13 @@ index bfdb0686..c711787 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 @@ -74,7 +70,7 @@ index bfdb0686..c711787 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)) + @@ -142,7 +138,7 @@ index bfdb0686..c711787 100644 if (!ch->skb[ch->dma.desc]) return -ENOMEM; ch->dma.desc_base[ch->dma.desc].addr = dma_map_single(NULL, -@@ -149,8 +202,11 @@ ltq_etop_hw_receive(struct ltq_etop_chan *ch) +@@ -149,8 +202,11 @@ ltq_etop_hw_receive(struct ltq_etop_chan spin_unlock_irqrestore(&priv->lock, flags); skb_put(skb, len); @@ -154,7 +150,7 @@ index bfdb0686..c711787 100644 } static int -@@ -158,8 +214,10 @@ ltq_etop_poll_rx(struct napi_struct *napi, int budget) +@@ -158,8 +214,10 @@ ltq_etop_poll_rx(struct napi_struct *nap { struct ltq_etop_chan *ch = container_of(napi, struct ltq_etop_chan, napi); @@ -165,7 +161,7 @@ index bfdb0686..c711787 100644 while ((rx < budget) && !complete) { struct ltq_dma_desc *desc = &ch->dma.desc_base[ch->dma.desc]; -@@ -173,7 +231,9 @@ ltq_etop_poll_rx(struct napi_struct *napi, int budget) +@@ -173,7 +231,9 @@ ltq_etop_poll_rx(struct napi_struct *nap } if (complete || !rx) { napi_complete(&ch->napi); @@ -175,7 +171,7 @@ index bfdb0686..c711787 100644 } return rx; } -@@ -185,12 +245,14 @@ ltq_etop_poll_tx(struct napi_struct *napi, int budget) +@@ -185,12 +245,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 = @@ -191,7 +187,7 @@ index bfdb0686..c711787 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 +265,9 @@ ltq_etop_poll_tx(struct napi_struct *napi, int budget) +@@ -203,7 +265,9 @@ ltq_etop_poll_tx(struct napi_struct *nap if (netif_tx_queue_stopped(txq)) netif_tx_start_queue(txq); napi_complete(&ch->napi); @@ -215,7 +211,7 @@ index bfdb0686..c711787 100644 return IRQ_HANDLED; } -@@ -225,7 +290,7 @@ ltq_etop_free_channel(struct net_device *dev, struct ltq_etop_chan *ch) +@@ -225,7 +290,7 @@ ltq_etop_free_channel(struct net_device ltq_dma_free(&ch->dma); if (ch->dma.irq) free_irq(ch->dma.irq, priv); @@ -383,7 +379,7 @@ index bfdb0686..c711787 100644 } static void -@@ -312,7 +442,10 @@ ltq_etop_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) +@@ -312,7 +442,10 @@ ltq_etop_get_settings(struct net_device { struct ltq_etop_priv *priv = netdev_priv(dev); @@ -395,7 +391,7 @@ index bfdb0686..c711787 100644 } static int -@@ -320,7 +453,10 @@ ltq_etop_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) +@@ -320,7 +453,10 @@ ltq_etop_set_settings(struct net_device { struct ltq_etop_priv *priv = netdev_priv(dev); @@ -407,7 +403,7 @@ index bfdb0686..c711787 100644 } static int -@@ -328,7 +464,10 @@ ltq_etop_nway_reset(struct net_device *dev) +@@ -328,7 +464,10 @@ ltq_etop_nway_reset(struct net_device *d { struct ltq_etop_priv *priv = netdev_priv(dev); @@ -419,7 +415,7 @@ index bfdb0686..c711787 100644 } static const struct ethtool_ops ltq_etop_ethtool_ops = { -@@ -339,6 +478,39 @@ static const struct ethtool_ops ltq_etop_ethtool_ops = { +@@ -339,6 +478,39 @@ static const struct ethtool_ops ltq_etop }; static int @@ -459,18 +455,11 @@ index bfdb0686..c711787 100644 ltq_etop_mdio_wr(struct mii_bus *bus, int phy_addr, int phy_reg, u16 phy_data) { u32 val = MDIO_REQUEST | -@@ -379,14 +551,18 @@ ltq_etop_mdio_probe(struct net_device *dev) +@@ -379,14 +551,18 @@ ltq_etop_mdio_probe(struct net_device *d { struct ltq_etop_priv *priv = netdev_priv(dev); struct phy_device *phydev = NULL; - int phy_addr; -- -- for (phy_addr = 0; phy_addr < PHY_MAX_ADDR; phy_addr++) { -- if (priv->mii_bus->phy_map[phy_addr]) { -- phydev = priv->mii_bus->phy_map[phy_addr]; -- break; -- } -- } + u32 phy_supported = (SUPPORTED_10baseT_Half + | SUPPORTED_10baseT_Full + | SUPPORTED_100baseT_Half @@ -478,7 +467,13 @@ index bfdb0686..c711787 100644 + | SUPPORTED_Autoneg + | SUPPORTED_MII + | SUPPORTED_TP); -+ + +- for (phy_addr = 0; phy_addr < PHY_MAX_ADDR; phy_addr++) { +- if (priv->mii_bus->phy_map[phy_addr]) { +- phydev = priv->mii_bus->phy_map[phy_addr]; +- break; +- } +- } + if (of_machine_is_compatible("lantiq,ase")) + phydev = priv->mii_bus->phy_map[8]; + else @@ -486,7 +481,7 @@ index bfdb0686..c711787 100644 if (!phydev) { netdev_err(dev, "no PHY found\n"); -@@ -394,21 +570,18 @@ ltq_etop_mdio_probe(struct net_device *dev) +@@ -394,21 +570,18 @@ ltq_etop_mdio_probe(struct net_device *d } phydev = phy_connect(dev, dev_name(&phydev->dev), @@ -513,7 +508,7 @@ index bfdb0686..c711787 100644 phydev->advertising = phydev->supported; priv->phydev = phydev; pr_info("%s: attached PHY [%s] (phy_addr=%s, irq=%d)\n", -@@ -433,8 +606,13 @@ ltq_etop_mdio_init(struct net_device *dev) +@@ -433,8 +606,13 @@ ltq_etop_mdio_init(struct net_device *de } priv->mii_bus->priv = dev; @@ -569,6 +564,12 @@ index bfdb0686..c711787 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); @@ -578,16 +579,11 @@ index bfdb0686..c711787 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 +704,16 @@ ltq_etop_tx(struct sk_buff *skb, struct net_device *dev) +@@ -523,16 +704,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); @@ -609,7 +605,7 @@ index bfdb0686..c711787 100644 netdev_err(dev, "tx ring full\n"); netif_tx_stop_queue(txq); return NETDEV_TX_BUSY; -@@ -540,7 +721,7 @@ ltq_etop_tx(struct sk_buff *skb, struct net_device *dev) +@@ -540,7 +721,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; @@ -618,7 +614,7 @@ index bfdb0686..c711787 100644 dev->trans_start = jiffies; -@@ -550,11 +731,11 @@ ltq_etop_tx(struct sk_buff *skb, struct net_device *dev) +@@ -550,11 +731,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); @@ -679,7 +675,7 @@ index bfdb0686..c711787 100644 return 0; err_netdev: -@@ -680,6 +860,9 @@ ltq_etop_tx_timeout(struct net_device *dev) +@@ -680,6 +860,9 @@ ltq_etop_tx_timeout(struct net_device *d err = ltq_etop_hw_init(dev); if (err) goto err_hw; @@ -689,7 +685,7 @@ index bfdb0686..c711787 100644 dev->trans_start = jiffies; netif_wake_queue(dev); return; -@@ -703,14 +886,18 @@ static const struct net_device_ops ltq_eth_netdev_ops = { +@@ -703,14 +886,18 @@ static const struct net_device_ops ltq_e .ndo_tx_timeout = ltq_etop_tx_timeout, }; @@ -712,7 +708,7 @@ index bfdb0686..c711787 100644 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { -@@ -736,30 +923,60 @@ ltq_etop_probe(struct platform_device *pdev) +@@ -736,30 +923,60 @@ ltq_etop_probe(struct platform_device *p goto err_out; } @@ -788,7 +784,7 @@ index bfdb0686..c711787 100644 err = register_netdev(dev); if (err) -@@ -788,32 +1005,23 @@ ltq_etop_remove(struct platform_device *pdev) +@@ -788,32 +1005,23 @@ ltq_etop_remove(struct platform_device * return 0; } @@ -830,6 +826,3 @@ index bfdb0686..c711787 100644 MODULE_AUTHOR("John Crispin "); MODULE_DESCRIPTION("Lantiq SoC ETOP"); --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.9/0011-MIPS-lantiq-add-pcie-driver.patch b/target/linux/lantiq/patches-3.9/0011-MIPS-lantiq-add-pcie-driver.patch index 35c735313e..4dd11e70d2 100644 --- a/target/linux/lantiq/patches-3.9/0011-MIPS-lantiq-add-pcie-driver.patch +++ b/target/linux/lantiq/patches-3.9/0011-MIPS-lantiq-add-pcie-driver.patch @@ -36,8 +36,6 @@ Subject: [PATCH 11/22] MIPS: lantiq: add 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 675310a..4c9a241 100644 --- a/arch/mips/lantiq/Kconfig +++ b/arch/mips/lantiq/Kconfig @@ -18,6 +18,7 @@ config SOC_XWAY @@ -64,8 +62,6 @@ index 675310a..4c9a241 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 c24924f..e30dde8 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 c24924f..e30dde8 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 2cb1d31..8ba7fff 100644 --- a/arch/mips/pci/Makefile +++ b/arch/mips/pci/Makefile -@@ -41,6 +41,8 @@ obj-$(CONFIG_SIBYTE_BCM1x80) += pci-bcm1480.o pci-bcm1480ht.o +@@ -41,6 +41,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 2cb1d31..8ba7fff 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 100644 -index 0000000..46f4cb2 --- /dev/null +++ b/arch/mips/pci/ifxmips_pci_common.h @@ -0,0 +1,57 @@ @@ -262,9 +248,6 @@ index 0000000..46f4cb2 + +#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..5cebfe6 --- /dev/null +++ b/arch/mips/pci/ifxmips_pcie.c @@ -0,0 +1,1607 @@ @@ -1875,9 +1858,6 @@ index 0000000..5cebfe6 +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..c6f92f5 --- /dev/null +++ b/arch/mips/pci/ifxmips_pcie.h @@ -0,0 +1,135 @@ @@ -2016,9 +1996,6 @@ index 0000000..c6f92f5 + +#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..bffd6fa --- /dev/null +++ b/arch/mips/pci/ifxmips_pcie_msi.c @@ -0,0 +1,392 @@ @@ -2710,9 +2684,6 @@ index 0000000..bffd6fa +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..f5b0f13 --- /dev/null +++ b/arch/mips/pci/ifxmips_pcie_phy.c @@ -0,0 +1,478 @@ @@ -3194,9 +3165,6 @@ index 0000000..f5b0f13 +#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,11 +4661,9 @@ index 0000000..57d9368 + +#endif /* IFXMIPS_PCIE_VR9_H */ + -diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c -index 0872f12..eb104ad 100644 --- a/arch/mips/pci/pci.c +++ b/arch/mips/pci/pci.c -@@ -260,6 +260,31 @@ static int __init pcibios_init(void) +@@ -266,6 +266,31 @@ static int __init pcibios_init(void) subsys_initcall(pcibios_init); @@ -4738,8 +4695,6 @@ index 0872f12..eb104ad 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 710067f..f06ad11 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h -@@ -1064,6 +1064,8 @@ void pci_walk_bus(struct pci_bus *top, int (*cb)(struct pci_dev *, void *), +@@ -1064,6 +1064,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 710067f..f06ad11 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 f11c1c2..ee87398 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1040,6 +1040,12 @@ @@ -4781,6 +4732,3 @@ index f11c1c2..ee87398 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.9/0012-MIPS-lantiq-adds-minimal-dcdc-driver.patch b/target/linux/lantiq/patches-3.9/0012-MIPS-lantiq-adds-minimal-dcdc-driver.patch index b1813b3898..1a0ac21a78 100644 --- a/target/linux/lantiq/patches-3.9/0012-MIPS-lantiq-adds-minimal-dcdc-driver.patch +++ b/target/linux/lantiq/patches-3.9/0012-MIPS-lantiq-adds-minimal-dcdc-driver.patch @@ -12,8 +12,6 @@ Signed-off-by: John Crispin 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..8dd871a --- /dev/null +++ b/arch/mips/lantiq/xway/dcdc.c @@ -0,0 +1,74 @@ @@ -101,6 +96,3 @@ index 0000000..8dd871a +} + +arch_initcall(dcdc_init); --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.9/0013-MTD-lantiq-Add-NAND-support-on-Lantiq-Falcon-SoC.patch b/target/linux/lantiq/patches-3.9/0013-MTD-lantiq-Add-NAND-support-on-Lantiq-Falcon-SoC.patch index 2651ea6fb4..ea6ce5b6a1 100644 --- a/target/linux/lantiq/patches-3.9/0013-MTD-lantiq-Add-NAND-support-on-Lantiq-Falcon-SoC.patch +++ b/target/linux/lantiq/patches-3.9/0013-MTD-lantiq-Add-NAND-support-on-Lantiq-Falcon-SoC.patch @@ -16,8 +16,6 @@ Signed-off-by: John Crispin 3 files changed, 92 insertions(+) create mode 100644 drivers/mtd/nand/falcon_nand.c -diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig -index 81bf5e5..2738097 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -574,4 +574,12 @@ config MTD_NAND_XWAY @@ -33,20 +31,15 @@ index 81bf5e5..2738097 100644 + attached to the External Bus Unit (EBU). + endif # MTD_NAND -diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile -index d76d912..1a61bf0 100644 --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile -@@ -53,5 +53,6 @@ obj-$(CONFIG_MTD_NAND_JZ4740) += jz4740_nand.o +@@ -53,5 +53,6 @@ obj-$(CONFIG_MTD_NAND_JZ4740) += jz4740 obj-$(CONFIG_MTD_NAND_GPMI_NAND) += gpmi-nand/ obj-$(CONFIG_MTD_NAND_XWAY) += xway_nand.o obj-$(CONFIG_MTD_NAND_BCM47XXNFLASH) += bcm47xxnflash/ +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..13458d3 --- /dev/null +++ b/drivers/mtd/nand/falcon_nand.c @@ -0,0 +1,83 @@ @@ -133,6 +126,3 @@ index 0000000..13458d3 +} + +arch_initcall(falcon_register_nand); --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.9/0014-MTD-lantiq-xway-make-nand-actually-work.patch b/target/linux/lantiq/patches-3.9/0014-MTD-lantiq-xway-make-nand-actually-work.patch index 06cfaa3e6b..839021d34e 100644 --- a/target/linux/lantiq/patches-3.9/0014-MTD-lantiq-xway-make-nand-actually-work.patch +++ b/target/linux/lantiq/patches-3.9/0014-MTD-lantiq-xway-make-nand-actually-work.patch @@ -10,8 +10,6 @@ Signed-off-by: John Crispin drivers/mtd/nand/xway_nand.c | 54 +++++++++++++++++++++++++++++++++++------- 1 file changed, 45 insertions(+), 9 deletions(-) -diff --git a/drivers/mtd/nand/xway_nand.c b/drivers/mtd/nand/xway_nand.c -index 3f81dc8..49b2e47 100644 --- a/drivers/mtd/nand/xway_nand.c +++ b/drivers/mtd/nand/xway_nand.c @@ -54,19 +54,29 @@ @@ -46,7 +44,7 @@ index 3f81dc8..49b2e47 100644 spin_unlock_irqrestore(&ebu_lock, flags); } -@@ -94,17 +104,15 @@ static void xway_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl) +@@ -94,17 +104,15 @@ static void xway_cmd_ctrl(struct mtd_inf unsigned long flags; if (ctrl & NAND_CTRL_CHANGE) { @@ -68,7 +66,7 @@ index 3f81dc8..49b2e47 100644 while ((ltq_ebu_r32(EBU_NAND_WAIT) & NAND_WAIT_WR_C) == 0) ; spin_unlock_irqrestore(&ebu_lock, flags); -@@ -124,12 +132,38 @@ static unsigned char xway_read_byte(struct mtd_info *mtd) +@@ -124,12 +132,38 @@ static unsigned char xway_read_byte(stru int ret; spin_lock_irqsave(&ebu_lock, flags); @@ -108,7 +106,7 @@ index 3f81dc8..49b2e47 100644 static int xway_nand_probe(struct platform_device *pdev) { struct nand_chip *this = platform_get_drvdata(pdev); -@@ -175,6 +209,8 @@ static struct platform_nand_data xway_nand_data = { +@@ -175,6 +209,8 @@ static struct platform_nand_data xway_na .dev_ready = xway_dev_ready, .select_chip = xway_select_chip, .read_byte = xway_read_byte, @@ -117,6 +115,3 @@ index 3f81dc8..49b2e47 100644 } }; --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.9/0015-MTD-lantiq-handle-NO_XIP-on-cfi0001-flash.patch b/target/linux/lantiq/patches-3.9/0015-MTD-lantiq-handle-NO_XIP-on-cfi0001-flash.patch index 97284deccb..661a4bf3bc 100644 --- a/target/linux/lantiq/patches-3.9/0015-MTD-lantiq-handle-NO_XIP-on-cfi0001-flash.patch +++ b/target/linux/lantiq/patches-3.9/0015-MTD-lantiq-handle-NO_XIP-on-cfi0001-flash.patch @@ -7,11 +7,9 @@ Subject: [PATCH 15/22] MTD: lantiq: handle NO_XIP on cfi0001 flash drivers/mtd/maps/lantiq-flash.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -diff --git a/drivers/mtd/maps/lantiq-flash.c b/drivers/mtd/maps/lantiq-flash.c -index d1da6ed..ae170ce 100644 --- a/drivers/mtd/maps/lantiq-flash.c +++ b/drivers/mtd/maps/lantiq-flash.c -@@ -135,7 +135,11 @@ ltq_mtd_probe(struct platform_device *pdev) +@@ -135,7 +135,11 @@ ltq_mtd_probe(struct platform_device *pd } ltq_mtd->map = kzalloc(sizeof(struct map_info), GFP_KERNEL); @@ -24,6 +22,3 @@ index d1da6ed..ae170ce 100644 ltq_mtd->map->size = resource_size(ltq_mtd->res); ltq_mtd->map->virt = devm_ioremap_resource(&pdev->dev, ltq_mtd->res); if (IS_ERR(ltq_mtd->map->virt)) { --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.9/0016-owrt-generic-dtb-image-hack.patch b/target/linux/lantiq/patches-3.9/0016-owrt-generic-dtb-image-hack.patch index 35a46cc0a6..deac9bfa4e 100644 --- a/target/linux/lantiq/patches-3.9/0016-owrt-generic-dtb-image-hack.patch +++ b/target/linux/lantiq/patches-3.9/0016-owrt-generic-dtb-image-hack.patch @@ -7,13 +7,11 @@ Subject: [PATCH 16/22] 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 c61cdae..b4e55bb 100644 --- a/arch/mips/kernel/head.S +++ b/arch/mips/kernel/head.S -@@ -140,6 +140,9 @@ FEXPORT(__kernel_entry) - j kernel_entry - #endif +@@ -146,6 +146,9 @@ EXPORT(__image_cmdline) + .fill 0x400 + #endif /* CONFIG_IMAGE_CMDLINE_HACK */ + .ascii "OWRTDTB:" + EXPORT(__image_dtb) @@ -21,6 +19,3 @@ index c61cdae..b4e55bb 100644 __REF NESTED(kernel_entry, 16, sp) # kernel entry point --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.9/0017-owrt-lantiq-dtb-image-hack.patch b/target/linux/lantiq/patches-3.9/0017-owrt-lantiq-dtb-image-hack.patch index 2b26564ff6..5110b7f4c9 100644 --- a/target/linux/lantiq/patches-3.9/0017-owrt-lantiq-dtb-image-hack.patch +++ b/target/linux/lantiq/patches-3.9/0017-owrt-lantiq-dtb-image-hack.patch @@ -8,8 +8,6 @@ Subject: [PATCH 17/22] owrt: lantiq dtb image hack arch/mips/lantiq/prom.c | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/arch/mips/lantiq/Makefile b/arch/mips/lantiq/Makefile -index d6bdc57..690257a 100644 --- a/arch/mips/lantiq/Makefile +++ b/arch/mips/lantiq/Makefile @@ -6,8 +6,6 @@ @@ -21,11 +19,9 @@ index d6bdc57..690257a 100644 obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_SOC_TYPE_XWAY) += xway/ -diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c -index 9f9e875..72b183a 100644 --- a/arch/mips/lantiq/prom.c +++ b/arch/mips/lantiq/prom.c -@@ -57,6 +57,8 @@ static void __init prom_init_cmdline(void) +@@ -57,6 +57,8 @@ static void __init prom_init_cmdline(voi } } @@ -43,6 +39,3 @@ index 9f9e875..72b183a 100644 } void __init device_tree_init(void) --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.9/0018-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch b/target/linux/lantiq/patches-3.9/0018-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch index 4c86eb4c0f..d589f47e1f 100644 --- a/target/linux/lantiq/patches-3.9/0018-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch +++ b/target/linux/lantiq/patches-3.9/0018-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch @@ -19,9 +19,6 @@ Subject: [PATCH 18/22] owrt: lantiq: wifi and ethernet eeprom handling create mode 100644 arch/mips/lantiq/xway/pci-ath-fixup.c create mode 100644 arch/mips/lantiq/xway/rt_eep.c -diff --git a/arch/mips/include/asm/mach-lantiq/pci-ath-fixup.h b/arch/mips/include/asm/mach-lantiq/pci-ath-fixup.h -new file mode 100644 -index 0000000..095d261 --- /dev/null +++ b/arch/mips/include/asm/mach-lantiq/pci-ath-fixup.h @@ -0,0 +1,6 @@ @@ -31,11 +28,9 @@ index 0000000..095d261 +void ltq_pci_ath_fixup(unsigned slot, u16 *cal_data) __init; + +#endif /* _PCI_ATH_FIXUP */ -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 133336b..779715c 100644 --- 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, unsigned int id, dma_addr_t dev_addr); +@@ -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); @@ -44,8 +39,6 @@ index 133336b..779715c 100644 + #endif /* CONFIG_SOC_TYPE_XWAY */ #endif /* _LTQ_XWAY_H__ */ -diff --git a/arch/mips/lantiq/xway/Makefile b/arch/mips/lantiq/xway/Makefile -index 087497d..51f0eba 100644 --- a/arch/mips/lantiq/xway/Makefile +++ b/arch/mips/lantiq/xway/Makefile @@ -1,3 +1,6 @@ @@ -55,9 +48,6 @@ index 087497d..51f0eba 100644 +obj-$(CONFIG_PCI) += ath_eep.o rt_eep.o pci-ath-fixup.o + obj-$(CONFIG_XRX200_PHY_FW) += xrx200_phy_fw.o -diff --git a/arch/mips/lantiq/xway/ath_eep.c b/arch/mips/lantiq/xway/ath_eep.c -new file mode 100644 -index 0000000..ed55124 --- /dev/null +++ b/arch/mips/lantiq/xway/ath_eep.c @@ -0,0 +1,248 @@ @@ -309,9 +299,6 @@ index 0000000..ed55124 + return platform_driver_probe(&ath5k_eeprom_driver, of_ath5k_eeprom_probe); +} +late_initcall(of_ath5k_eeprom_init); -diff --git a/arch/mips/lantiq/xway/eth_mac.c b/arch/mips/lantiq/xway/eth_mac.c -new file mode 100644 -index 0000000..d288a0e --- /dev/null +++ b/arch/mips/lantiq/xway/eth_mac.c @@ -0,0 +1,76 @@ @@ -391,9 +378,6 @@ index 0000000..d288a0e + return platform_driver_probe(ð_mac_driver, of_eth_mac_probe); +} +device_initcall(of_eth_mac_init); -diff --git a/arch/mips/lantiq/xway/pci-ath-fixup.c b/arch/mips/lantiq/xway/pci-ath-fixup.c -new file mode 100644 -index 0000000..c87ffb2 --- /dev/null +++ b/arch/mips/lantiq/xway/pci-ath-fixup.c @@ -0,0 +1,109 @@ @@ -506,9 +490,6 @@ index 0000000..c87ffb2 + ath_fixups[ath_num_fixups].cal_data = cal_data; + ath_num_fixups++; +} -diff --git a/arch/mips/lantiq/xway/rt_eep.c b/arch/mips/lantiq/xway/rt_eep.c -new file mode 100644 -index 0000000..00f2d4c --- /dev/null +++ b/arch/mips/lantiq/xway/rt_eep.c @@ -0,0 +1,60 @@ @@ -572,8 +553,6 @@ index 0000000..00f2d4c + return platform_driver_probe(&ralink_eeprom_driver, of_ralink_eeprom_probe); +} +device_initcall(of_ralink_eeprom_init); -diff --git a/arch/mips/pci/pci-lantiq.c b/arch/mips/pci/pci-lantiq.c -index 879077b..ad22c82 100644 --- a/arch/mips/pci/pci-lantiq.c +++ b/arch/mips/pci/pci-lantiq.c @@ -260,4 +260,4 @@ int __init pcibios_init(void) @@ -582,6 +561,3 @@ index 879077b..ad22c82 100644 -arch_initcall(pcibios_init); +late_initcall(pcibios_init); --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.9/0019-owrt-lantiq-handle-vmmc-memory-reservation.patch b/target/linux/lantiq/patches-3.9/0019-owrt-lantiq-handle-vmmc-memory-reservation.patch index 7eb0e22286..cb6811a124 100644 --- a/target/linux/lantiq/patches-3.9/0019-owrt-lantiq-handle-vmmc-memory-reservation.patch +++ b/target/linux/lantiq/patches-3.9/0019-owrt-lantiq-handle-vmmc-memory-reservation.patch @@ -9,8 +9,6 @@ Subject: [PATCH 19/22] owrt: lantiq: handle vmmc memory reservation 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 arch/mips/lantiq/xway/vmmc.c -diff --git a/arch/mips/lantiq/xway/Makefile b/arch/mips/lantiq/xway/Makefile -index 51f0eba..3a01d22 100644 --- a/arch/mips/lantiq/xway/Makefile +++ b/arch/mips/lantiq/xway/Makefile @@ -1,6 +1,6 @@ @@ -21,9 +19,6 @@ index 51f0eba..3a01d22 100644 obj-$(CONFIG_PCI) += ath_eep.o rt_eep.o pci-ath-fixup.o obj-$(CONFIG_XRX200_PHY_FW) += xrx200_phy_fw.o -diff --git a/arch/mips/lantiq/xway/vmmc.c b/arch/mips/lantiq/xway/vmmc.c -new file mode 100644 -index 0000000..6dedf77 --- /dev/null +++ b/arch/mips/lantiq/xway/vmmc.c @@ -0,0 +1,63 @@ @@ -90,6 +85,3 @@ index 0000000..6dedf77 +}; + +module_platform_driver(vmmc_driver); --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.9/0020-owrt-lantiq-backport-old-timer-code.patch b/target/linux/lantiq/patches-3.9/0020-owrt-lantiq-backport-old-timer-code.patch index b822148885..2e2a810952 100644 --- a/target/linux/lantiq/patches-3.9/0020-owrt-lantiq-backport-old-timer-code.patch +++ b/target/linux/lantiq/patches-3.9/0020-owrt-lantiq-backport-old-timer-code.patch @@ -11,9 +11,6 @@ Subject: [PATCH 20/22] owrt: lantiq: backport old timer code create mode 100644 arch/mips/include/asm/mach-lantiq/lantiq_timer.h create mode 100644 arch/mips/lantiq/xway/timer.c -diff --git a/arch/mips/include/asm/mach-lantiq/lantiq_timer.h b/arch/mips/include/asm/mach-lantiq/lantiq_timer.h -new file mode 100644 -index 0000000..ef564ab --- /dev/null +++ b/arch/mips/include/asm/mach-lantiq/lantiq_timer.h @@ -0,0 +1,155 @@ @@ -172,8 +169,6 @@ index 0000000..ef564ab + u32 reload, unsigned long arg1, unsigned long arg2); + +#endif /* __DANUBE_GPTU_DEV_H__2005_07_26__10_19__ */ -diff --git a/arch/mips/lantiq/xway/Makefile b/arch/mips/lantiq/xway/Makefile -index 3a01d22..ea8706f 100644 --- a/arch/mips/lantiq/xway/Makefile +++ b/arch/mips/lantiq/xway/Makefile @@ -1,4 +1,4 @@ @@ -182,9 +177,6 @@ index 3a01d22..ea8706f 100644 obj-y += eth_mac.o vmmc.o obj-$(CONFIG_PCI) += ath_eep.o rt_eep.o pci-ath-fixup.o -diff --git a/arch/mips/lantiq/xway/timer.c b/arch/mips/lantiq/xway/timer.c -new file mode 100644 -index 0000000..1c0fdb8 --- /dev/null +++ b/arch/mips/lantiq/xway/timer.c @@ -0,0 +1,845 @@ @@ -1033,6 +1025,3 @@ index 0000000..1c0fdb8 +module_exit(lq_gptu_exit); + +#endif --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.9/0021-owrt-lantiq-add-atm-hack.patch b/target/linux/lantiq/patches-3.9/0021-owrt-lantiq-add-atm-hack.patch index 2e2afbc05e..9c161bb29a 100644 --- a/target/linux/lantiq/patches-3.9/0021-owrt-lantiq-add-atm-hack.patch +++ b/target/linux/lantiq/patches-3.9/0021-owrt-lantiq-add-atm-hack.patch @@ -15,9 +15,6 @@ Subject: [PATCH 21/22] owrt: lantiq: add atm hack create mode 100644 arch/mips/include/asm/mach-lantiq/lantiq_atm.h create mode 100644 arch/mips/include/asm/mach-lantiq/lantiq_ptm.h -diff --git a/arch/mips/include/asm/mach-lantiq/lantiq_atm.h b/arch/mips/include/asm/mach-lantiq/lantiq_atm.h -new file mode 100644 -index 0000000..bf045a9 --- /dev/null +++ b/arch/mips/include/asm/mach-lantiq/lantiq_atm.h @@ -0,0 +1,196 @@ @@ -217,9 +214,6 @@ index 0000000..bf045a9 + +#endif // IFX_ATM_H + -diff --git a/arch/mips/include/asm/mach-lantiq/lantiq_ptm.h b/arch/mips/include/asm/mach-lantiq/lantiq_ptm.h -new file mode 100644 -index 0000000..698e5c3 --- /dev/null +++ b/arch/mips/include/asm/mach-lantiq/lantiq_ptm.h @@ -0,0 +1,203 @@ @@ -426,8 +420,6 @@ index 0000000..698e5c3 + +#endif // IFX_PTM_H + -diff --git a/arch/mips/lantiq/irq.c b/arch/mips/lantiq/irq.c -index 5119487..6d2c486 100644 --- a/arch/mips/lantiq/irq.c +++ b/arch/mips/lantiq/irq.c @@ -14,6 +14,7 @@ @@ -438,7 +430,7 @@ index 5119487..6d2c486 100644 #include #include -@@ -99,6 +100,7 @@ void ltq_mask_and_ack_irq(struct irq_data *d) +@@ -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); } @@ -446,11 +438,9 @@ index 5119487..6d2c486 100644 static void ltq_ack_irq(struct irq_data *d) { -diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c -index 07cec44..a3e3872 100644 --- a/arch/mips/mm/cache.c +++ b/arch/mips/mm/cache.c -@@ -57,6 +57,8 @@ void (*_dma_cache_wback)(unsigned long start, unsigned long size); +@@ -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); @@ -459,8 +449,6 @@ index 07cec44..a3e3872 100644 #endif /* CONFIG_DMA_NONCOHERENT */ -diff --git a/include/uapi/linux/atm.h b/include/uapi/linux/atm.h -index 88399db..78c8bbc 100644 --- a/include/uapi/linux/atm.h +++ b/include/uapi/linux/atm.h @@ -130,8 +130,14 @@ @@ -478,11 +466,9 @@ index 88399db..78c8bbc 100644 struct atm_trafprm { unsigned char traffic_class; /* traffic class (ATM_UBR, ...) */ int max_pcr; /* maximum PCR in cells per second */ -diff --git a/net/atm/common.c b/net/atm/common.c -index 737bef5..959008d 100644 --- a/net/atm/common.c +++ b/net/atm/common.c -@@ -62,11 +62,17 @@ static void vcc_remove_socket(struct sock *sk) +@@ -62,11 +62,17 @@ static void vcc_remove_socket(struct soc write_unlock_irq(&vcc_sklist_lock); } @@ -500,11 +486,9 @@ index 737bef5..959008d 100644 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); -diff --git a/net/atm/proc.c b/net/atm/proc.c -index 6ac35ff..3cea444 100644 --- a/net/atm/proc.c +++ b/net/atm/proc.c -@@ -154,7 +154,7 @@ static void *vcc_seq_next(struct seq_file *seq, void *v, loff_t *pos) +@@ -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[] = { @@ -513,6 +497,3 @@ index 6ac35ff..3cea444 100644 static const char *const aal_name[] = { "---", "1", "2", "3/4", /* 0- 3 */ "???", "5", "???", "???", /* 4- 7 */ --- -1.7.10.4 - diff --git a/target/linux/lantiq/patches-3.9/0022-PINCTRL-add-gpio_irq-support.patch b/target/linux/lantiq/patches-3.9/0022-PINCTRL-add-gpio_irq-support.patch index 223f78c3a3..fd18e62c73 100644 --- a/target/linux/lantiq/patches-3.9/0022-PINCTRL-add-gpio_irq-support.patch +++ b/target/linux/lantiq/patches-3.9/0022-PINCTRL-add-gpio_irq-support.patch @@ -7,11 +7,9 @@ Subject: [PATCH 22/22] PINCTRL: add gpio_irq support drivers/pinctrl/pinctrl-xway.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) -diff --git a/drivers/pinctrl/pinctrl-xway.c b/drivers/pinctrl/pinctrl-xway.c -index 068224e..8719d35 100644 --- a/drivers/pinctrl/pinctrl-xway.c +++ b/drivers/pinctrl/pinctrl-xway.c -@@ -564,10 +564,9 @@ static struct pinctrl_desc xway_pctrl_desc = { +@@ -564,10 +564,9 @@ static struct pinctrl_desc xway_pctrl_de .confops = &xway_pinconf_ops, }; @@ -23,7 +21,7 @@ index 068224e..8719d35 100644 int port = PORT(pin); u32 alt1_reg = GPIO_ALT1(pin); -@@ -587,6 +586,14 @@ static inline int xway_mux_apply(struct pinctrl_dev *pctrldev, +@@ -587,6 +586,14 @@ static inline int xway_mux_apply(struct return 0; } @@ -38,7 +36,7 @@ index 068224e..8719d35 100644 static const struct ltq_cfg_param xway_cfg_params[] = { {"lantiq,pull", LTQ_PINCONF_PARAM_PULL}, {"lantiq,open-drain", LTQ_PINCONF_PARAM_OPEN_DRAIN}, -@@ -631,6 +638,10 @@ static int xway_gpio_dir_out(struct gpio_chip *chip, unsigned int pin, int val) +@@ -631,6 +638,10 @@ static int xway_gpio_dir_out(struct gpio { struct ltq_pinmux_info *info = dev_get_drvdata(chip->dev); @@ -49,7 +47,7 @@ index 068224e..8719d35 100644 gpio_setbit(info->membase[0], GPIO_DIR(pin), PORT_PIN(pin)); xway_gpio_set(chip, pin, val); -@@ -651,6 +662,18 @@ static void xway_gpio_free(struct gpio_chip *chip, unsigned offset) +@@ -651,6 +662,18 @@ static void xway_gpio_free(struct gpio_c pinctrl_free_gpio(gpio); } @@ -76,6 +74,3 @@ index 068224e..8719d35 100644 .base = -1, }; --- -1.7.10.4 - diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile index 2ddf37da80..3975cba765 100644 --- a/target/linux/ramips/Makefile +++ b/target/linux/ramips/Makefile @@ -13,7 +13,7 @@ SUBTARGETS:=rt288x rt305x rt3883 mt7620a CFLAGS:=-Os -pipe -fno-caller-saves -mno-branch-likely FEATURES:=squashfs gpio -LINUX_VERSION:=3.9.6 +LINUX_VERSION:=3.9.8 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES+=\ diff --git a/target/linux/ramips/patches-3.9/0100-MIPS-move-mips_-set-get-_machine_name-to-a-more-gene.patch b/target/linux/ramips/patches-3.9/0100-MIPS-move-mips_-set-get-_machine_name-to-a-more-gene.patch index 89f40bf2e1..1b9935123d 100644 --- a/target/linux/ramips/patches-3.9/0100-MIPS-move-mips_-set-get-_machine_name-to-a-more-gene.patch +++ b/target/linux/ramips/patches-3.9/0100-MIPS-move-mips_-set-get-_machine_name-to-a-more-gene.patch @@ -17,8 +17,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5164/ arch/mips/kernel/prom.c | 31 +++++++++++++++++++++++++++++++ 5 files changed, 35 insertions(+), 26 deletions(-) -diff --git a/arch/mips/include/asm/mips_machine.h b/arch/mips/include/asm/mips_machine.h -index 363bb35..9d00aeb 100644 --- a/arch/mips/include/asm/mips_machine.h +++ b/arch/mips/include/asm/mips_machine.h @@ -42,13 +42,9 @@ extern long __mips_machines_end; @@ -35,11 +33,9 @@ index 363bb35..9d00aeb 100644 #endif /* CONFIG_MIPS_MACHINE */ #endif /* __ASM_MIPS_MACHINE_H */ -diff --git a/arch/mips/include/asm/prom.h b/arch/mips/include/asm/prom.h -index 8808bf5..1e7e096 100644 --- a/arch/mips/include/asm/prom.h +++ b/arch/mips/include/asm/prom.h -@@ -48,4 +48,7 @@ extern void __dt_setup_arch(struct boot_param_header *bph); +@@ -48,4 +48,7 @@ extern void __dt_setup_arch(struct boot_ static inline void device_tree_init(void) { } #endif /* CONFIG_OF */ @@ -47,8 +43,6 @@ index 8808bf5..1e7e096 100644 +extern void mips_set_machine_name(const char *name); + #endif /* __ASM_PROM_H */ -diff --git a/arch/mips/kernel/mips_machine.c b/arch/mips/kernel/mips_machine.c -index 411a058..6dc5866 100644 --- a/arch/mips/kernel/mips_machine.c +++ b/arch/mips/kernel/mips_machine.c @@ -13,7 +13,6 @@ @@ -59,7 +53,7 @@ index 411a058..6dc5866 100644 #define for_each_machine(mach) \ for ((mach) = (struct mips_machine *)&__mips_machines_start; \ -@@ -21,25 +20,6 @@ static char *mips_machine_name = "Unknown"; +@@ -21,25 +20,6 @@ static char *mips_machine_name = "Unknow (unsigned long)(mach) < (unsigned long)&__mips_machines_end; \ (mach)++) @@ -93,8 +87,6 @@ index 411a058..6dc5866 100644 if (mips_machine->mach_setup) mips_machine->mach_setup(); -diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c -index 7a54f74..1dd137b 100644 --- a/arch/mips/kernel/proc.c +++ b/arch/mips/kernel/proc.c @@ -12,7 +12,7 @@ @@ -106,8 +98,6 @@ index 7a54f74..1dd137b 100644 unsigned int vced_count, vcei_count; -diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c -index 028f6f8..b68e53b 100644 --- a/arch/mips/kernel/prom.c +++ b/arch/mips/kernel/prom.c @@ -23,6 +23,22 @@ @@ -133,7 +123,7 @@ index 028f6f8..b68e53b 100644 int __init early_init_dt_scan_memory_arch(unsigned long node, const char *uname, int depth, void *data) -@@ -50,6 +66,18 @@ void __init early_init_dt_setup_initrd_arch(unsigned long start, +@@ -50,6 +66,18 @@ void __init early_init_dt_setup_initrd_a } #endif @@ -152,7 +142,7 @@ index 028f6f8..b68e53b 100644 void __init early_init_devtree(void *params) { /* Setup flat device-tree pointer */ -@@ -65,6 +93,9 @@ void __init early_init_devtree(void *params) +@@ -65,6 +93,9 @@ void __init early_init_devtree(void *par /* Scan memory nodes */ of_scan_flat_dt(early_init_dt_scan_root, NULL); of_scan_flat_dt(early_init_dt_scan_memory_arch, NULL); @@ -162,6 +152,3 @@ index 028f6f8..b68e53b 100644 } void __init __dt_setup_arch(struct boot_param_header *bph) --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0101-MIPS-ralink-add-PCI-IRQ-handling.patch b/target/linux/ramips/patches-3.9/0101-MIPS-ralink-add-PCI-IRQ-handling.patch index 6e4e671e5b..6be8e85e27 100644 --- a/target/linux/ramips/patches-3.9/0101-MIPS-ralink-add-PCI-IRQ-handling.patch +++ b/target/linux/ramips/patches-3.9/0101-MIPS-ralink-add-PCI-IRQ-handling.patch @@ -13,8 +13,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5165/ arch/mips/ralink/irq.c | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/arch/mips/ralink/irq.c b/arch/mips/ralink/irq.c -index 6d054c5..d9807d0 100644 --- a/arch/mips/ralink/irq.c +++ b/arch/mips/ralink/irq.c @@ -31,6 +31,7 @@ @@ -35,6 +33,3 @@ index 6d054c5..d9807d0 100644 else if (pending & STATUSF_IP2) do_IRQ(RALINK_CPU_IRQ_INTC); --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0102-MIPS-ralink-add-RT3352-register-defines.patch b/target/linux/ramips/patches-3.9/0102-MIPS-ralink-add-RT3352-register-defines.patch index 726745cd7c..0ba5228fa3 100644 --- a/target/linux/ramips/patches-3.9/0102-MIPS-ralink-add-RT3352-register-defines.patch +++ b/target/linux/ramips/patches-3.9/0102-MIPS-ralink-add-RT3352-register-defines.patch @@ -13,8 +13,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5166/ arch/mips/include/asm/mach-ralink/rt305x.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) -diff --git a/arch/mips/include/asm/mach-ralink/rt305x.h b/arch/mips/include/asm/mach-ralink/rt305x.h -index 7d344f2..e36c3c5 100644 --- a/arch/mips/include/asm/mach-ralink/rt305x.h +++ b/arch/mips/include/asm/mach-ralink/rt305x.h @@ -136,4 +136,17 @@ static inline int soc_is_rt5350(void) @@ -35,6 +33,3 @@ index 7d344f2..e36c3c5 100644 +#define RT3352_SYSCFG1_USB0_HOST_MODE BIT(10) + #endif --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0103-MIPS-ralink-fix-RT305x-clock-setup.patch b/target/linux/ramips/patches-3.9/0103-MIPS-ralink-fix-RT305x-clock-setup.patch index 735ed8dd73..84b5429fc8 100644 --- a/target/linux/ramips/patches-3.9/0103-MIPS-ralink-fix-RT305x-clock-setup.patch +++ b/target/linux/ramips/patches-3.9/0103-MIPS-ralink-fix-RT305x-clock-setup.patch @@ -12,8 +12,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5167/ arch/mips/ralink/rt305x.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) -diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c -index 0a4bbdc..5d49a54 100644 --- a/arch/mips/ralink/rt305x.c +++ b/arch/mips/ralink/rt305x.c @@ -124,6 +124,8 @@ struct ralink_pinmux gpio_pinmux = { @@ -47,6 +45,3 @@ index 0a4bbdc..5d49a54 100644 } void __init ralink_of_remap(void) --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0104-MIPS-ralink-add-missing-comment-in-irq-driver.patch b/target/linux/ramips/patches-3.9/0104-MIPS-ralink-add-missing-comment-in-irq-driver.patch index e96a13e48a..0f6b519715 100644 --- a/target/linux/ramips/patches-3.9/0104-MIPS-ralink-add-missing-comment-in-irq-driver.patch +++ b/target/linux/ramips/patches-3.9/0104-MIPS-ralink-add-missing-comment-in-irq-driver.patch @@ -12,11 +12,9 @@ Patchwork: http://patchwork.linux-mips.org/patch/5168/ arch/mips/ralink/irq.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/arch/mips/ralink/irq.c b/arch/mips/ralink/irq.c -index d9807d0..320b1f1 100644 --- a/arch/mips/ralink/irq.c +++ b/arch/mips/ralink/irq.c -@@ -166,6 +166,7 @@ static int __init intc_of_init(struct device_node *node, +@@ -166,6 +166,7 @@ static int __init intc_of_init(struct de irq_set_chained_handler(irq, ralink_intc_irq_handler); irq_set_handler_data(irq, domain); @@ -24,6 +22,3 @@ index d9807d0..320b1f1 100644 cp0_perfcount_irq = irq_create_mapping(domain, 9); return 0; --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0105-MIPS-ralink-add-RT5350-sdram-register-defines.patch b/target/linux/ramips/patches-3.9/0105-MIPS-ralink-add-RT5350-sdram-register-defines.patch index 49860a56c6..2caf089d8d 100644 --- a/target/linux/ramips/patches-3.9/0105-MIPS-ralink-add-RT5350-sdram-register-defines.patch +++ b/target/linux/ramips/patches-3.9/0105-MIPS-ralink-add-RT5350-sdram-register-defines.patch @@ -13,8 +13,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5169/ arch/mips/include/asm/mach-ralink/rt305x.h | 8 ++++++++ 1 file changed, 8 insertions(+) -diff --git a/arch/mips/include/asm/mach-ralink/rt305x.h b/arch/mips/include/asm/mach-ralink/rt305x.h -index e36c3c5..80cda8a 100644 --- a/arch/mips/include/asm/mach-ralink/rt305x.h +++ b/arch/mips/include/asm/mach-ralink/rt305x.h @@ -97,6 +97,14 @@ static inline int soc_is_rt5350(void) @@ -32,6 +30,3 @@ index e36c3c5..80cda8a 100644 /* multi function gpio pins */ #define RT305X_GPIO_I2C_SD 1 #define RT305X_GPIO_I2C_SCLK 2 --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0106-MIPS-ralink-make-early_printk-work-on-RT2880.patch b/target/linux/ramips/patches-3.9/0106-MIPS-ralink-make-early_printk-work-on-RT2880.patch index f734032091..1d3f7566e2 100644 --- a/target/linux/ramips/patches-3.9/0106-MIPS-ralink-make-early_printk-work-on-RT2880.patch +++ b/target/linux/ramips/patches-3.9/0106-MIPS-ralink-make-early_printk-work-on-RT2880.patch @@ -12,8 +12,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5170/ arch/mips/ralink/early_printk.c | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/arch/mips/ralink/early_printk.c b/arch/mips/ralink/early_printk.c -index c4ae47e..b46d041 100644 --- a/arch/mips/ralink/early_printk.c +++ b/arch/mips/ralink/early_printk.c @@ -11,7 +11,11 @@ @@ -28,6 +26,3 @@ index c4ae47e..b46d041 100644 #define UART_REG_RX 0x00 #define UART_REG_TX 0x04 --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0107-MIPS-ralink-rename-gpio_pinmux-to-rt_gpio_pinmux.patch b/target/linux/ramips/patches-3.9/0107-MIPS-ralink-rename-gpio_pinmux-to-rt_gpio_pinmux.patch index 877ca66c67..6e42841892 100644 --- a/target/linux/ramips/patches-3.9/0107-MIPS-ralink-rename-gpio_pinmux-to-rt_gpio_pinmux.patch +++ b/target/linux/ramips/patches-3.9/0107-MIPS-ralink-rename-gpio_pinmux-to-rt_gpio_pinmux.patch @@ -12,8 +12,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5171/ arch/mips/ralink/rt305x.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/arch/mips/ralink/common.h b/arch/mips/ralink/common.h -index 3009903..f4b19c6 100644 --- a/arch/mips/ralink/common.h +++ b/arch/mips/ralink/common.h @@ -24,7 +24,7 @@ struct ralink_pinmux { @@ -25,8 +23,6 @@ index 3009903..f4b19c6 100644 struct ralink_soc_info { unsigned char sys_type[RAMIPS_SYS_TYPE_LEN]; -diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c -index 5d49a54..f1a6c33 100644 --- a/arch/mips/ralink/rt305x.c +++ b/arch/mips/ralink/rt305x.c @@ -114,7 +114,7 @@ void rt305x_wdt_reset(void) @@ -38,6 +34,3 @@ index 5d49a54..f1a6c33 100644 .mode = mode_mux, .uart = uart_mux, .uart_shift = RT305X_GPIO_MODE_UART0_SHIFT, --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0108-MIPS-ralink-make-the-RT305x-pinmuxing-structure-stat.patch b/target/linux/ramips/patches-3.9/0108-MIPS-ralink-make-the-RT305x-pinmuxing-structure-stat.patch index cb18cfe309..f3431ebe9e 100644 --- a/target/linux/ramips/patches-3.9/0108-MIPS-ralink-make-the-RT305x-pinmuxing-structure-stat.patch +++ b/target/linux/ramips/patches-3.9/0108-MIPS-ralink-make-the-RT305x-pinmuxing-structure-stat.patch @@ -13,8 +13,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5172/ arch/mips/ralink/rt305x.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c -index f1a6c33..5b42078 100644 --- a/arch/mips/ralink/rt305x.c +++ b/arch/mips/ralink/rt305x.c @@ -22,7 +22,7 @@ @@ -44,6 +42,3 @@ index f1a6c33..5b42078 100644 { u32 t; --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0109-MIPS-ralink-add-pci-group-to-struct-ralink_pinmux.patch b/target/linux/ramips/patches-3.9/0109-MIPS-ralink-add-pci-group-to-struct-ralink_pinmux.patch index be32230ad5..def2ba283f 100644 --- a/target/linux/ramips/patches-3.9/0109-MIPS-ralink-add-pci-group-to-struct-ralink_pinmux.patch +++ b/target/linux/ramips/patches-3.9/0109-MIPS-ralink-add-pci-group-to-struct-ralink_pinmux.patch @@ -12,8 +12,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5173/ arch/mips/ralink/common.h | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/arch/mips/ralink/common.h b/arch/mips/ralink/common.h -index f4b19c6..bebd149 100644 --- a/arch/mips/ralink/common.h +++ b/arch/mips/ralink/common.h @@ -23,6 +23,9 @@ struct ralink_pinmux { @@ -26,6 +24,3 @@ index f4b19c6..bebd149 100644 }; extern struct ralink_pinmux rt_gpio_pinmux; --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0110-MIPS-ralink-add-uart-mask-to-struct-ralink_pinmux.patch b/target/linux/ramips/patches-3.9/0110-MIPS-ralink-add-uart-mask-to-struct-ralink_pinmux.patch index 904b11d8ee..011a48789a 100644 --- a/target/linux/ramips/patches-3.9/0110-MIPS-ralink-add-uart-mask-to-struct-ralink_pinmux.patch +++ b/target/linux/ramips/patches-3.9/0110-MIPS-ralink-add-uart-mask-to-struct-ralink_pinmux.patch @@ -12,8 +12,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5744/ arch/mips/ralink/rt305x.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) -diff --git a/arch/mips/ralink/common.h b/arch/mips/ralink/common.h -index bebd149..299119b 100644 --- a/arch/mips/ralink/common.h +++ b/arch/mips/ralink/common.h @@ -22,6 +22,7 @@ struct ralink_pinmux { @@ -24,11 +22,9 @@ index bebd149..299119b 100644 void (*wdt_reset)(void); struct ralink_pinmux_grp *pci; int pci_shift; -diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c -index 5b42078..6aa3cb1 100644 --- a/arch/mips/ralink/rt305x.c +++ b/arch/mips/ralink/rt305x.c -@@ -91,12 +91,12 @@ static struct ralink_pinmux_grp uart_mux[] = { +@@ -91,12 +91,12 @@ static struct ralink_pinmux_grp uart_mux .name = "gpio uartf", .mask = RT305X_GPIO_MODE_GPIO_UARTF, .gpio_first = RT305X_GPIO_7, @@ -51,6 +47,3 @@ index 5b42078..6aa3cb1 100644 .wdt_reset = rt305x_wdt_reset, }; --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0111-MIPS-ralink-adds-support-for-RT2880-SoC-family.patch b/target/linux/ramips/patches-3.9/0111-MIPS-ralink-adds-support-for-RT2880-SoC-family.patch index 4f608f2928..d336b792a9 100644 --- a/target/linux/ramips/patches-3.9/0111-MIPS-ralink-adds-support-for-RT2880-SoC-family.patch +++ b/target/linux/ramips/patches-3.9/0111-MIPS-ralink-adds-support-for-RT2880-SoC-family.patch @@ -21,11 +21,9 @@ Patchwork: http://patchwork.linux-mips.org/patch/5176/ create mode 100644 arch/mips/include/asm/mach-ralink/rt288x.h create mode 100644 arch/mips/ralink/rt288x.c -diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig -index 51244bf..e4da4f8 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -1152,7 +1152,7 @@ config BOOT_ELF32 +@@ -1164,7 +1164,7 @@ config BOOT_ELF32 config MIPS_L1_CACHE_SHIFT int @@ -34,9 +32,6 @@ index 51244bf..e4da4f8 100644 default "6" if MIPS_CPU_SCACHE default "7" if SGI_IP22 || SGI_IP27 || SGI_IP28 || SNI_RM || CPU_CAVIUM_OCTEON default "5" -diff --git a/arch/mips/include/asm/mach-ralink/rt288x.h b/arch/mips/include/asm/mach-ralink/rt288x.h -new file mode 100644 -index 0000000..ad8b42d --- /dev/null +++ b/arch/mips/include/asm/mach-ralink/rt288x.h @@ -0,0 +1,49 @@ @@ -89,8 +84,6 @@ index 0000000..ad8b42d +#define CLKCFG_SRAM_CS_N_WDT BIT(9) + +#endif -diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig -index a0b0197..6723b94 100644 --- a/arch/mips/ralink/Kconfig +++ b/arch/mips/ralink/Kconfig @@ -6,6 +6,9 @@ choice @@ -103,8 +96,6 @@ index a0b0197..6723b94 100644 config SOC_RT305X bool "RT305x" select USB_ARCH_HAS_HCD -diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile -index 939757f..6d826f2 100644 --- a/arch/mips/ralink/Makefile +++ b/arch/mips/ralink/Makefile @@ -8,6 +8,7 @@ @@ -115,11 +106,9 @@ index 939757f..6d826f2 100644 obj-$(CONFIG_SOC_RT305X) += rt305x.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o -diff --git a/arch/mips/ralink/Platform b/arch/mips/ralink/Platform -index 6babd65..3f49e51 100644 --- a/arch/mips/ralink/Platform +++ b/arch/mips/ralink/Platform -@@ -5,6 +5,11 @@ core-$(CONFIG_RALINK) += arch/mips/ralink/ +@@ -5,6 +5,11 @@ core-$(CONFIG_RALINK) += arch/mips/rali cflags-$(CONFIG_RALINK) += -I$(srctree)/arch/mips/include/asm/mach-ralink # @@ -131,9 +120,6 @@ index 6babd65..3f49e51 100644 # Ralink RT305x # load-$(CONFIG_SOC_RT305X) += 0xffffffff80000000 -diff --git a/arch/mips/ralink/rt288x.c b/arch/mips/ralink/rt288x.c -new file mode 100644 -index 0000000..1e0788e --- /dev/null +++ b/arch/mips/ralink/rt288x.c @@ -0,0 +1,139 @@ @@ -276,6 +262,3 @@ index 0000000..1e0788e + (id >> CHIP_ID_ID_SHIFT) & CHIP_ID_ID_MASK, + (id & CHIP_ID_REV_MASK)); +} --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0112-MIPS-ralink-adds-support-for-RT3883-SoC-family.patch b/target/linux/ramips/patches-3.9/0112-MIPS-ralink-adds-support-for-RT3883-SoC-family.patch index 47b13d8142..6dfcc67c53 100644 --- a/target/linux/ramips/patches-3.9/0112-MIPS-ralink-adds-support-for-RT3883-SoC-family.patch +++ b/target/linux/ramips/patches-3.9/0112-MIPS-ralink-adds-support-for-RT3883-SoC-family.patch @@ -20,9 +20,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5185/ create mode 100644 arch/mips/include/asm/mach-ralink/rt3883.h create mode 100644 arch/mips/ralink/rt3883.c -diff --git a/arch/mips/include/asm/mach-ralink/rt3883.h b/arch/mips/include/asm/mach-ralink/rt3883.h -new file mode 100644 -index 0000000..b91c6c1 --- /dev/null +++ b/arch/mips/include/asm/mach-ralink/rt3883.h @@ -0,0 +1,247 @@ @@ -273,8 +270,6 @@ index 0000000..b91c6c1 +#define RT3883_FLASH_CFG_WIDTH_32BIT 0x2 + +#endif /* _RT3883_REGS_H_ */ -diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig -index 6723b94..ce57d3e 100644 --- a/arch/mips/ralink/Kconfig +++ b/arch/mips/ralink/Kconfig @@ -15,6 +15,11 @@ choice @@ -289,8 +284,6 @@ index 6723b94..ce57d3e 100644 endchoice choice -diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile -index 6d826f2..ba9669c 100644 --- a/arch/mips/ralink/Makefile +++ b/arch/mips/ralink/Makefile @@ -10,6 +10,7 @@ obj-y := prom.o of.o reset.o clk.o irq.o @@ -301,11 +294,9 @@ index 6d826f2..ba9669c 100644 obj-$(CONFIG_EARLY_PRINTK) += early_printk.o -diff --git a/arch/mips/ralink/Platform b/arch/mips/ralink/Platform -index 3f49e51..f67c08d 100644 --- a/arch/mips/ralink/Platform +++ b/arch/mips/ralink/Platform -@@ -13,3 +13,8 @@ load-$(CONFIG_SOC_RT288X) += 0xffffffff88000000 +@@ -13,3 +13,8 @@ load-$(CONFIG_SOC_RT288X) += 0xffffffff8 # Ralink RT305x # load-$(CONFIG_SOC_RT305X) += 0xffffffff80000000 @@ -314,9 +305,6 @@ index 3f49e51..f67c08d 100644 +# Ralink RT3883 +# +load-$(CONFIG_SOC_RT3883) += 0xffffffff80000000 -diff --git a/arch/mips/ralink/rt3883.c b/arch/mips/ralink/rt3883.c -new file mode 100644 -index 0000000..2d90aa9 --- /dev/null +++ b/arch/mips/ralink/rt3883.c @@ -0,0 +1,242 @@ @@ -562,6 +550,3 @@ index 0000000..2d90aa9 + (id >> RT3883_REVID_VER_ID_SHIFT) & RT3883_REVID_VER_ID_MASK, + (id & RT3883_REVID_ECO_ID_MASK)); +} --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0113-MIPS-ralink-adds-support-for-MT7620-SoC-family.patch b/target/linux/ramips/patches-3.9/0113-MIPS-ralink-adds-support-for-MT7620-SoC-family.patch index cd6a97b9f6..727e48b82c 100644 --- a/target/linux/ramips/patches-3.9/0113-MIPS-ralink-adds-support-for-MT7620-SoC-family.patch +++ b/target/linux/ramips/patches-3.9/0113-MIPS-ralink-adds-support-for-MT7620-SoC-family.patch @@ -20,9 +20,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5177/ create mode 100644 arch/mips/include/asm/mach-ralink/mt7620.h create mode 100644 arch/mips/ralink/mt7620.c -diff --git a/arch/mips/include/asm/mach-ralink/mt7620.h b/arch/mips/include/asm/mach-ralink/mt7620.h -new file mode 100644 -index 0000000..b272649 --- /dev/null +++ b/arch/mips/include/asm/mach-ralink/mt7620.h @@ -0,0 +1,76 @@ @@ -102,8 +99,6 @@ index 0000000..b272649 +#define MT7620_GPIO_MODE_WDT BIT(22) + +#endif -diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig -index ce57d3e..86f6c77 100644 --- a/arch/mips/ralink/Kconfig +++ b/arch/mips/ralink/Kconfig @@ -20,6 +20,9 @@ choice @@ -116,8 +111,6 @@ index ce57d3e..86f6c77 100644 endchoice choice -diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile -index ba9669c..38cf1a8 100644 --- a/arch/mips/ralink/Makefile +++ b/arch/mips/ralink/Makefile @@ -11,6 +11,7 @@ obj-y := prom.o of.o reset.o clk.o irq.o @@ -128,11 +121,9 @@ index ba9669c..38cf1a8 100644 obj-$(CONFIG_EARLY_PRINTK) += early_printk.o -diff --git a/arch/mips/ralink/Platform b/arch/mips/ralink/Platform -index f67c08d..b2cbf16 100644 --- a/arch/mips/ralink/Platform +++ b/arch/mips/ralink/Platform -@@ -18,3 +18,8 @@ load-$(CONFIG_SOC_RT305X) += 0xffffffff80000000 +@@ -18,3 +18,8 @@ load-$(CONFIG_SOC_RT305X) += 0xffffffff8 # Ralink RT3883 # load-$(CONFIG_SOC_RT3883) += 0xffffffff80000000 @@ -141,9 +132,6 @@ index f67c08d..b2cbf16 100644 +# Ralink MT7620 +# +load-$(CONFIG_SOC_MT7620) += 0xffffffff80000000 -diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c -new file mode 100644 -index 0000000..eb00ab8 --- /dev/null +++ b/arch/mips/ralink/mt7620.c @@ -0,0 +1,214 @@ @@ -361,6 +349,3 @@ index 0000000..eb00ab8 + cfg0 = __raw_readl(sysc + SYSC_REG_SYSTEM_CONFIG0); + dram_type = (cfg0 >> SYSCFG0_DRAM_TYPE_SHIFT) & SYSCFG0_DRAM_TYPE_MASK; +} --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0114-MIPS-ralink-add-cpu-feature-overrides.h.patch b/target/linux/ramips/patches-3.9/0114-MIPS-ralink-add-cpu-feature-overrides.h.patch index d02e2407e2..721809a334 100644 --- a/target/linux/ramips/patches-3.9/0114-MIPS-ralink-add-cpu-feature-overrides.h.patch +++ b/target/linux/ramips/patches-3.9/0114-MIPS-ralink-add-cpu-feature-overrides.h.patch @@ -18,9 +18,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5175/ create mode 100644 arch/mips/include/asm/mach-ralink/rt305x/cpu-feature-overrides.h create mode 100644 arch/mips/include/asm/mach-ralink/rt3883/cpu-feature-overrides.h -diff --git a/arch/mips/include/asm/mach-ralink/rt288x/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ralink/rt288x/cpu-feature-overrides.h -new file mode 100644 -index 0000000..72fc106 --- /dev/null +++ b/arch/mips/include/asm/mach-ralink/rt288x/cpu-feature-overrides.h @@ -0,0 +1,56 @@ @@ -80,9 +77,6 @@ index 0000000..72fc106 +#define cpu_icache_line_size() 16 + +#endif /* _RT288X_CPU_FEATURE_OVERRIDES_H */ -diff --git a/arch/mips/include/asm/mach-ralink/rt305x/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ralink/rt305x/cpu-feature-overrides.h -new file mode 100644 -index 0000000..917c286 --- /dev/null +++ b/arch/mips/include/asm/mach-ralink/rt305x/cpu-feature-overrides.h @@ -0,0 +1,56 @@ @@ -142,9 +136,6 @@ index 0000000..917c286 +#define cpu_icache_line_size() 32 + +#endif /* _RT305X_CPU_FEATURE_OVERRIDES_H */ -diff --git a/arch/mips/include/asm/mach-ralink/rt3883/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ralink/rt3883/cpu-feature-overrides.h -new file mode 100644 -index 0000000..181fbf4 --- /dev/null +++ b/arch/mips/include/asm/mach-ralink/rt3883/cpu-feature-overrides.h @@ -0,0 +1,55 @@ @@ -203,11 +194,9 @@ index 0000000..181fbf4 +#define cpu_icache_line_size() 32 + +#endif /* _RT3883_CPU_FEATURE_OVERRIDES_H */ -diff --git a/arch/mips/ralink/Platform b/arch/mips/ralink/Platform -index b2cbf16..cda4b66 100644 --- a/arch/mips/ralink/Platform +++ b/arch/mips/ralink/Platform -@@ -8,16 +8,19 @@ cflags-$(CONFIG_RALINK) += -I$(srctree)/arch/mips/include/asm/mach-ralink +@@ -8,16 +8,19 @@ cflags-$(CONFIG_RALINK) += -I$(srctree) # Ralink RT288x # load-$(CONFIG_SOC_RT288X) += 0xffffffff88000000 @@ -227,6 +216,3 @@ index b2cbf16..cda4b66 100644 # # Ralink MT7620 --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0115-DT-add-vendor-prefixes-for-Ralink.patch b/target/linux/ramips/patches-3.9/0115-DT-add-vendor-prefixes-for-Ralink.patch index cbae1080a8..4a3c7768d1 100644 --- a/target/linux/ramips/patches-3.9/0115-DT-add-vendor-prefixes-for-Ralink.patch +++ b/target/linux/ramips/patches-3.9/0115-DT-add-vendor-prefixes-for-Ralink.patch @@ -9,8 +9,6 @@ Acked-by: Grant Likely Documentation/devicetree/bindings/vendor-prefixes.txt | 1 + 1 file changed, 1 insertion(+) -diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt -index 19e1ef7..6527412 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -41,6 +41,7 @@ onnn ON Semiconductor Corp. @@ -21,6 +19,3 @@ index 19e1ef7..6527412 100644 ramtron Ramtron International realtek Realtek Semiconductor Corp. renesas Renesas Electronics Corporation --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0116-DT-add-documentation-for-the-Ralink-MIPS-SoCs.patch b/target/linux/ramips/patches-3.9/0116-DT-add-documentation-for-the-Ralink-MIPS-SoCs.patch index b029e45307..4cf7b0a425 100644 --- a/target/linux/ramips/patches-3.9/0116-DT-add-documentation-for-the-Ralink-MIPS-SoCs.patch +++ b/target/linux/ramips/patches-3.9/0116-DT-add-documentation-for-the-Ralink-MIPS-SoCs.patch @@ -15,9 +15,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5187/ 1 file changed, 18 insertions(+) create mode 100644 Documentation/devicetree/bindings/mips/ralink.txt -diff --git a/Documentation/devicetree/bindings/mips/ralink.txt b/Documentation/devicetree/bindings/mips/ralink.txt -new file mode 100644 -index 0000000..59b6a35 --- /dev/null +++ b/Documentation/devicetree/bindings/mips/ralink.txt @@ -0,0 +1,18 @@ @@ -39,6 +36,3 @@ index 0000000..59b6a35 + ralink,mt7620a-soc + ralink,mt7620n-soc + --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0117-DT-MIPS-ralink-clean-up-RT3050-dtsi-and-dts-file.patch b/target/linux/ramips/patches-3.9/0117-DT-MIPS-ralink-clean-up-RT3050-dtsi-and-dts-file.patch index e21565d668..08dcd82eff 100644 --- a/target/linux/ramips/patches-3.9/0117-DT-MIPS-ralink-clean-up-RT3050-dtsi-and-dts-file.patch +++ b/target/linux/ramips/patches-3.9/0117-DT-MIPS-ralink-clean-up-RT3050-dtsi-and-dts-file.patch @@ -15,8 +15,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5186/ arch/mips/ralink/dts/rt3052_eval.dts | 10 ++----- 2 files changed, 4 insertions(+), 58 deletions(-) -diff --git a/arch/mips/ralink/dts/rt3050.dtsi b/arch/mips/ralink/dts/rt3050.dtsi -index 069d066..ef7da1e 100644 --- a/arch/mips/ralink/dts/rt3050.dtsi +++ b/arch/mips/ralink/dts/rt3050.dtsi @@ -1,7 +1,7 @@ @@ -106,8 +104,6 @@ index 069d066..ef7da1e 100644 uartlite@c00 { compatible = "ralink,rt3052-uart", "ralink,rt2880-uart", "ns16550a"; reg = <0xc00 0x100>; -diff --git a/arch/mips/ralink/dts/rt3052_eval.dts b/arch/mips/ralink/dts/rt3052_eval.dts -index 148a590..df17f5f 100644 --- a/arch/mips/ralink/dts/rt3052_eval.dts +++ b/arch/mips/ralink/dts/rt3052_eval.dts @@ -3,8 +3,6 @@ @@ -134,6 +130,3 @@ index 148a590..df17f5f 100644 }; cfi@1f000000 { --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0118-DT-MIPS-ralink-add-RT2880-dts-files.patch b/target/linux/ramips/patches-3.9/0118-DT-MIPS-ralink-add-RT2880-dts-files.patch index b47dec8c95..7e92e12bd4 100644 --- a/target/linux/ramips/patches-3.9/0118-DT-MIPS-ralink-add-RT2880-dts-files.patch +++ b/target/linux/ramips/patches-3.9/0118-DT-MIPS-ralink-add-RT2880-dts-files.patch @@ -17,8 +17,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5188/ create mode 100644 arch/mips/ralink/dts/rt2880.dtsi create mode 100644 arch/mips/ralink/dts/rt2880_eval.dts -diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig -index 86f6c77..2f6fbb8 100644 --- a/arch/mips/ralink/Kconfig +++ b/arch/mips/ralink/Kconfig @@ -34,6 +34,10 @@ choice @@ -32,16 +30,11 @@ index 86f6c77..2f6fbb8 100644 config DTB_RT305X_EVAL bool "RT305x eval kit" depends on SOC_RT305X -diff --git a/arch/mips/ralink/dts/Makefile b/arch/mips/ralink/dts/Makefile -index 1a69fb3..f635a01 100644 --- a/arch/mips/ralink/dts/Makefile +++ b/arch/mips/ralink/dts/Makefile @@ -1 +1,2 @@ +obj-$(CONFIG_DTB_RT2880_EVAL) := rt2880_eval.dtb.o obj-$(CONFIG_DTB_RT305X_EVAL) := rt3052_eval.dtb.o -diff --git a/arch/mips/ralink/dts/rt2880.dtsi b/arch/mips/ralink/dts/rt2880.dtsi -new file mode 100644 -index 0000000..182afde --- /dev/null +++ b/arch/mips/ralink/dts/rt2880.dtsi @@ -0,0 +1,58 @@ @@ -103,9 +96,6 @@ index 0000000..182afde + }; + }; +}; -diff --git a/arch/mips/ralink/dts/rt2880_eval.dts b/arch/mips/ralink/dts/rt2880_eval.dts -new file mode 100644 -index 0000000..322d700 --- /dev/null +++ b/arch/mips/ralink/dts/rt2880_eval.dts @@ -0,0 +1,46 @@ @@ -155,6 +145,3 @@ index 0000000..322d700 + }; + }; +}; --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0119-DT-MIPS-ralink-add-RT3883-dts-files.patch b/target/linux/ramips/patches-3.9/0119-DT-MIPS-ralink-add-RT3883-dts-files.patch index 334ddee079..4a8df8c596 100644 --- a/target/linux/ramips/patches-3.9/0119-DT-MIPS-ralink-add-RT3883-dts-files.patch +++ b/target/linux/ramips/patches-3.9/0119-DT-MIPS-ralink-add-RT3883-dts-files.patch @@ -17,8 +17,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5189/ create mode 100644 arch/mips/ralink/dts/rt3883.dtsi create mode 100644 arch/mips/ralink/dts/rt3883_eval.dts -diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig -index 2f6fbb8..493411f 100644 --- a/arch/mips/ralink/Kconfig +++ b/arch/mips/ralink/Kconfig @@ -42,6 +42,10 @@ choice @@ -32,17 +30,12 @@ index 2f6fbb8..493411f 100644 endchoice endif -diff --git a/arch/mips/ralink/dts/Makefile b/arch/mips/ralink/dts/Makefile -index f635a01..040a986 100644 --- a/arch/mips/ralink/dts/Makefile +++ b/arch/mips/ralink/dts/Makefile @@ -1,2 +1,3 @@ obj-$(CONFIG_DTB_RT2880_EVAL) := rt2880_eval.dtb.o obj-$(CONFIG_DTB_RT305X_EVAL) := rt3052_eval.dtb.o +obj-$(CONFIG_DTB_RT3883_EVAL) := rt3883_eval.dtb.o -diff --git a/arch/mips/ralink/dts/rt3883.dtsi b/arch/mips/ralink/dts/rt3883.dtsi -new file mode 100644 -index 0000000..3b131dd --- /dev/null +++ b/arch/mips/ralink/dts/rt3883.dtsi @@ -0,0 +1,58 @@ @@ -104,9 +97,6 @@ index 0000000..3b131dd + }; + }; +}; -diff --git a/arch/mips/ralink/dts/rt3883_eval.dts b/arch/mips/ralink/dts/rt3883_eval.dts -new file mode 100644 -index 0000000..2fa6b33 --- /dev/null +++ b/arch/mips/ralink/dts/rt3883_eval.dts @@ -0,0 +1,16 @@ @@ -126,6 +116,3 @@ index 0000000..2fa6b33 + bootargs = "console=ttyS0,57600"; + }; +}; --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0120-DT-MIPS-ralink-add-MT7620A-dts-files.patch b/target/linux/ramips/patches-3.9/0120-DT-MIPS-ralink-add-MT7620A-dts-files.patch index d96e10de9f..3d9a9fc245 100644 --- a/target/linux/ramips/patches-3.9/0120-DT-MIPS-ralink-add-MT7620A-dts-files.patch +++ b/target/linux/ramips/patches-3.9/0120-DT-MIPS-ralink-add-MT7620A-dts-files.patch @@ -17,8 +17,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5190/ create mode 100644 arch/mips/ralink/dts/mt7620a.dtsi create mode 100644 arch/mips/ralink/dts/mt7620a_eval.dts -diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig -index 493411f..026e823 100644 --- a/arch/mips/ralink/Kconfig +++ b/arch/mips/ralink/Kconfig @@ -46,6 +46,10 @@ choice @@ -32,8 +30,6 @@ index 493411f..026e823 100644 endchoice endif -diff --git a/arch/mips/ralink/dts/Makefile b/arch/mips/ralink/dts/Makefile -index 040a986..18194fa 100644 --- a/arch/mips/ralink/dts/Makefile +++ b/arch/mips/ralink/dts/Makefile @@ -1,3 +1,4 @@ @@ -41,9 +37,6 @@ index 040a986..18194fa 100644 obj-$(CONFIG_DTB_RT305X_EVAL) := rt3052_eval.dtb.o obj-$(CONFIG_DTB_RT3883_EVAL) := rt3883_eval.dtb.o +obj-$(CONFIG_DTB_MT7620A_EVAL) := mt7620a_eval.dtb.o -diff --git a/arch/mips/ralink/dts/mt7620a.dtsi b/arch/mips/ralink/dts/mt7620a.dtsi -new file mode 100644 -index 0000000..08bf24f --- /dev/null +++ b/arch/mips/ralink/dts/mt7620a.dtsi @@ -0,0 +1,58 @@ @@ -105,9 +98,6 @@ index 0000000..08bf24f + }; + }; +}; -diff --git a/arch/mips/ralink/dts/mt7620a_eval.dts b/arch/mips/ralink/dts/mt7620a_eval.dts -new file mode 100644 -index 0000000..35eb874 --- /dev/null +++ b/arch/mips/ralink/dts/mt7620a_eval.dts @@ -0,0 +1,16 @@ @@ -127,6 +117,3 @@ index 0000000..35eb874 + bootargs = "console=ttyS0,57600"; + }; +}; --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0121-MIPS-add-detect_memory_region.patch b/target/linux/ramips/patches-3.9/0121-MIPS-add-detect_memory_region.patch index 90ca369901..bfb6ca2022 100644 --- a/target/linux/ramips/patches-3.9/0121-MIPS-add-detect_memory_region.patch +++ b/target/linux/ramips/patches-3.9/0121-MIPS-add-detect_memory_region.patch @@ -13,8 +13,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5178/ arch/mips/kernel/setup.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) -diff --git a/arch/mips/include/asm/bootinfo.h b/arch/mips/include/asm/bootinfo.h -index b71dd5b..4d2cdea 100644 --- a/arch/mips/include/asm/bootinfo.h +++ b/arch/mips/include/asm/bootinfo.h @@ -104,6 +104,7 @@ struct boot_mem_map { @@ -25,8 +23,6 @@ index b71dd5b..4d2cdea 100644 extern void prom_init(void); extern void prom_free_prom_memory(void); -diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c -index 4c774d5..7325793 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -23,6 +23,7 @@ @@ -37,7 +33,7 @@ index 4c774d5..7325793 100644 #include #include -@@ -122,6 +123,25 @@ void __init add_memory_region(phys_t start, phys_t size, long type) +@@ -122,6 +123,25 @@ void __init add_memory_region(phys_t sta boot_mem_map.nr_map++; } @@ -63,6 +59,3 @@ index 4c774d5..7325793 100644 static void __init print_memory_map(void) { int i; --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0122-MIPS-ralink-add-memory-definition-to-struct-ralink_s.patch b/target/linux/ramips/patches-3.9/0122-MIPS-ralink-add-memory-definition-to-struct-ralink_s.patch index 25e0711eb1..e7a61dad34 100644 --- a/target/linux/ramips/patches-3.9/0122-MIPS-ralink-add-memory-definition-to-struct-ralink_s.patch +++ b/target/linux/ramips/patches-3.9/0122-MIPS-ralink-add-memory-definition-to-struct-ralink_s.patch @@ -13,11 +13,9 @@ Patchwork: http://patchwork.linux-mips.org/patch/5179/ arch/mips/ralink/common.h | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/arch/mips/ralink/common.h b/arch/mips/ralink/common.h -index 299119b..83144c3 100644 --- a/arch/mips/ralink/common.h +++ b/arch/mips/ralink/common.h -@@ -33,6 +33,11 @@ extern struct ralink_pinmux rt_gpio_pinmux; +@@ -33,6 +33,11 @@ extern struct ralink_pinmux rt_gpio_pinm struct ralink_soc_info { unsigned char sys_type[RAMIPS_SYS_TYPE_LEN]; unsigned char *compatible; @@ -29,6 +27,3 @@ index 299119b..83144c3 100644 }; extern struct ralink_soc_info soc_info; --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0123-MIPS-ralink-add-memory-definition-for-RT305x.patch b/target/linux/ramips/patches-3.9/0123-MIPS-ralink-add-memory-definition-for-RT305x.patch index 0921629c22..b4a393f1e1 100644 --- a/target/linux/ramips/patches-3.9/0123-MIPS-ralink-add-memory-definition-for-RT305x.patch +++ b/target/linux/ramips/patches-3.9/0123-MIPS-ralink-add-memory-definition-for-RT305x.patch @@ -15,8 +15,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5180/ arch/mips/ralink/rt305x.c | 45 ++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) -diff --git a/arch/mips/include/asm/mach-ralink/rt305x.h b/arch/mips/include/asm/mach-ralink/rt305x.h -index 80cda8a..069bf37 100644 --- a/arch/mips/include/asm/mach-ralink/rt305x.h +++ b/arch/mips/include/asm/mach-ralink/rt305x.h @@ -157,4 +157,10 @@ static inline int soc_is_rt5350(void) @@ -30,8 +28,6 @@ index 80cda8a..069bf37 100644 +#define RT3352_MEM_SIZE_MAX 256 + #endif -diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c -index 6aa3cb1..ca7ee3a 100644 --- a/arch/mips/ralink/rt305x.c +++ b/arch/mips/ralink/rt305x.c @@ -122,6 +122,40 @@ struct ralink_pinmux rt_gpio_pinmux = { @@ -75,7 +71,7 @@ index 6aa3cb1..ca7ee3a 100644 void __init ralink_clk_init(void) { unsigned long cpu_rate, sys_rate, wdt_rate, uart_rate; -@@ -252,4 +286,15 @@ void prom_soc_init(struct ralink_soc_info *soc_info) +@@ -252,4 +286,15 @@ void prom_soc_init(struct ralink_soc_inf name, (id >> CHIP_ID_ID_SHIFT) & CHIP_ID_ID_MASK, (id & CHIP_ID_REV_MASK)); @@ -91,6 +87,3 @@ index 6aa3cb1..ca7ee3a 100644 + soc_info->mem_size_max = RT3352_MEM_SIZE_MAX; + } } --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0124-MIPS-ralink-add-memory-definition-for-RT2880.patch b/target/linux/ramips/patches-3.9/0124-MIPS-ralink-add-memory-definition-for-RT2880.patch index 43adf86a39..db026499a6 100644 --- a/target/linux/ramips/patches-3.9/0124-MIPS-ralink-add-memory-definition-for-RT2880.patch +++ b/target/linux/ramips/patches-3.9/0124-MIPS-ralink-add-memory-definition-for-RT2880.patch @@ -12,8 +12,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5181/ arch/mips/ralink/rt288x.c | 4 ++++ 2 files changed, 8 insertions(+) -diff --git a/arch/mips/include/asm/mach-ralink/rt288x.h b/arch/mips/include/asm/mach-ralink/rt288x.h -index ad8b42d..03ad716 100644 --- a/arch/mips/include/asm/mach-ralink/rt288x.h +++ b/arch/mips/include/asm/mach-ralink/rt288x.h @@ -46,4 +46,8 @@ @@ -25,11 +23,9 @@ index ad8b42d..03ad716 100644 +#define RT2880_MEM_SIZE_MAX 128 + #endif -diff --git a/arch/mips/ralink/rt288x.c b/arch/mips/ralink/rt288x.c -index 1e0788e..f87de1a 100644 --- a/arch/mips/ralink/rt288x.c +++ b/arch/mips/ralink/rt288x.c -@@ -136,4 +136,8 @@ void prom_soc_init(struct ralink_soc_info *soc_info) +@@ -136,4 +136,8 @@ void prom_soc_init(struct ralink_soc_inf name, (id >> CHIP_ID_ID_SHIFT) & CHIP_ID_ID_MASK, (id & CHIP_ID_REV_MASK)); @@ -38,6 +34,3 @@ index 1e0788e..f87de1a 100644 + soc_info->mem_size_min = RT2880_MEM_SIZE_MIN; + soc_info->mem_size_max = RT2880_MEM_SIZE_MAX; } --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0125-MIPS-ralink-add-memory-definition-for-RT3883.patch b/target/linux/ramips/patches-3.9/0125-MIPS-ralink-add-memory-definition-for-RT3883.patch index ab25311075..3226b10a42 100644 --- a/target/linux/ramips/patches-3.9/0125-MIPS-ralink-add-memory-definition-for-RT3883.patch +++ b/target/linux/ramips/patches-3.9/0125-MIPS-ralink-add-memory-definition-for-RT3883.patch @@ -12,8 +12,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5182/ arch/mips/ralink/rt3883.c | 4 ++++ 2 files changed, 9 insertions(+) -diff --git a/arch/mips/include/asm/mach-ralink/rt3883.h b/arch/mips/include/asm/mach-ralink/rt3883.h -index b91c6c1..058382f 100644 --- a/arch/mips/include/asm/mach-ralink/rt3883.h +++ b/arch/mips/include/asm/mach-ralink/rt3883.h @@ -152,6 +152,7 @@ @@ -33,11 +31,9 @@ index b91c6c1..058382f 100644 +#define RT3883_MEM_SIZE_MAX 256 + #endif /* _RT3883_REGS_H_ */ -diff --git a/arch/mips/ralink/rt3883.c b/arch/mips/ralink/rt3883.c -index 2d90aa9..afbf2ce 100644 --- a/arch/mips/ralink/rt3883.c +++ b/arch/mips/ralink/rt3883.c -@@ -239,4 +239,8 @@ void prom_soc_init(struct ralink_soc_info *soc_info) +@@ -239,4 +239,8 @@ void prom_soc_init(struct ralink_soc_inf name, (id >> RT3883_REVID_VER_ID_SHIFT) & RT3883_REVID_VER_ID_MASK, (id & RT3883_REVID_ECO_ID_MASK)); @@ -46,6 +42,3 @@ index 2d90aa9..afbf2ce 100644 + soc_info->mem_size_min = RT3883_MEM_SIZE_MIN; + soc_info->mem_size_max = RT3883_MEM_SIZE_MAX; } --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0126-MIPS-ralink-add-memory-definition-for-MT7620.patch b/target/linux/ramips/patches-3.9/0126-MIPS-ralink-add-memory-definition-for-MT7620.patch index 001483873d..10b15dc62a 100644 --- a/target/linux/ramips/patches-3.9/0126-MIPS-ralink-add-memory-definition-for-MT7620.patch +++ b/target/linux/ramips/patches-3.9/0126-MIPS-ralink-add-memory-definition-for-MT7620.patch @@ -12,8 +12,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5183/ arch/mips/ralink/mt7620.c | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+) -diff --git a/arch/mips/include/asm/mach-ralink/mt7620.h b/arch/mips/include/asm/mach-ralink/mt7620.h -index b272649..9809972 100644 --- a/arch/mips/include/asm/mach-ralink/mt7620.h +++ b/arch/mips/include/asm/mach-ralink/mt7620.h @@ -50,6 +50,14 @@ @@ -31,11 +29,9 @@ index b272649..9809972 100644 #define MT7620_GPIO_MODE_I2C BIT(0) #define MT7620_GPIO_MODE_UART0_SHIFT 2 #define MT7620_GPIO_MODE_UART0_MASK 0x7 -diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c -index eb00ab8..98ddb93 100644 --- a/arch/mips/ralink/mt7620.c +++ b/arch/mips/ralink/mt7620.c -@@ -211,4 +211,24 @@ void prom_soc_init(struct ralink_soc_info *soc_info) +@@ -211,4 +211,24 @@ void prom_soc_init(struct ralink_soc_inf cfg0 = __raw_readl(sysc + SYSC_REG_SYSTEM_CONFIG0); dram_type = (cfg0 >> SYSCFG0_DRAM_TYPE_SHIFT) & SYSCFG0_DRAM_TYPE_MASK; @@ -60,6 +56,3 @@ index eb00ab8..98ddb93 100644 + } + soc_info->mem_base = MT7620_DRAM_BASE; } --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0127-MIPS-ralink-make-use-of-the-new-memory-detection-cod.patch b/target/linux/ramips/patches-3.9/0127-MIPS-ralink-make-use-of-the-new-memory-detection-cod.patch index a1eae9007f..4fcd0a4f6d 100644 --- a/target/linux/ramips/patches-3.9/0127-MIPS-ralink-make-use-of-the-new-memory-detection-cod.patch +++ b/target/linux/ramips/patches-3.9/0127-MIPS-ralink-make-use-of-the-new-memory-detection-cod.patch @@ -13,8 +13,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5184/ arch/mips/ralink/of.c | 9 +++++++++ 1 file changed, 9 insertions(+) -diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c -index 4165e70..fb15695 100644 --- a/arch/mips/ralink/of.c +++ b/arch/mips/ralink/of.c @@ -11,6 +11,7 @@ @@ -40,6 +38,3 @@ index 4165e70..fb15695 100644 } static int __init plat_of_setup(void) --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0128-MIPS-ralink-upstream-v3.10.patch b/target/linux/ramips/patches-3.9/0128-MIPS-ralink-upstream-v3.10.patch index 105ef3eee8..b409d1e123 100644 --- a/target/linux/ramips/patches-3.9/0128-MIPS-ralink-upstream-v3.10.patch +++ b/target/linux/ramips/patches-3.9/0128-MIPS-ralink-upstream-v3.10.patch @@ -11,13 +11,7 @@ Signed-off-by: John Crispin 1 file changed, 1 insertion(+) create mode 100644 dummy -diff --git a/dummy b/dummy -new file mode 100644 -index 0000000..421376d --- /dev/null +++ b/dummy @@ -0,0 +1 @@ +dummy --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0129-MIPS-ralink-add-pinmux-driver.patch b/target/linux/ramips/patches-3.9/0129-MIPS-ralink-add-pinmux-driver.patch index c51a4f4215..03c912918b 100644 --- a/target/linux/ramips/patches-3.9/0129-MIPS-ralink-add-pinmux-driver.patch +++ b/target/linux/ramips/patches-3.9/0129-MIPS-ralink-add-pinmux-driver.patch @@ -16,8 +16,6 @@ Signed-off-by: John Crispin 4 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 arch/mips/ralink/pinmux.c -diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile -index 38cf1a8..341b4de 100644 --- a/arch/mips/ralink/Makefile +++ b/arch/mips/ralink/Makefile @@ -6,7 +6,7 @@ @@ -29,19 +27,15 @@ index 38cf1a8..341b4de 100644 obj-$(CONFIG_SOC_RT288X) += rt288x.o obj-$(CONFIG_SOC_RT305X) += rt305x.o -diff --git a/arch/mips/ralink/common.h b/arch/mips/ralink/common.h -index 83144c3..f113fd6 100644 --- a/arch/mips/ralink/common.h +++ b/arch/mips/ralink/common.h -@@ -50,4 +50,6 @@ extern void prom_soc_init(struct ralink_soc_info *soc_info); +@@ -50,4 +50,6 @@ extern void prom_soc_init(struct ralink_ __iomem void *plat_of_remap_node(const char *node); +void ralink_pinmux(void); + #endif /* _RALINK_COMMON_H__ */ -diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c -index fb15695..f916774 100644 --- a/arch/mips/ralink/of.c +++ b/arch/mips/ralink/of.c @@ -110,6 +110,8 @@ static int __init plat_of_setup(void) @@ -53,9 +47,6 @@ index fb15695..f916774 100644 return 0; } -diff --git a/arch/mips/ralink/pinmux.c b/arch/mips/ralink/pinmux.c -new file mode 100644 -index 0000000..1720216 --- /dev/null +++ b/arch/mips/ralink/pinmux.c @@ -0,0 +1,77 @@ @@ -136,6 +127,3 @@ index 0000000..1720216 + + rt_sysc_w32(mode, SYSC_REG_GPIO_MODE); +} --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0130-MIPS-ralink-add-support-for-periodic-timer-irq.patch b/target/linux/ramips/patches-3.9/0130-MIPS-ralink-add-support-for-periodic-timer-irq.patch index d2b318712c..376953a09c 100644 --- a/target/linux/ramips/patches-3.9/0130-MIPS-ralink-add-support-for-periodic-timer-irq.patch +++ b/target/linux/ramips/patches-3.9/0130-MIPS-ralink-add-support-for-periodic-timer-irq.patch @@ -12,8 +12,6 @@ Signed-off-by: John Crispin 2 files changed, 193 insertions(+), 1 deletion(-) create mode 100644 arch/mips/ralink/timer.c -diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile -index 341b4de..cae7d88 100644 --- a/arch/mips/ralink/Makefile +++ b/arch/mips/ralink/Makefile @@ -6,7 +6,7 @@ @@ -25,9 +23,6 @@ index 341b4de..cae7d88 100644 obj-$(CONFIG_SOC_RT288X) += rt288x.o obj-$(CONFIG_SOC_RT305X) += rt305x.o -diff --git a/arch/mips/ralink/timer.c b/arch/mips/ralink/timer.c -new file mode 100644 -index 0000000..0a6856c --- /dev/null +++ b/arch/mips/ralink/timer.c @@ -0,0 +1,192 @@ @@ -223,6 +218,3 @@ index 0000000..0a6856c +MODULE_DESCRIPTION("Ralink RT2880 timer"); +MODULE_AUTHOR("John Crispin arch/mips/include/asm/mach-ralink/ralink_regs.h | 7 +++++++ 1 file changed, 7 insertions(+) -diff --git a/arch/mips/include/asm/mach-ralink/ralink_regs.h b/arch/mips/include/asm/mach-ralink/ralink_regs.h -index 5a508f9..bd93014 100644 --- a/arch/mips/include/asm/mach-ralink/ralink_regs.h +++ b/arch/mips/include/asm/mach-ralink/ralink_regs.h -@@ -26,6 +26,13 @@ static inline u32 rt_sysc_r32(unsigned reg) +@@ -26,6 +26,13 @@ static inline u32 rt_sysc_r32(unsigned r return __raw_readl(rt_sysc_membase + reg); } @@ -26,6 +24,3 @@ index 5a508f9..bd93014 100644 static inline void rt_memc_w32(u32 val, unsigned reg) { __raw_writel(val, rt_memc_membase + reg); --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0132-MIPS-ralink-make-mt7620-ram-detect-verbose.patch b/target/linux/ramips/patches-3.9/0132-MIPS-ralink-make-mt7620-ram-detect-verbose.patch index e98a254dd4..c014ef5696 100644 --- a/target/linux/ramips/patches-3.9/0132-MIPS-ralink-make-mt7620-ram-detect-verbose.patch +++ b/target/linux/ramips/patches-3.9/0132-MIPS-ralink-make-mt7620-ram-detect-verbose.patch @@ -10,11 +10,9 @@ Signed-off-by: John Crispin arch/mips/ralink/mt7620.c | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c -index 98ddb93..28350d0 100644 --- a/arch/mips/ralink/mt7620.c +++ b/arch/mips/ralink/mt7620.c -@@ -214,16 +214,19 @@ void prom_soc_init(struct ralink_soc_info *soc_info) +@@ -214,16 +214,19 @@ void prom_soc_init(struct ralink_soc_inf switch (dram_type) { case SYSCFG0_DRAM_TYPE_SDRAM: @@ -34,6 +32,3 @@ index 98ddb93..28350d0 100644 soc_info->mem_size_min = MT7620_DDR2_SIZE_MIN; soc_info->mem_size_max = MT7620_DDR2_SIZE_MAX; break; --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0133-MIPS-ralink-add-verbose-pmu-info.patch b/target/linux/ramips/patches-3.9/0133-MIPS-ralink-add-verbose-pmu-info.patch index 5b9ac944a7..b56a734d01 100644 --- a/target/linux/ramips/patches-3.9/0133-MIPS-ralink-add-verbose-pmu-info.patch +++ b/target/linux/ramips/patches-3.9/0133-MIPS-ralink-add-verbose-pmu-info.patch @@ -10,8 +10,6 @@ Signed-off-by: John Crispin arch/mips/ralink/mt7620.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) -diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c -index 28350d0..69729a5 100644 --- a/arch/mips/ralink/mt7620.c +++ b/arch/mips/ralink/mt7620.c @@ -20,6 +20,22 @@ @@ -37,7 +35,7 @@ index 28350d0..69729a5 100644 /* does the board have sdram or ddram */ static int dram_type; -@@ -187,6 +203,8 @@ void prom_soc_init(struct ralink_soc_info *soc_info) +@@ -187,6 +203,8 @@ void prom_soc_init(struct ralink_soc_inf u32 n1; u32 rev; u32 cfg0; @@ -46,7 +44,7 @@ index 28350d0..69729a5 100644 n0 = __raw_readl(sysc + SYSC_REG_CHIP_NAME0); n1 = __raw_readl(sysc + SYSC_REG_CHIP_NAME1); -@@ -234,4 +252,12 @@ void prom_soc_init(struct ralink_soc_info *soc_info) +@@ -234,4 +252,12 @@ void prom_soc_init(struct ralink_soc_inf BUG(); } soc_info->mem_base = MT7620_DRAM_BASE; @@ -59,6 +57,3 @@ index 28350d0..69729a5 100644 + pr_info("Digital PMU set to %s control\n", + (pmu1 & DIG_SW_SEL) ? ("sw") : ("hw")); } --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0134-MIPS-ralink-adds-a-bootrom-dumper-module.patch b/target/linux/ramips/patches-3.9/0134-MIPS-ralink-adds-a-bootrom-dumper-module.patch index 602cf40a54..d4df8bbae9 100644 --- a/target/linux/ramips/patches-3.9/0134-MIPS-ralink-adds-a-bootrom-dumper-module.patch +++ b/target/linux/ramips/patches-3.9/0134-MIPS-ralink-adds-a-bootrom-dumper-module.patch @@ -13,8 +13,6 @@ Signed-off-by: John Crispin 2 files changed, 50 insertions(+) create mode 100644 arch/mips/ralink/bootrom.c -diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile -index cae7d88..5fa6129 100644 --- a/arch/mips/ralink/Makefile +++ b/arch/mips/ralink/Makefile @@ -15,4 +15,6 @@ obj-$(CONFIG_SOC_MT7620) += mt7620.o @@ -24,9 +22,6 @@ index cae7d88..5fa6129 100644 +obj-$(CONFIG_DEBUG_FS) += bootrom.o + obj-y += dts/ -diff --git a/arch/mips/ralink/bootrom.c b/arch/mips/ralink/bootrom.c -new file mode 100644 -index 0000000..f926f6f --- /dev/null +++ b/arch/mips/ralink/bootrom.c @@ -0,0 +1,48 @@ @@ -78,6 +73,3 @@ index 0000000..f926f6f +} + +postcore_initcall(bootrom_setup); --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0135-MIPS-ralink-add-missing-SZ_1M-multiplier.patch b/target/linux/ramips/patches-3.9/0135-MIPS-ralink-add-missing-SZ_1M-multiplier.patch index 2d5c71f539..74e780fdd1 100644 --- a/target/linux/ramips/patches-3.9/0135-MIPS-ralink-add-missing-SZ_1M-multiplier.patch +++ b/target/linux/ramips/patches-3.9/0135-MIPS-ralink-add-missing-SZ_1M-multiplier.patch @@ -11,8 +11,6 @@ Signed-off-by: John Crispin arch/mips/ralink/of.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c -index f916774..b25c1f2 100644 --- a/arch/mips/ralink/of.c +++ b/arch/mips/ralink/of.c @@ -88,7 +88,7 @@ void __init plat_mem_setup(void) @@ -24,6 +22,3 @@ index f916774..b25c1f2 100644 BOOT_MEM_RAM); else detect_memory_region(soc_info.mem_base, --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0136-MIPS-use-set_mode-to-enable-disable-the-cevt-r4k-irq.patch b/target/linux/ramips/patches-3.9/0136-MIPS-use-set_mode-to-enable-disable-the-cevt-r4k-irq.patch index 21ab341513..828a2ade1b 100644 --- a/target/linux/ramips/patches-3.9/0136-MIPS-use-set_mode-to-enable-disable-the-cevt-r4k-irq.patch +++ b/target/linux/ramips/patches-3.9/0136-MIPS-use-set_mode-to-enable-disable-the-cevt-r4k-irq.patch @@ -9,11 +9,9 @@ Signed-off-by: John Crispin arch/mips/kernel/cevt-r4k.c | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) -diff --git a/arch/mips/kernel/cevt-r4k.c b/arch/mips/kernel/cevt-r4k.c -index 07b847d..d5d94e5 100644 --- a/arch/mips/kernel/cevt-r4k.c +++ b/arch/mips/kernel/cevt-r4k.c -@@ -39,12 +39,6 @@ static int mips_next_event(unsigned long delta, +@@ -39,12 +39,6 @@ static int mips_next_event(unsigned long #endif /* CONFIG_MIPS_MT_SMTC */ @@ -26,7 +24,7 @@ index 07b847d..d5d94e5 100644 DEFINE_PER_CPU(struct clock_event_device, mips_clockevent_device); int cp0_timer_irq_installed; -@@ -89,6 +83,32 @@ struct irqaction c0_compare_irqaction = { +@@ -89,6 +83,32 @@ struct irqaction c0_compare_irqaction = .name = "timer", }; @@ -73,6 +71,3 @@ index 07b847d..d5d94e5 100644 return 0; } --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0137-MIPS-ralink-add-illegal-access-driver.patch b/target/linux/ramips/patches-3.9/0137-MIPS-ralink-add-illegal-access-driver.patch index 670b20052a..c82b7a97c2 100644 --- a/target/linux/ramips/patches-3.9/0137-MIPS-ralink-add-illegal-access-driver.patch +++ b/target/linux/ramips/patches-3.9/0137-MIPS-ralink-add-illegal-access-driver.patch @@ -10,8 +10,6 @@ Signed-off-by: John Crispin 2 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 arch/mips/ralink/ill_acc.c -diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile -index 5fa6129..55a5bfc 100644 --- a/arch/mips/ralink/Makefile +++ b/arch/mips/ralink/Makefile @@ -6,7 +6,7 @@ @@ -23,9 +21,6 @@ index 5fa6129..55a5bfc 100644 obj-$(CONFIG_SOC_RT288X) += rt288x.o obj-$(CONFIG_SOC_RT305X) += rt305x.o -diff --git a/arch/mips/ralink/ill_acc.c b/arch/mips/ralink/ill_acc.c -new file mode 100644 -index 0000000..4a3f696 --- /dev/null +++ b/arch/mips/ralink/ill_acc.c @@ -0,0 +1,87 @@ @@ -116,6 +111,3 @@ index 0000000..4a3f696 +} + +arch_initcall(ill_acc_of_setup); --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0138-MIPS-ralink-workaround-DTB-memory-issue.patch b/target/linux/ramips/patches-3.9/0138-MIPS-ralink-workaround-DTB-memory-issue.patch index dc113bd143..c4bf788167 100644 --- a/target/linux/ramips/patches-3.9/0138-MIPS-ralink-workaround-DTB-memory-issue.patch +++ b/target/linux/ramips/patches-3.9/0138-MIPS-ralink-workaround-DTB-memory-issue.patch @@ -11,8 +11,6 @@ Signed-off-by: John Crispin arch/mips/ralink/of.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c -index b25c1f2..8efb02b 100644 --- a/arch/mips/ralink/of.c +++ b/arch/mips/ralink/of.c @@ -74,7 +74,7 @@ void __init device_tree_init(void) @@ -24,6 +22,3 @@ index b25c1f2..8efb02b 100644 } void __init plat_mem_setup(void) --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0139-MIPS-ralink-add-spi-clock-definition-to-mt7620a.patch b/target/linux/ramips/patches-3.9/0139-MIPS-ralink-add-spi-clock-definition-to-mt7620a.patch index c520b66e45..fb0cd7bcdb 100644 --- a/target/linux/ramips/patches-3.9/0139-MIPS-ralink-add-spi-clock-definition-to-mt7620a.patch +++ b/target/linux/ramips/patches-3.9/0139-MIPS-ralink-add-spi-clock-definition-to-mt7620a.patch @@ -8,8 +8,6 @@ Signed-off-by: John Crispin arch/mips/ralink/mt7620.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c -index 69729a5..08c96db6 100644 --- a/arch/mips/ralink/mt7620.c +++ b/arch/mips/ralink/mt7620.c @@ -183,6 +183,7 @@ void __init ralink_clk_init(void) @@ -20,6 +18,3 @@ index 69729a5..08c96db6 100644 ralink_clk_add("10000c00.uartlite", 40000000); } --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0140-MIPS-ralink-DTS-file-updates.patch b/target/linux/ramips/patches-3.9/0140-MIPS-ralink-DTS-file-updates.patch index b85ff9cee6..a8152d6a58 100644 --- a/target/linux/ramips/patches-3.9/0140-MIPS-ralink-DTS-file-updates.patch +++ b/target/linux/ramips/patches-3.9/0140-MIPS-ralink-DTS-file-updates.patch @@ -21,8 +21,6 @@ Signed-off-by: John Crispin create mode 100644 arch/mips/ralink/dts/rt5350.dtsi create mode 100644 arch/mips/ralink/dts/rt5350_eval.dts -diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig -index 026e823..38540a4 100644 --- a/arch/mips/ralink/Kconfig +++ b/arch/mips/ralink/Kconfig @@ -42,6 +42,10 @@ choice @@ -47,8 +45,6 @@ index 026e823..38540a4 100644 endchoice endif -diff --git a/arch/mips/ralink/dts/Makefile b/arch/mips/ralink/dts/Makefile -index 18194fa..0bd12b5 100644 --- a/arch/mips/ralink/dts/Makefile +++ b/arch/mips/ralink/dts/Makefile @@ -1,4 +1,6 @@ @@ -58,8 +54,6 @@ index 18194fa..0bd12b5 100644 obj-$(CONFIG_DTB_RT3883_EVAL) := rt3883_eval.dtb.o obj-$(CONFIG_DTB_MT7620A_EVAL) := mt7620a_eval.dtb.o +obj-$(CONFIG_DTB_MT7620A_MT7610E_EVAL) := mt7620a_mt7610e_eval.dtb.o -diff --git a/arch/mips/ralink/dts/mt7620a.dtsi b/arch/mips/ralink/dts/mt7620a.dtsi -index 08bf24f..104abfb 100644 --- a/arch/mips/ralink/dts/mt7620a.dtsi +++ b/arch/mips/ralink/dts/mt7620a.dtsi @@ -25,14 +25,36 @@ @@ -331,8 +325,6 @@ index 08bf24f..104abfb 100644 + status = "disabled"; }; }; -diff --git a/arch/mips/ralink/dts/mt7620a_eval.dts b/arch/mips/ralink/dts/mt7620a_eval.dts -index 35eb874..b56f449 100644 --- a/arch/mips/ralink/dts/mt7620a_eval.dts +++ b/arch/mips/ralink/dts/mt7620a_eval.dts @@ -13,4 +13,115 @@ @@ -451,9 +443,6 @@ index 35eb874..b56f449 100644 + }; + }; }; -diff --git a/arch/mips/ralink/dts/mt7620a_mt7610e_eval.dts b/arch/mips/ralink/dts/mt7620a_mt7610e_eval.dts -new file mode 100644 -index 0000000..0d7755b --- /dev/null +++ b/arch/mips/ralink/dts/mt7620a_mt7610e_eval.dts @@ -0,0 +1,99 @@ @@ -556,8 +545,6 @@ index 0000000..0d7755b + }; + }; +}; -diff --git a/arch/mips/ralink/dts/rt2880.dtsi b/arch/mips/ralink/dts/rt2880.dtsi -index 182afde..2a34b8d 100644 --- a/arch/mips/ralink/dts/rt2880.dtsi +++ b/arch/mips/ralink/dts/rt2880.dtsi @@ -55,4 +55,21 @@ @@ -582,8 +569,6 @@ index 182afde..2a34b8d 100644 + }; + }; }; -diff --git a/arch/mips/ralink/dts/rt2880_eval.dts b/arch/mips/ralink/dts/rt2880_eval.dts -index 322d700..58a1edf 100644 --- a/arch/mips/ralink/dts/rt2880_eval.dts +++ b/arch/mips/ralink/dts/rt2880_eval.dts @@ -43,4 +43,10 @@ @@ -597,8 +582,6 @@ index 322d700..58a1edf 100644 + ralink,fixed-link = <1000 1 1 1>; + }; }; -diff --git a/arch/mips/ralink/dts/rt3050.dtsi b/arch/mips/ralink/dts/rt3050.dtsi -index ef7da1e..b1ac940 100644 --- a/arch/mips/ralink/dts/rt3050.dtsi +++ b/arch/mips/ralink/dts/rt3050.dtsi @@ -1,7 +1,7 @@ @@ -651,8 +634,6 @@ index ef7da1e..b1ac940 100644 + status = "disabled"; + }; }; -diff --git a/arch/mips/ralink/dts/rt3052_eval.dts b/arch/mips/ralink/dts/rt3052_eval.dts -index df17f5f..df02957 100644 --- a/arch/mips/ralink/dts/rt3052_eval.dts +++ b/arch/mips/ralink/dts/rt3052_eval.dts @@ -3,7 +3,7 @@ @@ -693,9 +674,6 @@ index df17f5f..df02957 100644 + ralink,portmap = <0x2f>; + }; }; -diff --git a/arch/mips/ralink/dts/rt5350.dtsi b/arch/mips/ralink/dts/rt5350.dtsi -new file mode 100644 -index 0000000..3d6b3bc --- /dev/null +++ b/arch/mips/ralink/dts/rt5350.dtsi @@ -0,0 +1,227 @@ @@ -926,9 +904,6 @@ index 0000000..3d6b3bc + interrupts = <18>; + }; +}; -diff --git a/arch/mips/ralink/dts/rt5350_eval.dts b/arch/mips/ralink/dts/rt5350_eval.dts -new file mode 100644 -index 0000000..ab92043 --- /dev/null +++ b/arch/mips/ralink/dts/rt5350_eval.dts @@ -0,0 +1,69 @@ @@ -1001,6 +976,3 @@ index 0000000..ab92043 + ralink,portmap = <0x2f>; + }; +}; --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0141-clocksource-make-clocksource_of_init-pass-a-device_n.patch b/target/linux/ramips/patches-3.9/0141-clocksource-make-clocksource_of_init-pass-a-device_n.patch index 6cfa91a049..f90dc5b2c5 100644 --- a/target/linux/ramips/patches-3.9/0141-clocksource-make-clocksource_of_init-pass-a-device_n.patch +++ b/target/linux/ramips/patches-3.9/0141-clocksource-make-clocksource_of_init-pass-a-device_n.patch @@ -17,11 +17,9 @@ Signed-off-by: John Crispin drivers/clocksource/vt8500_timer.c | 14 +------------- 4 files changed, 5 insertions(+), 39 deletions(-) -diff --git a/drivers/clocksource/bcm2835_timer.c b/drivers/clocksource/bcm2835_timer.c -index 50c68fe..766611d 100644 --- a/drivers/clocksource/bcm2835_timer.c +++ b/drivers/clocksource/bcm2835_timer.c -@@ -95,23 +95,13 @@ static irqreturn_t bcm2835_time_interrupt(int irq, void *dev_id) +@@ -95,23 +95,13 @@ static irqreturn_t bcm2835_time_interrup } } @@ -46,8 +44,6 @@ index 50c68fe..766611d 100644 base = of_iomap(node, 0); if (!base) panic("Can't remap registers"); -diff --git a/drivers/clocksource/clksrc-of.c b/drivers/clocksource/clksrc-of.c -index bdabdaa..3ef11fb 100644 --- a/drivers/clocksource/clksrc-of.c +++ b/drivers/clocksource/clksrc-of.c @@ -26,10 +26,10 @@ void __init clocksource_of_init(void) @@ -63,11 +59,9 @@ index bdabdaa..3ef11fb 100644 + init_func(np); } } -diff --git a/drivers/clocksource/tegra20_timer.c b/drivers/clocksource/tegra20_timer.c -index 0bde03f..e698d8e 100644 --- a/drivers/clocksource/tegra20_timer.c +++ b/drivers/clocksource/tegra20_timer.c -@@ -154,29 +154,17 @@ static struct irqaction tegra_timer_irq = { +@@ -154,29 +154,17 @@ static struct irqaction tegra_timer_irq .dev_id = &tegra_clockevent, }; @@ -98,8 +92,6 @@ index 0bde03f..e698d8e 100644 timer_reg_base = of_iomap(np, 0); if (!timer_reg_base) { pr_err("Can't map timer registers\n"); -diff --git a/drivers/clocksource/vt8500_timer.c b/drivers/clocksource/vt8500_timer.c -index 8efc86b..2422552 100644 --- a/drivers/clocksource/vt8500_timer.c +++ b/drivers/clocksource/vt8500_timer.c @@ -129,22 +129,10 @@ static struct irqaction irq = { @@ -126,6 +118,3 @@ index 8efc86b..2422552 100644 regbase = of_iomap(np, 0); if (!regbase) { pr_err("%s: Missing iobase description in Device Tree\n", --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0142-clocksource-MIPS-ralink-add-support-for-systick-time.patch b/target/linux/ramips/patches-3.9/0142-clocksource-MIPS-ralink-add-support-for-systick-time.patch index a17c160355..be45ae4fff 100644 --- a/target/linux/ramips/patches-3.9/0142-clocksource-MIPS-ralink-add-support-for-systick-time.patch +++ b/target/linux/ramips/patches-3.9/0142-clocksource-MIPS-ralink-add-support-for-systick-time.patch @@ -15,8 +15,6 @@ Signed-off-by: John Crispin 6 files changed, 173 insertions(+) create mode 100644 drivers/clocksource/cevt-rt3352.c -diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig -index 38540a4..3fe032c 100644 --- a/arch/mips/ralink/Kconfig +++ b/arch/mips/ralink/Kconfig @@ -14,6 +14,7 @@ choice @@ -35,8 +33,6 @@ index 38540a4..3fe032c 100644 endchoice -diff --git a/arch/mips/ralink/clk.c b/arch/mips/ralink/clk.c -index 8dfa22f..bba0cdf 100644 --- a/arch/mips/ralink/clk.c +++ b/arch/mips/ralink/clk.c @@ -69,4 +69,5 @@ void __init plat_time_init(void) @@ -45,8 +41,6 @@ index 8dfa22f..bba0cdf 100644 clk_put(clk); + clocksource_of_init(); } -diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig -index e507ab7..1216c16 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -7,6 +7,12 @@ config CLKSRC_I8253 @@ -62,8 +56,6 @@ index e507ab7..1216c16 100644 config I8253_LOCK bool -diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile -index 4d8283a..db47a4e 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -10,6 +10,7 @@ obj-$(CONFIG_SH_TIMER_TMU) += sh_tmu.o @@ -74,9 +66,6 @@ index 4d8283a..db47a4e 100644 obj-$(CONFIG_DW_APB_TIMER) += dw_apb_timer.o obj-$(CONFIG_DW_APB_TIMER_OF) += dw_apb_timer_of.o obj-$(CONFIG_CLKSRC_NOMADIK_MTU) += nomadik-mtu.o -diff --git a/drivers/clocksource/cevt-rt3352.c b/drivers/clocksource/cevt-rt3352.c -new file mode 100644 -index 0000000..bd50edd --- /dev/null +++ b/drivers/clocksource/cevt-rt3352.c @@ -0,0 +1,162 @@ @@ -242,8 +231,6 @@ index 0000000..bd50edd +} + +CLOCKSOURCE_OF_DECLARE(systick, "ralink,cevt-systick", ralink_systick_init); -diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h -index 27cfda4..08ed5e1 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -340,6 +340,7 @@ extern void clocksource_of_init(void); @@ -254,6 +241,3 @@ index 27cfda4..08ed5e1 100644 #define CLOCKSOURCE_OF_DECLARE(name, compat, fn) #endif --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0143-GPIO-MIPS-ralink-adds-ralink-gpio-support.patch b/target/linux/ramips/patches-3.9/0143-GPIO-MIPS-ralink-adds-ralink-gpio-support.patch index a6c36f09ea..a035df294e 100644 --- a/target/linux/ramips/patches-3.9/0143-GPIO-MIPS-ralink-adds-ralink-gpio-support.patch +++ b/target/linux/ramips/patches-3.9/0143-GPIO-MIPS-ralink-adds-ralink-gpio-support.patch @@ -17,8 +17,6 @@ Signed-off-by: John Crispin create mode 100644 arch/mips/include/asm/mach-ralink/gpio.h create mode 100644 drivers/gpio/gpio-ralink.c -diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig -index e4da4f8..b237c50 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -443,6 +443,7 @@ config RALINK @@ -29,9 +27,6 @@ index e4da4f8..b237c50 100644 config SGI_IP22 bool "SGI IP22 (Indy/Indigo2)" -diff --git a/arch/mips/include/asm/mach-ralink/gpio.h b/arch/mips/include/asm/mach-ralink/gpio.h -new file mode 100644 -index 0000000..f68ee16 --- /dev/null +++ b/arch/mips/include/asm/mach-ralink/gpio.h @@ -0,0 +1,24 @@ @@ -59,8 +54,6 @@ index 0000000..f68ee16 +#define gpio_to_irq __gpio_to_irq + +#endif /* __ASM_MACH_RALINK_GPIO_H */ -diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig -index 93aaadf..29add97 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -204,6 +204,12 @@ config GPIO_PXA @@ -76,11 +69,9 @@ index 93aaadf..29add97 100644 config GPIO_SPEAR_SPICS bool "ST SPEAr13xx SPI Chip Select as GPIO support" depends on PLAT_SPEAR -diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile -index 22e07bc..f7b6603 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile -@@ -55,6 +55,7 @@ obj-$(CONFIG_GPIO_PCF857X) += gpio-pcf857x.o +@@ -55,6 +55,7 @@ obj-$(CONFIG_GPIO_PCF857X) += gpio-pcf85 obj-$(CONFIG_GPIO_PCH) += gpio-pch.o obj-$(CONFIG_GPIO_PL061) += gpio-pl061.o obj-$(CONFIG_GPIO_PXA) += gpio-pxa.o @@ -88,9 +79,6 @@ index 22e07bc..f7b6603 100644 obj-$(CONFIG_GPIO_RC5T583) += gpio-rc5t583.o obj-$(CONFIG_GPIO_RDC321X) += gpio-rdc321x.o obj-$(CONFIG_PLAT_SAMSUNG) += gpio-samsung.o -diff --git a/drivers/gpio/gpio-ralink.c b/drivers/gpio/gpio-ralink.c -new file mode 100644 -index 0000000..12984f1 --- /dev/null +++ b/drivers/gpio/gpio-ralink.c @@ -0,0 +1,326 @@ @@ -420,6 +408,3 @@ index 0000000..12984f1 +} + +subsys_initcall(ralink_gpio_init); --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0144-SPI-ralink-add-Ralink-SoC-spi-driver.patch b/target/linux/ramips/patches-3.9/0144-SPI-ralink-add-Ralink-SoC-spi-driver.patch index 07a49c9f6e..fa20dca172 100644 --- a/target/linux/ramips/patches-3.9/0144-SPI-ralink-add-Ralink-SoC-spi-driver.patch +++ b/target/linux/ramips/patches-3.9/0144-SPI-ralink-add-Ralink-SoC-spi-driver.patch @@ -13,11 +13,9 @@ Signed-off-by: John Crispin 3 files changed, 482 insertions(+) create mode 100644 drivers/spi/spi-ralink.c -diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig -index 2be0de9..a7de751 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig -@@ -327,6 +327,12 @@ config SPI_RSPI +@@ -336,6 +336,12 @@ config SPI_RSPI help SPI driver for Renesas RSPI blocks. @@ -30,11 +28,9 @@ index 2be0de9..a7de751 100644 config SPI_S3C24XX tristate "Samsung S3C24XX series SPI" depends on ARCH_S3C24XX -diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile -index e53c309..a4b3c5b 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile -@@ -53,6 +53,7 @@ spi-pxa2xx-platform-$(CONFIG_SPI_PXA2XX_DMA) += spi-pxa2xx-dma.o +@@ -54,6 +54,7 @@ spi-pxa2xx-platform-$(CONFIG_SPI_PXA2XX_ obj-$(CONFIG_SPI_PXA2XX) += spi-pxa2xx-platform.o obj-$(CONFIG_SPI_PXA2XX_PCI) += spi-pxa2xx-pci.o obj-$(CONFIG_SPI_RSPI) += spi-rspi.o @@ -42,9 +38,6 @@ index e53c309..a4b3c5b 100644 obj-$(CONFIG_SPI_S3C24XX) += spi-s3c24xx-hw.o spi-s3c24xx-hw-y := spi-s3c24xx.o spi-s3c24xx-hw-$(CONFIG_SPI_S3C24XX_FIQ) += spi-s3c24xx-fiq.o -diff --git a/drivers/spi/spi-ralink.c b/drivers/spi/spi-ralink.c -new file mode 100644 -index 0000000..b07cbaa --- /dev/null +++ b/drivers/spi/spi-ralink.c @@ -0,0 +1,475 @@ @@ -523,6 +516,3 @@ index 0000000..b07cbaa +MODULE_AUTHOR("Sergiy "); +MODULE_AUTHOR("Gabor Juhos "); +MODULE_LICENSE("GPL"); --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0145-serial-of-allow-au1x00-and-rt288x-to-load-from-OF.patch b/target/linux/ramips/patches-3.9/0145-serial-of-allow-au1x00-and-rt288x-to-load-from-OF.patch index 9be464c8dd..77a6c0449f 100644 --- a/target/linux/ramips/patches-3.9/0145-serial-of-allow-au1x00-and-rt288x-to-load-from-OF.patch +++ b/target/linux/ramips/patches-3.9/0145-serial-of-allow-au1x00-and-rt288x-to-load-from-OF.patch @@ -11,11 +11,9 @@ Signed-off-by: John Crispin drivers/tty/serial/of_serial.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c -index b025d54..42f8550 100644 --- a/drivers/tty/serial/of_serial.c +++ b/drivers/tty/serial/of_serial.c -@@ -98,7 +98,10 @@ static int of_platform_serial_setup(struct platform_device *ofdev, +@@ -98,7 +98,10 @@ static int of_platform_serial_setup(stru port->regshift = prop; port->irq = irq_of_parse_and_map(np, 0); @@ -27,6 +25,3 @@ index b025d54..42f8550 100644 if (of_property_read_u32(np, "reg-io-width", &prop) == 0) { switch (prop) { case 1: --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0146-serial-ralink-adds-mt7620-serial.patch b/target/linux/ramips/patches-3.9/0146-serial-ralink-adds-mt7620-serial.patch index 31fb18e296..d85b4ff2ca 100644 --- a/target/linux/ramips/patches-3.9/0146-serial-ralink-adds-mt7620-serial.patch +++ b/target/linux/ramips/patches-3.9/0146-serial-ralink-adds-mt7620-serial.patch @@ -10,8 +10,6 @@ Signed-off-by: John Crispin drivers/tty/serial/8250/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig -index 80fe91e..f6d6820 100644 --- a/drivers/tty/serial/8250/Kconfig +++ b/drivers/tty/serial/8250/Kconfig @@ -296,7 +296,7 @@ config SERIAL_8250_EM @@ -23,6 +21,3 @@ index 80fe91e..f6d6820 100644 help If you have a Ralink RT288x/RT305x SoC based board and want to use the serial port, say Y to this option. The driver can handle up to 2 serial --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0147-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch b/target/linux/ramips/patches-3.9/0147-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch index 2689bb2882..801844670c 100644 --- a/target/linux/ramips/patches-3.9/0147-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch +++ b/target/linux/ramips/patches-3.9/0147-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch @@ -13,8 +13,6 @@ Signed-off-by: John Crispin create mode 100644 drivers/mmc/host/mt6575_sd.h create mode 100644 drivers/mmc/host/sdhci-mt7620.c -diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig -index d88219e..aa47e64 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -249,6 +249,17 @@ config MMC_SDHCI_BCM2835 @@ -35,11 +33,9 @@ index d88219e..aa47e64 100644 config MMC_OMAP tristate "TI OMAP Multimedia Card Interface support" depends on ARCH_OMAP -diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile -index c380e3c..3b81db4 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile -@@ -60,6 +60,7 @@ obj-$(CONFIG_MMC_SDHCI_TEGRA) += sdhci-tegra.o +@@ -61,6 +61,7 @@ obj-$(CONFIG_MMC_SDHCI_TEGRA) += sdhci- obj-$(CONFIG_MMC_SDHCI_OF_ESDHC) += sdhci-of-esdhc.o obj-$(CONFIG_MMC_SDHCI_OF_HLWD) += sdhci-of-hlwd.o obj-$(CONFIG_MMC_SDHCI_BCM2835) += sdhci-bcm2835.o @@ -47,9 +43,6 @@ index c380e3c..3b81db4 100644 ifeq ($(CONFIG_CB710_DEBUG),y) CFLAGS-cb710-mmc += -DDEBUG -diff --git a/drivers/mmc/host/mt6575_sd.h b/drivers/mmc/host/mt6575_sd.h -new file mode 100644 -index 0000000..406382c --- /dev/null +++ b/drivers/mmc/host/mt6575_sd.h @@ -0,0 +1,1068 @@ @@ -1121,9 +1114,6 @@ index 0000000..406382c + +#endif + -diff --git a/drivers/mmc/host/sdhci-mt7620.c b/drivers/mmc/host/sdhci-mt7620.c -new file mode 100644 -index 0000000..a3cb5e4 --- /dev/null +++ b/drivers/mmc/host/sdhci-mt7620.c @@ -0,0 +1,2314 @@ @@ -3441,6 +3431,3 @@ index 0000000..a3cb5e4 +MODULE_AUTHOR("Infinity Chen "); + +EXPORT_SYMBOL(msdc_6575_host); --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0148-DMA-MIPS-ralink-add-dmaengine-driver.patch b/target/linux/ramips/patches-3.9/0148-DMA-MIPS-ralink-add-dmaengine-driver.patch index a56ba188f1..bd3a6055bc 100644 --- a/target/linux/ramips/patches-3.9/0148-DMA-MIPS-ralink-add-dmaengine-driver.patch +++ b/target/linux/ramips/patches-3.9/0148-DMA-MIPS-ralink-add-dmaengine-driver.patch @@ -13,8 +13,6 @@ Signed-off-by: John Crispin create mode 100644 drivers/dma/ralink_gdma.c create mode 100644 drivers/dma/ralink_gdma.h -diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig -index aeaea32..751cdc4 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -322,6 +322,13 @@ config MMP_PDMA @@ -31,8 +29,6 @@ index aeaea32..751cdc4 100644 config DMA_ENGINE bool -diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile -index 488e3ff..f69e07e 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile @@ -37,3 +37,4 @@ obj-$(CONFIG_DMA_SA11X0) += sa11x0-dma.o @@ -40,9 +36,6 @@ index 488e3ff..f69e07e 100644 obj-$(CONFIG_DMA_OMAP) += omap-dma.o obj-$(CONFIG_MMP_PDMA) += mmp_pdma.o +obj-$(CONFIG_RALINK_GDMA) += ralink_gdma.o -diff --git a/drivers/dma/ralink_gdma.c b/drivers/dma/ralink_gdma.c -new file mode 100644 -index 0000000..be7c317 --- /dev/null +++ b/drivers/dma/ralink_gdma.c @@ -0,0 +1,229 @@ @@ -275,9 +268,6 @@ index 0000000..be7c317 +MODULE_AUTHOR("John Crispin "); +MODULE_DESCRIPTION("DMA engine driver for Ralink DMA engine"); +MODULE_LICENSE("GPL"); -diff --git a/drivers/dma/ralink_gdma.h b/drivers/dma/ralink_gdma.h -new file mode 100644 -index 0000000..73e1948 --- /dev/null +++ b/drivers/dma/ralink_gdma.h @@ -0,0 +1,55 @@ @@ -336,6 +326,3 @@ index 0000000..73e1948 +#define RT_DMA_DONEINT (RALINK_GDMA_BASE + 0x204) + +#endif --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0149-PCI-MIPS-adds-rt2880-pci-support.patch b/target/linux/ramips/patches-3.9/0149-PCI-MIPS-adds-rt2880-pci-support.patch index da94ee690a..16532c3ea9 100644 --- a/target/linux/ramips/patches-3.9/0149-PCI-MIPS-adds-rt2880-pci-support.patch +++ b/target/linux/ramips/patches-3.9/0149-PCI-MIPS-adds-rt2880-pci-support.patch @@ -13,11 +13,9 @@ Signed-off-by: John Crispin 3 files changed, 283 insertions(+) create mode 100644 arch/mips/pci/pci-rt2880.c -diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile -index 2cb1d31..77974ba 100644 --- a/arch/mips/pci/Makefile +++ b/arch/mips/pci/Makefile -@@ -41,6 +41,7 @@ obj-$(CONFIG_SIBYTE_BCM1x80) += pci-bcm1480.o pci-bcm1480ht.o +@@ -41,6 +41,7 @@ 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 @@ -25,9 +23,6 @@ index 2cb1d31..77974ba 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/pci-rt2880.c b/arch/mips/pci/pci-rt2880.c -new file mode 100644 -index 0000000..e2c4730 --- /dev/null +++ b/arch/mips/pci/pci-rt2880.c @@ -0,0 +1,281 @@ @@ -312,8 +307,6 @@ index 0000000..e2c4730 +} + +arch_initcall(pcibios_init); -diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig -index 3fe032c..c0ac93a 100644 --- a/arch/mips/ralink/Kconfig +++ b/arch/mips/ralink/Kconfig @@ -8,6 +8,7 @@ choice @@ -324,6 +317,3 @@ index 3fe032c..c0ac93a 100644 config SOC_RT305X bool "RT305x" --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0150-PCI-MIPS-adds-rt3883-pci-support.patch b/target/linux/ramips/patches-3.9/0150-PCI-MIPS-adds-rt3883-pci-support.patch index 20ae55875f..46a9198e04 100644 --- a/target/linux/ramips/patches-3.9/0150-PCI-MIPS-adds-rt3883-pci-support.patch +++ b/target/linux/ramips/patches-3.9/0150-PCI-MIPS-adds-rt3883-pci-support.patch @@ -13,11 +13,9 @@ Signed-off-by: John Crispin 3 files changed, 642 insertions(+) create mode 100644 arch/mips/pci/pci-rt3883.c -diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile -index 77974ba..3cbfd9b 100644 --- a/arch/mips/pci/Makefile +++ b/arch/mips/pci/Makefile -@@ -42,6 +42,7 @@ obj-$(CONFIG_SNI_RM) += fixup-sni.o ops-sni.o +@@ -42,6 +42,7 @@ obj-$(CONFIG_SNI_RM) += fixup-sni.o ops obj-$(CONFIG_LANTIQ) += fixup-lantiq.o obj-$(CONFIG_PCI_LANTIQ) += pci-lantiq.o ops-lantiq.o obj-$(CONFIG_SOC_RT2880) += pci-rt2880.o @@ -25,9 +23,6 @@ index 77974ba..3cbfd9b 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/pci-rt3883.c b/arch/mips/pci/pci-rt3883.c -new file mode 100644 -index 0000000..212c90b --- /dev/null +++ b/arch/mips/pci/pci-rt3883.c @@ -0,0 +1,640 @@ @@ -671,8 +666,6 @@ index 0000000..212c90b +} + +postcore_initcall(rt3883_pci_init); -diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig -index c0ac93a..2fbe93c 100644 --- a/arch/mips/ralink/Kconfig +++ b/arch/mips/ralink/Kconfig @@ -21,6 +21,7 @@ choice @@ -683,6 +676,3 @@ index c0ac93a..2fbe93c 100644 config SOC_MT7620 bool "MT7620" --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0151-PCI-MIPS-adds-mt7620a-pcie-driver.patch b/target/linux/ramips/patches-3.9/0151-PCI-MIPS-adds-mt7620a-pcie-driver.patch index f5be94e793..03a472c088 100644 --- a/target/linux/ramips/patches-3.9/0151-PCI-MIPS-adds-mt7620a-pcie-driver.patch +++ b/target/linux/ramips/patches-3.9/0151-PCI-MIPS-adds-mt7620a-pcie-driver.patch @@ -11,8 +11,6 @@ Signed-off-by: John Crispin 3 files changed, 365 insertions(+) create mode 100644 arch/mips/pci/pci-mt7620a.c -diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile -index 3cbfd9b..025d3a7 100644 --- a/arch/mips/pci/Makefile +++ b/arch/mips/pci/Makefile @@ -43,6 +43,7 @@ obj-$(CONFIG_LANTIQ) += fixup-lantiq.o @@ -23,9 +21,6 @@ index 3cbfd9b..025d3a7 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/pci-mt7620a.c b/arch/mips/pci/pci-mt7620a.c -new file mode 100644 -index 0000000..271763c --- /dev/null +++ b/arch/mips/pci/pci-mt7620a.c @@ -0,0 +1,363 @@ @@ -392,8 +387,6 @@ index 0000000..271763c +} + +arch_initcall(mt7620a_pci_init); -diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig -index 2fbe93c..c8d5b6c 100644 --- a/arch/mips/ralink/Kconfig +++ b/arch/mips/ralink/Kconfig @@ -26,6 +26,7 @@ choice @@ -404,6 +397,3 @@ index 2fbe93c..c8d5b6c 100644 endchoice --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0152-watchdog-adds-ralink-wdt.patch b/target/linux/ramips/patches-3.9/0152-watchdog-adds-ralink-wdt.patch index d70d2b28c0..a44e7d8abf 100644 --- a/target/linux/ramips/patches-3.9/0152-watchdog-adds-ralink-wdt.patch +++ b/target/linux/ramips/patches-3.9/0152-watchdog-adds-ralink-wdt.patch @@ -14,8 +14,6 @@ Signed-off-by: John Crispin 4 files changed, 217 insertions(+) create mode 100644 drivers/watchdog/rt2880_wdt.c -diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c -index 08c96db6..4956d96 100644 --- a/arch/mips/ralink/mt7620.c +++ b/arch/mips/ralink/mt7620.c @@ -182,6 +182,7 @@ void __init ralink_clk_init(void) @@ -26,8 +24,6 @@ index 08c96db6..4956d96 100644 ralink_clk_add("10000500.uart", 40000000); ralink_clk_add("10000b00.spi", 40000000); ralink_clk_add("10000c00.uartlite", 40000000); -diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig -index e89fc31..5e34760 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1104,6 +1104,13 @@ config LANTIQ_WDT @@ -44,8 +40,6 @@ index e89fc31..5e34760 100644 # PARISC Architecture # POWERPC Architecture -diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile -index a300b94..2681e3d 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -134,6 +134,7 @@ obj-$(CONFIG_TXX9_WDT) += txx9wdt.o @@ -56,9 +50,6 @@ index a300b94..2681e3d 100644 # PARISC Architecture -diff --git a/drivers/watchdog/rt2880_wdt.c b/drivers/watchdog/rt2880_wdt.c -new file mode 100644 -index 0000000..3df65a4 --- /dev/null +++ b/drivers/watchdog/rt2880_wdt.c @@ -0,0 +1,207 @@ @@ -269,6 +260,3 @@ index 0000000..3df65a4 +MODULE_AUTHOR("Gabor Juhos create mode 100644 Documentation/devicetree/bindings/i2c/i2c-ralink.txt create mode 100644 drivers/i2c/busses/i2c-ralink.c -diff --git a/Documentation/devicetree/bindings/i2c/i2c-ralink.txt b/Documentation/devicetree/bindings/i2c/i2c-ralink.txt -new file mode 100644 -index 0000000..8fa8ac3 --- /dev/null +++ b/Documentation/devicetree/bindings/i2c/i2c-ralink.txt @@ -0,0 +1,27 @@ @@ -46,8 +43,6 @@ index 0000000..8fa8ac3 + }; + }; +}; -diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig -index adfee98..ec925ae 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -628,6 +628,10 @@ config I2C_PXA_SLAVE @@ -61,8 +56,6 @@ index adfee98..ec925ae 100644 config HAVE_S3C2410_I2C bool help -diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile -index 8f4fc23..7e39a13 100644 --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile @@ -62,6 +62,7 @@ obj-$(CONFIG_I2C_PNX) += i2c-pnx.o @@ -73,9 +66,6 @@ index 8f4fc23..7e39a13 100644 obj-$(CONFIG_I2C_S3C2410) += i2c-s3c2410.o obj-$(CONFIG_I2C_S6000) += i2c-s6000.o obj-$(CONFIG_I2C_SH7760) += i2c-sh7760.o -diff --git a/drivers/i2c/busses/i2c-ralink.c b/drivers/i2c/busses/i2c-ralink.c -new file mode 100644 -index 0000000..b5abf0f --- /dev/null +++ b/drivers/i2c/busses/i2c-ralink.c @@ -0,0 +1,274 @@ @@ -353,6 +343,3 @@ index 0000000..b5abf0f +MODULE_DESCRIPTION("Ralink I2c host driver"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:Ralink-I2C"); --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0154-reset-Add-reset-controller-API.patch b/target/linux/ramips/patches-3.9/0154-reset-Add-reset-controller-API.patch index 900f0a2e46..0b2be47baf 100644 --- a/target/linux/ramips/patches-3.9/0154-reset-Add-reset-controller-API.patch +++ b/target/linux/ramips/patches-3.9/0154-reset-Add-reset-controller-API.patch @@ -34,9 +34,6 @@ Reviewed-by: Pavel Machek create mode 100644 include/linux/reset-controller.h create mode 100644 include/linux/reset.h -diff --git a/Documentation/devicetree/bindings/reset/reset.txt b/Documentation/devicetree/bindings/reset/reset.txt -new file mode 100644 -index 0000000..31db6ff --- /dev/null +++ b/Documentation/devicetree/bindings/reset/reset.txt @@ -0,0 +1,75 @@ @@ -115,22 +112,18 @@ index 0000000..31db6ff +This represents a bus that controls the reset signal of each of four sub- +ordinate devices. Consider for example a bus that fails to operate unless no +child device has reset asserted. -diff --git a/drivers/Kconfig b/drivers/Kconfig -index 202fa6d..847f8e3 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig -@@ -162,4 +162,6 @@ source "drivers/irqchip/Kconfig" +@@ -164,4 +164,6 @@ source "drivers/irqchip/Kconfig" source "drivers/ipack/Kconfig" +source "drivers/reset/Kconfig" + endmenu -diff --git a/drivers/Makefile b/drivers/Makefile -index dce39a9..1a64c4c 100644 --- a/drivers/Makefile +++ b/drivers/Makefile -@@ -37,6 +37,9 @@ obj-$(CONFIG_XEN) += xen/ +@@ -38,6 +38,9 @@ obj-$(CONFIG_XEN) += xen/ # regulators early, since some subsystems rely on them to initialize obj-$(CONFIG_REGULATOR) += regulator/ @@ -140,9 +133,6 @@ index dce39a9..1a64c4c 100644 # tty/ comes before char/ so that the VT console is the boot-time # default. obj-y += tty/ -diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig -new file mode 100644 -index 0000000..c9d04f7 --- /dev/null +++ b/drivers/reset/Kconfig @@ -0,0 +1,13 @@ @@ -159,16 +149,10 @@ index 0000000..c9d04f7 + via GPIOs or SoC-internal reset controller modules. + + If unsure, say no. -diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile -new file mode 100644 -index 0000000..1e2d83f --- /dev/null +++ b/drivers/reset/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_RESET_CONTROLLER) += core.o -diff --git a/drivers/reset/core.c b/drivers/reset/core.c -new file mode 100644 -index 0000000..d1b6089 --- /dev/null +++ b/drivers/reset/core.c @@ -0,0 +1,297 @@ @@ -469,9 +453,6 @@ index 0000000..d1b6089 + return ret; +} +EXPORT_SYMBOL_GPL(device_reset); -diff --git a/include/linux/reset-controller.h b/include/linux/reset-controller.h -new file mode 100644 -index 0000000..2f61311 --- /dev/null +++ b/include/linux/reset-controller.h @@ -0,0 +1,51 @@ @@ -526,9 +507,6 @@ index 0000000..2f61311 +void reset_controller_unregister(struct reset_controller_dev *rcdev); + +#endif -diff --git a/include/linux/reset.h b/include/linux/reset.h -new file mode 100644 -index 0000000..6082247 --- /dev/null +++ b/include/linux/reset.h @@ -0,0 +1,17 @@ @@ -549,6 +527,3 @@ index 0000000..6082247 +int device_reset(struct device *dev); + +#endif --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0155-reset-MIPS-ralink-add-core-device-reset-wrapper.patch b/target/linux/ramips/patches-3.9/0155-reset-MIPS-ralink-add-core-device-reset-wrapper.patch index a22cfc8020..ca2f298987 100644 --- a/target/linux/ramips/patches-3.9/0155-reset-MIPS-ralink-add-core-device-reset-wrapper.patch +++ b/target/linux/ramips/patches-3.9/0155-reset-MIPS-ralink-add-core-device-reset-wrapper.patch @@ -12,8 +12,6 @@ Signed-off-by: John Crispin arch/mips/ralink/reset.c | 1 + 3 files changed, 61 insertions(+) -diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig -index b237c50..cfc7153 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -444,6 +444,7 @@ config RALINK @@ -24,8 +22,6 @@ index b237c50..cfc7153 100644 config SGI_IP22 bool "SGI IP22 (Indy/Indigo2)" -diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c -index 8efb02b..2faf478 100644 --- a/arch/mips/ralink/of.c +++ b/arch/mips/ralink/of.c @@ -14,16 +14,22 @@ @@ -118,8 +114,6 @@ index 8efb02b..2faf478 100644 ralink_pinmux(); return 0; -diff --git a/arch/mips/ralink/reset.c b/arch/mips/ralink/reset.c -index 22120e5..6c15f4f 100644 --- a/arch/mips/ralink/reset.c +++ b/arch/mips/ralink/reset.c @@ -10,6 +10,7 @@ @@ -130,6 +124,3 @@ index 22120e5..6c15f4f 100644 #include --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0156-NET-add-of_get_mac_address_mtd.patch b/target/linux/ramips/patches-3.9/0156-NET-add-of_get_mac_address_mtd.patch index b790e6b21c..ba33c57f0e 100644 --- a/target/linux/ramips/patches-3.9/0156-NET-add-of_get_mac_address_mtd.patch +++ b/target/linux/ramips/patches-3.9/0156-NET-add-of_get_mac_address_mtd.patch @@ -14,8 +14,6 @@ Signed-off-by: John Crispin include/linux/of_net.h | 1 + 2 files changed, 38 insertions(+) -diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c -index ffab033..15f4a71 100644 --- a/drivers/of/of_net.c +++ b/drivers/of/of_net.c @@ -10,6 +10,7 @@ @@ -26,7 +24,7 @@ index ffab033..15f4a71 100644 /** * It maps 'enum phy_interface_t' found in include/linux/phy.h -@@ -92,3 +93,39 @@ const void *of_get_mac_address(struct device_node *np) +@@ -92,3 +93,39 @@ const void *of_get_mac_address(struct de return NULL; } EXPORT_SYMBOL(of_get_mac_address); @@ -66,8 +64,6 @@ index ffab033..15f4a71 100644 + return ret; +} +EXPORT_SYMBOL_GPL(of_get_mac_address_mtd); -diff --git a/include/linux/of_net.h b/include/linux/of_net.h -index f474641..9d3304f 100644 --- a/include/linux/of_net.h +++ b/include/linux/of_net.h @@ -11,6 +11,7 @@ @@ -78,6 +74,3 @@ index f474641..9d3304f 100644 #endif #endif /* __LINUX_OF_NET_H */ --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0157-NET-multi-phy-support.patch b/target/linux/ramips/patches-3.9/0157-NET-multi-phy-support.patch index 62133ef014..8279487163 100644 --- a/target/linux/ramips/patches-3.9/0157-NET-multi-phy-support.patch +++ b/target/linux/ramips/patches-3.9/0157-NET-multi-phy-support.patch @@ -9,11 +9,9 @@ Signed-off-by: John Crispin include/linux/phy.h | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) -diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c -index ef9ea92..27f9b45 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c -@@ -800,7 +800,8 @@ void phy_state_machine(struct work_struct *work) +@@ -847,7 +847,8 @@ void phy_state_machine(struct work_struc * negotiation for now */ if (!phydev->link) { phydev->state = PHY_NOLINK; @@ -23,7 +21,7 @@ index ef9ea92..27f9b45 100644 phydev->adjust_link(phydev->attached_dev); break; } -@@ -891,7 +892,8 @@ void phy_state_machine(struct work_struct *work) +@@ -938,7 +939,8 @@ void phy_state_machine(struct work_struc netif_carrier_on(phydev->attached_dev); } else { phydev->state = PHY_NOLINK; @@ -33,7 +31,7 @@ index ef9ea92..27f9b45 100644 } phydev->adjust_link(phydev->attached_dev); -@@ -903,7 +905,8 @@ void phy_state_machine(struct work_struct *work) +@@ -950,7 +952,8 @@ void phy_state_machine(struct work_struc case PHY_HALTED: if (phydev->link) { phydev->link = 0; @@ -43,8 +41,6 @@ index ef9ea92..27f9b45 100644 phydev->adjust_link(phydev->attached_dev); } break; -diff --git a/include/linux/phy.h b/include/linux/phy.h -index 33999ad..9c54bc9 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -298,7 +298,7 @@ struct phy_device { @@ -56,6 +52,3 @@ index 33999ad..9c54bc9 100644 enum phy_state state; u32 dev_flags; --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0159-NET-MIPS-add-ralink-SoC-ethernet-driver.patch b/target/linux/ramips/patches-3.9/0159-NET-MIPS-add-ralink-SoC-ethernet-driver.patch index 86219ac375..8555d3cd59 100644 --- a/target/linux/ramips/patches-3.9/0159-NET-MIPS-add-ralink-SoC-ethernet-driver.patch +++ b/target/linux/ramips/patches-3.9/0159-NET-MIPS-add-ralink-SoC-ethernet-driver.patch @@ -47,9 +47,6 @@ Signed-off-by: John Crispin create mode 100644 drivers/net/ethernet/ralink/soc_rt305x.c create mode 100644 drivers/net/ethernet/ralink/soc_rt3883.c -diff --git a/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h b/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h -new file mode 100644 -index 0000000..2098c5c --- /dev/null +++ b/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h @@ -0,0 +1,27 @@ @@ -80,8 +77,6 @@ index 0000000..2098c5c +}; + +#endif /* _RT305X_ESW_PLATFORM_H */ -diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c -index ca7ee3a..1a6b458 100644 --- a/arch/mips/ralink/rt305x.c +++ b/arch/mips/ralink/rt305x.c @@ -221,6 +221,7 @@ void __init ralink_clk_init(void) @@ -92,8 +87,6 @@ index ca7ee3a..1a6b458 100644 ralink_clk_add("10000b00.spi", sys_rate); ralink_clk_add("10000100.timer", wdt_rate); ralink_clk_add("10000120.watchdog", wdt_rate); -diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig -index ed956e0..0b3caa1 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -135,6 +135,7 @@ config ETHOC @@ -104,8 +97,6 @@ index ed956e0..0b3caa1 100644 source "drivers/net/ethernet/realtek/Kconfig" source "drivers/net/ethernet/renesas/Kconfig" source "drivers/net/ethernet/rdc/Kconfig" -diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile -index 8268d85..508c494 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -53,6 +53,7 @@ obj-$(CONFIG_ETHOC) += ethoc.o @@ -116,9 +107,6 @@ index 8268d85..508c494 100644 obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/ obj-$(CONFIG_SH_ETH) += renesas/ obj-$(CONFIG_NET_VENDOR_RDC) += rdc/ -diff --git a/drivers/net/ethernet/ralink/Kconfig b/drivers/net/ethernet/ralink/Kconfig -new file mode 100644 -index 0000000..ca2c9ad --- /dev/null +++ b/drivers/net/ethernet/ralink/Kconfig @@ -0,0 +1,31 @@ @@ -153,9 +141,6 @@ index 0000000..ca2c9ad + select PHYLIB + select SWCONFIG +endif -diff --git a/drivers/net/ethernet/ralink/Makefile b/drivers/net/ethernet/ralink/Makefile -new file mode 100644 -index 0000000..a38fa21 --- /dev/null +++ b/drivers/net/ethernet/ralink/Makefile @@ -0,0 +1,18 @@ @@ -177,9 +162,6 @@ index 0000000..a38fa21 +ralink-eth-$(CONFIG_SOC_MT7620) += soc_mt7620.o + +obj-$(CONFIG_NET_RALINK) += ralink-eth.o -diff --git a/drivers/net/ethernet/ralink/esw_rt3052.c b/drivers/net/ethernet/ralink/esw_rt3052.c -new file mode 100644 -index 0000000..b937062 --- /dev/null +++ b/drivers/net/ethernet/ralink/esw_rt3052.c @@ -0,0 +1,1463 @@ @@ -1646,9 +1628,6 @@ index 0000000..b937062 +{ + platform_driver_unregister(&esw_driver); +} -diff --git a/drivers/net/ethernet/ralink/esw_rt3052.h b/drivers/net/ethernet/ralink/esw_rt3052.h -new file mode 100644 -index 0000000..2ced3dff --- /dev/null +++ b/drivers/net/ethernet/ralink/esw_rt3052.h @@ -0,0 +1,32 @@ @@ -1684,9 +1663,6 @@ index 0000000..2ced3dff + +#endif +#endif -diff --git a/drivers/net/ethernet/ralink/gsw_mt7620a.c b/drivers/net/ethernet/ralink/gsw_mt7620a.c -new file mode 100644 -index 0000000..9fa6a54 --- /dev/null +++ b/drivers/net/ethernet/ralink/gsw_mt7620a.c @@ -0,0 +1,1027 @@ @@ -2717,9 +2693,6 @@ index 0000000..9fa6a54 + + return 0; +} -diff --git a/drivers/net/ethernet/ralink/gsw_mt7620a.h b/drivers/net/ethernet/ralink/gsw_mt7620a.h -new file mode 100644 -index 0000000..fd4add5 --- /dev/null +++ b/drivers/net/ethernet/ralink/gsw_mt7620a.h @@ -0,0 +1,29 @@ @@ -2752,9 +2725,6 @@ index 0000000..fd4add5 +extern int mt7620a_has_carrier(struct fe_priv *priv); + +#endif -diff --git a/drivers/net/ethernet/ralink/mdio.c b/drivers/net/ethernet/ralink/mdio.c -new file mode 100644 -index 0000000..b265c75 --- /dev/null +++ b/drivers/net/ethernet/ralink/mdio.c @@ -0,0 +1,245 @@ @@ -3003,9 +2973,6 @@ index 0000000..b265c75 + of_node_put(priv->mii_bus->dev.of_node); + kfree(priv->mii_bus); +} -diff --git a/drivers/net/ethernet/ralink/mdio.h b/drivers/net/ethernet/ralink/mdio.h -new file mode 100644 -index 0000000..c3910a0 --- /dev/null +++ b/drivers/net/ethernet/ralink/mdio.h @@ -0,0 +1,29 @@ @@ -3038,9 +3005,6 @@ index 0000000..c3910a0 +static inline void fe_mdio_cleanup(struct fe_priv *priv) {} +#endif +#endif -diff --git a/drivers/net/ethernet/ralink/mdio_rt2880.c b/drivers/net/ethernet/ralink/mdio_rt2880.c -new file mode 100644 -index 0000000..701c7b6 --- /dev/null +++ b/drivers/net/ethernet/ralink/mdio_rt2880.c @@ -0,0 +1,232 @@ @@ -3276,9 +3240,6 @@ index 0000000..701c7b6 + + return; +} -diff --git a/drivers/net/ethernet/ralink/mdio_rt2880.h b/drivers/net/ethernet/ralink/mdio_rt2880.h -new file mode 100644 -index 0000000..51e3633 --- /dev/null +++ b/drivers/net/ethernet/ralink/mdio_rt2880.h @@ -0,0 +1,26 @@ @@ -3308,9 +3269,6 @@ index 0000000..51e3633 +void rt2880_port_init(struct fe_priv *priv, struct device_node *np); + +#endif -diff --git a/drivers/net/ethernet/ralink/ralink_soc_eth.c b/drivers/net/ethernet/ralink/ralink_soc_eth.c -new file mode 100644 -index 0000000..d75c669 --- /dev/null +++ b/drivers/net/ethernet/ralink/ralink_soc_eth.c @@ -0,0 +1,746 @@ @@ -4060,9 +4018,6 @@ index 0000000..d75c669 +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("John Crispin "); +MODULE_DESCRIPTION("Ethernet driver for Ralink SoC"); -diff --git a/drivers/net/ethernet/ralink/ralink_soc_eth.h b/drivers/net/ethernet/ralink/ralink_soc_eth.h -new file mode 100644 -index 0000000..85bc881 --- /dev/null +++ b/drivers/net/ethernet/ralink/ralink_soc_eth.h @@ -0,0 +1,374 @@ @@ -4440,9 +4395,6 @@ index 0000000..85bc881 +u32 fe_r32(unsigned reg); + +#endif /* FE_ETH_H */ -diff --git a/drivers/net/ethernet/ralink/soc_mt7620.c b/drivers/net/ethernet/ralink/soc_mt7620.c -new file mode 100644 -index 0000000..55e303f --- /dev/null +++ b/drivers/net/ethernet/ralink/soc_mt7620.c @@ -0,0 +1,111 @@ @@ -4557,9 +4509,6 @@ index 0000000..55e303f +}; + +MODULE_DEVICE_TABLE(of, of_fe_match); -diff --git a/drivers/net/ethernet/ralink/soc_rt2880.c b/drivers/net/ethernet/ralink/soc_rt2880.c -new file mode 100644 -index 0000000..1110947 --- /dev/null +++ b/drivers/net/ethernet/ralink/soc_rt2880.c @@ -0,0 +1,51 @@ @@ -4614,9 +4563,6 @@ index 0000000..1110947 +}; + +MODULE_DEVICE_TABLE(of, of_fe_match); -diff --git a/drivers/net/ethernet/ralink/soc_rt305x.c b/drivers/net/ethernet/ralink/soc_rt305x.c -new file mode 100644 -index 0000000..482ca1f --- /dev/null +++ b/drivers/net/ethernet/ralink/soc_rt305x.c @@ -0,0 +1,113 @@ @@ -4733,9 +4679,6 @@ index 0000000..482ca1f +}; + +MODULE_DEVICE_TABLE(of, of_fe_match); -diff --git a/drivers/net/ethernet/ralink/soc_rt3883.c b/drivers/net/ethernet/ralink/soc_rt3883.c -new file mode 100644 -index 0000000..c660529 --- /dev/null +++ b/drivers/net/ethernet/ralink/soc_rt3883.c @@ -0,0 +1,60 @@ @@ -4799,6 +4742,3 @@ index 0000000..c660529 + +MODULE_DEVICE_TABLE(of, of_fe_match); + --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0160-USB-phy-add-ralink-SoC-driver.patch b/target/linux/ramips/patches-3.9/0160-USB-phy-add-ralink-SoC-driver.patch index 95948dd244..bde8daee28 100644 --- a/target/linux/ramips/patches-3.9/0160-USB-phy-add-ralink-SoC-driver.patch +++ b/target/linux/ramips/patches-3.9/0160-USB-phy-add-ralink-SoC-driver.patch @@ -11,11 +11,9 @@ Signed-off-by: John Crispin 3 files changed, 200 insertions(+) create mode 100644 drivers/usb/phy/ralink-phy.c -Index: linux-3.9.6/drivers/usb/phy/Kconfig -=================================================================== ---- linux-3.9.6.orig/drivers/usb/phy/Kconfig 2013-06-13 19:52:08.000000000 +0200 -+++ linux-3.9.6/drivers/usb/phy/Kconfig 2013-06-23 16:37:57.544772712 +0200 -@@ -74,3 +74,11 @@ +--- a/drivers/usb/phy/Kconfig ++++ b/drivers/usb/phy/Kconfig +@@ -74,3 +74,11 @@ config SAMSUNG_USBPHY help Enable this to support Samsung USB phy controller for samsung SoCs. @@ -27,19 +25,15 @@ Index: linux-3.9.6/drivers/usb/phy/Kconfig + help + Enable this to support ralink USB phy controller for ralink + SoCs. -Index: linux-3.9.6/drivers/usb/phy/Makefile -=================================================================== ---- linux-3.9.6.orig/drivers/usb/phy/Makefile 2013-06-13 19:52:08.000000000 +0200 -+++ linux-3.9.6/drivers/usb/phy/Makefile 2013-06-23 16:37:57.544772712 +0200 -@@ -12,3 +12,4 @@ +--- a/drivers/usb/phy/Makefile ++++ b/drivers/usb/phy/Makefile +@@ -12,3 +12,4 @@ obj-$(CONFIG_MV_U3D_PHY) += mv_u3d_phy. obj-$(CONFIG_USB_EHCI_TEGRA) += tegra_usb_phy.o obj-$(CONFIG_USB_RCAR_PHY) += rcar-phy.o obj-$(CONFIG_SAMSUNG_USBPHY) += samsung-usbphy.o +obj-$(CONFIG_RALINK_USBPHY) += ralink-phy.o -Index: linux-3.9.6/drivers/usb/phy/ralink-phy.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.6/drivers/usb/phy/ralink-phy.c 2013-06-24 13:55:19.932135036 +0200 +--- /dev/null ++++ b/drivers/usb/phy/ralink-phy.c @@ -0,0 +1,191 @@ +/* + * Copyright (C) 2013 John Crispin diff --git a/target/linux/ramips/patches-3.9/0161-USB-add-OHCI-EHCI-OF-binding.patch b/target/linux/ramips/patches-3.9/0161-USB-add-OHCI-EHCI-OF-binding.patch index abb1171391..552ab71bbf 100644 --- a/target/linux/ramips/patches-3.9/0161-USB-add-OHCI-EHCI-OF-binding.patch +++ b/target/linux/ramips/patches-3.9/0161-USB-add-OHCI-EHCI-OF-binding.patch @@ -13,8 +13,6 @@ Signed-off-by: John Crispin drivers/usb/host/ohci-platform.c | 37 +++++++++++++++++++++++++++----- 4 files changed, 74 insertions(+), 12 deletions(-) -diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig -index c8d5b6c..7cd1188 100644 --- a/arch/mips/ralink/Kconfig +++ b/arch/mips/ralink/Kconfig @@ -27,6 +27,8 @@ choice @@ -26,8 +24,6 @@ index c8d5b6c..7cd1188 100644 endchoice -diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile -index 8f5ebce..b766256 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile @@ -12,6 +12,8 @@ obj-$(CONFIG_USB_DWC3) += dwc3/ @@ -47,8 +43,6 @@ index 8f5ebce..b766256 100644 obj-$(CONFIG_EARLY_PRINTK_DBGP) += early/ obj-$(CONFIG_USB_ATM) += atm/ -diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c -index ca75063..ae32410 100644 --- a/drivers/usb/host/ehci-platform.c +++ b/drivers/usb/host/ehci-platform.c @@ -18,14 +18,18 @@ @@ -70,7 +64,7 @@ index ca75063..ae32410 100644 #include #include "ehci.h" -@@ -62,22 +66,32 @@ static const struct ehci_driver_overrides platform_overrides __initdata = { +@@ -63,22 +67,32 @@ static const struct ehci_driver_override .reset = ehci_platform_reset, }; @@ -109,7 +103,7 @@ index ca75063..ae32410 100644 irq = platform_get_irq(dev, 0); if (irq < 0) { dev_err(&dev->dev, "no irq provided"); -@@ -105,6 +119,15 @@ static int ehci_platform_probe(struct platform_device *dev) +@@ -106,6 +120,15 @@ static int ehci_platform_probe(struct pl hcd->rsrc_start = res_mem->start; hcd->rsrc_len = resource_size(res_mem); @@ -125,7 +119,7 @@ index ca75063..ae32410 100644 hcd->regs = devm_ioremap_resource(&dev->dev, res_mem); if (IS_ERR(hcd->regs)) { err = PTR_ERR(hcd->regs); -@@ -139,6 +162,9 @@ static int ehci_platform_remove(struct platform_device *dev) +@@ -140,6 +163,9 @@ static int ehci_platform_remove(struct p if (pdata->power_off) pdata->power_off(dev); @@ -135,7 +129,7 @@ index ca75063..ae32410 100644 return 0; } -@@ -183,6 +209,11 @@ static int ehci_platform_resume(struct device *dev) +@@ -184,6 +210,11 @@ static int ehci_platform_resume(struct d #define ehci_platform_resume NULL #endif /* CONFIG_PM */ @@ -147,7 +141,7 @@ index ca75063..ae32410 100644 static const struct platform_device_id ehci_platform_table[] = { { "ehci-platform", 0 }, { } -@@ -203,6 +234,7 @@ static struct platform_driver ehci_platform_driver = { +@@ -204,6 +235,7 @@ static struct platform_driver ehci_platf .owner = THIS_MODULE, .name = "ehci-platform", .pm = &ehci_platform_pm_ops, @@ -155,8 +149,6 @@ index ca75063..ae32410 100644 } }; -diff --git a/drivers/usb/host/ohci-platform.c b/drivers/usb/host/ohci-platform.c -index c3e7287..dd9bac6 100644 --- a/drivers/usb/host/ohci-platform.c +++ b/drivers/usb/host/ohci-platform.c @@ -16,6 +16,10 @@ @@ -170,7 +162,7 @@ index c3e7287..dd9bac6 100644 static int ohci_platform_reset(struct usb_hcd *hcd) { -@@ -88,14 +92,22 @@ static int ohci_platform_probe(struct platform_device *dev) +@@ -88,14 +92,22 @@ static int ohci_platform_probe(struct pl { struct usb_hcd *hcd; struct resource *res_mem; @@ -198,7 +190,7 @@ index c3e7287..dd9bac6 100644 if (usb_disabled()) return -ENODEV; -@@ -128,6 +140,12 @@ static int ohci_platform_probe(struct platform_device *dev) +@@ -128,6 +140,12 @@ static int ohci_platform_probe(struct pl hcd->rsrc_start = res_mem->start; hcd->rsrc_len = resource_size(res_mem); @@ -211,7 +203,7 @@ index c3e7287..dd9bac6 100644 hcd->regs = devm_ioremap_resource(&dev->dev, res_mem); if (IS_ERR(hcd->regs)) { err = PTR_ERR(hcd->regs); -@@ -162,6 +180,9 @@ static int ohci_platform_remove(struct platform_device *dev) +@@ -162,6 +180,9 @@ static int ohci_platform_remove(struct p if (pdata->power_off) pdata->power_off(dev); @@ -221,7 +213,7 @@ index c3e7287..dd9bac6 100644 return 0; } -@@ -201,6 +222,11 @@ static int ohci_platform_resume(struct device *dev) +@@ -201,6 +222,11 @@ static int ohci_platform_resume(struct d #define ohci_platform_resume NULL #endif /* CONFIG_PM */ @@ -233,13 +225,10 @@ index c3e7287..dd9bac6 100644 static const struct platform_device_id ohci_platform_table[] = { { "ohci-platform", 0 }, { } -@@ -221,5 +247,6 @@ static struct platform_driver ohci_platform_driver = { +@@ -221,5 +247,6 @@ static struct platform_driver ohci_platf .owner = THIS_MODULE, .name = "ohci-platform", .pm = &ohci_platform_pm_ops, + .of_match_table = of_match_ptr(ralink_ohci_ids), } }; --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0162-USB-MIPS-ralink-add-rt5350-mt7620-UDC.patch b/target/linux/ramips/patches-3.9/0162-USB-MIPS-ralink-add-rt5350-mt7620-UDC.patch index d1110a54cd..1fdd48c508 100644 --- a/target/linux/ramips/patches-3.9/0162-USB-MIPS-ralink-add-rt5350-mt7620-UDC.patch +++ b/target/linux/ramips/patches-3.9/0162-USB-MIPS-ralink-add-rt5350-mt7620-UDC.patch @@ -13,8 +13,6 @@ Signed-off-by: John Crispin create mode 100644 drivers/usb/gadget/rt_udc.h create mode 100644 drivers/usb/gadget/rt_udc_pdma.c -diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig -index c7525b1..6f0e293 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -336,6 +336,14 @@ config USB_MV_U3D @@ -32,8 +30,6 @@ index c7525b1..6f0e293 100644 # # Controllers available in both integrated and discrete versions # -diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile -index 82fb225..f78a3b2 100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile @@ -34,6 +34,7 @@ obj-$(CONFIG_USB_MV_UDC) += mv_udc.o @@ -44,9 +40,6 @@ index 82fb225..f78a3b2 100644 # USB Functions obj-$(CONFIG_USB_F_ACM) += f_acm.o -diff --git a/drivers/usb/gadget/rt_udc.h b/drivers/usb/gadget/rt_udc.h -new file mode 100644 -index 0000000..088e0d9 --- /dev/null +++ b/drivers/usb/gadget/rt_udc.h @@ -0,0 +1,417 @@ @@ -467,9 +460,6 @@ index 0000000..088e0d9 +#endif /* DEBUG */ + +#endif /* __LINUX_USB_GADGET_RT_UDC_H */ -diff --git a/drivers/usb/gadget/rt_udc_pdma.c b/drivers/usb/gadget/rt_udc_pdma.c -new file mode 100644 -index 0000000..d5b89a2 --- /dev/null +++ b/drivers/usb/gadget/rt_udc_pdma.c @@ -0,0 +1,2547 @@ @@ -3020,6 +3010,3 @@ index 0000000..d5b89a2 +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:rt_udc"); + --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0163-USB-MIPS-ralink-fix-usb-issue-on-mt7620.patch b/target/linux/ramips/patches-3.9/0163-USB-MIPS-ralink-fix-usb-issue-on-mt7620.patch index f7f6d32a68..d755a506f6 100644 --- a/target/linux/ramips/patches-3.9/0163-USB-MIPS-ralink-fix-usb-issue-on-mt7620.patch +++ b/target/linux/ramips/patches-3.9/0163-USB-MIPS-ralink-fix-usb-issue-on-mt7620.patch @@ -12,8 +12,6 @@ Signed-off-by: John Crispin arch/mips/ralink/mt7620.c | 8 ++++++++ 2 files changed, 9 insertions(+) -diff --git a/arch/mips/include/asm/mach-ralink/mt7620.h b/arch/mips/include/asm/mach-ralink/mt7620.h -index 9809972..d469c69 100644 --- a/arch/mips/include/asm/mach-ralink/mt7620.h +++ b/arch/mips/include/asm/mach-ralink/mt7620.h @@ -20,6 +20,7 @@ @@ -24,8 +22,6 @@ index 9809972..d469c69 100644 #define SYSC_REG_CPLL_CONFIG0 0x54 #define SYSC_REG_CPLL_CONFIG1 0x58 -diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c -index 4956d96..d76eb85 100644 --- a/arch/mips/ralink/mt7620.c +++ b/arch/mips/ralink/mt7620.c @@ -186,6 +186,14 @@ void __init ralink_clk_init(void) @@ -43,6 +39,3 @@ index 4956d96..d76eb85 100644 } void __init ralink_of_remap(void) --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0164-Kbuild-add-missing-space.patch b/target/linux/ramips/patches-3.9/0164-Kbuild-add-missing-space.patch index 5242d2081b..f8bcd421bf 100644 --- a/target/linux/ramips/patches-3.9/0164-Kbuild-add-missing-space.patch +++ b/target/linux/ramips/patches-3.9/0164-Kbuild-add-missing-space.patch @@ -20,11 +20,9 @@ Signed-off-by: John Crispin scripts/Makefile.lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib -index 07125e6..e13fff1 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib -@@ -251,7 +251,7 @@ cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -n -f -9 > $@) || \ +@@ -251,7 +251,7 @@ cmd_gzip = (cat $(filter-out FORCE,$^) | # --------------------------------------------------------------------------- # Generate an assembly file to wrap the output of the device tree compiler @@ -33,6 +31,3 @@ index 07125e6..e13fff1 100644 cmd_dt_S_dtb= \ ( \ echo '\#include '; \ --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0200-owrt-GPIO-add-gpio_export_with_name.patch b/target/linux/ramips/patches-3.9/0200-owrt-GPIO-add-gpio_export_with_name.patch index 74ef79b7d6..a1a2981a0d 100644 --- a/target/linux/ramips/patches-3.9/0200-owrt-GPIO-add-gpio_export_with_name.patch +++ b/target/linux/ramips/patches-3.9/0200-owrt-GPIO-add-gpio_export_with_name.patch @@ -14,8 +14,6 @@ Signed-off-by: John Crispin include/linux/gpio.h | 26 ++++++++- 5 files changed, 172 insertions(+), 12 deletions(-) -diff --git a/Documentation/devicetree/bindings/gpio/gpio.txt b/Documentation/devicetree/bindings/gpio/gpio.txt -index a336287..c2a9024 100644 --- a/Documentation/devicetree/bindings/gpio/gpio.txt +++ b/Documentation/devicetree/bindings/gpio/gpio.txt @@ -112,3 +112,63 @@ where, @@ -82,8 +80,6 @@ index a336287..c2a9024 100644 + gpio-export,output = <1>; + }; +}; -diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c -index 5150df6..195491b 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c @@ -21,6 +21,8 @@ @@ -95,7 +91,7 @@ index 5150df6..195491b 100644 /* Private data structure for of_gpiochip_find_and_xlate */ struct gg_data { -@@ -253,3 +255,69 @@ void of_gpiochip_remove(struct gpio_chip *chip) +@@ -253,3 +255,69 @@ void of_gpiochip_remove(struct gpio_chip if (chip->of_node) of_node_put(chip->of_node); } @@ -165,11 +161,9 @@ index 5150df6..195491b 100644 + return platform_driver_probe(&gpio_export_driver, of_gpio_export_probe); +} +device_initcall(of_gpio_export_init); -diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c -index c2534d6..8697c82 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c -@@ -96,7 +96,7 @@ static int gpiod_get_value(const struct gpio_desc *desc); +@@ -96,7 +96,7 @@ static int gpiod_get_value(const struct static void gpiod_set_value(struct gpio_desc *desc, int value); static int gpiod_cansleep(const struct gpio_desc *desc); static int gpiod_to_irq(const struct gpio_desc *desc); @@ -178,7 +172,7 @@ index c2534d6..8697c82 100644 static int gpiod_export_link(struct device *dev, const char *name, struct gpio_desc *desc); static int gpiod_sysfs_set_active_low(struct gpio_desc *desc, int value); -@@ -674,7 +674,7 @@ static ssize_t export_store(struct class *class, +@@ -674,7 +674,7 @@ static ssize_t export_store(struct class status = -ENODEV; goto done; } @@ -208,7 +202,7 @@ index c2534d6..8697c82 100644 { unsigned long flags; int status; -@@ -783,6 +784,8 @@ static int gpiod_export(struct gpio_desc *desc, bool direction_may_change) +@@ -783,6 +784,8 @@ static int gpiod_export(struct gpio_desc goto fail_unlock; } @@ -232,7 +226,7 @@ index c2534d6..8697c82 100644 static int match_export(struct device *dev, const void *data) { -@@ -1092,7 +1095,7 @@ static inline void gpiochip_unexport(struct gpio_chip *chip) +@@ -1092,7 +1095,7 @@ static inline void gpiochip_unexport(str } static inline int gpiod_export(struct gpio_desc *desc, @@ -241,7 +235,7 @@ index c2534d6..8697c82 100644 { return -ENOSYS; } -@@ -1521,6 +1524,9 @@ int gpio_request_one(unsigned gpio, unsigned long flags, const char *label) +@@ -1521,6 +1524,9 @@ int gpio_request_one(unsigned gpio, unsi if (flags & GPIOF_OPEN_SOURCE) set_bit(FLAG_OPEN_SOURCE, &desc->flags); @@ -251,7 +245,7 @@ index c2534d6..8697c82 100644 if (flags & GPIOF_DIR_IN) err = gpiod_direction_input(desc); else -@@ -1531,7 +1537,7 @@ int gpio_request_one(unsigned gpio, unsigned long flags, const char *label) +@@ -1531,7 +1537,7 @@ int gpio_request_one(unsigned gpio, unsi goto free_gpio; if (flags & GPIOF_EXPORT) { @@ -260,11 +254,9 @@ index c2534d6..8697c82 100644 if (err) goto free_gpio; } -diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h -index bde6469..3290572 100644 --- a/include/asm-generic/gpio.h +++ b/include/asm-generic/gpio.h -@@ -202,7 +202,8 @@ extern void gpio_free_array(const struct gpio *array, size_t num); +@@ -202,7 +202,8 @@ extern void gpio_free_array(const struct * A sysfs interface can be exported by individual drivers if they want, * but more typically is configured entirely from userspace. */ @@ -284,8 +276,6 @@ index bde6469..3290572 100644 { return -ENOSYS; } -diff --git a/include/linux/gpio.h b/include/linux/gpio.h -index f6c7ae3..80a574a 100644 --- a/include/linux/gpio.h +++ b/include/linux/gpio.h @@ -27,6 +27,9 @@ @@ -298,7 +288,7 @@ index f6c7ae3..80a574a 100644 /** * struct gpio - a structure describing a GPIO with configuration * @gpio: the GPIO number -@@ -169,7 +172,8 @@ static inline void gpio_set_value_cansleep(unsigned gpio, int value) +@@ -169,7 +172,8 @@ static inline void gpio_set_value_cansle WARN_ON(1); } @@ -308,7 +298,7 @@ index f6c7ae3..80a574a 100644 { /* GPIO can never have been requested or set as {in,out}put */ WARN_ON(1); -@@ -236,4 +240,24 @@ int devm_gpio_request_one(struct device *dev, unsigned gpio, +@@ -236,4 +240,24 @@ int devm_gpio_request_one(struct device unsigned long flags, const char *label); void devm_gpio_free(struct device *dev, unsigned int gpio); @@ -333,6 +323,3 @@ index f6c7ae3..80a574a 100644 +} + #endif /* __LINUX_GPIO_H */ --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.9/0205-owrt-MIPS-add-OWRTDTB-secion.patch b/target/linux/ramips/patches-3.9/0205-owrt-MIPS-add-OWRTDTB-secion.patch index b1e8058c7b..d048aee459 100644 --- a/target/linux/ramips/patches-3.9/0205-owrt-MIPS-add-OWRTDTB-secion.patch +++ b/target/linux/ramips/patches-3.9/0205-owrt-MIPS-add-OWRTDTB-secion.patch @@ -24,16 +24,16 @@ Signed-off-by: John Crispin NESTED(kernel_entry, 16, sp) # kernel entry point --- a/arch/mips/ralink/Makefile +++ b/arch/mips/ralink/Makefile -@@ -15,4 +15,4 @@ obj-$(CONFIG_SOC_MT7620) += mt7620.o +@@ -17,4 +17,4 @@ obj-$(CONFIG_EARLY_PRINTK) += early_prin - obj-$(CONFIG_EARLY_PRINTK) += early_printk.o + obj-$(CONFIG_DEBUG_FS) += bootrom.o -obj-y += dts/ +#obj-y += dts/ --- a/arch/mips/ralink/of.c +++ b/arch/mips/ralink/of.c -@@ -77,6 +77,8 @@ void __init device_tree_init(void) - free_bootmem(base, size); +@@ -83,6 +83,8 @@ void __init device_tree_init(void) + //free_bootmem(base, size); } +extern struct boot_param_header __image_dtb; @@ -41,7 +41,7 @@ Signed-off-by: John Crispin void __init plat_mem_setup(void) { set_io_port_base(KSEG1); -@@ -85,7 +87,7 @@ void __init plat_mem_setup(void) +@@ -91,7 +93,7 @@ void __init plat_mem_setup(void) * Load the builtin devicetree. This causes the chosen node to be * parsed resulting in our memory appearing */ @@ -49,4 +49,4 @@ Signed-off-by: John Crispin + __dt_setup_arch(&__image_dtb); if (soc_info.mem_size) - add_memory_region(soc_info.mem_base, soc_info.mem_size, + add_memory_region(soc_info.mem_base, soc_info.mem_size * SZ_1M, diff --git a/target/linux/ramips/patches-3.9/0210-mtd_fix_cfi_cmdset_0002_erase_status_check.patch b/target/linux/ramips/patches-3.9/0210-mtd_fix_cfi_cmdset_0002_erase_status_check.patch index 91b887f922..fa6ba25837 100644 --- a/target/linux/ramips/patches-3.9/0210-mtd_fix_cfi_cmdset_0002_erase_status_check.patch +++ b/target/linux/ramips/patches-3.9/0210-mtd_fix_cfi_cmdset_0002_erase_status_check.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -1939,7 +1939,7 @@ static int __xipram do_erase_chip(struct +@@ -1957,7 +1957,7 @@ static int __xipram do_erase_chip(struct chip->erase_suspended = 0; } @@ -9,7 +9,7 @@ break; if (time_after(jiffies, timeo)) { -@@ -2028,7 +2028,7 @@ static int __xipram do_erase_oneblock(st +@@ -2046,7 +2046,7 @@ static int __xipram do_erase_oneblock(st chip->erase_suspended = 0; } diff --git a/target/linux/ramips/patches-3.9/0211-mtd-cfi_cmdset_0002-force-word-write.patch b/target/linux/ramips/patches-3.9/0211-mtd-cfi_cmdset_0002-force-word-write.patch index 25ae351e65..ec1acc920a 100644 --- a/target/linux/ramips/patches-3.9/0211-mtd-cfi_cmdset_0002-force-word-write.patch +++ b/target/linux/ramips/patches-3.9/0211-mtd-cfi_cmdset_0002-force-word-write.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -39,7 +39,7 @@ +@@ -41,7 +41,7 @@ #include #define AMD_BOOTLOC_BUG @@ -9,7 +9,7 @@ #define MAX_WORD_RETRIES 3 -@@ -50,7 +50,9 @@ +@@ -52,7 +52,9 @@ static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *); static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *); @@ -19,7 +19,7 @@ static int cfi_amdstd_erase_chip(struct mtd_info *, struct erase_info *); static int cfi_amdstd_erase_varsize(struct mtd_info *, struct erase_info *); static void cfi_amdstd_sync (struct mtd_info *); -@@ -186,6 +188,7 @@ static void fixup_amd_bootblock(struct m +@@ -192,6 +194,7 @@ static void fixup_amd_bootblock(struct m } #endif @@ -27,7 +27,7 @@ static void fixup_use_write_buffers(struct mtd_info *mtd) { struct map_info *map = mtd->priv; -@@ -195,6 +198,7 @@ static void fixup_use_write_buffers(stru +@@ -201,6 +204,7 @@ static void fixup_use_write_buffers(stru mtd->_write = cfi_amdstd_write_buffers; } } @@ -35,7 +35,7 @@ /* Atmel chips don't use the same PRI format as AMD chips */ static void fixup_convert_atmel_pri(struct mtd_info *mtd) -@@ -1443,6 +1447,7 @@ static int cfi_amdstd_write_words(struct +@@ -1461,6 +1465,7 @@ static int cfi_amdstd_write_words(struct /* * FIXME: interleaved mode not tested, and probably not supported! */ @@ -43,7 +43,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, unsigned long adr, const u_char *buf, int len) -@@ -1567,7 +1572,6 @@ static int __xipram do_write_buffer(stru +@@ -1585,7 +1590,6 @@ static int __xipram do_write_buffer(stru return ret; } @@ -51,7 +51,7 @@ static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf) { -@@ -1642,6 +1646,7 @@ static int cfi_amdstd_write_buffers(stru +@@ -1660,6 +1664,7 @@ static int cfi_amdstd_write_buffers(stru return 0; }