lantiq: update USB controller initialization
authorHauke Mehrtens <hauke@hauke-m.de>
Fri, 6 Jan 2017 17:37:40 +0000 (18:37 +0100)
committerHauke Mehrtens <hauke@hauke-m.de>
Mon, 9 Jan 2017 22:25:34 +0000 (23:25 +0100)
This adds USB initialization fixes for Danube, Amazon SE and xrx300 and
should fix the clock on at least Danube which hopefully closes FS#351.

The xrx200 usb driver now uses more memory for the dwc2 fifos, this was
increased in the chip compared to ar9.

This is based in part on the vendor documentation and the vendor code
base as a reference.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
target/linux/lantiq/dts/amazonse.dtsi
target/linux/lantiq/dts/ar9.dtsi
target/linux/lantiq/dts/danube.dtsi
target/linux/lantiq/dts/vr9.dtsi
target/linux/lantiq/patches-4.4/0039-MIPS-lantiq-danube-initialize-usb-on-boot.patch [deleted file]
target/linux/lantiq/patches-4.4/0041-USB-DWC2-add-ltq-params.patch [deleted file]
target/linux/lantiq/patches-4.4/0047-poweroff.patch
target/linux/lantiq/patches-4.4/0060-usb-dwc2-Add-support-for-Lantiq-ARX-and-XRX-SoCs.patch [new file with mode: 0644]
target/linux/lantiq/patches-4.4/0061-USB-DWC2-make-the-lantiq-settings-match-vendor-drive.patch [new file with mode: 0644]
target/linux/lantiq/patches-4.4/0065-MIPS-lantiq-improve-USB-initialization.patch [new file with mode: 0644]
target/linux/lantiq/patches-4.4/0301-xrx200-add-gphy-clk-src-device-tree-binding.patch

index bce618f..2b8ad08 100644 (file)
                };
 
                ifxhcd@E101000 {
-                       compatible = "lantiq,ifxhcd-ase";
+                       compatible = "lantiq,ase-usb", "lantiq,ifxhcd-ase";
                        reg = <0xE101000 0x1000
                                0xE120000 0x3f000>;
                        interrupt-parent = <&icu0>;
                        interrupts = <39>;
+                       dr_mode = "host";
                        status = "disabled";
                };
 
index 569f25f..2638a4b 100644 (file)
                };
 
                ifxhcd@E101000 {
-                       compatible = "lantiq,ifxhcd-arx100", "lantiq,ifxhcd-arx100-dwc2";
+                       compatible = "lantiq,arx100-usb", "lantiq,ifxhcd-arx100";
                        reg = <0xE101000 0x1000
                                0xE120000 0x3f000>;
                        interrupt-parent = <&icu0>;
                        interrupts = <62 91>;
+                       dr_mode = "host";
                        status = "disabled";
                };
 
                ifxhcd@E106000 {
-                       compatible = "lantiq,ifxhcd-arx100-dwc2";
+                       compatible = "lantiq,arx100-usb";
                        reg = <0xE106000 0x1000
                                0xE1E0000 0x3f000>;
                        interrupt-parent = <&icu0>;
                        interrupts = <91>;
+                       dr_mode = "host";
                        status = "disabled";
                };
 
