Author: rmilecki
Date: 2016-03-30 12:49:25 +0200 (Wed, 30 Mar 2016)
New Revision: 49092
Modified:
branches/chaos_calmer/target/linux/bcm53xx/patches-3.18/812-USB-bcma-add-USB-3.0-support.patch
branches/chaos_calmer/target/linux/bcm53xx/patches-3.18/813-USB-bcma-use-simpler-devm_gpiod_get.patch
Log:
bcm53xx: simpify USB 3.0 PHY initialization
We can use one code path for BCM4707 rev. 4 and BCM53018.
Signed-off-by: Rafa{U+0142} Mi{U+0142}ecki <[email protected]>
Modified:
branches/chaos_calmer/target/linux/bcm53xx/patches-3.18/812-USB-bcma-add-USB-3.0-support.patch
===================================================================
---
branches/chaos_calmer/target/linux/bcm53xx/patches-3.18/812-USB-bcma-add-USB-3.0-support.patch
2016-03-30 10:23:02 UTC (rev 49091)
+++
branches/chaos_calmer/target/linux/bcm53xx/patches-3.18/812-USB-bcma-add-USB-3.0-support.patch
2016-03-30 10:49:25 UTC (rev 49092)
@@ -21,7 +21,7 @@
struct gpio_desc *gpio_desc;
};
-@@ -338,6 +339,215 @@ err_unregister_ohci_dev:
+@@ -338,6 +339,164 @@ err_unregister_ohci_dev:
return err;
}
@@ -78,9 +78,8 @@
+ iowrite32(0x0000009a, ccb->mii + 0x000);
+ udelay(2);
+
-+ switch (chipinfo->id) {
-+ case BCMA_CHIP_ID_BCM4707:
-+ if (chipinfo->rev == 4) {
++ if (chipinfo->id == BCMA_CHIP_ID_BCM53018 ||
++ chipinfo->id == BCMA_CHIP_ID_BCM4707 && chipinfo->rev == 4) {
+ /* For NS-B0, USB3 PLL Block */
+ bcma_wait_reg(bus, ccb->mii + 0x000, 0x0100, 0x0000,
1000);
+ iowrite32(0x587e8000, ccb->mii + 0x004);
@@ -101,32 +100,39 @@
+ bcma_wait_reg(bus, ccb->mii + 0x000, 0x0100, 0x0000,
1000);
+ iowrite32(0x582e8000, ccb->mii + 0x004);
+
++ /* Waiting MII Mgt interface idle */
++ bcma_wait_reg(bus, ccb->mii + 0x000, 0x0100, 0x0000,
1000);
++
+ /* Deasserting USB3 system reset */
+ bcma_awrite32(core, BCMA_RESET_CTL, 0);
+
-+ /* Set ana_pllSeqStart */
++ /* PLL frequency monitor enable */
+ bcma_wait_reg(bus, ccb->mii + 0x000, 0x0100, 0x0000,
1000);
+ iowrite32(0x58069000, ccb->mii + 0x004);
+
-+ /* RXPMD block */
++ /* PIPE Block */
+ bcma_wait_reg(bus, ccb->mii + 0x000, 0x0100, 0x0000,
1000);
-+ iowrite32(0x587e8020, ccb->mii + 0x004);
++ iowrite32(0x587e8060, ccb->mii + 0x004);
+
-+ /* CDR int loop locking BW to 1 */
++ /* CMPMAX & CMPMINTH setting */
+ bcma_wait_reg(bus, ccb->mii + 0x000, 0x0100, 0x0000,
1000);
-+ iowrite32(0x58120049, ccb->mii + 0x004);
++ iowrite32(0x580af30d, ccb->mii + 0x004);
+
-+ /* CDR int loop acquisition BW to 1 */
++ /* DEGLITCH MIN & MAX setting */
+ bcma_wait_reg(bus, ccb->mii + 0x000, 0x0100, 0x0000,
1000);
-+ iowrite32(0x580e0049, ccb->mii + 0x004);
++ iowrite32(0x580e6302, ccb->mii + 0x004);
+
-+ /* CDR prop loop BW to 1 */
++ /* TXPMD block */
+ bcma_wait_reg(bus, ccb->mii + 0x000, 0x0100, 0x0000,
1000);
-+ iowrite32(0x580a005c, ccb->mii + 0x004);
++ iowrite32(0x587e8040, ccb->mii + 0x004);
+
++ /* Enabling SSC */
++ bcma_wait_reg(bus, ccb->mii + 0x000, 0x0100, 0x0000,
1000);
++ iowrite32(0x58061003, ccb->mii + 0x004);
++
+ /* Waiting MII Mgt interface idle */
+ bcma_wait_reg(bus, ccb->mii + 0x000, 0x0100, 0x0000,
1000);
-+ } else {
++ } else if (chipinfo->id == BCMA_CHIP_ID_BCM4707) {
+ /* PLL30 block */
+ bcma_wait_reg(bus, ccb->mii + 0x000, 0x0100, 0x0000,
1000);
+ iowrite32(0x587e8000, ccb->mii + 0x004);
@@ -155,63 +161,6 @@
+
+ /* Deasserting USB3 system reset */
+ bcma_awrite32(core, BCMA_RESET_CTL, 0);
-+ }
-+ break;
-+ case BCMA_CHIP_ID_BCM53018:
-+ /* USB3 PLL Block */
-+ bcma_wait_reg(bus, ccb->mii + 0x000, 0x0100, 0x0000, 1000);
-+ iowrite32(0x587e8000, ccb->mii + 0x004);
-+
-+ /* Assert Ana_Pllseq start */
-+ bcma_wait_reg(bus, ccb->mii + 0x000, 0x0100, 0x0000, 1000);
-+ iowrite32(0x58061000, ccb->mii + 0x004);
-+
-+ /* Assert CML Divider ratio to 26 */
-+ bcma_wait_reg(bus, ccb->mii + 0x000, 0x0100, 0x0000, 1000);
-+ iowrite32(0x582a6400, ccb->mii + 0x004);
-+
-+ /* Asserting PLL Reset */
-+ bcma_wait_reg(bus, ccb->mii + 0x000, 0x0100, 0x0000, 1000);
-+ iowrite32(0x582ec000, ccb->mii + 0x004);
-+
-+ /* Deaaserting PLL Reset */
-+ bcma_wait_reg(bus, ccb->mii + 0x000, 0x0100, 0x0000, 1000);
-+ iowrite32(0x582e8000, ccb->mii + 0x004);
-+
-+ /* Waiting MII Mgt interface idle */
-+ bcma_wait_reg(bus, ccb->mii + 0x000, 0x0100, 0x0000, 1000);
-+
-+ /* Deasserting USB3 system reset */
-+ bcma_awrite32(core, BCMA_RESET_CTL, 0);
-+
-+ /* PLL frequency monitor enable */
-+ bcma_wait_reg(bus, ccb->mii + 0x000, 0x0100, 0x0000, 1000);
-+ iowrite32(0x58069000, ccb->mii + 0x004);
-+
-+ /* PIPE Block */
-+ bcma_wait_reg(bus, ccb->mii + 0x000, 0x0100, 0x0000, 1000);
-+ iowrite32(0x587e8060, ccb->mii + 0x004);
-+
-+ /* CMPMAX & CMPMINTH setting */
-+ bcma_wait_reg(bus, ccb->mii + 0x000, 0x0100, 0x0000, 1000);
-+ iowrite32(0x580af30d, ccb->mii + 0x004);
-+
-+ /* DEGLITCH MIN & MAX setting */
-+ bcma_wait_reg(bus, ccb->mii + 0x000, 0x0100, 0x0000, 1000);
-+ iowrite32(0x580e6302, ccb->mii + 0x004);
-+
-+ /* TXPMD block */
-+ bcma_wait_reg(bus, ccb->mii + 0x000, 0x0100, 0x0000, 1000);
-+ iowrite32(0x587e8040, ccb->mii + 0x004);
-+
-+ /* Enabling SSC */
-+ bcma_wait_reg(bus, ccb->mii + 0x000, 0x0100, 0x0000, 1000);
-+ iowrite32(0x58061003, ccb->mii + 0x004);
-+
-+ /* Waiting MII Mgt interface idle */
-+ bcma_wait_reg(bus, ccb->mii + 0x000, 0x0100, 0x0000, 1000);
-+
-+ break;
+ }
+out:
+ if (dmu)
@@ -237,7 +186,7 @@
static int bcma_hcd_probe(struct bcma_device *dev)
{
int err;
-@@ -364,6 +574,11 @@ static int bcma_hcd_probe(struct bcma_de
+@@ -364,6 +523,11 @@ static int bcma_hcd_probe(struct bcma_de
if (err)
return err;
break;
@@ -249,7 +198,7 @@
default:
return -ENODEV;
}
-@@ -377,11 +592,14 @@ static void bcma_hcd_remove(struct bcma_
+@@ -377,11 +541,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;
@@ -264,7 +213,7 @@
bcma_core_disable(dev, 0);
}
-@@ -418,6 +636,7 @@ static int bcma_hcd_resume(struct bcma_d
+@@ -418,6 +585,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),
Modified:
branches/chaos_calmer/target/linux/bcm53xx/patches-3.18/813-USB-bcma-use-simpler-devm_gpiod_get.patch
===================================================================
---
branches/chaos_calmer/target/linux/bcm53xx/patches-3.18/813-USB-bcma-use-simpler-devm_gpiod_get.patch
2016-03-30 10:23:02 UTC (rev 49091)
+++
branches/chaos_calmer/target/linux/bcm53xx/patches-3.18/813-USB-bcma-use-simpler-devm_gpiod_get.patch
2016-03-30 10:49:25 UTC (rev 49092)
@@ -12,7 +12,7 @@
--- a/drivers/usb/host/bcma-hcd.c
+++ b/drivers/usb/host/bcma-hcd.c
-@@ -562,8 +562,7 @@ static int bcma_hcd_probe(struct bcma_de
+@@ -511,8 +511,7 @@ static int bcma_hcd_probe(struct bcma_de
usb_dev->core = dev;
if (dev->dev.of_node)
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
