treewide: fix replace nbd@openwrt.org with nbd@nbd.name
[openwrt.org/openwrt.git] / target / linux / bcm53xx / patches-4.1 / 184-USB-bcma-add-bcm53xx-support.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
From b65851f41c22b8c69b8fe9ca7782d19ed2155efc Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Thu, 11 Jun 2015 22:57:39 +0200
Subject: [PATCH] USB: bcma: add bcm53xx support
 
The Broadcom ARM SoCs with this usb core need a different
initialization and they have a different core id. This patch adds
support for these USB 2.0 core.
 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 drivers/usb/host/bcma-hcd.c | 81 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 78 insertions(+), 3 deletions(-)
 
--- a/drivers/usb/host/bcma-hcd.c
+++ b/drivers/usb/host/bcma-hcd.c
@@ -2,7 +2,8 @@
  * Broadcom specific Advanced Microcontroller Bus
  * Broadcom USB-core driver (BCMA bus glue)
  *
- * Copyright 2011-2012 Hauke Mehrtens <hauke@hauke-m.de>
+ * Copyright 2011-2015 Hauke Mehrtens <hauke@hauke-m.de>
+ * Copyright 2015 Felix Fietkau <nbd@nbd.name>
  *
  * Based on ssb-ohci driver
  * Copyright 2007 Michael Buesch <m@bues.ch>
@@ -88,7 +89,7 @@ static void bcma_hcd_4716wa(struct bcma_
 }
 
 /* based on arch/mips/brcm-boards/bcm947xx/pcibios.c */
-static void bcma_hcd_init_chip(struct bcma_device *dev)
+static void bcma_hcd_init_chip_mips(struct bcma_device *dev)
 {
        u32 tmp;
 
@@ -159,6 +160,70 @@ static void bcma_hcd_init_chip(struct bc
        }
 }
 
+static void bcma_hcd_init_chip_arm_phy(struct bcma_device *dev)
+{
+       struct bcma_device *arm_core;
+       void __iomem *dmu;
+
+       arm_core = bcma_find_core(dev->bus, BCMA_CORE_ARMCA9);
+       if (!arm_core) {
+               dev_err(&dev->dev, "can not find ARM Cortex A9 ihost core\n");
+               return;
+       }
+
+       dmu = ioremap_nocache(arm_core->addr_s[0], 0x1000);
+       if (!dmu) {
+               dev_err(&dev->dev, "can not map ARM Cortex A9 ihost core\n");
+               return;
+       }
+
+       /* Unlock DMU PLL settings */
+       iowrite32(0x0000ea68, dmu + 0x180);
+
+       /* Write USB 2.0 PLL control setting */
+       iowrite32(0x00dd10c3, dmu + 0x164);
+
+       /* Lock DMU PLL settings */
+       iowrite32(0x00000000, dmu + 0x180);
+
+       iounmap(dmu);
+}
+
+static void bcma_hcd_init_chip_arm_hc(struct bcma_device *dev)
+{
+       u32 val;
+
+       /*
+        * Delay after PHY initialized to ensure HC is ready to be configured
+        */
+       usleep_range(1000, 2000);
+
+       /* Set packet buffer OUT threshold */
+       val = bcma_read32(dev, 0x94);
+       val &= 0xffff;
+       val |= 0x80 << 16;
+       bcma_write32(dev, 0x94, val);
+
+       /* Enable break memory transfer */
+       val = bcma_read32(dev, 0x9c);
+       val |= 1;
+       bcma_write32(dev, 0x9c, val);
+}
+
+static void bcma_hcd_init_chip_arm(struct bcma_device *dev)
+{
+       bcma_core_enable(dev, 0);
+
+       if (dev->bus->chipinfo.id == BCMA_CHIP_ID_BCM4707 ||
+           dev->bus->chipinfo.id == BCMA_CHIP_ID_BCM53018) {
+               if (dev->bus->chipinfo.pkg == BCMA_PKG_ID_BCM4707 ||
+                   dev->bus->chipinfo.pkg == BCMA_PKG_ID_BCM4708)
+                       bcma_hcd_init_chip_arm_phy(dev);
+
+               bcma_hcd_init_chip_arm_hc(dev);
+       }
+}
+
 static const struct usb_ehci_pdata ehci_pdata = {
 };
 
@@ -230,7 +295,16 @@ static int bcma_hcd_probe(struct bcma_de
        if (!usb_dev)
                return -ENOMEM;
 
-       bcma_hcd_init_chip(dev);
+       switch (dev->id.id) {
+       case BCMA_CORE_NS_USB20:
+               bcma_hcd_init_chip_arm(dev);
+               break;
+       case BCMA_CORE_USB20_HOST:
+               bcma_hcd_init_chip_mips(dev);
+               break;
+       default:
+               return -ENODEV;
+       }
 
        /* In AI chips EHCI is addrspace 0, OHCI is 1 */
        ohci_addr = dev->addr_s[0];
@@ -299,6 +373,7 @@ static int bcma_hcd_resume(struct bcma_d
 
 static const struct bcma_device_id bcma_hcd_table[] = {
        BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_USB20_HOST, BCMA_ANY_REV, BCMA_ANY_CLASS),
+       BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_NS_USB20, BCMA_ANY_REV, BCMA_ANY_CLASS),
        {},
 };
 MODULE_DEVICE_TABLE(bcma, bcma_hcd_table);
 
comments