diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2016-03-30 10:49:29 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2016-03-30 10:49:29 +0000 |
| commit | c805fa62d2b58f40cec05f5e0ef9b261d6dbe9e0 (patch) | |
| tree | ef987fa4419274735d0fa60283d70e9e83becf10 | |
| parent | 70fa90052a238801c47a5293cb5ac9b1f4449924 (diff) | |
| download | upstream-c805fa62d2b58f40cec05f5e0ef9b261d6dbe9e0.tar.gz upstream-c805fa62d2b58f40cec05f5e0ef9b261d6dbe9e0.tar.bz2 upstream-c805fa62d2b58f40cec05f5e0ef9b261d6dbe9e0.zip | |
bcm53xx: support USB 3.0 PHY on BCM4707 rev. 6 and BCM47094
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@49093 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/bcm53xx/patches-3.18/812-USB-bcma-add-USB-3.0-support.patch | 12 | ||||
| -rw-r--r-- | target/linux/bcm53xx/patches-3.18/813-USB-bcma-use-simpler-devm_gpiod_get.patch | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/target/linux/bcm53xx/patches-3.18/812-USB-bcma-add-USB-3.0-support.patch b/target/linux/bcm53xx/patches-3.18/812-USB-bcma-add-USB-3.0-support.patch index 80c8fd2dfd..52d4231649 100644 --- a/target/linux/bcm53xx/patches-3.18/812-USB-bcma-add-USB-3.0-support.patch +++ b/target/linux/bcm53xx/patches-3.18/812-USB-bcma-add-USB-3.0-support.patch @@ -21,7 +21,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> struct gpio_desc *gpio_desc; }; -@@ -338,6 +339,164 @@ err_unregister_ohci_dev: +@@ -338,6 +339,166 @@ err_unregister_ohci_dev: return err; } @@ -55,6 +55,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> + u32 cru_straps_ctrl; + + if (chipinfo->id != BCMA_CHIP_ID_BCM4707 && ++ chipinfo->id != BCMA_CHIP_ID_BCM47094 && + chipinfo->id != BCMA_CHIP_ID_BCM53018) + return; + @@ -79,7 +80,8 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> + 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); @@ -186,7 +188,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> static int bcma_hcd_probe(struct bcma_device *dev) { int err; -@@ -364,6 +523,11 @@ static int bcma_hcd_probe(struct bcma_de +@@ -364,6 +525,11 @@ static int bcma_hcd_probe(struct bcma_de if (err) return err; break; @@ -198,7 +200,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> default: return -ENODEV; } -@@ -377,11 +541,14 @@ static void bcma_hcd_remove(struct bcma_ +@@ -377,11 +543,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; @@ -213,7 +215,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> bcma_core_disable(dev, 0); } -@@ -418,6 +585,7 @@ static int bcma_hcd_resume(struct bcma_d +@@ -418,6 +587,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), diff --git a/target/linux/bcm53xx/patches-3.18/813-USB-bcma-use-simpler-devm_gpiod_get.patch b/target/linux/bcm53xx/patches-3.18/813-USB-bcma-use-simpler-devm_gpiod_get.patch index f4a1a61b46..84355ac274 100644 --- a/target/linux/bcm53xx/patches-3.18/813-USB-bcma-use-simpler-devm_gpiod_get.patch +++ b/target/linux/bcm53xx/patches-3.18/813-USB-bcma-use-simpler-devm_gpiod_get.patch @@ -12,7 +12,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> --- a/drivers/usb/host/bcma-hcd.c +++ b/drivers/usb/host/bcma-hcd.c -@@ -511,8 +511,7 @@ static int bcma_hcd_probe(struct bcma_de +@@ -513,8 +513,7 @@ static int bcma_hcd_probe(struct bcma_de usb_dev->core = dev; if (dev->dev.of_node) |