ar71xx: update 3.3 patches

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / patches-3.3 / 134-MIPS-ath79-add-USB-platform-setup-code-for-AR934X.patch

diff --git a/target/linux/ar71xx/patches-3.3/134-MIPS-ath79-add-USB-platform-setup-code-for-AR934X.patch b/target/linux/ar71xx/patches-3.3/134-MIPS-ath79-add-USB-platform-setup-code-for-AR934X.patch
new file mode 100644 (file)
index 0000000..2a287ec
--- /dev/null
+++ b/target/linux/ar71xx/patches-3.3/134-MIPS-ath79-add-USB-platform-setup-code-for-AR934X.patch
@@ -0,0 +1,78 @@
+From 635d5a2ac8aa483c3a0635c60bff8ea8978ff6a7 Mon Sep 17 00:00:00 2001
+From: Gabor Juhos <juhosg@openwrt.org>
+Date: Sun, 11 Dec 2011 18:34:13 +0100
+Subject: [PATCH 39/47] MIPS: ath79: add USB platform setup code for AR934X
+
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+---
+ arch/mips/ath79/dev-usb.c                      |   28 ++++++++++++++++++++++++
+ arch/mips/include/asm/mach-ath79/ar71xx_regs.h |    7 ++++++
+ 2 files changed, 35 insertions(+), 0 deletions(-)
+
+--- a/arch/mips/ath79/dev-usb.c
++++ b/arch/mips/ath79/dev-usb.c
+@@ -193,6 +193,32 @@ static void __init ar933x_usb_setup(void
+       platform_device_register(&ath79_ehci_device);
+ }
+ 
++static void __init ar934x_usb_setup(void)
++{
++      u32 bootstrap;
++
++      bootstrap = ath79_reset_rr(AR934X_RESET_REG_BOOTSTRAP);
++      if (bootstrap & AR934X_BOOTSTRAP_USB_MODE_DEVICE)
++              return;
++
++      ath79_device_reset_set(AR934X_RESET_USBSUS_OVERRIDE);
++      udelay(1000);
++
++      ath79_device_reset_clear(AR934X_RESET_USB_PHY);
++      udelay(1000);
++
++      ath79_device_reset_clear(AR934X_RESET_USB_PHY_ANALOG);
++      udelay(1000);
++
++      ath79_device_reset_clear(AR934X_RESET_USB_HOST);
++      udelay(1000);
++
++      ath79_usb_init_resource(ath79_ehci_resources, AR934X_EHCI_BASE,
++                              AR934X_EHCI_SIZE, ATH79_CPU_IRQ_USB);
++      ath79_ehci_device.dev.platform_data = &ath79_ehci_pdata_v2;
++      platform_device_register(&ath79_ehci_device);
++}
++
+ void __init ath79_register_usb(void)
+ {
+       if (soc_is_ar71xx())
+@@ -205,6 +231,8 @@ void __init ath79_register_usb(void)
+               ar913x_usb_setup();
+       else if (soc_is_ar933x())
+               ar933x_usb_setup();
++      else if (soc_is_ar934x())
++              ar934x_usb_setup();
+       else
+               BUG();
+ }
+--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
++++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
+@@ -63,6 +63,8 @@
+ 
+ #define AR934X_WMAC_BASE      (AR71XX_APB_BASE + 0x00100000)
+ #define AR934X_WMAC_SIZE      0x20000
++#define AR934X_EHCI_BASE      0x1b000000
++#define AR934X_EHCI_SIZE      0x1000
+ 
+ /*
+  * DDR_CTRL block
+@@ -288,6 +290,11 @@
+ #define AR933X_RESET_USB_PHY          BIT(4)
+ #define AR933X_RESET_USBSUS_OVERRIDE  BIT(3)
+ 
++#define AR934X_RESET_USB_PHY_ANALOG   BIT(11)
++#define AR934X_RESET_USB_HOST         BIT(5)
++#define AR934X_RESET_USB_PHY          BIT(4)
++#define AR934X_RESET_USBSUS_OVERRIDE  BIT(3)
++
+ #define AR933X_BOOTSTRAP_REF_CLK_40   BIT(0)
+ 
+ #define AR934X_BOOTSTRAP_SW_OPTION8   BIT(23)