projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ar71xx: support for D-LINK DIR-615 rev. E4
[openwrt.git] / target / linux / brcm47xx / patches-3.0 / 0032-USB-Add-driver-for-the-bcma-bus.patch
diff --git a/target/linux/brcm47xx/patches-3.0/0032-USB-Add-driver-for-the-bcma-bus.patch b/target/linux/brcm47xx/patches-3.0/0032-USB-Add-driver-for-the-bcma-bus.patch
index 3a35ac8..e2a2f1e 100644 (file)
--- a/target/linux/brcm47xx/patches-3.0/0032-USB-Add-driver-for-the-bcma-bus.patch
+++ b/target/linux/brcm47xx/patches-3.0/0032-USB-Add-driver-for-the-bcma-bus.patch
@@ -1,7 +1,7 @@
-From 7151c34627b938486008cfab25bfb4e4f730a021 Mon Sep 17 00:00:00 2001
+From 4ea647c5a257d57eaf230f783e54b2c0232852b8 Mon Sep 17 00:00:00 2001
 From: Hauke Mehrtens <hauke@hauke-m.de>
 Date: Sat, 26 Nov 2011 21:33:41 +0100
 From: Hauke Mehrtens <hauke@hauke-m.de>
 Date: Sat, 26 Nov 2011 21:33:41 +0100
-Subject: [PATCH 19/21] USB: Add driver for the bcma bus
+Subject: [PATCH 19/26] USB: Add driver for the bcma bus
 
 This adds a USB driver using the generic platform device driver for the
 USB controller found on the Broadcom bcma bus. The bcma bus just
 
 This adds a USB driver using the generic platform device driver for the
 USB controller found on the Broadcom bcma bus. The bcma bus just
@@ -15,8 +15,8 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 ---
  drivers/usb/host/Kconfig    |   12 ++
  drivers/usb/host/Makefile   |    1 +
 ---
  drivers/usb/host/Kconfig    |   12 ++
  drivers/usb/host/Makefile   |    1 +
- drivers/usb/host/bcma-hcd.c |  350 +++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 363 insertions(+), 0 deletions(-)
+ drivers/usb/host/bcma-hcd.c |  309 +++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 322 insertions(+), 0 deletions(-)
  create mode 100644 drivers/usb/host/bcma-hcd.c
 
 --- a/drivers/usb/host/Kconfig
  create mode 100644 drivers/usb/host/bcma-hcd.c
 
 --- a/drivers/usb/host/Kconfig
@@ -46,7 +46,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +obj-$(CONFIG_USB_HCD_BCMA)    += bcma-hcd.o
 --- /dev/null
 +++ b/drivers/usb/host/bcma-hcd.c
 +obj-$(CONFIG_USB_HCD_BCMA)    += bcma-hcd.o
 --- /dev/null
 +++ b/drivers/usb/host/bcma-hcd.c
