[PATCH 1/5] Enable HSIC on MMP3 SoC

[PATCH 1/5] Enable HSIC on MMP3 SoC

[Lubomir Rintel]

Hi,

this patch set enables the HSIC USB on MMP3 platform. It adds support
for the necessary clocks and adds the device tree nodes.

Apart from patch 3/5, the patches need to be applied in order.

I've tested this on a MMP3-based Dell Wyse 3020/Ariel machine. The HSIC
controllers should be present on MMP2 too, but I don't have a board
where it is wired up.

Thanks,
Lubo

[PATCH 1/5] dt-bindings: marvell,mmp2: Add clock ids for the HSIC clocks

[Lubomir Rintel]

There are two USB HSIC controllers on MMP2 and MMP3.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
 include/dt-bindings/clock/marvell,mmp2.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/dt-bindings/clock/marvell,mmp2.h b/include/dt-bindings/clock/marvell,mmp2.h
index e785c6eb35613..4b1a7724f20d7 100644
--- a/include/dt-bindings/clock/marvell,mmp2.h
+++ b/include/dt-bindings/clock/marvell,mmp2.h
@@ -72,6 +72,8 @@
 #define MMP2_CLK_CCIC1_PHY		118
 #define MMP2_CLK_CCIC1_SPHY		119
 #define MMP2_CLK_DISP0_LCDC		120
+#define MMP2_CLK_USBHSIC0		121
+#define MMP2_CLK_USBHSIC1		122
 
 #define MMP2_NR_CLKS			200
 #endif
-- 
2.24.1

[PATCH 2/5] clk: mmp2: Add HSIC clocks

[Lubomir Rintel]

There are two USB HSIC controllers on MMP2 and MMP3.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
 drivers/clk/mmp/clk-of-mmp2.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/clk/mmp/clk-of-mmp2.c b/drivers/clk/mmp/clk-of-mmp2.c
index a60a1be937ad6..05834953e1fd3 100644
--- a/drivers/clk/mmp/clk-of-mmp2.c
+++ b/drivers/clk/mmp/clk-of-mmp2.c
@@ -53,6 +53,8 @@
 #define APMU_DISP1	0x110
 #define APMU_CCIC0	0x50
 #define APMU_CCIC1	0xf4
