kernel: update linux 3.8 to 3.8.12

[openwrt/staging/jow.git] / target / linux / ramips / patches-3.8 / 0204-owrt-MIPS-ralink-add-usb-platform-support.patch

diff --git a/target/linux/ramips/patches-3.8/0204-owrt-MIPS-ralink-add-usb-platform-support.patch b/target/linux/ramips/patches-3.8/0204-owrt-MIPS-ralink-add-usb-platform-support.patch
index 7b9e1a366a06d8ac7aad0992505206f30825b652..0fedc91b77c83c7250328c2c43bb750addcc160b 100644 (file)
--- a/target/linux/ramips/patches-3.8/0204-owrt-MIPS-ralink-add-usb-platform-support.patch
+++ b/target/linux/ramips/patches-3.8/0204-owrt-MIPS-ralink-add-usb-platform-support.patch
@@ -19,8 +19,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  create mode 100644 arch/mips/ralink/rt305x-usb.c
  create mode 100644 arch/mips/ralink/rt3883-usb.c
 
-diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile
-index cae7d88..8572538 100644
 --- a/arch/mips/ralink/Makefile
 +++ b/arch/mips/ralink/Makefile
 @@ -9,8 +9,8 @@
@@ -34,23 +32,19 @@ index cae7d88..8572538 100644
  obj-$(CONFIG_SOC_MT7620) += mt7620.o
  
  obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
-diff --git a/arch/mips/ralink/common.h b/arch/mips/ralink/common.h
-index ed99f23..14a101c 100644
 --- a/arch/mips/ralink/common.h
 +++ b/arch/mips/ralink/common.h
-@@ -43,5 +43,6 @@ extern void prom_soc_init(struct ralink_soc_info *soc_info);
+@@ -51,5 +51,6 @@ extern void prom_soc_init(struct ralink_
  __iomem void *plat_of_remap_node(const char *node);
  
  void ralink_pinmux(void);
 +void ralink_usb_platform(void);
  
  #endif /* _RALINK_COMMON_H__ */
-diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c
-index 9d0dc8b..19b28c5 100644
 --- a/arch/mips/ralink/mt7620.c
 +++ b/arch/mips/ralink/mt7620.c
-@@ -146,6 +146,11 @@ struct ralink_pinmux rt_pinmux = {
- //    .wdt_reset = rt305x_wdt_reset,
+@@ -140,6 +140,11 @@ struct ralink_pinmux rt_gpio_pinmux = {
+       .uart_mask = MT7620_GPIO_MODE_GPIO,
  };
  
 +void ralink_usb_platform(void)
@@ -61,11 +55,9 @@ index 9d0dc8b..19b28c5 100644
  void __init ralink_clk_init(void)
  {
        unsigned long cpu_rate, sys_rate;
-diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
-index ecf1482..f438145 100644
 --- a/arch/mips/ralink/of.c
 +++ b/arch/mips/ralink/of.c
-@@ -102,6 +102,7 @@ static int __init plat_of_setup(void)
+@@ -111,6 +111,7 @@ static int __init plat_of_setup(void)
                panic("failed to populate DT\n");
  
        ralink_pinmux();
@@ -73,9 +65,6 @@ index ecf1482..f438145 100644
  
        return 0;
  }
-diff --git a/arch/mips/ralink/rt305x-usb.c b/arch/mips/ralink/rt305x-usb.c
-new file mode 100644
-index 0000000..793fc82
 --- /dev/null
 +++ b/arch/mips/ralink/rt305x-usb.c
 @@ -0,0 +1,120 @@
@@ -199,9 +188,6 @@ index 0000000..793fc82
 +                              &rt3352_ehci_data, &rt3352_ehci_dmamask);
 +      }
 +}
-diff --git a/arch/mips/ralink/rt3883-usb.c b/arch/mips/ralink/rt3883-usb.c
-new file mode 100644
-index 0000000..1d948a9
 --- /dev/null
 +++ b/arch/mips/ralink/rt3883-usb.c
 @@ -0,0 +1,118 @@
@@ -323,6 +309,17 @@ index 0000000..1d948a9
 +      ralink_add_usb("ehci-platform",
 +                      &rt3883_ehci_data, &rt3883_ehci_dmamask);
 +}
--- 
-1.7.10.4
-
+--- a/arch/mips/ralink/rt288x.c
++++ b/arch/mips/ralink/rt288x.c
+@@ -74,6 +74,11 @@ struct ralink_pinmux rt_gpio_pinmux = {
+       .wdt_reset = rt288x_wdt_reset,
+ };
+ 
++void ralink_usb_platform(void)
++{
++
++}
++
+ void __init ralink_clk_init(void)
+ {
+       unsigned long cpu_rate;