-@@ -0,0 +1,298 @@
+@@ -0,0 +1,309 @@
 +/*
 + * Broadcom specific Advanced Microcontroller Bus
 + * Broadcom USB-core driver (BCMA bus glue)
 +/*
 + * Broadcom specific Advanced Microcontroller Bus
 + * Broadcom USB-core driver (BCMA bus glue)
@@ -76,15 +76,46 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +MODULE_DESCRIPTION("Common USB driver for BCMA Bus");
 +MODULE_LICENSE("GPL");
 +
 +MODULE_DESCRIPTION("Common USB driver for BCMA Bus");
 +MODULE_LICENSE("GPL");
 +
-+#define BCMA_CORE_SIZE                0x1000
-+
 +struct bcma_hcd_device {
 +      struct platform_device *ehci_dev;
 +      struct platform_device *ohci_dev;
 +};
 +
 +struct bcma_hcd_device {
 +      struct platform_device *ehci_dev;
 +      struct platform_device *ohci_dev;
 +};
 +
++static void __devinit bcma_hcd_4716wa(struct bcma_device *dev)
++{
++#ifdef CONFIG_BCMA_DRIVER_MIPS
++      /* Work around for 4716 failures. */
++      if (dev->bus->chipinfo.id == 0x4716) {
++              u32 tmp;
++
++              tmp = bcma_cpu_clock(&dev->bus->drv_mips);
++              if (tmp >= 480000000)
++                      tmp = 0x1846b; /* set CDR to 0x11(fast) */
++              else if (tmp == 453000000)
++                      tmp = 0x1046b; /* set CDR to 0x10(slow) */
++              else
++                      tmp = 0;
++
++              /* Change Shim mdio control reg to fix host not acking at
++               * high frequencies
++               */
++              if (tmp) {
++                      bcma_write32(dev, 0x524, 0x1); /* write sel to enable */
++                      udelay(500);
++
++                      bcma_write32(dev, 0x524, tmp);
++                      udelay(500);
++                      bcma_write32(dev, 0x524, 0x4ab);
++                      udelay(500);
++                      bcma_read32(dev, 0x528);
++                      bcma_write32(dev, 0x528, 0x80000000);
++              }
++      }
++#endif /* CONFIG_BCMA_DRIVER_MIPS */
++}
++
 +/* based on arch/mips/brcm-boards/bcm947xx/pcibios.c */
 +/* based on arch/mips/brcm-boards/bcm947xx/pcibios.c */
-+static void bcma_hcd_init_chip(struct bcma_device *dev)
++static void __devinit bcma_hcd_init_chip(struct bcma_device *dev)
 +{
 +      u32 tmp;
 +
 +{
 +      u32 tmp;
 +
@@ -106,7 +137,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +                      tmp = bcma_read32(dev, 0x1e0);
 +                      tmp |= 0x100;
 +                      bcma_write32(dev, 0x1e0, tmp);
 +                      tmp = bcma_read32(dev, 0x1e0);
 +                      tmp |= 0x100;
 +                      bcma_write32(dev, 0x1e0, tmp);
-+                      if (bcma_wait_bits(dev, 0x1e0, 1 << 24, 100, 0))
++                      if (bcma_wait_bits(dev, 0x1e0, 1 << 24, 100, 1))
 +                              printk(KERN_EMERG "Failed to enable misc PPL!\n");
 +
 +                      /* Take out of resets */
 +                              printk(KERN_EMERG "Failed to enable misc PPL!\n");
 +
 +                      /* Take out of resets */
@@ -132,10 +163,11 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +                      udelay(50);
 +                      tmp = bcma_read32(dev, 0x524);
 +
 +                      udelay(50);
 +                      tmp = bcma_read32(dev, 0x524);
 +
-+                      if (bcma_wait_bits(dev, 0x528, 0xc000, 10000, 1))
++                      if (bcma_wait_bits(dev, 0x528, 0xc000, 10000, 1)) {
++                              tmp = bcma_read32(dev, 0x528);
 +                              printk(KERN_EMERG
 +                                     "USB20H mdio_rddata 0x%08x\n", tmp);
 +                              printk(KERN_EMERG
 +                                     "USB20H mdio_rddata 0x%08x\n", tmp);
-+
++                      }
 +                      bcma_write32(dev, 0x528, 0x80000000);
 +                      tmp = bcma_read32(dev, 0x314);
 +                      udelay(265);
 +                      bcma_write32(dev, 0x528, 0x80000000);
 +                      tmp = bcma_read32(dev, 0x314);
 +                      udelay(265);
@@ -149,51 +181,22 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +
 +                      udelay(1);
 +              }
 +
 +                      udelay(1);
 +              }
