[PATCH 1/5] ARM: dts: exynos: align EHCI/OHCI nodes with dtschema on Exynos4

[PATCH 1/5] ARM: dts: exynos: align EHCI/OHCI nodes with dtschema on Exynos4

[Krzysztof Kozlowski]

The node names should be generic and USB DT schema expects "usb" names.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
 arch/arm/boot/dts/exynos4.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index e81b3ee4e0f7..5fd17bc52321 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -373,7 +373,7 @@ hsotg: hsotg@12480000 {
 			status = "disabled";
 		};
 
-		ehci: ehci@12580000 {
+		ehci: usb@12580000 {
 			compatible = "samsung,exynos4210-ehci";
 			reg = <0x12580000 0x100>;
 			interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
@@ -384,7 +384,7 @@ ehci: ehci@12580000 {
 			phy-names = "host", "hsic0", "hsic1";
 		};
 
-		ohci: ohci@12590000 {
+		ohci: usb@12590000 {
 			compatible = "samsung,exynos4210-ohci";
 			reg = <0x12590000 0x100>;
 			interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
-- 
2.32.0

[PATCH 2/5] ARM: dts: s5pv210: align EHCI/OHCI nodes with dtschema

[Krzysztof Kozlowski]

The node names should be generic and USB DT schema expects "usb" names.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
 arch/arm/boot/dts/s5pv210.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/s5pv210.dtsi b/arch/arm/boot/dts/s5pv210.dtsi
index 353ba7b09a0c..a7aca54832d9 100644
--- a/arch/arm/boot/dts/s5pv210.dtsi
+++ b/arch/arm/boot/dts/s5pv210.dtsi
@@ -427,7 +427,7 @@ usbphy: usbphy@ec100000 {
 			status = "disabled";
 		};
 
-		ehci: ehci@ec200000 {
+		ehci: usb@ec200000 {
 			compatible = "samsung,exynos4210-ehci";
 			reg = <0xec200000 0x100>;
 			interrupts = <23>;
@@ -444,7 +444,7 @@ port@0 {
 			};
 		};
 
-		ohci: ohci@ec300000 {
+		ohci: usb@ec300000 {
 			compatible = "samsung,exynos4210-ohci";
 			reg = <0xec300000 0x100>;
 			interrupts = <23>;
-- 
2.32.0

[PATCH 3/5] ARM: dts: s5pv210: Use standard arrays of generic PHYs for EHCI/OHCI device

[Krzysztof Kozlowski]

Move USB PHYs to a standard arrays for S5PV210 EHCI/OHCI devices. This
resolves the conflict between S5PV210 EHCI/OHCI sub-nodes and generic USB
device bindings.

Suggested-by: Måns Rullgård <mans@mansr.com>
Suggested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
 arch/arm/boot/dts/s5pv210.dtsi | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/arch/arm/boot/dts/s5pv210.dtsi b/arch/arm/boot/dts/s5pv210.dtsi
index a7aca54832d9..4ea1e638432a 100644
--- a/arch/arm/boot/dts/s5pv210.dtsi
+++ b/arch/arm/boot/dts/s5pv210.dtsi
@@ -434,14 +434,9 @@ ehci: usb@ec200000 {
 			interrupt-parent = <&vic1>;
 			clocks = <&clocks CLK_USB_HOST>;
 			clock-names = "usbhost";
-			#address-cells = <1>;
-			#size-cells = <0>;
+			phys = <&usbphy 1>;
+			phy-names = "host";
 			status = "disabled";
-
-			port@0 {
-				reg = <0>;
-				phys = <&usbphy 1>;
-			};
 		};
 
 		ohci: usb@ec300000 {
@@ -451,14 +446,9 @@ ohci: usb@ec300000 {
 			interrupt-parent = <&vic1>;
 			clocks = <&clocks CLK_USB_HOST>;
 			clock-names = "usbhost";
-			#address-cells = <1>;
-			#size-cells = <0>;
+			phys = <&usbphy 1>;
+			phy-names = "host";
 			status = "disabled";
-
-			port@0 {
-				reg = <0>;
-				phys = <&usbphy 1>;
-			};
 		};
 
 		mfc: codec@f1700000 {
-- 
2.32.0

[PATCH 4/5] dt-bindings: usb: samsung,exynos-usb2: add missing required reg

[Krzysztof Kozlowski]

"reg" property is required on Samsung S5PV210/Exynos EHCI/OHCI
controllers.

Fixes: 4bf2283cb208 ("dt-bindings: usb: samsung,exynos-usb2: convert to dtschema")
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>

---

Fixed commit in current next. If this should go as fix, I can split it
from the second commit.
---
 Documentation/devicetree/bindings/usb/samsung,exynos-usb2.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/usb/samsung,exynos-usb2.yaml b/Documentation/devicetree/bindings/usb/samsung,exynos-usb2.yaml
index fbf07d6e707a..ef42c6fce73c 100644
--- a/Documentation/devicetree/bindings/usb/samsung,exynos-usb2.yaml
+++ b/Documentation/devicetree/bindings/usb/samsung,exynos-usb2.yaml
@@ -62,6 +62,7 @@ required:
   - interrupts
   - phys
   - phy-names
+  - reg
 
 allOf:
   - if:
-- 
2.32.0

[PATCH 5/5] dt-bindings: usb: samsung,exynos-usb2: include usb-hcd schema

[Krzysztof Kozlowski]

Remove parts duplicated with usb-hcd.yaml DT schema and include it
directly.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
 .../bindings/usb/samsung,exynos-usb2.yaml         | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/Documentation/devicetree/bindings/usb/samsung,exynos-usb2.yaml b/Documentation/devicetree/bindings/usb/samsung,exynos-usb2.yaml
index ef42c6fce73c..76e25b9efebd 100644
--- a/Documentation/devicetree/bindings/usb/samsung,exynos-usb2.yaml
+++ b/Documentation/devicetree/bindings/usb/samsung,exynos-usb2.yaml
@@ -15,9 +15,6 @@ properties:
       - samsung,exynos4210-ehci
       - samsung,exynos4210-ohci
 
-  '#address-cells':
-    const: 1
-
   clocks:
     maxItems: 1
 
@@ -46,15 +43,6 @@ properties:
       Only for controller in EHCI mode, if present, specifies the GPIO that
       needs to be pulled up for the bus to be powered.
 
-  '#size-cells':
-    const: 0
-
-patternProperties:
-  "^.*@[0-9a-f]{1,2}$":
-    description: The hard wired USB devices
-    type: object
-    $ref: /usb/usb-device.yaml
-
 required:
   - compatible
   - clocks
@@ -65,6 +53,7 @@ required:
   - reg
 
 allOf:
+  - $ref: usb-hcd.yaml#
   - if:
       properties:
         compatible:
@@ -74,7 +63,7 @@ allOf:
       properties:
         samsung,vbus-gpio: false
 
-additionalProperties: false
+unevaluatedProperties: false
 
 examples:
   - |
-- 
2.32.0

RE: [PATCH 2/5] ARM: dts: s5pv210: align EHCI/OHCI nodes with dtschema

[Alim Akhtar]

>-----Original Message-----
>From: Krzysztof Kozlowski [mailto:krzysztof.kozlowski@canonical.com]
>Sent: Monday, March 14, 2022 11:50 PM
>To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>; Rob Herring
><robh+dt@kernel.org>; Krzysztof Kozlowski <krzk+dt@kernel.org>; Alim
>Akhtar <alim.akhtar@samsung.com>; linux-usb@vger.kernel.org;
>devicetree@vger.kernel.org; linux-arm-kernel@lists.infradead.org; linux-
>samsung-soc@vger.kernel.org; linux-kernel@vger.kernel.org
>Cc: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
>Subject: [PATCH 2/5] ARM: dts: s5pv210: align EHCI/OHCI nodes with
>dtschema
>
>The node names should be generic and USB DT schema expects "usb" names.
>
>Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
>---
Probably you can squash this with the 1/5 patch

Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>

> arch/arm/boot/dts/s5pv210.dtsi | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/arch/arm/boot/dts/s5pv210.dtsi
b/arch/arm/boot/dts/s5pv210.dtsi
>index 353ba7b09a0c..a7aca54832d9 100644
>--- a/arch/arm/boot/dts/s5pv210.dtsi
>+++ b/arch/arm/boot/dts/s5pv210.dtsi
>@@ -427,7 +427,7 @@ usbphy: usbphy@ec100000 {
> 			status = "disabled";
> 		};
>
>-		ehci: ehci@ec200000 {
>+		ehci: usb@ec200000 {
> 			compatible = "samsung,exynos4210-ehci";
> 			reg = <0xec200000 0x100>;
> 			interrupts = <23>;
>@@ -444,7 +444,7 @@ port@0 {
> 			};
> 		};
>
>-		ohci: ohci@ec300000 {
>+		ohci: usb@ec300000 {
> 			compatible = "samsung,exynos4210-ohci";
> 			reg = <0xec300000 0x100>;
> 			interrupts = <23>;
>--
>2.32.0

RE: [PATCH 1/5] ARM: dts: exynos: align EHCI/OHCI nodes with dtschema on Exynos4

[Alim Akhtar]

>-----Original Message-----
>From: Krzysztof Kozlowski [mailto:krzysztof.kozlowski@canonical.com]
>Sent: Monday, March 14, 2022 11:50 PM
>To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>; Rob Herring
><robh+dt@kernel.org>; Krzysztof Kozlowski <krzk+dt@kernel.org>; Alim
>Akhtar <alim.akhtar@samsung.com>; linux-usb@vger.kernel.org;
>devicetree@vger.kernel.org; linux-arm-kernel@lists.infradead.org; linux-
>samsung-soc@vger.kernel.org; linux-kernel@vger.kernel.org
>Cc: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
>Subject: [PATCH 1/5] ARM: dts: exynos: align EHCI/OHCI nodes with dtschema
>on Exynos4
>
>The node names should be generic and USB DT schema expects "usb" names.
>
>Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
>---

Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>


> arch/arm/boot/dts/exynos4.dtsi | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/arch/arm/boot/dts/exynos4.dtsi
>b/arch/arm/boot/dts/exynos4.dtsi index e81b3ee4e0f7..5fd17bc52321 100644
>--- a/arch/arm/boot/dts/exynos4.dtsi
>+++ b/arch/arm/boot/dts/exynos4.dtsi
>@@ -373,7 +373,7 @@ hsotg: hsotg@12480000 {
> 			status = "disabled";
> 		};
>
>-		ehci: ehci@12580000 {
>+		ehci: usb@12580000 {
> 			compatible = "samsung,exynos4210-ehci";
> 			reg = <0x12580000 0x100>;
> 			interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
>@@ -384,7 +384,7 @@ ehci: ehci@12580000 {
> 			phy-names = "host", "hsic0", "hsic1";
> 		};
>
>-		ohci: ohci@12590000 {
>+		ohci: usb@12590000 {
> 			compatible = "samsung,exynos4210-ohci";
> 			reg = <0x12590000 0x100>;
> 			interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
>--
>2.32.0

RE: [PATCH 4/5] dt-bindings: usb: samsung,exynos-usb2: add missing required reg

[Alim Akhtar]

>-----Original Message-----
>From: Krzysztof Kozlowski [mailto:krzysztof.kozlowski@canonical.com]
>Sent: Monday, March 14, 2022 11:50 PM
>To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>; Rob Herring
><robh+dt@kernel.org>; Krzysztof Kozlowski <krzk+dt@kernel.org>; Alim
>Akhtar <alim.akhtar@samsung.com>; linux-usb@vger.kernel.org;
>devicetree@vger.kernel.org; linux-arm-kernel@lists.infradead.org; linux-
>samsung-soc@vger.kernel.org; linux-kernel@vger.kernel.org
>Cc: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
>Subject: [PATCH 4/5] dt-bindings: usb: samsung,exynos-usb2: add missing
>required reg
>
>"reg" property is required on Samsung S5PV210/Exynos EHCI/OHCI
>controllers.
>
>Fixes: 4bf2283cb208 ("dt-bindings: usb: samsung,exynos-usb2: convert to
>dtschema")
>Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
>

Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>


>---
>
>Fixed commit in current next. If this should go as fix, I can split it from
the
>second commit.
>---
> Documentation/devicetree/bindings/usb/samsung,exynos-usb2.yaml | 1 +
> 1 file changed, 1 insertion(+)
>
>diff --git a/Documentation/devicetree/bindings/usb/samsung,exynos-
>usb2.yaml b/Documentation/devicetree/bindings/usb/samsung,exynos-
>usb2.yaml
>index fbf07d6e707a..ef42c6fce73c 100644
>--- a/Documentation/devicetree/bindings/usb/samsung,exynos-usb2.yaml
>+++ b/Documentation/devicetree/bindings/usb/samsung,exynos-usb2.yaml
>@@ -62,6 +62,7 @@ required:
>   - interrupts
>   - phys
>   - phy-names
>+  - reg
>
> allOf:
>   - if:
>--
>2.32.0

Re: [PATCH 4/5] dt-bindings: usb: samsung,exynos-usb2: add missing required reg

[Rob Herring]

On Mon, 14 Mar 2022 19:19:47 +0100, Krzysztof Kozlowski wrote:
> "reg" property is required on Samsung S5PV210/Exynos EHCI/OHCI
> controllers.
> 
> Fixes: 4bf2283cb208 ("dt-bindings: usb: samsung,exynos-usb2: convert to dtschema")
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
> 
> ---
> 
> Fixed commit in current next. If this should go as fix, I can split it
> from the second commit.
> ---
>  Documentation/devicetree/bindings/usb/samsung,exynos-usb2.yaml | 1 +
>  1 file changed, 1 insertion(+)
> 

Acked-by: Rob Herring <robh@kernel.org>

Re: [PATCH 5/5] dt-bindings: usb: samsung,exynos-usb2: include usb-hcd schema

[Rob Herring]

On Mon, 14 Mar 2022 19:19:48 +0100, Krzysztof Kozlowski wrote:
> Remove parts duplicated with usb-hcd.yaml DT schema and include it
> directly.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
> ---
>  .../bindings/usb/samsung,exynos-usb2.yaml         | 15 ++-------------
>  1 file changed, 2 insertions(+), 13 deletions(-)
> 

Reviewed-by: Rob Herring <robh@kernel.org>

Re: (subset) [PATCH 1/5] ARM: dts: exynos: align EHCI/OHCI nodes with dtschema on Exynos4

[Krzysztof Kozlowski]

On Mon, 14 Mar 2022 19:19:44 +0100, Krzysztof Kozlowski wrote:
> The node names should be generic and USB DT schema expects "usb" names.
> 
> 

Applied, thanks!

[1/5] ARM: dts: exynos: align EHCI/OHCI nodes with dtschema on Exynos4
      commit: b412be7d3c0a248db0de4b7b53ee6ad44d49c71b

Best regards,
-- 
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Re: (subset) [PATCH 2/5] ARM: dts: s5pv210: align EHCI/OHCI nodes with dtschema

[Krzysztof Kozlowski]

On Mon, 14 Mar 2022 19:19:45 +0100, Krzysztof Kozlowski wrote:
> The node names should be generic and USB DT schema expects "usb" names.
> 
> 

Applied, thanks!

[2/5] ARM: dts: s5pv210: align EHCI/OHCI nodes with dtschema
      commit: ab92681ca16194c966844ed4dd2c336705e0c727

Best regards,
-- 
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>