diff mbox series

[v2,13/14] ARM: dts: rockchip: Fix the spi controller on rk3036

Message ID 20241008203940.2573684-14-heiko@sntech.de (mailing list archive)
State New
Headers show
Series Fixing some dtbscheck warnings | expand

Commit Message

Heiko Stübner Oct. 8, 2024, 8:39 p.m. UTC
Compatible and clock names did not match the existing binding.
So set the correct values and re-order+rename the clocks.

It looks like no rk3036 board did use the spi controller so far,
so this was never detected on a running device yet.

Fixes: f629fcfab2cd ("ARM: dts: rockchip: support the spi for rk3036")
Cc: Caesar Wang <wxt@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 arch/arm/boot/dts/rockchip/rk3036.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Dragan Simic Oct. 9, 2024, 7:42 a.m. UTC | #1
Hello Heiko,

On 2024-10-08 22:39, Heiko Stuebner wrote:
> Compatible and clock names did not match the existing binding.
> So set the correct values and re-order+rename the clocks.
> 
> It looks like no rk3036 board did use the spi controller so far,
> so this was never detected on a running device yet.

Wow, that's quite surprising.

> Fixes: f629fcfab2cd ("ARM: dts: rockchip: support the spi for rk3036")
> Cc: Caesar Wang <wxt@rock-chips.com>
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>

Looking good to me, thanks for the patch.  It all matches with
what drivers/spi/spi-rockchip.c actually expects.

Reviewed-by: Dragan Simic <dsimic@manjaro.org>

> ---
>  arch/arm/boot/dts/rockchip/rk3036.dtsi | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/rockchip/rk3036.dtsi
> b/arch/arm/boot/dts/rockchip/rk3036.dtsi
> index 09371f07d7b4..63b9912be06a 100644
> --- a/arch/arm/boot/dts/rockchip/rk3036.dtsi
> +++ b/arch/arm/boot/dts/rockchip/rk3036.dtsi
> @@ -553,11 +553,11 @@ i2c0: i2c@20072000 {
>  	};
> 
>  	spi: spi@20074000 {
> -		compatible = "rockchip,rockchip-spi";
> +		compatible = "rockchip,rk3036-spi";
>  		reg = <0x20074000 0x1000>;
>  		interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
> -		clocks = <&cru PCLK_SPI>, <&cru SCLK_SPI>;
> -		clock-names = "apb-pclk","spi_pclk";
> +		clocks = <&cru SCLK_SPI>, <&cru PCLK_SPI>;
> +		clock-names = "spiclk", "apb_pclk";
>  		dmas = <&pdma 8>, <&pdma 9>;
>  		dma-names = "tx", "rx";
>  		pinctrl-names = "default";
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/rockchip/rk3036.dtsi b/arch/arm/boot/dts/rockchip/rk3036.dtsi
index 09371f07d7b4..63b9912be06a 100644
--- a/arch/arm/boot/dts/rockchip/rk3036.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3036.dtsi
@@ -553,11 +553,11 @@  i2c0: i2c@20072000 {
 	};
 
 	spi: spi@20074000 {
-		compatible = "rockchip,rockchip-spi";
+		compatible = "rockchip,rk3036-spi";
 		reg = <0x20074000 0x1000>;
 		interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&cru PCLK_SPI>, <&cru SCLK_SPI>;
-		clock-names = "apb-pclk","spi_pclk";
+		clocks = <&cru SCLK_SPI>, <&cru PCLK_SPI>;
+		clock-names = "spiclk", "apb_pclk";
 		dmas = <&pdma 8>, <&pdma 9>;
 		dma-names = "tx", "rx";
 		pinctrl-names = "default";