-+      }
-+#ifdef CONFIG_BCMA_DRIVER_MIPS
-+      /* Work around for 4716 failures. */
-+      if (dev->bus->chipinfo.id == 0x4716) {
-+              u32 clk_freq;
-+
-+              clk_freq = bcma_cpu_clock(&dev->bus->drv_mips);
-+              if (clk_freq >= 480000000)
-+                      tmp = 0x1846b; /* set CDR to 0x11(fast) */
-+              else if (clk_freq == 453000000)
-+                      tmp = 0x1046b; /* set CDR to 0x10(slow) */
-+              else
-+                      tmp = 0;
 +
 +
-+              /* Change Shim mdio control reg to fix host not acking at
-+               * high frequencies
-+               */
-+              if (tmp) {
-+                      bcma_write32(dev, 0x524, 0x1); /* write sel to enable */
-+                      udelay(500);
-+
-+                      bcma_write32(dev, 0x524, tmp);
-+                      udelay(500);
-+                      bcma_write32(dev, 0x524, 0x4ab);
-+                      udelay(500);
-+                      tmp = bcma_read32(dev, 0x528);
-+                      bcma_write32(dev, 0x528, 0x80000000);
-+              }
++              bcma_hcd_4716wa(dev);
 +      }
 +      }
-+#endif /* CONFIG_BCMA_DRIVER_MIPS */
 +}
 +
 +}
 +
-+static struct platform_device *bcma_hcd_create_pdev(struct bcma_device *dev,
-+                                                  char *name, u32 addr)
++static struct platform_device * __devinit
++bcma_hcd_create_pdev(struct bcma_device *dev, char *name, u32 addr)
 +{
 +      struct platform_device *hci_dev;
 +{
 +      struct platform_device *hci_dev;
-+      struct resource *hci_res;
++      struct resource hci_res[2];
 +      int ret = -ENOMEM;
 +
 +      int ret = -ENOMEM;
 +
-+      hci_res = kzalloc(sizeof(struct resource) * 2, GFP_KERNEL);
-+      if (!hci_res)
-+              return ERR_PTR(-ENOMEM);
++      memset(hci_res, 0, sizeof(hci_res));
 +
 +      hci_res[0].start = addr;
 +
 +      hci_res[0].start = addr;
-+      hci_res[0].end = hci_res[0].start + BCMA_CORE_SIZE - 1;
++      hci_res[0].end = hci_res[0].start + 0x1000 - 1;
 +      hci_res[0].flags = IORESOURCE_MEM;
 +
 +      hci_res[1].start = dev->irq;
 +      hci_res[0].flags = IORESOURCE_MEM;
 +
 +      hci_res[1].start = dev->irq;
@@ -206,14 +209,14 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +      hci_dev->dev.parent = &dev->dev;
 +      hci_dev->dev.dma_mask = &hci_dev->dev.coherent_dma_mask;
 +
 +      hci_dev->dev.parent = &dev->dev;
 +      hci_dev->dev.dma_mask = &hci_dev->dev.coherent_dma_mask;
 +
-+      ret = platform_device_add_resources(hci_dev, hci_res, 2);
++      ret = platform_device_add_resources(hci_dev, hci_res,
++                                          ARRAY_SIZE(hci_res));
 +      if (ret)
 +              goto err_alloc;
 +
 +      ret = platform_device_add(hci_dev);
 +      if (ret) {
 +err_alloc:
 +      if (ret)
 +              goto err_alloc;
 +
 +      ret = platform_device_add(hci_dev);
 +      if (ret) {
 +err_alloc:
-+              kfree(hci_res);
 +              platform_device_put(hci_dev);
 +              return ERR_PTR(ret);
 +      }
 +              platform_device_put(hci_dev);
 +              return ERR_PTR(ret);
 +      }
@@ -221,14 +224,17 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +      return hci_dev;
 +}
 +
 +      return hci_dev;
 +}
 +
