[v2,3/3] ARM: dts: rockchip: fixes the spi compatible for rk3036
diff mbox

Message ID 1463702182-5188-3-git-send-email-wxt@rock-chips.com
State New
Headers show

Commit Message

Caesar Wang May 19, 2016, 11:56 p.m. UTC
That's seem the incorrect string to match the spi driver.

Fixes commit f629fcfab2cd
("ARM: dts: rockchip: support the spi for rk3036")

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: linux-rockchip@lists.infradead.org

---

Changes in v2: None

 arch/arm/boot/dts/rk3036.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Shawn Lin May 20, 2016, 12:35 p.m. UTC | #1
在 2016/5/20 7:56, Caesar Wang 写道:
> That's seem the incorrect string to match the spi driver.
>

Will it break the backward compatibility for some dtb if not
falling back to "rockchip,rockchip-spi" ?

> Fixes commit f629fcfab2cd
> ("ARM: dts: rockchip: support the spi for rk3036")
>
> Signed-off-by: Caesar Wang <wxt@rock-chips.com>
> Cc: Heiko Stuebner <heiko@sntech.de>
> Cc: linux-rockchip@lists.infradead.org
>
> ---
>
> Changes in v2: None
>
>  arch/arm/boot/dts/rk3036.dtsi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
> index d0f4bb7..a30700a 100644
> --- a/arch/arm/boot/dts/rk3036.dtsi
> +++ b/arch/arm/boot/dts/rk3036.dtsi
> @@ -431,7 +431,7 @@
>  	};
>
>  	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>;
>
Caesar Wang May 20, 2016, 12:57 p.m. UTC | #2
于 2016年05月20日 20:35, Shawn Lin 写道:
> 在 2016/5/20 7:56, Caesar Wang 写道:
>> That's seem the incorrect string to match the spi driver.
>>
>
> Will it break the backward compatibility for some dtb if not
> falling back to "rockchip,rockchip-spi" ?

The rk3036 shouldn't work if you read the driver/spi/spi-rockchip.c.
since the "rockchip,rockchip-spi" is *not* exist in linux kernel.

..
  static const struct of_device_id rockchip_spi_dt_match[] = {
     { .compatible = "rockchip,rk3066-spi", },
     { .compatible = "rockchip,rk3188-spi", },
     { .compatible = "rockchip,rk3288-spi", },
     { .compatible = "rockchip,rk3399-spi", },
     { },
}
..


-Caesar

>
>> Fixes commit f629fcfab2cd
>> ("ARM: dts: rockchip: support the spi for rk3036")
>>
>> Signed-off-by: Caesar Wang <wxt@rock-chips.com>
>> Cc: Heiko Stuebner <heiko@sntech.de>
>> Cc: linux-rockchip@lists.infradead.org
>>
>> ---
>>
>> Changes in v2: None
>>
>>  arch/arm/boot/dts/rk3036.dtsi | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/arch/arm/boot/dts/rk3036.dtsi 
>> b/arch/arm/boot/dts/rk3036.dtsi
>> index d0f4bb7..a30700a 100644
>> --- a/arch/arm/boot/dts/rk3036.dtsi
>> +++ b/arch/arm/boot/dts/rk3036.dtsi
>> @@ -431,7 +431,7 @@
>>      };
>>
>>      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>;
>>
>
>
>
>
Heiko Stübner May 20, 2016, 12:58 p.m. UTC | #3
Am Freitag, 20. Mai 2016, 20:35:53 schrieb Shawn Lin:
> 在 2016/5/20 7:56, Caesar Wang 写道:
> > That's seem the incorrect string to match the spi driver.
> 
> Will it break the backward compatibility for some dtb if not
> falling back to "rockchip,rockchip-spi" ?

in what dtb did you see "rockchip,rockchip-spi"?
I.e. it isn't part of any current _mainline_ devicetree files.


Heiko