index f11787f..83e85c3 100644 (file)
                };
 
                ifxhcd@E101000 {
-                       compatible = "lantiq,ifxhcd-danube-dwc2", "lantiq,ifxhcd-danube";
+                       compatible = "lantiq,danube-usb", "lantiq,ifxhcd-danube";
                        reg = <0xE101000 0x1000
                                0xE120000 0x3f000>;
                        interrupt-parent = <&icu0>;
index 4810a91..eff4944 100644 (file)
 
                ifxhcd@E101000 {
                        status = "disabled";
-                       compatible = "lantiq,ifxhcd-xrx200", "lantiq,ifxhcd-xrx200-dwc2";
+                       compatible = "lantiq,xrx200-usb", "lantiq,ifxhcd-xrx200";
                        reg = <0xE101000 0x1000
                                0xE120000 0x3f000>;
                        interrupt-parent = <&icu0>;
                        interrupts = <62 91>;
+                       dr_mode = "host";
                };
 
                ifxhcd@E106000 {
                        status = "disabled";
-                       compatible = "lantiq,ifxhcd-xrx200-dwc2";
+                       compatible = "lantiq,xrx200-usb";
                        reg = <0xE106000 0x1000>;
                        interrupt-parent = <&icu0>;
                        interrupts = <91>;
+                       dr_mode = "host";
                };
 
                eth0: eth@E108000 {
diff --git a/target/linux/lantiq/patches-4.4/0039-MIPS-lantiq-danube-initialize-usb-on-boot.patch b/target/linux/lantiq/patches-4.4/0039-MIPS-lantiq-danube-initialize-usb-on-boot.patch
deleted file mode 100644 (file)
index bd42f38..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/mips/lantiq/xway/reset.c
-+++ b/arch/mips/lantiq/xway/reset.c
-@@ -370,6 +370,7 @@ static int __init mips_reboot_setup(void
-               panic("Failed to remap core memory");
-       if (of_machine_is_compatible("lantiq,ar9") ||
-+          of_machine_is_compatible("lantiq,danube") ||
-           of_machine_is_compatible("lantiq,vr9"))
-               ltq_usb_init();
diff --git a/target/linux/lantiq/patches-4.4/0041-USB-DWC2-add-ltq-params.patch b/target/linux/lantiq/patches-4.4/0041-USB-DWC2-add-ltq-params.patch
deleted file mode 100644 (file)
index 68d5f3f..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
---- a/drivers/usb/dwc2/platform.c
-+++ b/drivers/usb/dwc2/platform.c
-@@ -145,6 +145,62 @@ static int __dwc2_lowlevel_hw_enable(str
-       return ret;
- }
-+static const struct dwc2_core_params params_ltq = {
-+      .otg_cap                        = 2,    /* non-HNP/non-SRP */
-+      .otg_ver                        = -1,
-+      .dma_enable                     = -1,
-+      .dma_desc_enable                = -1,
-+      .speed                          = -1,
-+      .enable_dynamic_fifo            = -1,
-+      .en_multiple_tx_fifo            = -1,
-+      .host_rx_fifo_size              = 288,  /* 288 DWORDs */
-+      .host_nperio_tx_fifo_size       = 128,  /* 128 DWORDs */
-+      .host_perio_tx_fifo_size        = 96,   /* 96 DWORDs */
-+      .max_transfer_size              = -1,
-+      .max_packet_count               = 511,
-+      .host_channels                  = -1,
-+      .phy_type                       = -1,
-+      .phy_utmi_width                 = -1,
-+      .phy_ulpi_ddr                   = -1,
-+      .phy_ulpi_ext_vbus              = -1,
-+      .i2c_enable                     = -1,
-+      .ulpi_fs_ls                     = -1,
-+      .host_support_fs_ls_low_power   = -1,
-+      .host_ls_low_power_phy_clk      = -1,
-+      .ts_dline                       = -1,
-+      .reload_ctl                     = -1,
-+      .ahbcfg                         = GAHBCFG_HBSTLEN_INCR16 << GAHBCFG_HBSTLEN_SHIFT,
-+      .uframe_sched                   = -1,
-+};
-+
-+static const struct dwc2_core_params params_danube = {
-+      .otg_cap                        =  2,   /* non-HNP/non-SRP */
-+      .otg_ver                        = -1,
-+      .dma_enable                     = -1,
-+      .dma_desc_enable                = -1,
-+      .speed                          = -1,
-+      .enable_dynamic_fifo            = -1,
-+      .en_multiple_tx_fifo            = -1,
-+      .host_rx_fifo_size              = -1,
-+      .host_nperio_tx_fifo_size       = -1,
-+      .host_perio_tx_fifo_size        = -1,
-+      .max_transfer_size              = -1,
-+      .max_packet_count               = -1,
-+      .host_channels                  = -1,
-+      .phy_type                       = -1,
-+      .phy_utmi_width                 = -1,
-+      .phy_ulpi_ddr                   = -1,
-+      .phy_ulpi_ext_vbus              = -1,
-+      .i2c_enable                     = -1,
-+      .ulpi_fs_ls                     = -1,
-+      .host_support_fs_ls_low_power   = -1,
-+      .host_ls_low_power_phy_clk      = -1,
-+      .ts_dline                       = -1,
-+      .reload_ctl                     = -1,
-+      .ahbcfg                         = -1,
-+      .uframe_sched                   = -1,
-+};
-+
- /**
-  * dwc2_lowlevel_hw_enable - enable platform lowlevel hw resources
-  * @hsotg: The driver state
-@@ -310,6 +366,9 @@ static int dwc2_driver_remove(struct pla
- static const struct of_device_id dwc2_of_match_table[] = {
-       { .compatible = "brcm,bcm2835-usb", .data = &params_bcm2835 },
-       { .compatible = "rockchip,rk3066-usb", .data = &params_rk3066 },
-+      { .compatible = "lantiq,ifxhcd-danube-dwc2", .data = &params_danube },
-+      { .compatible = "lantiq,ifxhcd-arx100-dwc2", .data = &params_ltq },
-+      { .compatible = "lantiq,ifxhcd-xrx200-dwc2", .data = &params_ltq },
-       { .compatible = "snps,dwc2", .data = NULL },
-       { .compatible = "samsung,s3c6400-hsotg", .data = NULL},
-       {},
index 88aed2c..54249bb 100644 (file)
@@ -13,7 +13,7 @@
  static void ltq_usb_init(void)
  {
        /* Power for USB cores 1 & 2 */
-@@ -380,7 +374,6 @@ static int __init mips_reboot_setup(void
+@@ -379,7 +373,6 @@ static int __init mips_reboot_setup(void
  
        _machine_restart = ltq_machine_restart;
        _machine_halt = ltq_machine_halt;
diff --git a/target/linux/lantiq/patches-4.4/0060-usb-dwc2-Add-support-for-Lantiq-ARX-and-XRX-SoCs.patch b/target/linux/lantiq/patches-4.4/0060-usb-dwc2-Add-support-for-Lantiq-ARX-and-XRX-SoCs.patch
new file mode 100644 (file)
index 0000000..91d6ac9
--- /dev/null
@@ -0,0 +1,78 @@
+From 6c0c0951bbf8c2c216675fe277fba4c42aa0a2bf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Antti=20Sepp=C3=A4l=C3=A4?= <a.seppala@gmail.com>
+Date: Sat, 27 Feb 2016 12:31:24 +0200
+Subject: [PATCH] usb: dwc2: Add support for Lantiq ARX and XRX SoCs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add support for Lantiq ARX and XRX SoC families to the dwc2 driver.
+
+Acked-by: John Youn <johnyoun@synopsys.com>
+Signed-off-by: Antti Seppälä <a.seppala@gmail.com>
+Signed-off-by: Felipe Balbi <balbi@kernel.org>
+---
+ Documentation/devicetree/bindings/usb/dwc2.txt |  2 ++
+ drivers/usb/dwc2/platform.c                    | 34 ++++++++++++++++++++++++++
+ 2 files changed, 36 insertions(+)
+
+--- a/Documentation/devicetree/bindings/usb/dwc2.txt
++++ b/Documentation/devicetree/bindings/usb/dwc2.txt
+@@ -7,6 +7,8 @@ Required properties:
+   - rockchip,rk3066-usb: The DWC2 USB controller instance in the rk3066 Soc;
+   - "rockchip,rk3188-usb", "rockchip,rk3066-usb", "snps,dwc2": for rk3188 Soc;
+   - "rockchip,rk3288-usb", "rockchip,rk3066-usb", "snps,dwc2": for rk3288 Soc;
++  - "lantiq,arx100-usb": The DWC2 USB controller instance in Lantiq ARX SoCs;
++  - "lantiq,xrx200-usb": The DWC2 USB controller instance in Lantiq XRX SoCs;
+   - snps,dwc2: A generic DWC2 USB controller with default parameters.
+ - reg : Should contain 1 register range (address and length)
+ - interrupts : Should contain 1 interrupt
+--- a/drivers/usb/dwc2/platform.c
++++ b/drivers/usb/dwc2/platform.c
+@@ -116,6 +116,37 @@ static const struct dwc2_core_params par
+       .hibernation                    = -1,
+ };
++static const struct dwc2_core_params params_ltq = {
++      .otg_cap                        = 2,    /* non-HNP/non-SRP */
++      .otg_ver                        = -1,
++      .dma_enable                     = -1,
++      .dma_desc_enable                = -1,
++      .speed                          = -1,
++      .enable_dynamic_fifo            = -1,
++      .en_multiple_tx_fifo            = -1,
++      .host_rx_fifo_size              = 288,  /* 288 DWORDs */
++      .host_nperio_tx_fifo_size       = 128,  /* 128 DWORDs */
++      .host_perio_tx_fifo_size        = 96,   /* 96 DWORDs */
++      .max_transfer_size              = 65535,
++      .max_packet_count               = 511,
++      .host_channels                  = -1,
++      .phy_type                       = -1,
++      .phy_utmi_width                 = -1,
++      .phy_ulpi_ddr                   = -1,
++      .phy_ulpi_ext_vbus              = -1,
++      .i2c_enable                     = -1,
++      .ulpi_fs_ls                     = -1,
++      .host_support_fs_ls_low_power   = -1,
++      .host_ls_low_power_phy_clk      = -1,
++      .ts_dline                       = -1,
++      .reload_ctl                     = -1,
++      .ahbcfg                         = GAHBCFG_HBSTLEN_INCR16 <<
++                                        GAHBCFG_HBSTLEN_SHIFT,
++      .uframe_sched                   = -1,
++      .external_id_pin_ctl            = -1,
++      .hibernation                    = -1,
++};
++
+ static int __dwc2_lowlevel_hw_enable(struct dwc2_hsotg *hsotg)
+ {
+       struct platform_device *pdev = to_platform_device(hsotg->dev);
+@@ -310,6 +341,8 @@ static int dwc2_driver_remove(struct pla
+ static const struct of_device_id dwc2_of_match_table[] = {
+       { .compatible = "brcm,bcm2835-usb", .data = &params_bcm2835 },
+       { .compatible = "rockchip,rk3066-usb", .data = &params_rk3066 },
++      { .compatible = "lantiq,arx100-usb", .data = &params_ltq },
++      { .compatible = "lantiq,xrx200-usb", .data = &params_ltq },
+       { .compatible = "snps,dwc2", .data = NULL },
+       { .compatible = "samsung,s3c6400-hsotg", .data = NULL},
+       {},
diff --git a/target/linux/lantiq/patches-4.4/0061-USB-DWC2-make-the-lantiq-settings-match-vendor-drive.patch b/target/linux/lantiq/patches-4.4/0061-USB-DWC2-make-the-lantiq-settings-match-vendor-drive.patch
new file mode 100644 (file)
index 0000000..1eda4cc
--- /dev/null
@@ -0,0 +1,99 @@
+From de2cad82c4d0872066f83ce59462603852b47f03 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Fri, 6 Jan 2017 17:55:24 +0100
+Subject: [PATCH 2/2] usb: dwc2:  add support for other Lantiq SoCs
+
+The size of the internal RAM of the DesignWare USB controller changed
+between the different Lantiq SoCs. We have the following sizes:
+
+Amazon + Danube: 8 KByte
+Amazon SE + arx100: 2 KByte
+xrx200 + xrx300: 2.5 KByte
+
+For Danube SoC we do not provide the params and let the driver decide
+to use sane defaults, for the Amazon SE and arx100 we use small fifos
+and for the xrx200 and xrx300 SCs a little bit bigger periodic fifo.
+The auto detection of max_transfer_size and max_packet_count should
+work, so remove it.
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ drivers/usb/dwc2/platform.c | 46 ++++++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 39 insertions(+), 7 deletions(-)
+
+--- a/drivers/usb/dwc2/platform.c
++++ b/drivers/usb/dwc2/platform.c
+@@ -116,7 +116,7 @@ static const struct dwc2_core_params par
+       .hibernation                    = -1,
+ };
+-static const struct dwc2_core_params params_ltq = {
++static const struct dwc2_core_params params_ase = {
+       .otg_cap                        = 2,    /* non-HNP/non-SRP */
+       .otg_ver                        = -1,
+       .dma_enable                     = -1,
+@@ -127,8 +127,8 @@ static const struct dwc2_core_params par
+       .host_rx_fifo_size              = 288,  /* 288 DWORDs */
+       .host_nperio_tx_fifo_size       = 128,  /* 128 DWORDs */
+       .host_perio_tx_fifo_size        = 96,   /* 96 DWORDs */
+-      .max_transfer_size              = 65535,
+-      .max_packet_count               = 511,
++      .max_transfer_size              = -1,
++      .max_packet_count               = -1,
+       .host_channels                  = -1,
+       .phy_type                       = -1,
+       .phy_utmi_width                 = -1,
+@@ -140,8 +140,37 @@ static const struct dwc2_core_params par
+       .host_ls_low_power_phy_clk      = -1,
+       .ts_dline                       = -1,
+       .reload_ctl                     = -1,
+-      .ahbcfg                         = GAHBCFG_HBSTLEN_INCR16 <<
+-                                        GAHBCFG_HBSTLEN_SHIFT,
++      .ahbcfg                         = -1,
++      .uframe_sched                   = -1,
++      .external_id_pin_ctl            = -1,
++      .hibernation                    = -1,
++};
++
++static const struct dwc2_core_params params_xrx200 = {
++      .otg_cap                        = 2,    /* non-HNP/non-SRP */
++      .otg_ver                        = -1,
++      .dma_enable                     = -1,
++      .dma_desc_enable                = -1,
++      .speed                          = -1,
++      .enable_dynamic_fifo            = -1,
++      .en_multiple_tx_fifo            = -1,
++      .host_rx_fifo_size              = 288,  /* 288 DWORDs */
++      .host_nperio_tx_fifo_size       = 128,  /* 128 DWORDs */
++      .host_perio_tx_fifo_size        = 136,  /* 136 DWORDs */
++      .max_transfer_size              = -1,
++      .max_packet_count               = -1,
++      .host_channels                  = -1,
++      .phy_type                       = -1,
++      .phy_utmi_width                 = -1,
++      .phy_ulpi_ddr                   = -1,
++      .phy_ulpi_ext_vbus              = -1,
++      .i2c_enable                     = -1,
++      .ulpi_fs_ls                     = -1,
++      .host_support_fs_ls_low_power   = -1,
++      .host_ls_low_power_phy_clk      = -1,
++      .ts_dline                       = -1,
++      .reload_ctl                     = -1,
++      .ahbcfg                         = -1,
+       .uframe_sched                   = -1,
+       .external_id_pin_ctl            = -1,
+       .hibernation                    = -1,
+@@ -341,8 +370,11 @@ static int dwc2_driver_remove(struct pla
+ static const struct of_device_id dwc2_of_match_table[] = {
+       { .compatible = "brcm,bcm2835-usb", .data = &params_bcm2835 },
+       { .compatible = "rockchip,rk3066-usb", .data = &params_rk3066 },
+-      { .compatible = "lantiq,arx100-usb", .data = &params_ltq },
+-      { .compatible = "lantiq,xrx200-usb", .data = &params_ltq },
++      { .compatible = "lantiq,danube-usb", .data = NULL },
++      { .compatible = "lantiq,ase-usb", .data = &params_ase },
++      { .compatible = "lantiq,arx100-usb", .data = &params_ase },
++      { .compatible = "lantiq,xrx200-usb", .data = &params_xrx200 },
++      { .compatible = "lantiq,xrx300-usb", .data = &params_xrx200 },
+       { .compatible = "snps,dwc2", .data = NULL },
+       { .compatible = "samsung,s3c6400-hsotg", .data = NULL},
+       {},
diff --git a/target/linux/lantiq/patches-4.4/0065-MIPS-lantiq-improve-USB-initialization.patch b/target/linux/lantiq/patches-4.4/0065-MIPS-lantiq-improve-USB-initialization.patch
new file mode 100644 (file)
index 0000000..acc2308
--- /dev/null
@@ -0,0 +1,202 @@
+From 14909c4e4e836925668e74fc6e0e85ba0283cbf9 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Fri, 6 Jan 2017 17:40:12 +0100
+Subject: [PATCH 2/2] MIPS: lantiq: improve USB initialization
+
+This adds code to initialize the USB controller and PHY also on Danube,
+Amazon SE and AR10. This code is based on the Vendor driver from
+different UGW versions and compared to the hardware documentation.
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ arch/mips/lantiq/xway/reset.c   | 120 ++++++++++++++++++++++++++++++----------
+ arch/mips/lantiq/xway/sysctrl.c |  20 +++++++
+ 2 files changed, 110 insertions(+), 30 deletions(-)
+
+--- a/arch/mips/lantiq/xway/reset.c
++++ b/arch/mips/lantiq/xway/reset.c
+@@ -72,6 +72,8 @@
+ #define RCU_USBCFG_HDSEL_BIT  BIT(11)
+ #define RCU_USBCFG_HOST_END_BIT       BIT(10)
+ #define RCU_USBCFG_SLV_END_BIT        BIT(9)
++#define RCU_USBCFG_SLV_END_BIT_AR9    BIT(17)
++
+ /* USB reset bits */
+ #define RCU_USBRESET          0x0010
+@@ -85,6 +87,8 @@
+ #define RCU_CFG1A             0x0038
+ #define RCU_CFG1B             0x003C
++#define  RCU_CFG1_TX_PEE      BIT(0)
++#define  RCU_CFG1_DIS_THR_SHIFT       15 /* Disconnect Threshold */   
+ /* USB PMU devices */
+ #define PMU_AHBM              BIT(15)
+@@ -306,38 +310,91 @@ static void ltq_usb_init(void)
+       /* Power for USB cores 1 & 2 */
+       ltq_pmu_enable(PMU_AHBM);
+       ltq_pmu_enable(PMU_USB0);
+-      ltq_pmu_enable(PMU_USB1);
+-      ltq_rcu_w32(ltq_rcu_r32(RCU_CFG1A) | BIT(0), RCU_CFG1A);
+-      ltq_rcu_w32(ltq_rcu_r32(RCU_CFG1B) | BIT(0), RCU_CFG1B);
++      if (of_machine_is_compatible("lantiq,ar10") ||
++          of_machine_is_compatible("lantiq,grx390") ||
++          of_machine_is_compatible("lantiq,ar9") ||
++          of_machine_is_compatible("lantiq,vr9"))
++              ltq_pmu_enable(PMU_USB1);
++
++      if (of_machine_is_compatible("lantiq,vr9") ||
++          of_machine_is_compatible("lantiq,ar10")) {
++              ltq_rcu_w32(ltq_rcu_r32(RCU_CFG1A) | RCU_CFG1_TX_PEE |
++                          7 << RCU_CFG1_DIS_THR_SHIFT, RCU_CFG1A);
++              ltq_rcu_w32(ltq_rcu_r32(RCU_CFG1B) | RCU_CFG1_TX_PEE |
++                          7 << RCU_CFG1_DIS_THR_SHIFT, RCU_CFG1B);
++      }
+       /* Enable USB PHY power for cores 1 & 2 */
+       ltq_pmu_enable(PMU_USB0_P);
+-      ltq_pmu_enable(PMU_USB1_P);
++      if (of_machine_is_compatible("lantiq,ar10") ||
++          of_machine_is_compatible("lantiq,grx390") ||
++          of_machine_is_compatible("lantiq,ar9") ||
++          of_machine_is_compatible("lantiq,vr9"))
++              ltq_pmu_enable(PMU_USB1_P);
++
++      if (of_machine_is_compatible("lantiq,ase") ||
++          of_machine_is_compatible("lantiq,danube")) {
++              /* Configure cores to host mode */
++              ltq_rcu_w32(ltq_rcu_r32(RCU_USB1CFG) & ~RCU_USBCFG_HDSEL_BIT,
++                      RCU_USB1CFG);
++
++              /* Select DMA endianness (Host-endian: big-endian) */
++              ltq_rcu_w32((ltq_rcu_r32(RCU_USB1CFG) & ~RCU_USBCFG_SLV_END_BIT)
++                      | RCU_USBCFG_HOST_END_BIT, RCU_USB1CFG);
++      }
++
++      if (of_machine_is_compatible("lantiq,ar9")) {
++              /* Configure cores to host mode */
++              ltq_rcu_w32(ltq_rcu_r32(RCU_USB1CFG) & ~RCU_USBCFG_HDSEL_BIT,
++                      RCU_USB1CFG);
++              ltq_rcu_w32(ltq_rcu_r32(RCU_USB2CFG) & ~RCU_USBCFG_HDSEL_BIT,
++                      RCU_USB2CFG);
++
++              /* Select DMA endianness (Host-endian: big-endian) */
++              ltq_rcu_w32((ltq_rcu_r32(RCU_USB1CFG) & ~RCU_USBCFG_SLV_END_BIT_AR9)
++                      | RCU_USBCFG_HOST_END_BIT, RCU_USB1CFG);
++              ltq_rcu_w32(ltq_rcu_r32((RCU_USB2CFG) & ~RCU_USBCFG_SLV_END_BIT_AR9)
++                      | RCU_USBCFG_HOST_END_BIT, RCU_USB2CFG);
++      }
++
++      if (of_machine_is_compatible("lantiq,vr9") ||
++          of_machine_is_compatible("lantiq,ar10")) {
++              /* Configure cores to host mode */
++              ltq_rcu_w32(ltq_rcu_r32(RCU_USB1CFG) & ~RCU_USBCFG_HDSEL_BIT,
++                      RCU_USB1CFG);
++              ltq_rcu_w32(ltq_rcu_r32(RCU_USB2CFG) & ~RCU_USBCFG_HDSEL_BIT,
++                      RCU_USB2CFG);
++
++              /* Select DMA endianness (Host-endian: big-endian) */
++              ltq_rcu_w32((ltq_rcu_r32(RCU_USB1CFG) & ~RCU_USBCFG_SLV_END_BIT)
++                      | RCU_USBCFG_HOST_END_BIT, RCU_USB1CFG);
++              ltq_rcu_w32(ltq_rcu_r32((RCU_USB2CFG) & ~RCU_USBCFG_SLV_END_BIT)
++                      | RCU_USBCFG_HOST_END_BIT, RCU_USB2CFG);
++      }
++
++      if (of_machine_is_compatible("lantiq,ar9")) {
++              /* Hard reset USB state machines */
++              ltq_rcu_w32(ltq_rcu_r32(RCU_USBRESET)
++                         | USBRESET_BIT | BIT(28), RCU_USBRESET);
++              udelay(50 * 1000);
++              ltq_rcu_w32(ltq_rcu_r32(RCU_USBRESET)
++                          & ~(USBRESET_BIT | BIT(28)), RCU_USBRESET);
++      } else {
++              /* Hard reset USB state machines */
++              ltq_rcu_w32(ltq_rcu_r32(RCU_USBRESET) | USBRESET_BIT, RCU_USBRESET);
++              udelay(50 * 1000);
++              ltq_rcu_w32(ltq_rcu_r32(RCU_USBRESET) & ~USBRESET_BIT, RCU_USBRESET);
++      }
+-      /* Configure cores to host mode */
+-      ltq_rcu_w32(ltq_rcu_r32(RCU_USB1CFG) & ~RCU_USBCFG_HDSEL_BIT,
+-              RCU_USB1CFG);
+-      ltq_rcu_w32(ltq_rcu_r32(RCU_USB2CFG) & ~RCU_USBCFG_HDSEL_BIT,
+-              RCU_USB2CFG);
+-
+-      /* Select DMA endianness (Host-endian: big-endian) */
+-      ltq_rcu_w32((ltq_rcu_r32(RCU_USB1CFG) & ~RCU_USBCFG_SLV_END_BIT)
+-              | RCU_USBCFG_HOST_END_BIT, RCU_USB1CFG);
+-      ltq_rcu_w32(ltq_rcu_r32((RCU_USB2CFG) & ~RCU_USBCFG_SLV_END_BIT)
+-              | RCU_USBCFG_HOST_END_BIT, RCU_USB2CFG);
+-
+-      /* Hard reset USB state machines */
+-      ltq_rcu_w32(ltq_rcu_r32(RCU_USBRESET) | USBRESET_BIT, RCU_USBRESET);
+-      udelay(50 * 1000);
+-      ltq_rcu_w32(ltq_rcu_r32(RCU_USBRESET) & ~USBRESET_BIT, RCU_USBRESET);
+-
+-      /* Soft reset USB state machines */
+-      ltq_rcu_w32(ltq_rcu_r32(RCU_USBRESET2)
+-              | USB1RESET_BIT | USB2RESET_BIT, RCU_USBRESET2);
+-      udelay(50 * 1000);
+-      ltq_rcu_w32(ltq_rcu_r32(RCU_USBRESET2)
+-              & ~(USB1RESET_BIT | USB2RESET_BIT), RCU_USBRESET2);
++      if (of_machine_is_compatible("lantiq,vr9")) {
++              /* Soft reset USB state machines */
++              ltq_rcu_w32(ltq_rcu_r32(RCU_USBRESET2)
++                      | USB1RESET_BIT | USB2RESET_BIT, RCU_USBRESET2);
++              udelay(50 * 1000);
++              ltq_rcu_w32(ltq_rcu_r32(RCU_USBRESET2)
++                      & ~(USB1RESET_BIT | USB2RESET_BIT), RCU_USBRESET2);
++      }
+ }
+ static int __init mips_reboot_setup(void)
+@@ -363,8 +420,11 @@ static int __init mips_reboot_setup(void
+       if (!ltq_rcu_membase)
+               panic("Failed to remap core memory");
+-      if (of_machine_is_compatible("lantiq,ar9") ||
+-          of_machine_is_compatible("lantiq,vr9"))
++      if (of_machine_is_compatible("lantiq,danube") ||
++          of_machine_is_compatible("lantiq,ase") ||
++          of_machine_is_compatible("lantiq,ar9") ||
++          of_machine_is_compatible("lantiq,vr9") ||
++          of_machine_is_compatible("lantiq,ar10"))
+               ltq_usb_init();
+       if (of_machine_is_compatible("lantiq,vr9"))
+--- a/arch/mips/lantiq/xway/sysctrl.c
++++ b/arch/mips/lantiq/xway/sysctrl.c
+@@ -254,6 +254,25 @@ static void pmu_disable(struct clk *clk)
+               pr_warn("deactivating PMU module failed!");
+ }
++static void usb_set_clock(void)
++{
++      unsigned int val = ltq_cgu_r32(ifccr);
++
++      if (of_machine_is_compatible("lantiq,ar10") ||
++          of_machine_is_compatible("lantiq,grx390")) {
++              val &= ~0x03; /* XTAL divided by 3 */
++      } else if (of_machine_is_compatible("lantiq,ar9") ||
++                 of_machine_is_compatible("lantiq,vr9")) {
++              /* TODO: this depends on the XTAL frequency */
++              val |= 0x03; /* XTAL divided by 3 */
++      } else if (of_machine_is_compatible("lantiq,ase")) {
++              val |= 0x20; /* from XTAL */
++      } else if (of_machine_is_compatible("lantiq,danube")) {
++              val |= 0x30; /* 12 MHz, generated from 36 MHz */
++      }
++      ltq_cgu_w32(val, ifccr);
++}
++
+ /* the pci enable helper */
+ static int pci_enable(struct clk *clk)
+ {
+@@ -608,4 +627,5 @@ void __init ltq_soc_init(void)
+       if (of_machine_is_compatible("lantiq,vr9"))
+               xbar_fpi_burst_disable();
++      usb_set_clock();
+ }
index 227d1cf..e42aaf9 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/lantiq/xway/sysctrl.c
 +++ b/arch/mips/lantiq/xway/sysctrl.c
-@@ -423,6 +423,20 @@ static void clkdev_add_clkout(void)
+@@ -442,6 +442,20 @@ static void clkdev_add_clkout(void)
        }
  }
  
  /* bring up all register ranges that we need for basic system control */
  void __init ltq_soc_init(void)
  {
-@@ -608,4 +622,6 @@ void __init ltq_soc_init(void)
+@@ -628,4 +642,6 @@ void __init ltq_soc_init(void)
        if (of_machine_is_compatible("lantiq,vr9"))
                xbar_fpi_burst_disable();
+       usb_set_clock();
 +
 +      set_phy_clock_source(np_cgu);
  }