|
|
@@ -41,7 +41,7 @@ Signed-off-by: Hauke Mehrtens <[email protected]>
|
|
|
static struct platform_device *bcma_hcd_create_pdev(struct bcma_device *dev,
|
|
|
const char *name, u32 addr,
|
|
|
const void *data,
|
|
|
-@@ -338,6 +344,165 @@ err_unregister_ohci_dev:
|
|
|
+@@ -338,6 +344,167 @@ err_unregister_ohci_dev:
|
|
|
return err;
|
|
|
}
|
|
|
|
|
|
@@ -75,6 +75,7 @@ Signed-off-by: Hauke Mehrtens <[email protected]>
|
|
|
+ u32 cru_straps_ctrl;
|
|
|
+
|
|
|
+ if (chipinfo->id != BCMA_CHIP_ID_BCM4707 &&
|
|
|
++ chipinfo->id != BCMA_CHIP_ID_BCM47094 &&
|
|
|
+ chipinfo->id != BCMA_CHIP_ID_BCM53018)
|
|
|
+ return;
|
|
|
+
|
|
|
@@ -99,7 +100,8 @@ Signed-off-by: Hauke Mehrtens <[email protected]>
|
|
|
+ udelay(2);
|
|
|
+
|
|
|
+ if (chipinfo->id == BCMA_CHIP_ID_BCM53018 ||
|
|
|
-+ chipinfo->id == BCMA_CHIP_ID_BCM4707 && chipinfo->rev == 4) {
|
|
|
++ (chipinfo->id == BCMA_CHIP_ID_BCM4707 && (chipinfo->rev == 4 || chipinfo->rev == 6)) ||
|
|
|
++ chipinfo->id == BCMA_CHIP_ID_BCM47094) {
|
|
|
+ /* For NS-B0, USB3 PLL Block */
|
|
|
+ bcma_wait_reg(bus, ccb->mii + 0x000, 0x0100, 0x0000, 1000);
|
|
|
+ iowrite32(0x587e8000, ccb->mii + 0x004);
|
|
|
@@ -207,7 +209,7 @@ Signed-off-by: Hauke Mehrtens <[email protected]>
|
|
|
static int bcma_hcd_probe(struct bcma_device *core)
|
|
|
{
|
|
|
int err;
|
|
|
-@@ -364,6 +529,11 @@ static int bcma_hcd_probe(struct bcma_de
|
|
|
+@@ -364,6 +531,11 @@ static int bcma_hcd_probe(struct bcma_de
|
|
|
if (err)
|
|
|
return err;
|
|
|
break;
|
|
|
@@ -219,7 +221,7 @@ Signed-off-by: Hauke Mehrtens <[email protected]>
|
|
|
default:
|
|
|
return -ENODEV;
|
|
|
}
|
|
|
-@@ -377,11 +547,14 @@ static void bcma_hcd_remove(struct bcma_
|
|
|
+@@ -377,11 +549,14 @@ static void bcma_hcd_remove(struct bcma_
|
|
|
struct bcma_hcd_device *usb_dev = bcma_get_drvdata(dev);
|
|
|
struct platform_device *ohci_dev = usb_dev->ohci_dev;
|
|
|
struct platform_device *ehci_dev = usb_dev->ehci_dev;
|
|
|
@@ -234,7 +236,7 @@ Signed-off-by: Hauke Mehrtens <[email protected]>
|
|
|
|
|
|
bcma_core_disable(dev, 0);
|
|
|
}
|
|
|
-@@ -418,6 +591,7 @@ static int bcma_hcd_resume(struct bcma_d
|
|
|
+@@ -418,6 +593,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),
|
Rafał Miłecki