* [PATCH v2 2/2] dt-bindings: soc: rockchip: grf: add rockchip,rk3288-dp-phy.yaml
2022-12-29 9:44 [PATCH v2 1/2] dt-bindings: phy: rockchip: convert rockchip-dp-phy.txt to yaml Johan Jonker
@ 2022-12-29 9:45 ` Johan Jonker
2022-12-29 10:30 ` [PATCH v2 1/2] dt-bindings: phy: rockchip: convert rockchip-dp-phy.txt to yaml Krzysztof Kozlowski
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Johan Jonker @ 2022-12-29 9:45 UTC (permalink / raw)
To: heiko
Cc: robh+dt, krzysztof.kozlowski+dt, devicetree, linux-kernel,
linux-arm-kernel, linux-rockchip, linux-phy, vkoul, kishon
Add new converted rockchip,rk3288-dp-phy.yaml to grf.yaml file.
Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
Apply after:
dt-bindings: soc: rockchip: grf: add rockchip,lvds.yaml
Changed V2:
Use the compatible as filename.
Drop blank lines.
---
.../devicetree/bindings/soc/rockchip/grf.yaml | 21 +++----------------
1 file changed, 3 insertions(+), 18 deletions(-)
diff --git a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml
index 7ac9aa5fa..8dc141410 100644
--- a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml
+++ b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml
@@ -82,9 +82,7 @@ allOf:
properties:
lvds:
type: object
-
$ref: /schemas/display/rockchip/rockchip,lvds.yaml#
-
unevaluatedProperties: false
- if:
@@ -96,8 +94,9 @@ allOf:
then:
properties:
edp-phy:
- description:
- Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt
+ type: object
+ $ref: /schemas/phy/rockchip,rk3288-dp-phy.yaml#
+ unevaluatedProperties: false
- if:
properties:
@@ -112,9 +111,7 @@ allOf:
properties:
usbphy:
type: object
-
$ref: /schemas/phy/rockchip-usb-phy.yaml#
-
unevaluatedProperties: false
- if:
@@ -127,16 +124,12 @@ allOf:
properties:
gpio:
type: object
-
$ref: /schemas/gpio/rockchip,rk3328-grf-gpio.yaml#
-
unevaluatedProperties: false
power-controller:
type: object
-
$ref: /schemas/power/rockchip,power-controller.yaml#
-
unevaluatedProperties: false
- if:
@@ -149,9 +142,7 @@ allOf:
properties:
mipi-dphy-rx0:
type: object
-
$ref: /schemas/phy/rockchip-mipi-dphy-rx0.yaml#
-
unevaluatedProperties: false
pcie-phy:
@@ -177,9 +168,7 @@ allOf:
properties:
reboot-mode:
type: object
-
$ref: /schemas/power/reset/syscon-reboot-mode.yaml#
-
unevaluatedProperties: false
- if:
@@ -203,9 +192,7 @@ allOf:
patternProperties:
"usb2phy@[0-9a-f]+$":
type: object
-
$ref: /schemas/phy/phy-rockchip-inno-usb2.yaml#
-
unevaluatedProperties: false
- if:
@@ -231,9 +218,7 @@ allOf:
properties:
io-domains:
type: object
-
$ref: /schemas/power/rockchip-io-domain.yaml#
-
unevaluatedProperties: false
examples:
--
2.20.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v2 1/2] dt-bindings: phy: rockchip: convert rockchip-dp-phy.txt to yaml
2022-12-29 9:44 [PATCH v2 1/2] dt-bindings: phy: rockchip: convert rockchip-dp-phy.txt to yaml Johan Jonker
2022-12-29 9:45 ` [PATCH v2 2/2] dt-bindings: soc: rockchip: grf: add rockchip,rk3288-dp-phy.yaml Johan Jonker
@ 2022-12-29 10:30 ` Krzysztof Kozlowski
2023-01-13 18:08 ` Vinod Koul
2023-01-29 13:39 ` Heiko Stuebner
3 siblings, 0 replies; 7+ messages in thread
From: Krzysztof Kozlowski @ 2022-12-29 10:30 UTC (permalink / raw)
To: Johan Jonker, heiko
Cc: robh+dt, krzysztof.kozlowski+dt, devicetree, linux-kernel,
linux-arm-kernel, linux-rockchip, linux-phy, vkoul, kishon
On 29/12/2022 10:44, Johan Jonker wrote:
> Convert rockchip-dp-phy.txt to yaml.
>
> Changed:
> rename file name
>
> Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/2] dt-bindings: phy: rockchip: convert rockchip-dp-phy.txt to yaml
2022-12-29 9:44 [PATCH v2 1/2] dt-bindings: phy: rockchip: convert rockchip-dp-phy.txt to yaml Johan Jonker
2022-12-29 9:45 ` [PATCH v2 2/2] dt-bindings: soc: rockchip: grf: add rockchip,rk3288-dp-phy.yaml Johan Jonker
2022-12-29 10:30 ` [PATCH v2 1/2] dt-bindings: phy: rockchip: convert rockchip-dp-phy.txt to yaml Krzysztof Kozlowski
@ 2023-01-13 18:08 ` Vinod Koul
2023-01-13 19:58 ` Johan Jonker
2023-01-29 13:39 ` Heiko Stuebner
3 siblings, 1 reply; 7+ messages in thread
From: Vinod Koul @ 2023-01-13 18:08 UTC (permalink / raw)
To: Johan Jonker
Cc: heiko, robh+dt, krzysztof.kozlowski+dt, devicetree, linux-kernel,
linux-arm-kernel, linux-rockchip, linux-phy, kishon
On 29-12-22, 10:44, Johan Jonker wrote:
> Convert rockchip-dp-phy.txt to yaml.
This series fails to apply, pls rebase
>
> Changed:
> rename file name
This should not be in change log but after the --- line
>
> Signed-off-by: Johan Jonker <jbx6244@gmail.com>
> ---
>
> Changed V2:
> Use the compatible as filename.
> ---
> .../bindings/phy/rockchip,rk3288-dp-phy.yaml | 41 +++++++++++++++++++
> .../bindings/phy/rockchip-dp-phy.txt | 26 ------------
> 2 files changed, 41 insertions(+), 26 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/phy/rockchip,rk3288-dp-phy.yaml
> delete mode 100644 Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt
>
> diff --git a/Documentation/devicetree/bindings/phy/rockchip,rk3288-dp-phy.yaml b/Documentation/devicetree/bindings/phy/rockchip,rk3288-dp-phy.yaml
> new file mode 100644
> index 000000000..2538235c5
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/phy/rockchip,rk3288-dp-phy.yaml
> @@ -0,0 +1,41 @@
> +# SPDX-License-Identifier: GPL-2.0
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/phy/rockchip,rk3288-dp-phy.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Rockchip specific extensions to the Analogix Display Port PHY
> +
> +maintainers:
> + - Heiko Stuebner <heiko@sntech.de>
> +
> +properties:
> + compatible:
> + const: rockchip,rk3288-dp-phy
> +
> + clocks:
> + maxItems: 1
> +
> + clock-names:
> + const: 24m
> +
> + "#phy-cells":
> + const: 0
> +
> +required:
> + - compatible
> + - clocks
> + - clock-names
> + - "#phy-cells"
> +
> +additionalProperties: false
> +
> +examples:
> + - |
> + #include <dt-bindings/clock/rk3288-cru.h>
> + edp-phy {
> + compatible = "rockchip,rk3288-dp-phy";
> + clocks = <&cru SCLK_EDP_24M>;
> + clock-names = "24m";
> + #phy-cells = <0>;
> + };
> diff --git a/Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt b/Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt
> deleted file mode 100644
> index e3b4809fb..000000000
> --- a/Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -Rockchip specific extensions to the Analogix Display Port PHY
> -------------------------------------
> -
> -Required properties:
> -- compatible : should be one of the following supported values:
> - - "rockchip.rk3288-dp-phy"
> -- clocks: from common clock binding: handle to dp clock.
> - of memory mapped region.
> -- clock-names: from common clock binding:
> - Required elements: "24m"
> -- #phy-cells : from the generic PHY bindings, must be 0;
> -
> -Example:
> -
> -grf: syscon@ff770000 {
> - compatible = "rockchip,rk3288-grf", "syscon", "simple-mfd";
> -
> -...
> -
> - edp_phy: edp-phy {
> - compatible = "rockchip,rk3288-dp-phy";
> - clocks = <&cru SCLK_EDP_24M>;
> - clock-names = "24m";
> - #phy-cells = <0>;
> - };
> -};
> --
> 2.20.1
--
~Vinod
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH v2 1/2] dt-bindings: phy: rockchip: convert rockchip-dp-phy.txt to yaml
2023-01-13 18:08 ` Vinod Koul
@ 2023-01-13 19:58 ` Johan Jonker
2023-01-18 17:01 ` Vinod Koul
0 siblings, 1 reply; 7+ messages in thread
From: Johan Jonker @ 2023-01-13 19:58 UTC (permalink / raw)
To: Vinod Koul
Cc: heiko, robh+dt, krzysztof.kozlowski+dt, devicetree, linux-kernel,
linux-arm-kernel, linux-rockchip, linux-phy, kishon
On 1/13/23 19:08, Vinod Koul wrote:
> On 29-12-22, 10:44, Johan Jonker wrote:
>> Convert rockchip-dp-phy.txt to yaml.
>
> This series fails to apply, pls rebase
Hi Vinod, Heiko,
This serie and others must be combined in the right order to grf.yaml.
Maybe better that Heiko does that with your ACK.
Johan
===
Apply after:
dt-bindings: soc: rockchip: grf: add rockchip,lvds.yaml
>>
>> Changed:
>> rename file name
>
> This should not be in change log but after the --- line
>
>>
>> Signed-off-by: Johan Jonker <jbx6244@gmail.com>
>> ---
>>
>> Changed V2:
>> Use the compatible as filename.
>> ---
>> .../bindings/phy/rockchip,rk3288-dp-phy.yaml | 41 +++++++++++++++++++
>> .../bindings/phy/rockchip-dp-phy.txt | 26 ------------
>> 2 files changed, 41 insertions(+), 26 deletions(-)
>> create mode 100644 Documentation/devicetree/bindings/phy/rockchip,rk3288-dp-phy.yaml
>> delete mode 100644 Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt
>>
>> diff --git a/Documentation/devicetree/bindings/phy/rockchip,rk3288-dp-phy.yaml b/Documentation/devicetree/bindings/phy/rockchip,rk3288-dp-phy.yaml
>> new file mode 100644
>> index 000000000..2538235c5
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/phy/rockchip,rk3288-dp-phy.yaml
>> @@ -0,0 +1,41 @@
>> +# SPDX-License-Identifier: GPL-2.0
>> +%YAML 1.2
>> +---
>> +$id: http://devicetree.org/schemas/phy/rockchip,rk3288-dp-phy.yaml#
>> +$schema: http://devicetree.org/meta-schemas/core.yaml#
>> +
>> +title: Rockchip specific extensions to the Analogix Display Port PHY
>> +
>> +maintainers:
>> + - Heiko Stuebner <heiko@sntech.de>
>> +
>> +properties:
>> + compatible:
>> + const: rockchip,rk3288-dp-phy
>> +
>> + clocks:
>> + maxItems: 1
>> +
>> + clock-names:
>> + const: 24m
>> +
>> + "#phy-cells":
>> + const: 0
>> +
>> +required:
>> + - compatible
>> + - clocks
>> + - clock-names
>> + - "#phy-cells"
>> +
>> +additionalProperties: false
>> +
>> +examples:
>> + - |
>> + #include <dt-bindings/clock/rk3288-cru.h>
>> + edp-phy {
>> + compatible = "rockchip,rk3288-dp-phy";
>> + clocks = <&cru SCLK_EDP_24M>;
>> + clock-names = "24m";
>> + #phy-cells = <0>;
>> + };
>> diff --git a/Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt b/Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt
>> deleted file mode 100644
>> index e3b4809fb..000000000
>> --- a/Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt
>> +++ /dev/null
>> @@ -1,26 +0,0 @@
>> -Rockchip specific extensions to the Analogix Display Port PHY
>> -------------------------------------
>> -
>> -Required properties:
>> -- compatible : should be one of the following supported values:
>> - - "rockchip.rk3288-dp-phy"
>> -- clocks: from common clock binding: handle to dp clock.
>> - of memory mapped region.
>> -- clock-names: from common clock binding:
>> - Required elements: "24m"
>> -- #phy-cells : from the generic PHY bindings, must be 0;
>> -
>> -Example:
>> -
>> -grf: syscon@ff770000 {
>> - compatible = "rockchip,rk3288-grf", "syscon", "simple-mfd";
>> -
>> -...
>> -
>> - edp_phy: edp-phy {
>> - compatible = "rockchip,rk3288-dp-phy";
>> - clocks = <&cru SCLK_EDP_24M>;
>> - clock-names = "24m";
>> - #phy-cells = <0>;
>> - };
>> -};
>> --
>> 2.20.1
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH v2 1/2] dt-bindings: phy: rockchip: convert rockchip-dp-phy.txt to yaml
2023-01-13 19:58 ` Johan Jonker
@ 2023-01-18 17:01 ` Vinod Koul
0 siblings, 0 replies; 7+ messages in thread
From: Vinod Koul @ 2023-01-18 17:01 UTC (permalink / raw)
To: Johan Jonker
Cc: heiko, robh+dt, krzysztof.kozlowski+dt, devicetree, linux-kernel,
linux-arm-kernel, linux-rockchip, linux-phy, kishon
On 13-01-23, 20:58, Johan Jonker wrote:
>
>
> On 1/13/23 19:08, Vinod Koul wrote:
> > On 29-12-22, 10:44, Johan Jonker wrote:
> >> Convert rockchip-dp-phy.txt to yaml.
> >
> > This series fails to apply, pls rebase
>
> Hi Vinod, Heiko,
>
> This serie and others must be combined in the right order to grf.yaml.
> Maybe better that Heiko does that with your ACK.
Sure:
Acked-By: Vinod Koul <vkoul@kernel.org>
--
~Vinod
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/2] dt-bindings: phy: rockchip: convert rockchip-dp-phy.txt to yaml
2022-12-29 9:44 [PATCH v2 1/2] dt-bindings: phy: rockchip: convert rockchip-dp-phy.txt to yaml Johan Jonker
` (2 preceding siblings ...)
2023-01-13 18:08 ` Vinod Koul
@ 2023-01-29 13:39 ` Heiko Stuebner
3 siblings, 0 replies; 7+ messages in thread
From: Heiko Stuebner @ 2023-01-29 13:39 UTC (permalink / raw)
To: Johan Jonker
Cc: Heiko Stuebner, vkoul, linux-rockchip, linux-phy, kishon,
linux-arm-kernel, krzysztof.kozlowski+dt, linux-kernel,
devicetree, robh+dt
On Thu, 29 Dec 2022 10:44:28 +0100, Johan Jonker wrote:
> Convert rockchip-dp-phy.txt to yaml.
>
> Changed:
> rename file name
>
>
Applied, thanks!
[1/2] dt-bindings: phy: rockchip: convert rockchip-dp-phy.txt to yaml
commit: fc7b83bcaf0334a80d175ab6b280fd838e8a5596
[2/2] dt-bindings: soc: rockchip: grf: add rockchip,rk3288-dp-phy.yaml
commit: 51b2089284f3f08ca8971b65d5b2f66f926f7d14
Best regards,
--
Heiko Stuebner <heiko@sntech.de>
^ permalink raw reply [flat|nested] 7+ messages in thread