bcm53xx: support USB 3.0 PHY on BCM4707 rev. 6 and BCM47094

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 49091
This commit is contained in:
Rafał Miłecki 2016-03-30 10:23:02 +00:00
parent 7b61ed5254
commit de2f31c3f5
2 changed files with 8 additions and 6 deletions

View File

@ -41,7 +41,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
static struct platform_device *bcma_hcd_create_pdev(struct bcma_device *dev, static struct platform_device *bcma_hcd_create_pdev(struct bcma_device *dev,
const char *name, u32 addr, const char *name, u32 addr,
const void *data, const void *data,
@@ -338,6 +344,165 @@ err_unregister_ohci_dev: @@ -338,6 +344,167 @@ err_unregister_ohci_dev:
return err; return err;
} }
@ -75,6 +75,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+ u32 cru_straps_ctrl; + u32 cru_straps_ctrl;
+ +
+ if (chipinfo->id != BCMA_CHIP_ID_BCM4707 && + if (chipinfo->id != BCMA_CHIP_ID_BCM4707 &&
+ chipinfo->id != BCMA_CHIP_ID_BCM47094 &&
+ chipinfo->id != BCMA_CHIP_ID_BCM53018) + chipinfo->id != BCMA_CHIP_ID_BCM53018)
+ return; + return;
+ +
@ -99,7 +100,8 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+ udelay(2); + udelay(2);
+ +
+ if (chipinfo->id == BCMA_CHIP_ID_BCM53018 || + 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 */ + /* For NS-B0, USB3 PLL Block */
+ bcma_wait_reg(bus, ccb->mii + 0x000, 0x0100, 0x0000, 1000); + bcma_wait_reg(bus, ccb->mii + 0x000, 0x0100, 0x0000, 1000);
+ iowrite32(0x587e8000, ccb->mii + 0x004); + iowrite32(0x587e8000, ccb->mii + 0x004);
@ -207,7 +209,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
static int bcma_hcd_probe(struct bcma_device *core) static int bcma_hcd_probe(struct bcma_device *core)
{ {
int err; 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) if (err)
return err; return err;
break; break;
@ -219,7 +221,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
default: default:
return -ENODEV; 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 bcma_hcd_device *usb_dev = bcma_get_drvdata(dev);
struct platform_device *ohci_dev = usb_dev->ohci_dev; struct platform_device *ohci_dev = usb_dev->ohci_dev;
struct platform_device *ehci_dev = usb_dev->ehci_dev; struct platform_device *ehci_dev = usb_dev->ehci_dev;
@ -234,7 +236,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
bcma_core_disable(dev, 0); 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[] = { 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_USB20_HOST, BCMA_ANY_REV, BCMA_ANY_CLASS),
BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_NS_USB20, BCMA_ANY_REV, BCMA_ANY_CLASS), BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_NS_USB20, BCMA_ANY_REV, BCMA_ANY_CLASS),

View File

@ -12,7 +12,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--- a/drivers/usb/host/bcma-hcd.c --- a/drivers/usb/host/bcma-hcd.c
+++ b/drivers/usb/host/bcma-hcd.c +++ b/drivers/usb/host/bcma-hcd.c
@@ -517,8 +517,7 @@ static int bcma_hcd_probe(struct bcma_de @@ -519,8 +519,7 @@ static int bcma_hcd_probe(struct bcma_de
usb_dev->core = core; usb_dev->core = core;
if (core->dev.of_node) if (core->dev.of_node)