+#define APMU_USBHSIC0	0xf8
+#define APMU_USBHSIC1	0xfc
 #define MPMU_UART_PLL	0x14
 
 struct mmp2_clk_unit {
@@ -194,6 +196,8 @@ static struct mmp_clk_mix_config sdh_mix_config = {
 };
 
 static DEFINE_SPINLOCK(usb_lock);
+static DEFINE_SPINLOCK(usbhsic0_lock);
+static DEFINE_SPINLOCK(usbhsic1_lock);
 
 static DEFINE_SPINLOCK(disp0_lock);
 static DEFINE_SPINLOCK(disp1_lock);
@@ -224,6 +228,8 @@ static struct mmp_param_div_clk apmu_div_clks[] = {
 
 static struct mmp_param_gate_clk apmu_gate_clks[] = {
 	{MMP2_CLK_USB, "usb_clk", "usb_pll", 0, APMU_USB, 0x9, 0x9, 0x0, 0, &usb_lock},
+	{MMP2_CLK_USBHSIC0, "usbhsic0_clk", "usb_pll", 0, APMU_USBHSIC0, 0x1b, 0x1b, 0x0, 0, &usbhsic0_lock},
+	{MMP2_CLK_USBHSIC1, "usbhsic1_clk", "usb_pll", 0, APMU_USBHSIC1, 0x1b, 0x1b, 0x0, 0, &usbhsic1_lock},
 	/* The gate clocks has mux parent. */
 	{MMP2_CLK_SDH0, "sdh0_clk", "sdh_mix_clk", CLK_SET_RATE_PARENT, APMU_SDH0, 0x1b, 0x1b, 0x0, 0, &sdh_lock},
 	{MMP2_CLK_SDH1, "sdh1_clk", "sdh_mix_clk", CLK_SET_RATE_PARENT, APMU_SDH1, 0x1b, 0x1b, 0x0, 0, &sdh_lock},
-- 
2.24.1

[PATCH 3/5] dt-bindings: phy: Add binding for marvell,mmp3-hsic-phy

[Lubomir Rintel]

This is the PHY chip for USB HSIC on MMP3 platform.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
 .../bindings/phy/marvell,mmp3-hsic-phy.yaml   | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/phy/marvell,mmp3-hsic-phy.yaml

diff --git a/Documentation/devicetree/bindings/phy/marvell,mmp3-hsic-phy.yaml b/Documentation/devicetree/bindings/phy/marvell,mmp3-hsic-phy.yaml
new file mode 100644
index 0000000000000..7917a95cda78d
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/marvell,mmp3-hsic-phy.yaml
@@ -0,0 +1,41 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright 2019 Lubomir Rintel <lkundrak@v3.sk>
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/phy/marvell,mmp3-hsic-phy.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: Marvell MMP3 HSIC PHY
+
+maintainers:
+  - Lubomir Rintel <lkundrak@v3.sk>
+
+properties:
+  compatible:
+    const: marvell,mmp3-hsic-phy
+
+  reg:
+    maxItems: 1
+    description: base address of the device
+
+  reset-gpios:
+    maxItems: 1
+    description: GPIO connected to reset
+
+  "#phy-cells":
+    const: 0
+
+required:
+  - compatible
+  - reg
+  - reset-gpios
+  - "#phy-cells"
+
+examples:
+  - |
+    hsic-phy@f0001800 {
+            compatible = "marvell,mmp3-hsic-phy";
+            reg = <0xf0001800 0x40>;
+            reset-gpios = <&gpio 63 GPIO_ACTIVE_HIGH>;
+            #phy-cells = <0>;
+    };
-- 
2.24.1

[PATCH 4/5] ARM: dts: mmp3: Add HSIC controllers

[Lubomir Rintel]

There are two on MMP3, along with the PHYs. The PHYs are made compatible
with the NOP transceiver, since there's no driver for the time being and
they're likely configured by the firmware.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
 arch/arm/boot/dts/mmp3.dtsi | 44 +++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/arch/arm/boot/dts/mmp3.dtsi b/arch/arm/boot/dts/mmp3.dtsi
index d9762de0ed34b..36c50706e60e0 100644
--- a/arch/arm/boot/dts/mmp3.dtsi
+++ b/arch/arm/boot/dts/mmp3.dtsi
@@ -201,6 +201,50 @@ usb_otg0: usb-otg@d4208000 {
 				status = "disabled";
 			};
 
+			hsic_phy0: hsic-phy@f0001800 {
+				compatible = "marvell,mmp3-hsic-phy",
+					     "usb-nop-xceiv",
+				reg = <0xf0001800 0x40>;
+				#phy-cells = <0>;
+				status = "disabled";
+			};
+
+			hsic0: hsic@f0001000 {
+				compatible = "marvell,pxau2o-ehci";
+				reg = <0xf0001000 0x200>;
+				interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
+				clocks = <&soc_clocks MMP2_CLK_USBHSIC0>;
+				clock-names = "USBCLK";
+				phys = <&hsic_phy0>;
+				phy-names = "usb";
+				phy_type = "hsic";
+				#address-cells = <0x01>;
+				#size-cells = <0x00>;
+				status = "disabled";
+			};
+
+			hsic_phy1: hsic-phy@f0002800 {
+				compatible = "marvell,mmp3-hsic-phy",
+					     "usb-nop-xceiv",
+				reg = <0xf0002800 0x40>;
+				#phy-cells = <0>;
+				status = "disabled";
+			};
+
+			hsic1: hsic@f0002000 {
+				compatible = "marvell,pxau2o-ehci";
+				reg = <0xf0002000 0x200>;
+				interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
+				clocks = <&soc_clocks MMP2_CLK_USBHSIC1>;
+				clock-names = "USBCLK";
+				phys = <&hsic_phy1>;
+				phy-names = "usb";
+				phy_type = "hsic";
+				#address-cells = <0x01>;
+				#size-cells = <0x00>;
+				status = "disabled";
+			};
+
 			mmc1: mmc@d4280000 {
 				compatible = "mrvl,pxav3-mmc";
 				reg = <0xd4280000 0x120>;
-- 
2.24.1

[PATCH 5/5] ARM: dts: mmp3-dell-ariel: Enable the HSIC

[Lubomir Rintel]

There's a SMSC USB2640 (USB hub & SD controller) connected to it, but
the SD card slot footprint is unpopulated. Also connected to the hub is
a SMSC LAN7500 gigabit ethernet adapter.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
 arch/arm/boot/dts/mmp3-dell-ariel.dts | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/arch/arm/boot/dts/mmp3-dell-ariel.dts b/arch/arm/boot/dts/mmp3-dell-ariel.dts
index c1947b5a688d7..15449c72c042b 100644
--- a/arch/arm/boot/dts/mmp3-dell-ariel.dts
+++ b/arch/arm/boot/dts/mmp3-dell-ariel.dts
@@ -49,6 +49,28 @@ &usb_otg_phy0 {
 	status = "okay";
 };
 
+&hsic0 {
+	status = "okay";
+
+	usb1@1 {
+		compatible = "usb424,2640";
+		reg = <0x01>;
+		#address-cells = <0x01>;
+		#size-cells = <0x00>;
+
+		mass-storage@1 {
+			compatible = "usb424,4040";
+			reg = <0x01>;
+			status = "disabled";
+		};
+	};
+};
+
+&hsic_phy0 {
+	status = "okay";
+	reset-gpios = <&gpio 63 GPIO_ACTIVE_HIGH>;
+};
+
 &mmc3 {
 	status = "okay";
 	max-frequency = <50000000>;
-- 
2.24.1

Re: [PATCH 4/5] ARM: dts: mmp3: Add HSIC controllers

[Lubomir Rintel]

On Fri, 2019-12-20 at 07:53 +0100, Lubomir Rintel wrote:
> There are two on MMP3, along with the PHYs. The PHYs are made compatible
> with the NOP transceiver, since there's no driver for the time being and
> they're likely configured by the firmware.
> 
> Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
> ---
>  arch/arm/boot/dts/mmp3.dtsi | 44 +++++++++++++++++++++++++++++++++++++
>  1 file changed, 44 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/mmp3.dtsi b/arch/arm/boot/dts/mmp3.dtsi
> index d9762de0ed34b..36c50706e60e0 100644
> --- a/arch/arm/boot/dts/mmp3.dtsi
> +++ b/arch/arm/boot/dts/mmp3.dtsi
> @@ -201,6 +201,50 @@ usb_otg0: usb-otg@d4208000 {
>  				status = "disabled";
>  			};
>  
> +			hsic_phy0: hsic-phy@f0001800 {
> +				compatible = "marvell,mmp3-hsic-phy",
> +					     "usb-nop-xceiv",

I managed to mess this up right before sending it out.     ^^^
Sorry for that. There should be a semicolon there. I'll fix this up on
next patch spin.

> +				reg = <0xf0001800 0x40>;
> +				#phy-cells = <0>;
> +				status = "disabled";
> +			};
> +
> +			hsic0: hsic@f0001000 {
> +				compatible = "marvell,pxau2o-ehci";
> +				reg = <0xf0001000 0x200>;
> +				interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
> +				clocks = <&soc_clocks MMP2_CLK_USBHSIC0>;
> +				clock-names = "USBCLK";
> +				phys = <&hsic_phy0>;
> +				phy-names = "usb";
> +				phy_type = "hsic";
> +				#address-cells = <0x01>;
> +				#size-cells = <0x00>;
> +				status = "disabled";
> +			};
> +
> +			hsic_phy1: hsic-phy@f0002800 {
> +				compatible = "marvell,mmp3-hsic-phy",
> +					     "usb-nop-xceiv",
> +				reg = <0xf0002800 0x40>;
> +				#phy-cells = <0>;
> +				status = "disabled";
> +			};
> +
> +			hsic1: hsic@f0002000 {
> +				compatible = "marvell,pxau2o-ehci";
> +				reg = <0xf0002000 0x200>;
> +				interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
> +				clocks = <&soc_clocks MMP2_CLK_USBHSIC1>;
> +				clock-names = "USBCLK";
> +				phys = <&hsic_phy1>;
> +				phy-names = "usb";
> +				phy_type = "hsic";
> +				#address-cells = <0x01>;
> +				#size-cells = <0x00>;
> +				status = "disabled";
> +			};
> +
>  			mmc1: mmc@d4280000 {
>  				compatible = "mrvl,pxav3-mmc";
>  				reg = <0xd4280000 0x120>;

Re: [PATCH 4/5] ARM: dts: mmp3: Add HSIC controllers

[kbuild test robot]

[-- Attachment #1: Type: text/plain, Size: 1389 bytes --]

Hi Lubomir,

I love your patch! Yet something to improve:

[auto build test ERROR on robh/for-next]
[also build test ERROR on clk/clk-next phy/next arm-soc/for-next v5.5-rc3 next-20191220]
[if your patch is applied to the wrong git tree, please drop us a note to help
improve the system. BTW, we also suggest to use '--base' option to specify the
base tree in git format-patch, please see https://stackoverflow.com/a/37406982]

url:    https://github.com/0day-ci/linux/commits/Lubomir-Rintel/dt-bindings-marvell-mmp2-Add-clock-ids-for-the-HSIC-clocks/20191223-141100
base:   https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git for-next
config: arm-defconfig (attached as .config)
compiler: arm-linux-gnueabi-gcc (GCC) 7.5.0
reproduce:
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        GCC_VERSION=7.5.0 make.cross ARCH=arm 

If you fix the issue, kindly add following tag
Reported-by: kbuild test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

>> Error: arch/arm/boot/dts/mmp3.dtsi:207.5-6 syntax error
   FATAL ERROR: Unable to parse input tree

---
0-DAY kernel test infrastructure                 Open Source Technology Center
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org Intel Corporation

[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 49450 bytes --]

Re: [PATCH 1/5] dt-bindings: marvell,mmp2: Add clock ids for the HSIC clocks

[Stephen Boyd]

Quoting Lubomir Rintel (2019-12-19 22:53:10)
> There are two USB HSIC controllers on MMP2 and MMP3.
> 
> Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
> ---

Acked-by: Stephen Boyd <sboyd@kernel.org>

Re: [PATCH 2/5] clk: mmp2: Add HSIC clocks

[Stephen Boyd]

Quoting Lubomir Rintel (2019-12-19 22:53:11)
> There are two USB HSIC controllers on MMP2 and MMP3.
> 
> Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
> ---

Acked-by: Stephen Boyd <sboyd@kernel.org>

Re: [PATCH 4/5] ARM: dts: mmp3: Add HSIC controllers

[Olof Johansson]

On Fri, Dec 20, 2019 at 08:05:50AM +0100, Lubomir Rintel wrote:
> On Fri, 2019-12-20 at 07:53 +0100, Lubomir Rintel wrote:
> > There are two on MMP3, along with the PHYs. The PHYs are made compatible
> > with the NOP transceiver, since there's no driver for the time being and
> > they're likely configured by the firmware.
> > 
> > Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
> > ---
> >  arch/arm/boot/dts/mmp3.dtsi | 44 +++++++++++++++++++++++++++++++++++++
> >  1 file changed, 44 insertions(+)
> > 
> > diff --git a/arch/arm/boot/dts/mmp3.dtsi b/arch/arm/boot/dts/mmp3.dtsi
> > index d9762de0ed34b..36c50706e60e0 100644
> > --- a/arch/arm/boot/dts/mmp3.dtsi
> > +++ b/arch/arm/boot/dts/mmp3.dtsi
> > @@ -201,6 +201,50 @@ usb_otg0: usb-otg@d4208000 {
> >  				status = "disabled";
> >  			};
> >  
> > +			hsic_phy0: hsic-phy@f0001800 {
> > +				compatible = "marvell,mmp3-hsic-phy",
> > +					     "usb-nop-xceiv",
> 
> I managed to mess this up right before sending it out.     ^^^
> Sorry for that. There should be a semicolon there. I'll fix this up on
> next patch spin.

Missed the comments when applying, but I fixed it up locally with the below
patch. Please send new versions incremental on top of it.

I applied the series to the mmp/hsic (and mmp/hsic-fixed) branch in our tree if
you want to use that as a base.


-Olof


---

From e2ce979bf176af4b8eb7aea866919d618c08f752 Mon Sep 17 00:00:00 2001
From: Olof Johansson <olof@lixom.net>
Date: Mon, 6 Jan 2020 11:14:10 -0800
Subject: [PATCH] ARM: dts: mmp3: Fix typos

Fixes build failures due to syntax errors.

Fixes: 3240d5b872f2 ("ARM: dts: mmp3: Add HSIC controllers")
Signed-off-by: Olof Johansson <olof@lixom.net>
---
 arch/arm/boot/dts/mmp3.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/mmp3.dtsi b/arch/arm/boot/dts/mmp3.dtsi
index 36c50706e60e..1eba7fb6629b 100644
--- a/arch/arm/boot/dts/mmp3.dtsi
+++ b/arch/arm/boot/dts/mmp3.dtsi
@@ -203,7 +203,7 @@
 
 			hsic_phy0: hsic-phy@f0001800 {
 				compatible = "marvell,mmp3-hsic-phy",
-					     "usb-nop-xceiv",
+					     "usb-nop-xceiv";
 				reg = <0xf0001800 0x40>;
 				#phy-cells = <0>;
 				status = "disabled";
@@ -225,7 +225,7 @@
 
 			hsic_phy1: hsic-phy@f0002800 {
 				compatible = "marvell,mmp3-hsic-phy",
-					     "usb-nop-xceiv",
+					     "usb-nop-xceiv";
 				reg = <0xf0002800 0x40>;
 				#phy-cells = <0>;
 				status = "disabled";
-- 
2.22.GIT

Re: [PATCH 3/5] dt-bindings: phy: Add binding for marvell,mmp3-hsic-phy

[Rob Herring]

On Fri, Dec 20, 2019 at 1:01 AM Lubomir Rintel <lkundrak@v3.sk> wrote:
>
> This is the PHY chip for USB HSIC on MMP3 platform.
>
> Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
> ---
>  .../bindings/phy/marvell,mmp3-hsic-phy.yaml   | 41 +++++++++++++++++++
>  1 file changed, 41 insertions(+)
>  create mode 100644 Documentation/devicetree/bindings/phy/marvell,mmp3-hsic-phy.yaml

Seems this is already in -next, but it breaks dt_binding_check.

>
> diff --git a/Documentation/devicetree/bindings/phy/marvell,mmp3-hsic-phy.yaml b/Documentation/devicetree/bindings/phy/marvell,mmp3-hsic-phy.yaml
> new file mode 100644
> index 0000000000000..7917a95cda78d
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/phy/marvell,mmp3-hsic-phy.yaml
> @@ -0,0 +1,41 @@
> +# SPDX-License-Identifier: GPL-2.0-or-later

Dual license new bindings:

(GPL-2.0-only OR BSD-2-Clause)

> +# Copyright 2019 Lubomir Rintel <lkundrak@v3.sk>
> +%YAML 1.2
> +---
> +$id: "http://devicetree.org/schemas/phy/marvell,mmp3-hsic-phy.yaml#"
> +$schema: "http://devicetree.org/meta-schemas/core.yaml#"
> +
> +title: Marvell MMP3 HSIC PHY
> +
> +maintainers:
> +  - Lubomir Rintel <lkundrak@v3.sk>
> +
> +properties:
> +  compatible:
> +    const: marvell,mmp3-hsic-phy
> +
> +  reg:
> +    maxItems: 1
> +    description: base address of the device

Drop description. That's *every* 'reg' property.

> +
> +  reset-gpios:
> +    maxItems: 1
> +    description: GPIO connected to reset
> +
> +  "#phy-cells":
> +    const: 0
> +
> +required:
> +  - compatible
> +  - reg
> +  - reset-gpios
> +  - "#phy-cells"
> +
> +examples:
> +  - |
> +    hsic-phy@f0001800 {
> +            compatible = "marvell,mmp3-hsic-phy";
> +            reg = <0xf0001800 0x40>;
> +            reset-gpios = <&gpio 63 GPIO_ACTIVE_HIGH>;

Examples are built now and this one doesn't. You need the include for
the define. Check with 'make dt_binding_check'.

> +            #phy-cells = <0>;
> +    };
> --
> 2.24.1
>