-+static int bcma_hcd_probe(struct bcma_device *dev)
++static int __devinit bcma_hcd_probe(struct bcma_device *dev)
 +{
 +      int err;
 +      u16 chipid_top;
 +{
 +      int err;
 +      u16 chipid_top;
++      u32 ohci_addr;
 +      struct bcma_hcd_device *usb_dev;
 +      struct bcma_hcd_device *usb_dev;
++      struct bcma_chipinfo *chipinfo;
 +
 +
++      chipinfo = &dev->bus->chipinfo;
 +      /* USBcores are only connected on embedded devices. */
 +      /* USBcores are only connected on embedded devices. */
-+      chipid_top = (dev->bus->chipinfo.id & 0xFF00);
++      chipid_top = (chipinfo->id & 0xFF00);
 +      if (chipid_top != 0x4700 && chipid_top != 0x5300)
 +              return -ENODEV;
 +
 +      if (chipid_top != 0x4700 && chipid_top != 0x5300)
 +              return -ENODEV;
 +
@@ -244,8 +250,14 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +
 +      bcma_hcd_init_chip(dev);
 +
 +
 +      bcma_hcd_init_chip(dev);
 +
++      /* In AI chips EHCI is addrspace 0, OHCI is 1 */
++      ohci_addr = dev->addr1;
++      if ((chipinfo->id == 0x5357 || chipinfo->id == 0x4749)
++          && chipinfo->rev == 0)
++              ohci_addr = 0x18009000;
++
 +      usb_dev->ohci_dev = bcma_hcd_create_pdev(dev, "ohci-platform",
 +      usb_dev->ohci_dev = bcma_hcd_create_pdev(dev, "ohci-platform",
-+                                               dev->addr1);
++                                               ohci_addr);
 +      if (IS_ERR(usb_dev->ohci_dev)) {
 +              err = PTR_ERR(usb_dev->ohci_dev);
 +              goto err_free_usb_dev;
 +      if (IS_ERR(usb_dev->ohci_dev)) {
 +              err = PTR_ERR(usb_dev->ohci_dev);
 +              goto err_free_usb_dev;
@@ -256,7 +268,6 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +      if (IS_ERR(usb_dev->ehci_dev)) {
 +              err = PTR_ERR(usb_dev->ehci_dev);
 +              goto err_unregister_ohci_dev;
 +      if (IS_ERR(usb_dev->ehci_dev)) {
 +              err = PTR_ERR(usb_dev->ehci_dev);
 +              goto err_unregister_ohci_dev;
-+
 +      }
 +
 +      bcma_set_drvdata(dev, usb_dev);
 +      }
 +
 +      bcma_set_drvdata(dev, usb_dev);
@@ -269,7 +280,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +      return err;
 +}
 +
 +      return err;
 +}
 +
-+static void bcma_hcd_remove(struct bcma_device *dev)
++static void __devexit bcma_hcd_remove(struct bcma_device *dev)
 +{
 +      struct bcma_hcd_device *usb_dev;
 +      struct platform_device *ohci_dev;
 +{
 +      struct bcma_hcd_device *usb_dev;
 +      struct platform_device *ohci_dev;
@@ -318,7 +329,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +#define bcma_hcd_resume       NULL
 +#endif /* CONFIG_PM */
 +
 +#define bcma_hcd_resume       NULL
 +#endif /* CONFIG_PM */
 +
-+static const struct bcma_device_id bcma_hcd_table[] = {
++static const struct bcma_device_id bcma_hcd_table[] __devinitconst = {
 +      BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_USB20_HOST, BCMA_ANY_REV, BCMA_ANY_CLASS),
 +      BCMA_CORETABLE_END
 +};
 +      BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_USB20_HOST, BCMA_ANY_REV, BCMA_ANY_CLASS),
 +      BCMA_CORETABLE_END
 +};
@@ -328,7 +339,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +      .name           = KBUILD_MODNAME,
 +      .id_table       = bcma_hcd_table,
 +      .probe          = bcma_hcd_probe,
 +      .name           = KBUILD_MODNAME,
 +      .id_table       = bcma_hcd_table,
 +      .probe          = bcma_hcd_probe,
-+      .remove         = bcma_hcd_remove,
++      .remove         = __devexit_p(bcma_hcd_remove),
 +      .shutdown       = bcma_hcd_shutdown,
 +      .suspend        = bcma_hcd_suspend,
 +      .resume         = bcma_hcd_resume,
 +      .shutdown       = bcma_hcd_shutdown,
 +      .suspend        = bcma_hcd_suspend,
 +      .resume         = bcma_hcd_resume,
Personal OpenWRT clone
This page took 0.031396 seconds and 4 git commands to generate.