* [PATCH 2/2] ARM: dts: rockchip: swap clocks and clock-names values for spdif nodes
2020-03-12 17:22 [PATCH 1/2] arm64: dts: rockchip: remove properties from spdif node RK3399 Excavator Johan Jonker
@ 2020-03-12 17:22 ` Johan Jonker
2020-03-17 0:29 ` Heiko Stuebner
2020-03-17 0:52 ` [PATCH 1/2] arm64: dts: rockchip: remove properties from spdif node RK3399 Excavator Heiko Stuebner
1 sibling, 1 reply; 4+ messages in thread
From: Johan Jonker @ 2020-03-12 17:22 UTC (permalink / raw)
To: heiko; +Cc: robh+dt, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel
Current dts files with 'spdif' nodes are manually verified.
In order to automate this process rockchip-spdif.txt
has to be converted to yaml. In the new setup dtbs_check with
rockchip-spdif.yaml expect clocks and clock-names values
in the same order. Fix this for some older Rockchip models.
make ARCH=arm dtbs_check
DT_SCHEMA_FILES=Documentation/devicetree/bindings/sound/rockchip-spdif.yaml
Signed-off-by: Johan Jonker <jbx6244@gmail.com>
---
arch/arm/boot/dts/rk3188.dtsi | 4 ++--
arch/arm/boot/dts/rk3288.dtsi | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
index 24abf214a..2298a8d84 100644
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -182,8 +182,8 @@
compatible = "rockchip,rk3188-spdif", "rockchip,rk3066-spdif";
reg = <0x1011e000 0x2000>;
#sound-dai-cells = <0>;
- clock-names = "hclk", "mclk";
- clocks = <&cru HCLK_SPDIF>, <&cru SCLK_SPDIF>;
+ clocks = <&cru SCLK_SPDIF>, <&cru HCLK_SPDIF>;
+ clock-names = "mclk", "hclk";
dmas = <&dmac1_s 8>;
dma-names = "tx";
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 485234f6a..07681f1f0 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -944,8 +944,8 @@
compatible = "rockchip,rk3288-spdif", "rockchip,rk3066-spdif";
reg = <0x0 0xff8b0000 0x0 0x10000>;
#sound-dai-cells = <0>;
- clock-names = "hclk", "mclk";
- clocks = <&cru HCLK_SPDIF8CH>, <&cru SCLK_SPDIF8CH>;
+ clocks = <&cru SCLK_SPDIF8CH>, <&cru HCLK_SPDIF8CH>;
+ clock-names = "mclk", "hclk";
dmas = <&dmac_bus_s 3>;
dma-names = "tx";
interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] arm64: dts: rockchip: remove properties from spdif node RK3399 Excavator
2020-03-12 17:22 [PATCH 1/2] arm64: dts: rockchip: remove properties from spdif node RK3399 Excavator Johan Jonker
2020-03-12 17:22 ` [PATCH 2/2] ARM: dts: rockchip: swap clocks and clock-names values for spdif nodes Johan Jonker
@ 2020-03-17 0:52 ` Heiko Stuebner
1 sibling, 0 replies; 4+ messages in thread
From: Heiko Stuebner @ 2020-03-17 0:52 UTC (permalink / raw)
To: Johan Jonker
Cc: robh+dt, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel
Am Donnerstag, 12. März 2020, 18:22:39 CET schrieb Johan Jonker:
> An expermental test with the command below gives this error:
>
> arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dt.yaml:
> spdif@ff870000:
> 'i2c-scl-falling-time-ns', 'i2c-scl-rising-time-ns', 'power-domains'
> do not match any of the regexes: 'pinctrl-[0-9]+'
>
> 'i2c-scl-falling-time-ns', 'i2c-scl-rising-time-ns'
> are not valid properties for 'spdif' nodes, so remove them.
>
> make ARCH=arm64 dtbs_check
> DT_SCHEMA_FILES=Documentation/devicetree/bindings/sound/rockchip-spdif.yaml
>
> Signed-off-by: Johan Jonker <jbx6244@gmail.com>
applied for 5.7
Thanks
Heiko
^ permalink raw reply [flat|nested] 4+ messages in thread