* [PATCH v2 0/5] dt-bindings: phy: Fix uniphier descriptions
@ 2022-03-30 5:20 ` Kunihiko Hayashi
0 siblings, 0 replies; 36+ messages in thread
From: Kunihiko Hayashi @ 2022-03-30 5:20 UTC (permalink / raw)
To: Vinod Koul, Kishon Vijay Abraham I, Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel,
linux-kernel, Kunihiko Hayashi
This series fixes dt-schema descriptions for all PHYs implemented in
UniPhier SoCs.
Changes since v1:
- Add "Reviewed-by:" line to patch 1 and 2
- Remove result messages about unpublished nodes in patch 3
- Add patch 4 for fixing incorrect properties in ahci-phy
- Add patch 5 to rewrite properties using allOf-if-then in all phys
Kunihiko Hayashi (5):
dt-bindings: phy: uniphier-usb2: Add vbus-supply
dt-bindings: phy: uniphier-usb3ss: Treat vbus-supply as optional
dt-bindings: phy: uniphier-ahci: Fix missing reset-names
dt-bindings: phy: uniphier-usb3hs: Fix incorrect clock-names and
reset-names
dt-bindings: phy: uniphier: Clean up clock-names and reset-names using
compatible string
.../phy/socionext,uniphier-ahci-phy.yaml | 74 ++++++++++++-----
.../phy/socionext,uniphier-pcie-phy.yaml | 37 ++++++---
.../phy/socionext,uniphier-usb2-phy.yaml | 3 +
.../phy/socionext,uniphier-usb3hs-phy.yaml | 71 ++++++++++++----
.../phy/socionext,uniphier-usb3ss-phy.yaml | 80 ++++++++++++++-----
5 files changed, 194 insertions(+), 71 deletions(-)
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 36+ messages in thread* [PATCH v2 0/5] dt-bindings: phy: Fix uniphier descriptions
@ 2022-03-30 5:20 ` Kunihiko Hayashi
0 siblings, 0 replies; 36+ messages in thread
From: Kunihiko Hayashi @ 2022-03-30 5:20 UTC (permalink / raw)
To: Vinod Koul, Kishon Vijay Abraham I, Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel,
linux-kernel, Kunihiko Hayashi
This series fixes dt-schema descriptions for all PHYs implemented in
UniPhier SoCs.
Changes since v1:
- Add "Reviewed-by:" line to patch 1 and 2
- Remove result messages about unpublished nodes in patch 3
- Add patch 4 for fixing incorrect properties in ahci-phy
- Add patch 5 to rewrite properties using allOf-if-then in all phys
Kunihiko Hayashi (5):
dt-bindings: phy: uniphier-usb2: Add vbus-supply
dt-bindings: phy: uniphier-usb3ss: Treat vbus-supply as optional
dt-bindings: phy: uniphier-ahci: Fix missing reset-names
dt-bindings: phy: uniphier-usb3hs: Fix incorrect clock-names and
reset-names
dt-bindings: phy: uniphier: Clean up clock-names and reset-names using
compatible string
.../phy/socionext,uniphier-ahci-phy.yaml | 74 ++++++++++++-----
.../phy/socionext,uniphier-pcie-phy.yaml | 37 ++++++---
.../phy/socionext,uniphier-usb2-phy.yaml | 3 +
.../phy/socionext,uniphier-usb3hs-phy.yaml | 71 ++++++++++++----
.../phy/socionext,uniphier-usb3ss-phy.yaml | 80 ++++++++++++++-----
5 files changed, 194 insertions(+), 71 deletions(-)
--
2.25.1
--
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy
^ permalink raw reply [flat|nested] 36+ messages in thread* [PATCH v2 1/5] dt-bindings: phy: uniphier-usb2: Add vbus-supply
2022-03-30 5:20 ` Kunihiko Hayashi
(?)
@ 2022-03-30 5:20 ` Kunihiko Hayashi
-1 siblings, 0 replies; 36+ messages in thread
From: Kunihiko Hayashi @ 2022-03-30 5:20 UTC (permalink / raw)
To: Vinod Koul, Kishon Vijay Abraham I, Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel,
linux-kernel, Kunihiko Hayashi
UniPhier USB2 PHY controller can apply vbus-supply.
Add "vbus-supply" property to fix the following warning.
uniphier-pro4-ace.dtb: usb-glue: phy@2: 'vbus-supply' does not match any of the regexes: 'pinctrl-[0-9]+'
From schema: Documentation/devicetree/bindings/phy/socionext,uniphier-usb2-phy.yaml
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
.../devicetree/bindings/phy/socionext,uniphier-usb2-phy.yaml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb2-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb2-phy.yaml
index 479b203f7aa6..63dab914a48d 100644
--- a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb2-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb2-phy.yaml
@@ -43,6 +43,9 @@ patternProperties:
"#phy-cells":
const: 0
+ vbus-supply:
+ description: A phandle to the regulator for USB VBUS, only for USB host
+
required:
- reg
- "#phy-cells"
--
2.25.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH v2 1/5] dt-bindings: phy: uniphier-usb2: Add vbus-supply
@ 2022-03-30 5:20 ` Kunihiko Hayashi
0 siblings, 0 replies; 36+ messages in thread
From: Kunihiko Hayashi @ 2022-03-30 5:20 UTC (permalink / raw)
To: Vinod Koul, Kishon Vijay Abraham I, Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel,
linux-kernel, Kunihiko Hayashi
UniPhier USB2 PHY controller can apply vbus-supply.
Add "vbus-supply" property to fix the following warning.
uniphier-pro4-ace.dtb: usb-glue: phy@2: 'vbus-supply' does not match any of the regexes: 'pinctrl-[0-9]+'
From schema: Documentation/devicetree/bindings/phy/socionext,uniphier-usb2-phy.yaml
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
.../devicetree/bindings/phy/socionext,uniphier-usb2-phy.yaml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb2-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb2-phy.yaml
index 479b203f7aa6..63dab914a48d 100644
--- a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb2-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb2-phy.yaml
@@ -43,6 +43,9 @@ patternProperties:
"#phy-cells":
const: 0
+ vbus-supply:
+ description: A phandle to the regulator for USB VBUS, only for USB host
+
required:
- reg
- "#phy-cells"
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH v2 1/5] dt-bindings: phy: uniphier-usb2: Add vbus-supply
@ 2022-03-30 5:20 ` Kunihiko Hayashi
0 siblings, 0 replies; 36+ messages in thread
From: Kunihiko Hayashi @ 2022-03-30 5:20 UTC (permalink / raw)
To: Vinod Koul, Kishon Vijay Abraham I, Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel,
linux-kernel, Kunihiko Hayashi
UniPhier USB2 PHY controller can apply vbus-supply.
Add "vbus-supply" property to fix the following warning.
uniphier-pro4-ace.dtb: usb-glue: phy@2: 'vbus-supply' does not match any of the regexes: 'pinctrl-[0-9]+'
From schema: Documentation/devicetree/bindings/phy/socionext,uniphier-usb2-phy.yaml
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
.../devicetree/bindings/phy/socionext,uniphier-usb2-phy.yaml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb2-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb2-phy.yaml
index 479b203f7aa6..63dab914a48d 100644
--- a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb2-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb2-phy.yaml
@@ -43,6 +43,9 @@ patternProperties:
"#phy-cells":
const: 0
+ vbus-supply:
+ description: A phandle to the regulator for USB VBUS, only for USB host
+
required:
- reg
- "#phy-cells"
--
2.25.1
--
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 2/5] dt-bindings: phy: uniphier-usb3ss: Treat vbus-supply as optional
2022-03-30 5:20 ` Kunihiko Hayashi
(?)
@ 2022-03-30 5:20 ` Kunihiko Hayashi
-1 siblings, 0 replies; 36+ messages in thread
From: Kunihiko Hayashi @ 2022-03-30 5:20 UTC (permalink / raw)
To: Vinod Koul, Kishon Vijay Abraham I, Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel,
linux-kernel, Kunihiko Hayashi
The usb-device doesn't need "vbus-supply" property, so the property should
be removed from required.
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
.../devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml
index 92d46eb913a3..06c957d52d23 100644
--- a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml
@@ -61,7 +61,7 @@ properties:
- const: phy
vbus-supply:
- description: A phandle to the regulator for USB VBUS
+ description: A phandle to the regulator for USB VBUS, only for USB host
required:
- compatible
@@ -71,7 +71,6 @@ required:
- clock-names
- resets
- reset-names
- - vbus-supply
additionalProperties: false
--
2.25.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH v2 2/5] dt-bindings: phy: uniphier-usb3ss: Treat vbus-supply as optional
@ 2022-03-30 5:20 ` Kunihiko Hayashi
0 siblings, 0 replies; 36+ messages in thread
From: Kunihiko Hayashi @ 2022-03-30 5:20 UTC (permalink / raw)
To: Vinod Koul, Kishon Vijay Abraham I, Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel,
linux-kernel, Kunihiko Hayashi
The usb-device doesn't need "vbus-supply" property, so the property should
be removed from required.
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
.../devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml
index 92d46eb913a3..06c957d52d23 100644
--- a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml
@@ -61,7 +61,7 @@ properties:
- const: phy
vbus-supply:
- description: A phandle to the regulator for USB VBUS
+ description: A phandle to the regulator for USB VBUS, only for USB host
required:
- compatible
@@ -71,7 +71,6 @@ required:
- clock-names
- resets
- reset-names
- - vbus-supply
additionalProperties: false
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH v2 2/5] dt-bindings: phy: uniphier-usb3ss: Treat vbus-supply as optional
@ 2022-03-30 5:20 ` Kunihiko Hayashi
0 siblings, 0 replies; 36+ messages in thread
From: Kunihiko Hayashi @ 2022-03-30 5:20 UTC (permalink / raw)
To: Vinod Koul, Kishon Vijay Abraham I, Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel,
linux-kernel, Kunihiko Hayashi
The usb-device doesn't need "vbus-supply" property, so the property should
be removed from required.
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
.../devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml
index 92d46eb913a3..06c957d52d23 100644
--- a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml
@@ -61,7 +61,7 @@ properties:
- const: phy
vbus-supply:
- description: A phandle to the regulator for USB VBUS
+ description: A phandle to the regulator for USB VBUS, only for USB host
required:
- compatible
@@ -71,7 +71,6 @@ required:
- clock-names
- resets
- reset-names
- - vbus-supply
additionalProperties: false
--
2.25.1
--
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 3/5] dt-bindings: phy: uniphier-ahci: Fix missing reset-names
2022-03-30 5:20 ` Kunihiko Hayashi
(?)
@ 2022-03-30 5:20 ` Kunihiko Hayashi
-1 siblings, 0 replies; 36+ messages in thread
From: Kunihiko Hayashi @ 2022-03-30 5:20 UTC (permalink / raw)
To: Vinod Koul, Kishon Vijay Abraham I, Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel,
linux-kernel, Kunihiko Hayashi
UniPhier AHCI PHY controller needs to specify 6 reset lines, so this adds
missing "phy" to reset-names and increases maxItems of resets.
Fixes: 34f92b67621f ("dt-bindings: phy: uniphier-ahci: Add bindings for Pro4 SoC")
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
.../devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
index 3b400a85b44a..14f7579e7daa 100644
--- a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
@@ -43,13 +43,14 @@ properties:
resets:
minItems: 2
- maxItems: 5
+ maxItems: 6
reset-names:
oneOf:
- items: # for Pro4
- const: link
- const: gio
+ - const: phy
- const: pm
- const: tx
- const: rx
--
2.25.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH v2 3/5] dt-bindings: phy: uniphier-ahci: Fix missing reset-names
@ 2022-03-30 5:20 ` Kunihiko Hayashi
0 siblings, 0 replies; 36+ messages in thread
From: Kunihiko Hayashi @ 2022-03-30 5:20 UTC (permalink / raw)
To: Vinod Koul, Kishon Vijay Abraham I, Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel,
linux-kernel, Kunihiko Hayashi
UniPhier AHCI PHY controller needs to specify 6 reset lines, so this adds
missing "phy" to reset-names and increases maxItems of resets.
Fixes: 34f92b67621f ("dt-bindings: phy: uniphier-ahci: Add bindings for Pro4 SoC")
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
.../devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
index 3b400a85b44a..14f7579e7daa 100644
--- a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
@@ -43,13 +43,14 @@ properties:
resets:
minItems: 2
- maxItems: 5
+ maxItems: 6
reset-names:
oneOf:
- items: # for Pro4
- const: link
- const: gio
+ - const: phy
- const: pm
- const: tx
- const: rx
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH v2 3/5] dt-bindings: phy: uniphier-ahci: Fix missing reset-names
@ 2022-03-30 5:20 ` Kunihiko Hayashi
0 siblings, 0 replies; 36+ messages in thread
From: Kunihiko Hayashi @ 2022-03-30 5:20 UTC (permalink / raw)
To: Vinod Koul, Kishon Vijay Abraham I, Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel,
linux-kernel, Kunihiko Hayashi
UniPhier AHCI PHY controller needs to specify 6 reset lines, so this adds
missing "phy" to reset-names and increases maxItems of resets.
Fixes: 34f92b67621f ("dt-bindings: phy: uniphier-ahci: Add bindings for Pro4 SoC")
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
.../devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
index 3b400a85b44a..14f7579e7daa 100644
--- a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
@@ -43,13 +43,14 @@ properties:
resets:
minItems: 2
- maxItems: 5
+ maxItems: 6
reset-names:
oneOf:
- items: # for Pro4
- const: link
- const: gio
+ - const: phy
- const: pm
- const: tx
- const: rx
--
2.25.1
--
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy
^ permalink raw reply related [flat|nested] 36+ messages in thread* Re: [PATCH v2 3/5] dt-bindings: phy: uniphier-ahci: Fix missing reset-names
2022-03-30 5:20 ` Kunihiko Hayashi
(?)
@ 2022-03-30 8:08 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 36+ messages in thread
From: Krzysztof Kozlowski @ 2022-03-30 8:08 UTC (permalink / raw)
To: Kunihiko Hayashi, Vinod Koul, Kishon Vijay Abraham I,
Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel, linux-kernel
On 30/03/2022 07:20, Kunihiko Hayashi wrote:
> UniPhier AHCI PHY controller needs to specify 6 reset lines, so this adds
> missing "phy" to reset-names and increases maxItems of resets.
>
> Fixes: 34f92b67621f ("dt-bindings: phy: uniphier-ahci: Add bindings for Pro4 SoC")
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
> .../devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PATCH v2 3/5] dt-bindings: phy: uniphier-ahci: Fix missing reset-names
@ 2022-03-30 8:08 ` Krzysztof Kozlowski
0 siblings, 0 replies; 36+ messages in thread
From: Krzysztof Kozlowski @ 2022-03-30 8:08 UTC (permalink / raw)
To: Kunihiko Hayashi, Vinod Koul, Kishon Vijay Abraham I,
Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel, linux-kernel
On 30/03/2022 07:20, Kunihiko Hayashi wrote:
> UniPhier AHCI PHY controller needs to specify 6 reset lines, so this adds
> missing "phy" to reset-names and increases maxItems of resets.
>
> Fixes: 34f92b67621f ("dt-bindings: phy: uniphier-ahci: Add bindings for Pro4 SoC")
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
> .../devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Best regards,
Krzysztof
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PATCH v2 3/5] dt-bindings: phy: uniphier-ahci: Fix missing reset-names
@ 2022-03-30 8:08 ` Krzysztof Kozlowski
0 siblings, 0 replies; 36+ messages in thread
From: Krzysztof Kozlowski @ 2022-03-30 8:08 UTC (permalink / raw)
To: Kunihiko Hayashi, Vinod Koul, Kishon Vijay Abraham I,
Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel, linux-kernel
On 30/03/2022 07:20, Kunihiko Hayashi wrote:
> UniPhier AHCI PHY controller needs to specify 6 reset lines, so this adds
> missing "phy" to reset-names and increases maxItems of resets.
>
> Fixes: 34f92b67621f ("dt-bindings: phy: uniphier-ahci: Add bindings for Pro4 SoC")
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
> .../devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Best regards,
Krzysztof
--
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v2 4/5] dt-bindings: phy: uniphier-usb3hs: Fix incorrect clock-names and reset-names
2022-03-30 5:20 ` Kunihiko Hayashi
(?)
@ 2022-03-30 5:20 ` Kunihiko Hayashi
-1 siblings, 0 replies; 36+ messages in thread
From: Kunihiko Hayashi @ 2022-03-30 5:20 UTC (permalink / raw)
To: Vinod Koul, Kishon Vijay Abraham I, Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel,
linux-kernel, Kunihiko Hayashi
There is no clock-names and reset-names for Pro5 SoC, that should have two
properties, "gio" and "link" like usb3-ssphy.
And according to the existing PXs2 devicetree, the clock-names for PXs2 SoC
should have "link" and "phy", and minItems of clocks should be 2.
Fixes: 134ab2845acb ("dt-bindings: phy: Convert UniPhier USB3-PHY conroller to json-schema")
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
.../phy/socionext,uniphier-usb3hs-phy.yaml | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
index 33946efcac5e..1bbd164f2527 100644
--- a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
@@ -31,12 +31,14 @@ properties:
const: 0
clocks:
- minItems: 1
+ minItems: 2
maxItems: 3
clock-names:
oneOf:
- - const: link # for PXs2
+ - items: # for Pro5
+ - const: gio
+ - const: link
- items: # for PXs3 with phy-ext
- const: link
- const: phy
@@ -49,9 +51,13 @@ properties:
maxItems: 2
reset-names:
- items:
- - const: link
- - const: phy
+ oneOf:
+ - items: # for Pro5
+ - const: gio
+ - const: link
+ - items: # for others
+ - const: link
+ - const: phy
vbus-supply:
description: A phandle to the regulator for USB VBUS
--
2.25.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH v2 4/5] dt-bindings: phy: uniphier-usb3hs: Fix incorrect clock-names and reset-names
@ 2022-03-30 5:20 ` Kunihiko Hayashi
0 siblings, 0 replies; 36+ messages in thread
From: Kunihiko Hayashi @ 2022-03-30 5:20 UTC (permalink / raw)
To: Vinod Koul, Kishon Vijay Abraham I, Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel,
linux-kernel, Kunihiko Hayashi
There is no clock-names and reset-names for Pro5 SoC, that should have two
properties, "gio" and "link" like usb3-ssphy.
And according to the existing PXs2 devicetree, the clock-names for PXs2 SoC
should have "link" and "phy", and minItems of clocks should be 2.
Fixes: 134ab2845acb ("dt-bindings: phy: Convert UniPhier USB3-PHY conroller to json-schema")
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
.../phy/socionext,uniphier-usb3hs-phy.yaml | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
index 33946efcac5e..1bbd164f2527 100644
--- a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
@@ -31,12 +31,14 @@ properties:
const: 0
clocks:
- minItems: 1
+ minItems: 2
maxItems: 3
clock-names:
oneOf:
- - const: link # for PXs2
+ - items: # for Pro5
+ - const: gio
+ - const: link
- items: # for PXs3 with phy-ext
- const: link
- const: phy
@@ -49,9 +51,13 @@ properties:
maxItems: 2
reset-names:
- items:
- - const: link
- - const: phy
+ oneOf:
+ - items: # for Pro5
+ - const: gio
+ - const: link
+ - items: # for others
+ - const: link
+ - const: phy
vbus-supply:
description: A phandle to the regulator for USB VBUS
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH v2 4/5] dt-bindings: phy: uniphier-usb3hs: Fix incorrect clock-names and reset-names
@ 2022-03-30 5:20 ` Kunihiko Hayashi
0 siblings, 0 replies; 36+ messages in thread
From: Kunihiko Hayashi @ 2022-03-30 5:20 UTC (permalink / raw)
To: Vinod Koul, Kishon Vijay Abraham I, Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel,
linux-kernel, Kunihiko Hayashi
There is no clock-names and reset-names for Pro5 SoC, that should have two
properties, "gio" and "link" like usb3-ssphy.
And according to the existing PXs2 devicetree, the clock-names for PXs2 SoC
should have "link" and "phy", and minItems of clocks should be 2.
Fixes: 134ab2845acb ("dt-bindings: phy: Convert UniPhier USB3-PHY conroller to json-schema")
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
.../phy/socionext,uniphier-usb3hs-phy.yaml | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
index 33946efcac5e..1bbd164f2527 100644
--- a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
@@ -31,12 +31,14 @@ properties:
const: 0
clocks:
- minItems: 1
+ minItems: 2
maxItems: 3
clock-names:
oneOf:
- - const: link # for PXs2
+ - items: # for Pro5
+ - const: gio
+ - const: link
- items: # for PXs3 with phy-ext
- const: link
- const: phy
@@ -49,9 +51,13 @@ properties:
maxItems: 2
reset-names:
- items:
- - const: link
- - const: phy
+ oneOf:
+ - items: # for Pro5
+ - const: gio
+ - const: link
+ - items: # for others
+ - const: link
+ - const: phy
vbus-supply:
description: A phandle to the regulator for USB VBUS
--
2.25.1
--
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy
^ permalink raw reply related [flat|nested] 36+ messages in thread* Re: [PATCH v2 4/5] dt-bindings: phy: uniphier-usb3hs: Fix incorrect clock-names and reset-names
2022-03-30 5:20 ` Kunihiko Hayashi
(?)
@ 2022-03-30 8:10 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 36+ messages in thread
From: Krzysztof Kozlowski @ 2022-03-30 8:10 UTC (permalink / raw)
To: Kunihiko Hayashi, Vinod Koul, Kishon Vijay Abraham I,
Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel, linux-kernel
On 30/03/2022 07:20, Kunihiko Hayashi wrote:
> There is no clock-names and reset-names for Pro5 SoC, that should have two
> properties, "gio" and "link" like usb3-ssphy.
>
> And according to the existing PXs2 devicetree, the clock-names for PXs2 SoC
> should have "link" and "phy", and minItems of clocks should be 2.
>
> Fixes: 134ab2845acb ("dt-bindings: phy: Convert UniPhier USB3-PHY conroller to json-schema")
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
> .../phy/socionext,uniphier-usb3hs-phy.yaml | 16 +++++++++++-----
> 1 file changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
> index 33946efcac5e..1bbd164f2527 100644
> --- a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
> +++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
> @@ -31,12 +31,14 @@ properties:
> const: 0
>
> clocks:
> - minItems: 1
> + minItems: 2
> maxItems: 3
>
> clock-names:
> oneOf:
> - - const: link # for PXs2
> + - items: # for Pro5
> + - const: gio
> + - const: link
> - items: # for PXs3 with phy-ext
Similarly to our other discussion, it would be good to convert it to
allOf:if:then: constraining it per compatible. The change itself is ok:
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PATCH v2 4/5] dt-bindings: phy: uniphier-usb3hs: Fix incorrect clock-names and reset-names
@ 2022-03-30 8:10 ` Krzysztof Kozlowski
0 siblings, 0 replies; 36+ messages in thread
From: Krzysztof Kozlowski @ 2022-03-30 8:10 UTC (permalink / raw)
To: Kunihiko Hayashi, Vinod Koul, Kishon Vijay Abraham I,
Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel, linux-kernel
On 30/03/2022 07:20, Kunihiko Hayashi wrote:
> There is no clock-names and reset-names for Pro5 SoC, that should have two
> properties, "gio" and "link" like usb3-ssphy.
>
> And according to the existing PXs2 devicetree, the clock-names for PXs2 SoC
> should have "link" and "phy", and minItems of clocks should be 2.
>
> Fixes: 134ab2845acb ("dt-bindings: phy: Convert UniPhier USB3-PHY conroller to json-schema")
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
> .../phy/socionext,uniphier-usb3hs-phy.yaml | 16 +++++++++++-----
> 1 file changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
> index 33946efcac5e..1bbd164f2527 100644
> --- a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
> +++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
> @@ -31,12 +31,14 @@ properties:
> const: 0
>
> clocks:
> - minItems: 1
> + minItems: 2
> maxItems: 3
>
> clock-names:
> oneOf:
> - - const: link # for PXs2
> + - items: # for Pro5
> + - const: gio
> + - const: link
> - items: # for PXs3 with phy-ext
Similarly to our other discussion, it would be good to convert it to
allOf:if:then: constraining it per compatible. The change itself is ok:
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Best regards,
Krzysztof
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PATCH v2 4/5] dt-bindings: phy: uniphier-usb3hs: Fix incorrect clock-names and reset-names
@ 2022-03-30 8:10 ` Krzysztof Kozlowski
0 siblings, 0 replies; 36+ messages in thread
From: Krzysztof Kozlowski @ 2022-03-30 8:10 UTC (permalink / raw)
To: Kunihiko Hayashi, Vinod Koul, Kishon Vijay Abraham I,
Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel, linux-kernel
On 30/03/2022 07:20, Kunihiko Hayashi wrote:
> There is no clock-names and reset-names for Pro5 SoC, that should have two
> properties, "gio" and "link" like usb3-ssphy.
>
> And according to the existing PXs2 devicetree, the clock-names for PXs2 SoC
> should have "link" and "phy", and minItems of clocks should be 2.
>
> Fixes: 134ab2845acb ("dt-bindings: phy: Convert UniPhier USB3-PHY conroller to json-schema")
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
> .../phy/socionext,uniphier-usb3hs-phy.yaml | 16 +++++++++++-----
> 1 file changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
> index 33946efcac5e..1bbd164f2527 100644
> --- a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
> +++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
> @@ -31,12 +31,14 @@ properties:
> const: 0
>
> clocks:
> - minItems: 1
> + minItems: 2
> maxItems: 3
>
> clock-names:
> oneOf:
> - - const: link # for PXs2
> + - items: # for Pro5
> + - const: gio
> + - const: link
> - items: # for PXs3 with phy-ext
Similarly to our other discussion, it would be good to convert it to
allOf:if:then: constraining it per compatible. The change itself is ok:
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Best regards,
Krzysztof
--
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v2 5/5] dt-bindings: phy: uniphier: Clean up clock-names and reset-names using compatible string
2022-03-30 5:20 ` Kunihiko Hayashi
(?)
@ 2022-03-30 5:20 ` Kunihiko Hayashi
-1 siblings, 0 replies; 36+ messages in thread
From: Kunihiko Hayashi @ 2022-03-30 5:20 UTC (permalink / raw)
To: Vinod Koul, Kishon Vijay Abraham I, Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel,
linux-kernel, Kunihiko Hayashi
Instead of "oneOf:" choices, use "allOf:" and "if:" to define clock-names
and reset-names that can be taken by the compatible string.
The order of clock-names and reset-names doesn't change here.
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
.../phy/socionext,uniphier-ahci-phy.yaml | 73 ++++++++++++------
.../phy/socionext,uniphier-pcie-phy.yaml | 37 ++++++---
.../phy/socionext,uniphier-usb3hs-phy.yaml | 75 +++++++++++++-----
.../phy/socionext,uniphier-usb3ss-phy.yaml | 77 ++++++++++++++-----
4 files changed, 188 insertions(+), 74 deletions(-)
diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
index 14f7579e7daa..61d9306e1852 100644
--- a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
@@ -30,33 +30,62 @@ properties:
minItems: 1
maxItems: 2
- clock-names:
- oneOf:
- - items: # for PXs2
- - const: link
- - items: # for Pro4
- - const: link
- - const: gio
- - items: # for others
- - const: link
- - const: phy
+ clock-names: true
resets:
minItems: 2
maxItems: 6
- reset-names:
- oneOf:
- - items: # for Pro4
- - const: link
- - const: gio
- - const: phy
- - const: pm
- - const: tx
- - const: rx
- - items: # for others
- - const: link
- - const: phy
+ reset-names: true
+
+allOf:
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: socionext,uniphier-pro4-ahci-phy
+ then:
+ properties:
+ clock-names:
+ items:
+ - const: link
+ - const: gio
+ reset-names:
+ items:
+ - const: link
+ - const: gio
+ - const: phy
+ - const: pm
+ - const: tx
+ - const: rx
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: socionext,uniphier-pxs2-ahci-phy
+ then:
+ properties:
+ clock-names:
+ const: link
+ reset-names:
+ items:
+ - const: link
+ - const: phy
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: socionext,uniphier-pxs3-ahci-phy
+ then:
+ properties:
+ clock-names:
+ items:
+ - const: link
+ - const: phy
+ reset-names:
+ items:
+ - const: link
+ - const: phy
required:
- compatible
diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-pcie-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-pcie-phy.yaml
index fbb71d6dd531..e45489a9bf1a 100644
--- a/Documentation/devicetree/bindings/phy/socionext,uniphier-pcie-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-pcie-phy.yaml
@@ -31,28 +31,41 @@ properties:
minItems: 1
maxItems: 2
- clock-names:
- oneOf:
- - items: # for Pro5
- - const: gio
- - const: link
- - const: link # for others
+ clock-names: true
resets:
minItems: 1
maxItems: 2
- reset-names:
- oneOf:
- - items: # for Pro5
- - const: gio
- - const: link
- - const: link # for others
+ reset-names: true
socionext,syscon:
$ref: /schemas/types.yaml#/definitions/phandle
description: A phandle to system control to set configurations for phy
+allOf:
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: socionext,uniphier-pro5-pcie-phy
+ then:
+ properties:
+ clock-names:
+ items:
+ - const: gio
+ - const: link
+ reset-names:
+ items:
+ - const: gio
+ - const: link
+ else:
+ properties:
+ clock-names:
+ const: link
+ reset-names:
+ const: link
+
required:
- compatible
- reg
diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
index 1bbd164f2527..a37205242dc1 100644
--- a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
@@ -34,30 +34,12 @@ properties:
minItems: 2
maxItems: 3
- clock-names:
- oneOf:
- - items: # for Pro5
- - const: gio
- - const: link
- - items: # for PXs3 with phy-ext
- - const: link
- - const: phy
- - const: phy-ext
- - items: # for others
- - const: link
- - const: phy
+ clock-names: true
resets:
maxItems: 2
- reset-names:
- oneOf:
- - items: # for Pro5
- - const: gio
- - const: link
- - items: # for others
- - const: link
- - const: phy
+ reset-names: true
vbus-supply:
description: A phandle to the regulator for USB VBUS
@@ -80,6 +62,59 @@ properties:
required for each port, if any one is omitted, the trimming data
of the port will not be set at all.
+allOf:
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: socionext,uniphier-pro5-usb3-hsphy
+ then:
+ properties:
+ clock-names:
+ items:
+ - const: gio
+ - const: link
+ reset-names:
+ items:
+ - const: gio
+ - const: link
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - socionext,uniphier-pxs2-usb3-hsphy
+ - socionext,uniphier-ld20-usb3-hsphy
+ then:
+ properties:
+ clock-names:
+ items:
+ - const: link
+ - const: phy
+ reset-names:
+ items:
+ - const: link
+ - const: phy
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - socionext,uniphier-pxs3-usb3-hsphy
+ - socionext,uniphier-nx1-usb3-hsphy
+ then:
+ properties:
+ clock-names:
+ minItems: 2
+ items:
+ - const: link
+ - const: phy
+ - const: phy-ext
+ reset-names:
+ items:
+ - const: link
+ - const: phy
+
required:
- compatible
- reg
diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml
index 06c957d52d23..dd6ebee6377f 100644
--- a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml
@@ -35,34 +35,71 @@ properties:
minItems: 2
maxItems: 3
- clock-names:
- oneOf:
- - items: # for Pro4, Pro5
- - const: gio
- - const: link
- - items: # for PXs3 with phy-ext
- - const: link
- - const: phy
- - const: phy-ext
- - items: # for others
- - const: link
- - const: phy
+ clock-names: true
resets:
maxItems: 2
- reset-names:
- oneOf:
- - items: # for Pro4,Pro5
- - const: gio
- - const: link
- - items: # for others
- - const: link
- - const: phy
+ reset-names: true
vbus-supply:
description: A phandle to the regulator for USB VBUS, only for USB host
+allOf:
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - socionext,uniphier-pro4-usb3-ssphy
+ - socionext,uniphier-pro5-usb3-ssphy
+ then:
+ properties:
+ clock-names:
+ items:
+ - const: gio
+ - const: link
+ reset-names:
+ items:
+ - const: gio
+ - const: link
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - socionext,uniphier-pxs2-usb3-ssphy
+ - socionext,uniphier-ld20-usb3-ssphy
+ then:
+ properties:
+ clock-names:
+ items:
+ - const: link
+ - const: phy
+ reset-names:
+ items:
+ - const: link
+ - const: phy
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - socionext,uniphier-pxs3-usb3-ssphy
+ - socionext,uniphier-nx1-usb3-ssphy
+ then:
+ properties:
+ clock-names:
+ minItems: 2
+ items:
+ - const: link
+ - const: phy
+ - const: phy-ext
+ reset-names:
+ items:
+ - const: link
+ - const: phy
+
required:
- compatible
- reg
--
2.25.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH v2 5/5] dt-bindings: phy: uniphier: Clean up clock-names and reset-names using compatible string
@ 2022-03-30 5:20 ` Kunihiko Hayashi
0 siblings, 0 replies; 36+ messages in thread
From: Kunihiko Hayashi @ 2022-03-30 5:20 UTC (permalink / raw)
To: Vinod Koul, Kishon Vijay Abraham I, Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel,
linux-kernel, Kunihiko Hayashi
Instead of "oneOf:" choices, use "allOf:" and "if:" to define clock-names
and reset-names that can be taken by the compatible string.
The order of clock-names and reset-names doesn't change here.
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
.../phy/socionext,uniphier-ahci-phy.yaml | 73 ++++++++++++------
.../phy/socionext,uniphier-pcie-phy.yaml | 37 ++++++---
.../phy/socionext,uniphier-usb3hs-phy.yaml | 75 +++++++++++++-----
.../phy/socionext,uniphier-usb3ss-phy.yaml | 77 ++++++++++++++-----
4 files changed, 188 insertions(+), 74 deletions(-)
diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
index 14f7579e7daa..61d9306e1852 100644
--- a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
@@ -30,33 +30,62 @@ properties:
minItems: 1
maxItems: 2
- clock-names:
- oneOf:
- - items: # for PXs2
- - const: link
- - items: # for Pro4
- - const: link
- - const: gio
- - items: # for others
- - const: link
- - const: phy
+ clock-names: true
resets:
minItems: 2
maxItems: 6
- reset-names:
- oneOf:
- - items: # for Pro4
- - const: link
- - const: gio
- - const: phy
- - const: pm
- - const: tx
- - const: rx
- - items: # for others
- - const: link
- - const: phy
+ reset-names: true
+
+allOf:
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: socionext,uniphier-pro4-ahci-phy
+ then:
+ properties:
+ clock-names:
+ items:
+ - const: link
+ - const: gio
+ reset-names:
+ items:
+ - const: link
+ - const: gio
+ - const: phy
+ - const: pm
+ - const: tx
+ - const: rx
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: socionext,uniphier-pxs2-ahci-phy
+ then:
+ properties:
+ clock-names:
+ const: link
+ reset-names:
+ items:
+ - const: link
+ - const: phy
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: socionext,uniphier-pxs3-ahci-phy
+ then:
+ properties:
+ clock-names:
+ items:
+ - const: link
+ - const: phy
+ reset-names:
+ items:
+ - const: link
+ - const: phy
required:
- compatible
diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-pcie-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-pcie-phy.yaml
index fbb71d6dd531..e45489a9bf1a 100644
--- a/Documentation/devicetree/bindings/phy/socionext,uniphier-pcie-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-pcie-phy.yaml
@@ -31,28 +31,41 @@ properties:
minItems: 1
maxItems: 2
- clock-names:
- oneOf:
- - items: # for Pro5
- - const: gio
- - const: link
- - const: link # for others
+ clock-names: true
resets:
minItems: 1
maxItems: 2
- reset-names:
- oneOf:
- - items: # for Pro5
- - const: gio
- - const: link
- - const: link # for others
+ reset-names: true
socionext,syscon:
$ref: /schemas/types.yaml#/definitions/phandle
description: A phandle to system control to set configurations for phy
+allOf:
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: socionext,uniphier-pro5-pcie-phy
+ then:
+ properties:
+ clock-names:
+ items:
+ - const: gio
+ - const: link
+ reset-names:
+ items:
+ - const: gio
+ - const: link
+ else:
+ properties:
+ clock-names:
+ const: link
+ reset-names:
+ const: link
+
required:
- compatible
- reg
diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
index 1bbd164f2527..a37205242dc1 100644
--- a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
@@ -34,30 +34,12 @@ properties:
minItems: 2
maxItems: 3
- clock-names:
- oneOf:
- - items: # for Pro5
- - const: gio
- - const: link
- - items: # for PXs3 with phy-ext
- - const: link
- - const: phy
- - const: phy-ext
- - items: # for others
- - const: link
- - const: phy
+ clock-names: true
resets:
maxItems: 2
- reset-names:
- oneOf:
- - items: # for Pro5
- - const: gio
- - const: link
- - items: # for others
- - const: link
- - const: phy
+ reset-names: true
vbus-supply:
description: A phandle to the regulator for USB VBUS
@@ -80,6 +62,59 @@ properties:
required for each port, if any one is omitted, the trimming data
of the port will not be set at all.
+allOf:
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: socionext,uniphier-pro5-usb3-hsphy
+ then:
+ properties:
+ clock-names:
+ items:
+ - const: gio
+ - const: link
+ reset-names:
+ items:
+ - const: gio
+ - const: link
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - socionext,uniphier-pxs2-usb3-hsphy
+ - socionext,uniphier-ld20-usb3-hsphy
+ then:
+ properties:
+ clock-names:
+ items:
+ - const: link
+ - const: phy
+ reset-names:
+ items:
+ - const: link
+ - const: phy
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - socionext,uniphier-pxs3-usb3-hsphy
+ - socionext,uniphier-nx1-usb3-hsphy
+ then:
+ properties:
+ clock-names:
+ minItems: 2
+ items:
+ - const: link
+ - const: phy
+ - const: phy-ext
+ reset-names:
+ items:
+ - const: link
+ - const: phy
+
required:
- compatible
- reg
diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml
index 06c957d52d23..dd6ebee6377f 100644
--- a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml
@@ -35,34 +35,71 @@ properties:
minItems: 2
maxItems: 3
- clock-names:
- oneOf:
- - items: # for Pro4, Pro5
- - const: gio
- - const: link
- - items: # for PXs3 with phy-ext
- - const: link
- - const: phy
- - const: phy-ext
- - items: # for others
- - const: link
- - const: phy
+ clock-names: true
resets:
maxItems: 2
- reset-names:
- oneOf:
- - items: # for Pro4,Pro5
- - const: gio
- - const: link
- - items: # for others
- - const: link
- - const: phy
+ reset-names: true
vbus-supply:
description: A phandle to the regulator for USB VBUS, only for USB host
+allOf:
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - socionext,uniphier-pro4-usb3-ssphy
+ - socionext,uniphier-pro5-usb3-ssphy
+ then:
+ properties:
+ clock-names:
+ items:
+ - const: gio
+ - const: link
+ reset-names:
+ items:
+ - const: gio
+ - const: link
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - socionext,uniphier-pxs2-usb3-ssphy
+ - socionext,uniphier-ld20-usb3-ssphy
+ then:
+ properties:
+ clock-names:
+ items:
+ - const: link
+ - const: phy
+ reset-names:
+ items:
+ - const: link
+ - const: phy
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - socionext,uniphier-pxs3-usb3-ssphy
+ - socionext,uniphier-nx1-usb3-ssphy
+ then:
+ properties:
+ clock-names:
+ minItems: 2
+ items:
+ - const: link
+ - const: phy
+ - const: phy-ext
+ reset-names:
+ items:
+ - const: link
+ - const: phy
+
required:
- compatible
- reg
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH v2 5/5] dt-bindings: phy: uniphier: Clean up clock-names and reset-names using compatible string
@ 2022-03-30 5:20 ` Kunihiko Hayashi
0 siblings, 0 replies; 36+ messages in thread
From: Kunihiko Hayashi @ 2022-03-30 5:20 UTC (permalink / raw)
To: Vinod Koul, Kishon Vijay Abraham I, Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel,
linux-kernel, Kunihiko Hayashi
Instead of "oneOf:" choices, use "allOf:" and "if:" to define clock-names
and reset-names that can be taken by the compatible string.
The order of clock-names and reset-names doesn't change here.
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
.../phy/socionext,uniphier-ahci-phy.yaml | 73 ++++++++++++------
.../phy/socionext,uniphier-pcie-phy.yaml | 37 ++++++---
.../phy/socionext,uniphier-usb3hs-phy.yaml | 75 +++++++++++++-----
.../phy/socionext,uniphier-usb3ss-phy.yaml | 77 ++++++++++++++-----
4 files changed, 188 insertions(+), 74 deletions(-)
diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
index 14f7579e7daa..61d9306e1852 100644
--- a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
@@ -30,33 +30,62 @@ properties:
minItems: 1
maxItems: 2
- clock-names:
- oneOf:
- - items: # for PXs2
- - const: link
- - items: # for Pro4
- - const: link
- - const: gio
- - items: # for others
- - const: link
- - const: phy
+ clock-names: true
resets:
minItems: 2
maxItems: 6
- reset-names:
- oneOf:
- - items: # for Pro4
- - const: link
- - const: gio
- - const: phy
- - const: pm
- - const: tx
- - const: rx
- - items: # for others
- - const: link
- - const: phy
+ reset-names: true
+
+allOf:
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: socionext,uniphier-pro4-ahci-phy
+ then:
+ properties:
+ clock-names:
+ items:
+ - const: link
+ - const: gio
+ reset-names:
+ items:
+ - const: link
+ - const: gio
+ - const: phy
+ - const: pm
+ - const: tx
+ - const: rx
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: socionext,uniphier-pxs2-ahci-phy
+ then:
+ properties:
+ clock-names:
+ const: link
+ reset-names:
+ items:
+ - const: link
+ - const: phy
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: socionext,uniphier-pxs3-ahci-phy
+ then:
+ properties:
+ clock-names:
+ items:
+ - const: link
+ - const: phy
+ reset-names:
+ items:
+ - const: link
+ - const: phy
required:
- compatible
diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-pcie-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-pcie-phy.yaml
index fbb71d6dd531..e45489a9bf1a 100644
--- a/Documentation/devicetree/bindings/phy/socionext,uniphier-pcie-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-pcie-phy.yaml
@@ -31,28 +31,41 @@ properties:
minItems: 1
maxItems: 2
- clock-names:
- oneOf:
- - items: # for Pro5
- - const: gio
- - const: link
- - const: link # for others
+ clock-names: true
resets:
minItems: 1
maxItems: 2
- reset-names:
- oneOf:
- - items: # for Pro5
- - const: gio
- - const: link
- - const: link # for others
+ reset-names: true
socionext,syscon:
$ref: /schemas/types.yaml#/definitions/phandle
description: A phandle to system control to set configurations for phy
+allOf:
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: socionext,uniphier-pro5-pcie-phy
+ then:
+ properties:
+ clock-names:
+ items:
+ - const: gio
+ - const: link
+ reset-names:
+ items:
+ - const: gio
+ - const: link
+ else:
+ properties:
+ clock-names:
+ const: link
+ reset-names:
+ const: link
+
required:
- compatible
- reg
diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
index 1bbd164f2527..a37205242dc1 100644
--- a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
@@ -34,30 +34,12 @@ properties:
minItems: 2
maxItems: 3
- clock-names:
- oneOf:
- - items: # for Pro5
- - const: gio
- - const: link
- - items: # for PXs3 with phy-ext
- - const: link
- - const: phy
- - const: phy-ext
- - items: # for others
- - const: link
- - const: phy
+ clock-names: true
resets:
maxItems: 2
- reset-names:
- oneOf:
- - items: # for Pro5
- - const: gio
- - const: link
- - items: # for others
- - const: link
- - const: phy
+ reset-names: true
vbus-supply:
description: A phandle to the regulator for USB VBUS
@@ -80,6 +62,59 @@ properties:
required for each port, if any one is omitted, the trimming data
of the port will not be set at all.
+allOf:
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: socionext,uniphier-pro5-usb3-hsphy
+ then:
+ properties:
+ clock-names:
+ items:
+ - const: gio
+ - const: link
+ reset-names:
+ items:
+ - const: gio
+ - const: link
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - socionext,uniphier-pxs2-usb3-hsphy
+ - socionext,uniphier-ld20-usb3-hsphy
+ then:
+ properties:
+ clock-names:
+ items:
+ - const: link
+ - const: phy
+ reset-names:
+ items:
+ - const: link
+ - const: phy
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - socionext,uniphier-pxs3-usb3-hsphy
+ - socionext,uniphier-nx1-usb3-hsphy
+ then:
+ properties:
+ clock-names:
+ minItems: 2
+ items:
+ - const: link
+ - const: phy
+ - const: phy-ext
+ reset-names:
+ items:
+ - const: link
+ - const: phy
+
required:
- compatible
- reg
diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml
index 06c957d52d23..dd6ebee6377f 100644
--- a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml
@@ -35,34 +35,71 @@ properties:
minItems: 2
maxItems: 3
- clock-names:
- oneOf:
- - items: # for Pro4, Pro5
- - const: gio
- - const: link
- - items: # for PXs3 with phy-ext
- - const: link
- - const: phy
- - const: phy-ext
- - items: # for others
- - const: link
- - const: phy
+ clock-names: true
resets:
maxItems: 2
- reset-names:
- oneOf:
- - items: # for Pro4,Pro5
- - const: gio
- - const: link
- - items: # for others
- - const: link
- - const: phy
+ reset-names: true
vbus-supply:
description: A phandle to the regulator for USB VBUS, only for USB host
+allOf:
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - socionext,uniphier-pro4-usb3-ssphy
+ - socionext,uniphier-pro5-usb3-ssphy
+ then:
+ properties:
+ clock-names:
+ items:
+ - const: gio
+ - const: link
+ reset-names:
+ items:
+ - const: gio
+ - const: link
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - socionext,uniphier-pxs2-usb3-ssphy
+ - socionext,uniphier-ld20-usb3-ssphy
+ then:
+ properties:
+ clock-names:
+ items:
+ - const: link
+ - const: phy
+ reset-names:
+ items:
+ - const: link
+ - const: phy
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - socionext,uniphier-pxs3-usb3-ssphy
+ - socionext,uniphier-nx1-usb3-ssphy
+ then:
+ properties:
+ clock-names:
+ minItems: 2
+ items:
+ - const: link
+ - const: phy
+ - const: phy-ext
+ reset-names:
+ items:
+ - const: link
+ - const: phy
+
required:
- compatible
- reg
--
2.25.1
--
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy
^ permalink raw reply related [flat|nested] 36+ messages in thread* Re: [PATCH v2 5/5] dt-bindings: phy: uniphier: Clean up clock-names and reset-names using compatible string
2022-03-30 5:20 ` Kunihiko Hayashi
(?)
@ 2022-03-30 8:13 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 36+ messages in thread
From: Krzysztof Kozlowski @ 2022-03-30 8:13 UTC (permalink / raw)
To: Kunihiko Hayashi, Vinod Koul, Kishon Vijay Abraham I,
Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel, linux-kernel
On 30/03/2022 07:20, Kunihiko Hayashi wrote:
> Instead of "oneOf:" choices, use "allOf:" and "if:" to define clock-names
> and reset-names that can be taken by the compatible string.
>
> The order of clock-names and reset-names doesn't change here.
>
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
> .../phy/socionext,uniphier-ahci-phy.yaml | 73 ++++++++++++------
> .../phy/socionext,uniphier-pcie-phy.yaml | 37 ++++++---
> .../phy/socionext,uniphier-usb3hs-phy.yaml | 75 +++++++++++++-----
> .../phy/socionext,uniphier-usb3ss-phy.yaml | 77 ++++++++++++++-----
> 4 files changed, 188 insertions(+), 74 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
> index 14f7579e7daa..61d9306e1852 100644
> --- a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
> +++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
> @@ -30,33 +30,62 @@ properties:
> minItems: 1
> maxItems: 2
>
> - clock-names:
> - oneOf:
> - - items: # for PXs2
> - - const: link
> - - items: # for Pro4
> - - const: link
> - - const: gio
> - - items: # for others
> - - const: link
> - - const: phy
> + clock-names: true
>
> resets:
> minItems: 2
> maxItems: 6
>
> - reset-names:
> - oneOf:
> - - items: # for Pro4
> - - const: link
> - - const: gio
> - - const: phy
> - - const: pm
> - - const: tx
> - - const: rx
> - - items: # for others
> - - const: link
> - - const: phy
> + reset-names: true
> +
> +allOf:
> + - if:
> + properties:
> + compatible:
> + contains:
> + const: socionext,uniphier-pro4-ahci-phy
> + then:
> + properties:
> + clock-names:
> + items:
> + - const: link
> + - const: gio
> + reset-names:
> + items:
> + - const: link
> + - const: gio
> + - const: phy
> + - const: pm
> + - const: tx
> + - const: rx
Constrain also everywhere clocks and resets, so here should be:
resets:
minItems: 6
maxItems: 6
etc.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PATCH v2 5/5] dt-bindings: phy: uniphier: Clean up clock-names and reset-names using compatible string
@ 2022-03-30 8:13 ` Krzysztof Kozlowski
0 siblings, 0 replies; 36+ messages in thread
From: Krzysztof Kozlowski @ 2022-03-30 8:13 UTC (permalink / raw)
To: Kunihiko Hayashi, Vinod Koul, Kishon Vijay Abraham I,
Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel, linux-kernel
On 30/03/2022 07:20, Kunihiko Hayashi wrote:
> Instead of "oneOf:" choices, use "allOf:" and "if:" to define clock-names
> and reset-names that can be taken by the compatible string.
>
> The order of clock-names and reset-names doesn't change here.
>
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
> .../phy/socionext,uniphier-ahci-phy.yaml | 73 ++++++++++++------
> .../phy/socionext,uniphier-pcie-phy.yaml | 37 ++++++---
> .../phy/socionext,uniphier-usb3hs-phy.yaml | 75 +++++++++++++-----
> .../phy/socionext,uniphier-usb3ss-phy.yaml | 77 ++++++++++++++-----
> 4 files changed, 188 insertions(+), 74 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
> index 14f7579e7daa..61d9306e1852 100644
> --- a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
> +++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
> @@ -30,33 +30,62 @@ properties:
> minItems: 1
> maxItems: 2
>
> - clock-names:
> - oneOf:
> - - items: # for PXs2
> - - const: link
> - - items: # for Pro4
> - - const: link
> - - const: gio
> - - items: # for others
> - - const: link
> - - const: phy
> + clock-names: true
>
> resets:
> minItems: 2
> maxItems: 6
>
> - reset-names:
> - oneOf:
> - - items: # for Pro4
> - - const: link
> - - const: gio
> - - const: phy
> - - const: pm
> - - const: tx
> - - const: rx
> - - items: # for others
> - - const: link
> - - const: phy
> + reset-names: true
> +
> +allOf:
> + - if:
> + properties:
> + compatible:
> + contains:
> + const: socionext,uniphier-pro4-ahci-phy
> + then:
> + properties:
> + clock-names:
> + items:
> + - const: link
> + - const: gio
> + reset-names:
> + items:
> + - const: link
> + - const: gio
> + - const: phy
> + - const: pm
> + - const: tx
> + - const: rx
Constrain also everywhere clocks and resets, so here should be:
resets:
minItems: 6
maxItems: 6
etc.
Best regards,
Krzysztof
--
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PATCH v2 5/5] dt-bindings: phy: uniphier: Clean up clock-names and reset-names using compatible string
@ 2022-03-30 8:13 ` Krzysztof Kozlowski
0 siblings, 0 replies; 36+ messages in thread
From: Krzysztof Kozlowski @ 2022-03-30 8:13 UTC (permalink / raw)
To: Kunihiko Hayashi, Vinod Koul, Kishon Vijay Abraham I,
Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel, linux-kernel
On 30/03/2022 07:20, Kunihiko Hayashi wrote:
> Instead of "oneOf:" choices, use "allOf:" and "if:" to define clock-names
> and reset-names that can be taken by the compatible string.
>
> The order of clock-names and reset-names doesn't change here.
>
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
> .../phy/socionext,uniphier-ahci-phy.yaml | 73 ++++++++++++------
> .../phy/socionext,uniphier-pcie-phy.yaml | 37 ++++++---
> .../phy/socionext,uniphier-usb3hs-phy.yaml | 75 +++++++++++++-----
> .../phy/socionext,uniphier-usb3ss-phy.yaml | 77 ++++++++++++++-----
> 4 files changed, 188 insertions(+), 74 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
> index 14f7579e7daa..61d9306e1852 100644
> --- a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
> +++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
> @@ -30,33 +30,62 @@ properties:
> minItems: 1
> maxItems: 2
>
> - clock-names:
> - oneOf:
> - - items: # for PXs2
> - - const: link
> - - items: # for Pro4
> - - const: link
> - - const: gio
> - - items: # for others
> - - const: link
> - - const: phy
> + clock-names: true
>
> resets:
> minItems: 2
> maxItems: 6
>
> - reset-names:
> - oneOf:
> - - items: # for Pro4
> - - const: link
> - - const: gio
> - - const: phy
> - - const: pm
> - - const: tx
> - - const: rx
> - - items: # for others
> - - const: link
> - - const: phy
> + reset-names: true
> +
> +allOf:
> + - if:
> + properties:
> + compatible:
> + contains:
> + const: socionext,uniphier-pro4-ahci-phy
> + then:
> + properties:
> + clock-names:
> + items:
> + - const: link
> + - const: gio
> + reset-names:
> + items:
> + - const: link
> + - const: gio
> + - const: phy
> + - const: pm
> + - const: tx
> + - const: rx
Constrain also everywhere clocks and resets, so here should be:
resets:
minItems: 6
maxItems: 6
etc.
Best regards,
Krzysztof
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PATCH v2 5/5] dt-bindings: phy: uniphier: Clean up clock-names and reset-names using compatible string
2022-03-30 8:13 ` Krzysztof Kozlowski
(?)
@ 2022-03-30 9:16 ` Kunihiko Hayashi
-1 siblings, 0 replies; 36+ messages in thread
From: Kunihiko Hayashi @ 2022-03-30 9:16 UTC (permalink / raw)
To: Krzysztof Kozlowski, Vinod Koul, Kishon Vijay Abraham I,
Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel, linux-kernel
Hi Krzysztof,
On 2022/03/30 17:13, Krzysztof Kozlowski wrote:
> On 30/03/2022 07:20, Kunihiko Hayashi wrote:
>> Instead of "oneOf:" choices, use "allOf:" and "if:" to define clock-names
>> and reset-names that can be taken by the compatible string.
>>
>> The order of clock-names and reset-names doesn't change here.
>>
>> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
>> ---
>> .../phy/socionext,uniphier-ahci-phy.yaml | 73 ++++++++++++------
>> .../phy/socionext,uniphier-pcie-phy.yaml | 37 ++++++---
>> .../phy/socionext,uniphier-usb3hs-phy.yaml | 75 +++++++++++++-----
>> .../phy/socionext,uniphier-usb3ss-phy.yaml | 77 ++++++++++++++-----
>> 4 files changed, 188 insertions(+), 74 deletions(-)
>>
>> diff --git
>> a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>> b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>> index 14f7579e7daa..61d9306e1852 100644
>> ---
>> a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>> +++
>> b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>> @@ -30,33 +30,62 @@ properties:
>> minItems: 1
>> maxItems: 2
>>
>> - clock-names:
>> - oneOf:
>> - - items: # for PXs2
>> - - const: link
>> - - items: # for Pro4
>> - - const: link
>> - - const: gio
>> - - items: # for others
>> - - const: link
>> - - const: phy
>> + clock-names: true
>>
>> resets:
>> minItems: 2
>> maxItems: 6
>>
>> - reset-names:
>> - oneOf:
>> - - items: # for Pro4
>> - - const: link
>> - - const: gio
>> - - const: phy
>> - - const: pm
>> - - const: tx
>> - - const: rx
>> - - items: # for others
>> - - const: link
>> - - const: phy
>> + reset-names: true
>> +
>> +allOf:
>> + - if:
>> + properties:
>> + compatible:
>> + contains:
>> + const: socionext,uniphier-pro4-ahci-phy
>> + then:
>> + properties:
>> + clock-names:
>> + items:
>> + - const: link
>> + - const: gio
>> + reset-names:
>> + items:
>> + - const: link
>> + - const: gio
>> + - const: phy
>> + - const: pm
>> + - const: tx
>> + - const: rx
>
> Constrain also everywhere clocks and resets, so here should be:
> resets:
> minItems: 6
> maxItems: 6
If I put the constraint here, it would conflict with the original one.
Should I also replace the original resets
resets:
minItems: 2
maxItems: 6
with "resets: true"?
Thank you,
---
Best Regards
Kunihiko Hayashi
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PATCH v2 5/5] dt-bindings: phy: uniphier: Clean up clock-names and reset-names using compatible string
@ 2022-03-30 9:16 ` Kunihiko Hayashi
0 siblings, 0 replies; 36+ messages in thread
From: Kunihiko Hayashi @ 2022-03-30 9:16 UTC (permalink / raw)
To: Krzysztof Kozlowski, Vinod Koul, Kishon Vijay Abraham I,
Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel, linux-kernel
Hi Krzysztof,
On 2022/03/30 17:13, Krzysztof Kozlowski wrote:
> On 30/03/2022 07:20, Kunihiko Hayashi wrote:
>> Instead of "oneOf:" choices, use "allOf:" and "if:" to define clock-names
>> and reset-names that can be taken by the compatible string.
>>
>> The order of clock-names and reset-names doesn't change here.
>>
>> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
>> ---
>> .../phy/socionext,uniphier-ahci-phy.yaml | 73 ++++++++++++------
>> .../phy/socionext,uniphier-pcie-phy.yaml | 37 ++++++---
>> .../phy/socionext,uniphier-usb3hs-phy.yaml | 75 +++++++++++++-----
>> .../phy/socionext,uniphier-usb3ss-phy.yaml | 77 ++++++++++++++-----
>> 4 files changed, 188 insertions(+), 74 deletions(-)
>>
>> diff --git
>> a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>> b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>> index 14f7579e7daa..61d9306e1852 100644
>> ---
>> a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>> +++
>> b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>> @@ -30,33 +30,62 @@ properties:
>> minItems: 1
>> maxItems: 2
>>
>> - clock-names:
>> - oneOf:
>> - - items: # for PXs2
>> - - const: link
>> - - items: # for Pro4
>> - - const: link
>> - - const: gio
>> - - items: # for others
>> - - const: link
>> - - const: phy
>> + clock-names: true
>>
>> resets:
>> minItems: 2
>> maxItems: 6
>>
>> - reset-names:
>> - oneOf:
>> - - items: # for Pro4
>> - - const: link
>> - - const: gio
>> - - const: phy
>> - - const: pm
>> - - const: tx
>> - - const: rx
>> - - items: # for others
>> - - const: link
>> - - const: phy
>> + reset-names: true
>> +
>> +allOf:
>> + - if:
>> + properties:
>> + compatible:
>> + contains:
>> + const: socionext,uniphier-pro4-ahci-phy
>> + then:
>> + properties:
>> + clock-names:
>> + items:
>> + - const: link
>> + - const: gio
>> + reset-names:
>> + items:
>> + - const: link
>> + - const: gio
>> + - const: phy
>> + - const: pm
>> + - const: tx
>> + - const: rx
>
> Constrain also everywhere clocks and resets, so here should be:
> resets:
> minItems: 6
> maxItems: 6
If I put the constraint here, it would conflict with the original one.
Should I also replace the original resets
resets:
minItems: 2
maxItems: 6
with "resets: true"?
Thank you,
---
Best Regards
Kunihiko Hayashi
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PATCH v2 5/5] dt-bindings: phy: uniphier: Clean up clock-names and reset-names using compatible string
@ 2022-03-30 9:16 ` Kunihiko Hayashi
0 siblings, 0 replies; 36+ messages in thread
From: Kunihiko Hayashi @ 2022-03-30 9:16 UTC (permalink / raw)
To: Krzysztof Kozlowski, Vinod Koul, Kishon Vijay Abraham I,
Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel, linux-kernel
Hi Krzysztof,
On 2022/03/30 17:13, Krzysztof Kozlowski wrote:
> On 30/03/2022 07:20, Kunihiko Hayashi wrote:
>> Instead of "oneOf:" choices, use "allOf:" and "if:" to define clock-names
>> and reset-names that can be taken by the compatible string.
>>
>> The order of clock-names and reset-names doesn't change here.
>>
>> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
>> ---
>> .../phy/socionext,uniphier-ahci-phy.yaml | 73 ++++++++++++------
>> .../phy/socionext,uniphier-pcie-phy.yaml | 37 ++++++---
>> .../phy/socionext,uniphier-usb3hs-phy.yaml | 75 +++++++++++++-----
>> .../phy/socionext,uniphier-usb3ss-phy.yaml | 77 ++++++++++++++-----
>> 4 files changed, 188 insertions(+), 74 deletions(-)
>>
>> diff --git
>> a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>> b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>> index 14f7579e7daa..61d9306e1852 100644
>> ---
>> a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>> +++
>> b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>> @@ -30,33 +30,62 @@ properties:
>> minItems: 1
>> maxItems: 2
>>
>> - clock-names:
>> - oneOf:
>> - - items: # for PXs2
>> - - const: link
>> - - items: # for Pro4
>> - - const: link
>> - - const: gio
>> - - items: # for others
>> - - const: link
>> - - const: phy
>> + clock-names: true
>>
>> resets:
>> minItems: 2
>> maxItems: 6
>>
>> - reset-names:
>> - oneOf:
>> - - items: # for Pro4
>> - - const: link
>> - - const: gio
>> - - const: phy
>> - - const: pm
>> - - const: tx
>> - - const: rx
>> - - items: # for others
>> - - const: link
>> - - const: phy
>> + reset-names: true
>> +
>> +allOf:
>> + - if:
>> + properties:
>> + compatible:
>> + contains:
>> + const: socionext,uniphier-pro4-ahci-phy
>> + then:
>> + properties:
>> + clock-names:
>> + items:
>> + - const: link
>> + - const: gio
>> + reset-names:
>> + items:
>> + - const: link
>> + - const: gio
>> + - const: phy
>> + - const: pm
>> + - const: tx
>> + - const: rx
>
> Constrain also everywhere clocks and resets, so here should be:
> resets:
> minItems: 6
> maxItems: 6
If I put the constraint here, it would conflict with the original one.
Should I also replace the original resets
resets:
minItems: 2
maxItems: 6
with "resets: true"?
Thank you,
---
Best Regards
Kunihiko Hayashi
--
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PATCH v2 5/5] dt-bindings: phy: uniphier: Clean up clock-names and reset-names using compatible string
2022-03-30 9:16 ` Kunihiko Hayashi
(?)
@ 2022-03-30 9:45 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 36+ messages in thread
From: Krzysztof Kozlowski @ 2022-03-30 9:45 UTC (permalink / raw)
To: Kunihiko Hayashi, Vinod Koul, Kishon Vijay Abraham I,
Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel, linux-kernel
On 30/03/2022 11:16, Kunihiko Hayashi wrote:
> Hi Krzysztof,
>
> On 2022/03/30 17:13, Krzysztof Kozlowski wrote:
>> On 30/03/2022 07:20, Kunihiko Hayashi wrote:
>>> Instead of "oneOf:" choices, use "allOf:" and "if:" to define clock-names
>>> and reset-names that can be taken by the compatible string.
>>>
>>> The order of clock-names and reset-names doesn't change here.
>>>
>>> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
>>> ---
>>> .../phy/socionext,uniphier-ahci-phy.yaml | 73 ++++++++++++------
>>> .../phy/socionext,uniphier-pcie-phy.yaml | 37 ++++++---
>>> .../phy/socionext,uniphier-usb3hs-phy.yaml | 75 +++++++++++++-----
>>> .../phy/socionext,uniphier-usb3ss-phy.yaml | 77 ++++++++++++++-----
>>> 4 files changed, 188 insertions(+), 74 deletions(-)
>>>
>>> diff --git
>>> a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>>> b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>>> index 14f7579e7daa..61d9306e1852 100644
>>> ---
>>> a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>>> +++
>>> b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>>> @@ -30,33 +30,62 @@ properties:
>>> minItems: 1
>>> maxItems: 2
>>>
>>> - clock-names:
>>> - oneOf:
>>> - - items: # for PXs2
>>> - - const: link
>>> - - items: # for Pro4
>>> - - const: link
>>> - - const: gio
>>> - - items: # for others
>>> - - const: link
>>> - - const: phy
>>> + clock-names: true
>>>
>>> resets:
>>> minItems: 2
>>> maxItems: 6
>>>
>>> - reset-names:
>>> - oneOf:
>>> - - items: # for Pro4
>>> - - const: link
>>> - - const: gio
>>> - - const: phy
>>> - - const: pm
>>> - - const: tx
>>> - - const: rx
>>> - - items: # for others
>>> - - const: link
>>> - - const: phy
>>> + reset-names: true
>>> +
>>> +allOf:
>>> + - if:
>>> + properties:
>>> + compatible:
>>> + contains:
>>> + const: socionext,uniphier-pro4-ahci-phy
>>> + then:
>>> + properties:
>>> + clock-names:
>>> + items:
>>> + - const: link
>>> + - const: gio
>>> + reset-names:
>>> + items:
>>> + - const: link
>>> + - const: gio
>>> + - const: phy
>>> + - const: pm
>>> + - const: tx
>>> + - const: rx
>>
>> Constrain also everywhere clocks and resets, so here should be:
>> resets:
>> minItems: 6
>> maxItems: 6
>
> If I put the constraint here, it would conflict with the original one.
> Should I also replace the original resets
>
> resets:
> minItems: 2
> maxItems: 6
>
> with "resets: true"?
It should not conflict. Check the bindings for Samsung Exynos clock I
sent you last time. In the main "properties" you put the widest
constraints, like you have now (2-6). Then for each compatible you
narrow it (2-2, 6-6).
You can later test it by adding/removing clocks to check if constraints
are properly working.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 5/5] dt-bindings: phy: uniphier: Clean up clock-names and reset-names using compatible string
@ 2022-03-30 9:45 ` Krzysztof Kozlowski
0 siblings, 0 replies; 36+ messages in thread
From: Krzysztof Kozlowski @ 2022-03-30 9:45 UTC (permalink / raw)
To: Kunihiko Hayashi, Vinod Koul, Kishon Vijay Abraham I,
Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel, linux-kernel
On 30/03/2022 11:16, Kunihiko Hayashi wrote:
> Hi Krzysztof,
>
> On 2022/03/30 17:13, Krzysztof Kozlowski wrote:
>> On 30/03/2022 07:20, Kunihiko Hayashi wrote:
>>> Instead of "oneOf:" choices, use "allOf:" and "if:" to define clock-names
>>> and reset-names that can be taken by the compatible string.
>>>
>>> The order of clock-names and reset-names doesn't change here.
>>>
>>> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
>>> ---
>>> .../phy/socionext,uniphier-ahci-phy.yaml | 73 ++++++++++++------
>>> .../phy/socionext,uniphier-pcie-phy.yaml | 37 ++++++---
>>> .../phy/socionext,uniphier-usb3hs-phy.yaml | 75 +++++++++++++-----
>>> .../phy/socionext,uniphier-usb3ss-phy.yaml | 77 ++++++++++++++-----
>>> 4 files changed, 188 insertions(+), 74 deletions(-)
>>>
>>> diff --git
>>> a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>>> b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>>> index 14f7579e7daa..61d9306e1852 100644
>>> ---
>>> a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>>> +++
>>> b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>>> @@ -30,33 +30,62 @@ properties:
>>> minItems: 1
>>> maxItems: 2
>>>
>>> - clock-names:
>>> - oneOf:
>>> - - items: # for PXs2
>>> - - const: link
>>> - - items: # for Pro4
>>> - - const: link
>>> - - const: gio
>>> - - items: # for others
>>> - - const: link
>>> - - const: phy
>>> + clock-names: true
>>>
>>> resets:
>>> minItems: 2
>>> maxItems: 6
>>>
>>> - reset-names:
>>> - oneOf:
>>> - - items: # for Pro4
>>> - - const: link
>>> - - const: gio
>>> - - const: phy
>>> - - const: pm
>>> - - const: tx
>>> - - const: rx
>>> - - items: # for others
>>> - - const: link
>>> - - const: phy
>>> + reset-names: true
>>> +
>>> +allOf:
>>> + - if:
>>> + properties:
>>> + compatible:
>>> + contains:
>>> + const: socionext,uniphier-pro4-ahci-phy
>>> + then:
>>> + properties:
>>> + clock-names:
>>> + items:
>>> + - const: link
>>> + - const: gio
>>> + reset-names:
>>> + items:
>>> + - const: link
>>> + - const: gio
>>> + - const: phy
>>> + - const: pm
>>> + - const: tx
>>> + - const: rx
>>
>> Constrain also everywhere clocks and resets, so here should be:
>> resets:
>> minItems: 6
>> maxItems: 6
>
> If I put the constraint here, it would conflict with the original one.
> Should I also replace the original resets
>
> resets:
> minItems: 2
> maxItems: 6
>
> with "resets: true"?
It should not conflict. Check the bindings for Samsung Exynos clock I
sent you last time. In the main "properties" you put the widest
constraints, like you have now (2-6). Then for each compatible you
narrow it (2-2, 6-6).
You can later test it by adding/removing clocks to check if constraints
are properly working.
Best regards,
Krzysztof
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 5/5] dt-bindings: phy: uniphier: Clean up clock-names and reset-names using compatible string
@ 2022-03-30 9:45 ` Krzysztof Kozlowski
0 siblings, 0 replies; 36+ messages in thread
From: Krzysztof Kozlowski @ 2022-03-30 9:45 UTC (permalink / raw)
To: Kunihiko Hayashi, Vinod Koul, Kishon Vijay Abraham I,
Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel, linux-kernel
On 30/03/2022 11:16, Kunihiko Hayashi wrote:
> Hi Krzysztof,
>
> On 2022/03/30 17:13, Krzysztof Kozlowski wrote:
>> On 30/03/2022 07:20, Kunihiko Hayashi wrote:
>>> Instead of "oneOf:" choices, use "allOf:" and "if:" to define clock-names
>>> and reset-names that can be taken by the compatible string.
>>>
>>> The order of clock-names and reset-names doesn't change here.
>>>
>>> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
>>> ---
>>> .../phy/socionext,uniphier-ahci-phy.yaml | 73 ++++++++++++------
>>> .../phy/socionext,uniphier-pcie-phy.yaml | 37 ++++++---
>>> .../phy/socionext,uniphier-usb3hs-phy.yaml | 75 +++++++++++++-----
>>> .../phy/socionext,uniphier-usb3ss-phy.yaml | 77 ++++++++++++++-----
>>> 4 files changed, 188 insertions(+), 74 deletions(-)
>>>
>>> diff --git
>>> a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>>> b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>>> index 14f7579e7daa..61d9306e1852 100644
>>> ---
>>> a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>>> +++
>>> b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>>> @@ -30,33 +30,62 @@ properties:
>>> minItems: 1
>>> maxItems: 2
>>>
>>> - clock-names:
>>> - oneOf:
>>> - - items: # for PXs2
>>> - - const: link
>>> - - items: # for Pro4
>>> - - const: link
>>> - - const: gio
>>> - - items: # for others
>>> - - const: link
>>> - - const: phy
>>> + clock-names: true
>>>
>>> resets:
>>> minItems: 2
>>> maxItems: 6
>>>
>>> - reset-names:
>>> - oneOf:
>>> - - items: # for Pro4
>>> - - const: link
>>> - - const: gio
>>> - - const: phy
>>> - - const: pm
>>> - - const: tx
>>> - - const: rx
>>> - - items: # for others
>>> - - const: link
>>> - - const: phy
>>> + reset-names: true
>>> +
>>> +allOf:
>>> + - if:
>>> + properties:
>>> + compatible:
>>> + contains:
>>> + const: socionext,uniphier-pro4-ahci-phy
>>> + then:
>>> + properties:
>>> + clock-names:
>>> + items:
>>> + - const: link
>>> + - const: gio
>>> + reset-names:
>>> + items:
>>> + - const: link
>>> + - const: gio
>>> + - const: phy
>>> + - const: pm
>>> + - const: tx
>>> + - const: rx
>>
>> Constrain also everywhere clocks and resets, so here should be:
>> resets:
>> minItems: 6
>> maxItems: 6
>
> If I put the constraint here, it would conflict with the original one.
> Should I also replace the original resets
>
> resets:
> minItems: 2
> maxItems: 6
>
> with "resets: true"?
It should not conflict. Check the bindings for Samsung Exynos clock I
sent you last time. In the main "properties" you put the widest
constraints, like you have now (2-6). Then for each compatible you
narrow it (2-2, 6-6).
You can later test it by adding/removing clocks to check if constraints
are properly working.
Best regards,
Krzysztof
--
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 5/5] dt-bindings: phy: uniphier: Clean up clock-names and reset-names using compatible string
2022-03-30 9:45 ` Krzysztof Kozlowski
(?)
@ 2022-03-30 10:24 ` Kunihiko Hayashi
-1 siblings, 0 replies; 36+ messages in thread
From: Kunihiko Hayashi @ 2022-03-30 10:24 UTC (permalink / raw)
To: Krzysztof Kozlowski, Vinod Koul, Kishon Vijay Abraham I,
Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel, linux-kernel
Hi Krzysztof,
On 2022/03/30 18:45, Krzysztof Kozlowski wrote:
> On 30/03/2022 11:16, Kunihiko Hayashi wrote:
>> Hi Krzysztof,
>>
>> On 2022/03/30 17:13, Krzysztof Kozlowski wrote:
>>> On 30/03/2022 07:20, Kunihiko Hayashi wrote:
>>>> Instead of "oneOf:" choices, use "allOf:" and "if:" to define
>>>> clock-names
>>>> and reset-names that can be taken by the compatible string.
>>>>
>>>> The order of clock-names and reset-names doesn't change here.
>>>>
>>>> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
>>>> ---
>>>> .../phy/socionext,uniphier-ahci-phy.yaml | 73 ++++++++++++------
>>>> .../phy/socionext,uniphier-pcie-phy.yaml | 37 ++++++---
>>>> .../phy/socionext,uniphier-usb3hs-phy.yaml | 75 +++++++++++++-----
>>>> .../phy/socionext,uniphier-usb3ss-phy.yaml | 77 ++++++++++++++-----
>>>> 4 files changed, 188 insertions(+), 74 deletions(-)
>>>>
>>>> diff --git
>>>> a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>>>> b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>>>> index 14f7579e7daa..61d9306e1852 100644
>>>> ---
>>>> a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>>>> +++
>>>> b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>>>> @@ -30,33 +30,62 @@ properties:
>>>> minItems: 1
>>>> maxItems: 2
>>>>
>>>> - clock-names:
>>>> - oneOf:
>>>> - - items: # for PXs2
>>>> - - const: link
>>>> - - items: # for Pro4
>>>> - - const: link
>>>> - - const: gio
>>>> - - items: # for others
>>>> - - const: link
>>>> - - const: phy
>>>> + clock-names: true
>>>>
>>>> resets:
>>>> minItems: 2
>>>> maxItems: 6
>>>>
>>>> - reset-names:
>>>> - oneOf:
>>>> - - items: # for Pro4
>>>> - - const: link
>>>> - - const: gio
>>>> - - const: phy
>>>> - - const: pm
>>>> - - const: tx
>>>> - - const: rx
>>>> - - items: # for others
>>>> - - const: link
>>>> - - const: phy
>>>> + reset-names: true
>>>> +
>>>> +allOf:
>>>> + - if:
>>>> + properties:
>>>> + compatible:
>>>> + contains:
>>>> + const: socionext,uniphier-pro4-ahci-phy
>>>> + then:
>>>> + properties:
>>>> + clock-names:
>>>> + items:
>>>> + - const: link
>>>> + - const: gio
>>>> + reset-names:
>>>> + items:
>>>> + - const: link
>>>> + - const: gio
>>>> + - const: phy
>>>> + - const: pm
>>>> + - const: tx
>>>> + - const: rx
>>>
>>> Constrain also everywhere clocks and resets, so here should be:
>>> resets:
>>> minItems: 6
>>> maxItems: 6
>>
>> If I put the constraint here, it would conflict with the original one.
>> Should I also replace the original resets
>>
>> resets:
>> minItems: 2
>> maxItems: 6
>>
>> with "resets: true"?
>
> It should not conflict. Check the bindings for Samsung Exynos clock I
> sent you last time. In the main "properties" you put the widest
> constraints, like you have now (2-6). Then for each compatible you
> narrow it (2-2, 6-6).
>
> You can later test it by adding/removing clocks to check if constraints
> are properly working.
I understand. The main "properties" should be the widest constraints,
and I checked that Exynos clock is set to the widest (1-10).
I'll add the constraints.
Thank you,
---
Best Regards
Kunihiko Hayashi
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 5/5] dt-bindings: phy: uniphier: Clean up clock-names and reset-names using compatible string
@ 2022-03-30 10:24 ` Kunihiko Hayashi
0 siblings, 0 replies; 36+ messages in thread
From: Kunihiko Hayashi @ 2022-03-30 10:24 UTC (permalink / raw)
To: Krzysztof Kozlowski, Vinod Koul, Kishon Vijay Abraham I,
Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel, linux-kernel
Hi Krzysztof,
On 2022/03/30 18:45, Krzysztof Kozlowski wrote:
> On 30/03/2022 11:16, Kunihiko Hayashi wrote:
>> Hi Krzysztof,
>>
>> On 2022/03/30 17:13, Krzysztof Kozlowski wrote:
>>> On 30/03/2022 07:20, Kunihiko Hayashi wrote:
>>>> Instead of "oneOf:" choices, use "allOf:" and "if:" to define
>>>> clock-names
>>>> and reset-names that can be taken by the compatible string.
>>>>
>>>> The order of clock-names and reset-names doesn't change here.
>>>>
>>>> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
>>>> ---
>>>> .../phy/socionext,uniphier-ahci-phy.yaml | 73 ++++++++++++------
>>>> .../phy/socionext,uniphier-pcie-phy.yaml | 37 ++++++---
>>>> .../phy/socionext,uniphier-usb3hs-phy.yaml | 75 +++++++++++++-----
>>>> .../phy/socionext,uniphier-usb3ss-phy.yaml | 77 ++++++++++++++-----
>>>> 4 files changed, 188 insertions(+), 74 deletions(-)
>>>>
>>>> diff --git
>>>> a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>>>> b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>>>> index 14f7579e7daa..61d9306e1852 100644
>>>> ---
>>>> a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>>>> +++
>>>> b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>>>> @@ -30,33 +30,62 @@ properties:
>>>> minItems: 1
>>>> maxItems: 2
>>>>
>>>> - clock-names:
>>>> - oneOf:
>>>> - - items: # for PXs2
>>>> - - const: link
>>>> - - items: # for Pro4
>>>> - - const: link
>>>> - - const: gio
>>>> - - items: # for others
>>>> - - const: link
>>>> - - const: phy
>>>> + clock-names: true
>>>>
>>>> resets:
>>>> minItems: 2
>>>> maxItems: 6
>>>>
>>>> - reset-names:
>>>> - oneOf:
>>>> - - items: # for Pro4
>>>> - - const: link
>>>> - - const: gio
>>>> - - const: phy
>>>> - - const: pm
>>>> - - const: tx
>>>> - - const: rx
>>>> - - items: # for others
>>>> - - const: link
>>>> - - const: phy
>>>> + reset-names: true
>>>> +
>>>> +allOf:
>>>> + - if:
>>>> + properties:
>>>> + compatible:
>>>> + contains:
>>>> + const: socionext,uniphier-pro4-ahci-phy
>>>> + then:
>>>> + properties:
>>>> + clock-names:
>>>> + items:
>>>> + - const: link
>>>> + - const: gio
>>>> + reset-names:
>>>> + items:
>>>> + - const: link
>>>> + - const: gio
>>>> + - const: phy
>>>> + - const: pm
>>>> + - const: tx
>>>> + - const: rx
>>>
>>> Constrain also everywhere clocks and resets, so here should be:
>>> resets:
>>> minItems: 6
>>> maxItems: 6
>>
>> If I put the constraint here, it would conflict with the original one.
>> Should I also replace the original resets
>>
>> resets:
>> minItems: 2
>> maxItems: 6
>>
>> with "resets: true"?
>
> It should not conflict. Check the bindings for Samsung Exynos clock I
> sent you last time. In the main "properties" you put the widest
> constraints, like you have now (2-6). Then for each compatible you
> narrow it (2-2, 6-6).
>
> You can later test it by adding/removing clocks to check if constraints
> are properly working.
I understand. The main "properties" should be the widest constraints,
and I checked that Exynos clock is set to the widest (1-10).
I'll add the constraints.
Thank you,
---
Best Regards
Kunihiko Hayashi
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 5/5] dt-bindings: phy: uniphier: Clean up clock-names and reset-names using compatible string
@ 2022-03-30 10:24 ` Kunihiko Hayashi
0 siblings, 0 replies; 36+ messages in thread
From: Kunihiko Hayashi @ 2022-03-30 10:24 UTC (permalink / raw)
To: Krzysztof Kozlowski, Vinod Koul, Kishon Vijay Abraham I,
Rob Herring, Krzysztof Kozlowski
Cc: Masami Hiramatsu, linux-phy, devicetree, linux-arm-kernel, linux-kernel
Hi Krzysztof,
On 2022/03/30 18:45, Krzysztof Kozlowski wrote:
> On 30/03/2022 11:16, Kunihiko Hayashi wrote:
>> Hi Krzysztof,
>>
>> On 2022/03/30 17:13, Krzysztof Kozlowski wrote:
>>> On 30/03/2022 07:20, Kunihiko Hayashi wrote:
>>>> Instead of "oneOf:" choices, use "allOf:" and "if:" to define
>>>> clock-names
>>>> and reset-names that can be taken by the compatible string.
>>>>
>>>> The order of clock-names and reset-names doesn't change here.
>>>>
>>>> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
>>>> ---
>>>> .../phy/socionext,uniphier-ahci-phy.yaml | 73 ++++++++++++------
>>>> .../phy/socionext,uniphier-pcie-phy.yaml | 37 ++++++---
>>>> .../phy/socionext,uniphier-usb3hs-phy.yaml | 75 +++++++++++++-----
>>>> .../phy/socionext,uniphier-usb3ss-phy.yaml | 77 ++++++++++++++-----
>>>> 4 files changed, 188 insertions(+), 74 deletions(-)
>>>>
>>>> diff --git
>>>> a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>>>> b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>>>> index 14f7579e7daa..61d9306e1852 100644
>>>> ---
>>>> a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>>>> +++
>>>> b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
>>>> @@ -30,33 +30,62 @@ properties:
>>>> minItems: 1
>>>> maxItems: 2
>>>>
>>>> - clock-names:
>>>> - oneOf:
>>>> - - items: # for PXs2
>>>> - - const: link
>>>> - - items: # for Pro4
>>>> - - const: link
>>>> - - const: gio
>>>> - - items: # for others
>>>> - - const: link
>>>> - - const: phy
>>>> + clock-names: true
>>>>
>>>> resets:
>>>> minItems: 2
>>>> maxItems: 6
>>>>
>>>> - reset-names:
>>>> - oneOf:
>>>> - - items: # for Pro4
>>>> - - const: link
>>>> - - const: gio
>>>> - - const: phy
>>>> - - const: pm
>>>> - - const: tx
>>>> - - const: rx
>>>> - - items: # for others
>>>> - - const: link
>>>> - - const: phy
>>>> + reset-names: true
>>>> +
>>>> +allOf:
>>>> + - if:
>>>> + properties:
>>>> + compatible:
>>>> + contains:
>>>> + const: socionext,uniphier-pro4-ahci-phy
>>>> + then:
>>>> + properties:
>>>> + clock-names:
>>>> + items:
>>>> + - const: link
>>>> + - const: gio
>>>> + reset-names:
>>>> + items:
>>>> + - const: link
>>>> + - const: gio
>>>> + - const: phy
>>>> + - const: pm
>>>> + - const: tx
>>>> + - const: rx
>>>
>>> Constrain also everywhere clocks and resets, so here should be:
>>> resets:
>>> minItems: 6
>>> maxItems: 6
>>
>> If I put the constraint here, it would conflict with the original one.
>> Should I also replace the original resets
>>
>> resets:
>> minItems: 2
>> maxItems: 6
>>
>> with "resets: true"?
>
> It should not conflict. Check the bindings for Samsung Exynos clock I
> sent you last time. In the main "properties" you put the widest
> constraints, like you have now (2-6). Then for each compatible you
> narrow it (2-2, 6-6).
>
> You can later test it by adding/removing clocks to check if constraints
> are properly working.
I understand. The main "properties" should be the widest constraints,
and I checked that Exynos clock is set to the widest (1-10).
I'll add the constraints.
Thank you,
---
Best Regards
Kunihiko Hayashi
--
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy
^ permalink raw reply [flat|nested] 36+ messages in thread