> 
> > Fixes commit f629fcfab2cd
> > ("ARM: dts: rockchip: support the spi for rk3036")
> > 
> > Signed-off-by: Caesar Wang <wxt@rock-chips.com>
> > Cc: Heiko Stuebner <heiko@sntech.de>
> > Cc: linux-rockchip@lists.infradead.org
> > 
> > ---
> > 
> > Changes in v2: None
> > 
> >  arch/arm/boot/dts/rk3036.dtsi | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/arch/arm/boot/dts/rk3036.dtsi
> > b/arch/arm/boot/dts/rk3036.dtsi index d0f4bb7..a30700a 100644
> > --- a/arch/arm/boot/dts/rk3036.dtsi
> > +++ b/arch/arm/boot/dts/rk3036.dtsi
> > @@ -431,7 +431,7 @@
> > 
> >  	};
> >  	
> >  	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>;
Shawn Lin May 20, 2016, 1:04 p.m. UTC | #4
在 2016/5/20 20:57, Caesar Wang 写道:
>
> 于 2016年05月20日 20:35, Shawn Lin 写道:
>> 在 2016/5/20 7:56, Caesar Wang 写道:
>>> That's seem the incorrect string to match the spi driver.
>>>
>>
>> Will it break the backward compatibility for some dtb if not
>> falling back to "rockchip,rockchip-spi" ?
>
> The rk3036 shouldn't work if you read the driver/spi/spi-rockchip.c.
> since the "rockchip,rockchip-spi" is *not* exist in linux kernel.
>

okay, so that means we take "rockchip,rockchip-spi" from local branch
by mistake?

> ..
>  static const struct of_device_id rockchip_spi_dt_match[] = {
>     { .compatible = "rockchip,rk3066-spi", },
>     { .compatible = "rockchip,rk3188-spi", },
>     { .compatible = "rockchip,rk3288-spi", },
>     { .compatible = "rockchip,rk3399-spi", },
>     { },
> }
> ..
>
>
> -Caesar
>
>>
>>> Fixes commit f629fcfab2cd
>>> ("ARM: dts: rockchip: support the spi for rk3036")
>>>
>>> Signed-off-by: Caesar Wang <wxt@rock-chips.com>
>>> Cc: Heiko Stuebner <heiko@sntech.de>
>>> Cc: linux-rockchip@lists.infradead.org
>>>
>>> ---
>>>
>>> Changes in v2: None
>>>
>>>  arch/arm/boot/dts/rk3036.dtsi | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/arch/arm/boot/dts/rk3036.dtsi
>>> b/arch/arm/boot/dts/rk3036.dtsi
>>> index d0f4bb7..a30700a 100644
>>> --- a/arch/arm/boot/dts/rk3036.dtsi
>>> +++ b/arch/arm/boot/dts/rk3036.dtsi
>>> @@ -431,7 +431,7 @@
>>>      };
>>>
>>>      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>;
>>>
>>
>>
>>
>>
>
Shawn Lin May 20, 2016, 1:09 p.m. UTC | #5
On 2016/5/20 20:58, Heiko Stuebner wrote:
> Am Freitag, 20. Mai 2016, 20:35:53 schrieb Shawn Lin:
>> 在 2016/5/20 7:56, Caesar Wang 写道:
>>> That's seem the incorrect string to match the spi driver.
>>
>> Will it break the backward compatibility for some dtb if not
>> falling back to "rockchip,rockchip-spi" ?
>
> in what dtb did you see "rockchip,rockchip-spi"?

I'm not 100% sure, but I remember we toke this name on local
branch for rk3036 when we were developing this Soc.

> I.e. it isn't part of any current _mainline_ devicetree files.
>

Caesar, Could you check our develop-3.10 branch to see if it does
exist?

Anyway, "rockchip,rockchip-spi" isn't a part of mainline dt property.


>
> Heiko
>
>>
>>> Fixes commit f629fcfab2cd
>>> ("ARM: dts: rockchip: support the spi for rk3036")
>>>
>>> Signed-off-by: Caesar Wang <wxt@rock-chips.com>
>>> Cc: Heiko Stuebner <heiko@sntech.de>
>>> Cc: linux-rockchip@lists.infradead.org
>>>
>>> ---
>>>
>>> Changes in v2: None
>>>
>>>  arch/arm/boot/dts/rk3036.dtsi | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/arch/arm/boot/dts/rk3036.dtsi
>>> b/arch/arm/boot/dts/rk3036.dtsi index d0f4bb7..a30700a 100644
>>> --- a/arch/arm/boot/dts/rk3036.dtsi
>>> +++ b/arch/arm/boot/dts/rk3036.dtsi
>>> @@ -431,7 +431,7 @@
>>>
>>>  	};
>>>  	
>>>  	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>;
>
>

Patch
diff mbox

diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index d0f4bb7..a30700a 100644
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -431,7 +431,7 @@ 
 	};
 
 	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>;