Google Groups no longer supports new Usenet posts or subscriptions. Historical content remains viewable.
Dismiss

[PATCH 3/3] ARM: dts: rockchip: fixes the spi compatible for rk3036

68 views
Skip to first unread message

Caesar Wang

unread,
May 19, 2016, 11:50:07 AM5/19/16
to
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 <w...@rock-chips.com>
Cc: Heiko Stuebner <he...@sntech.de>
Cc: linux-r...@lists.infradead.org

---

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>;
--
2.7.4

Caesar Wang

unread,
May 19, 2016, 11:50:07 AM5/19/16
to
We had supported the rk3036/rk3066/rk3188/rk3228/rk3288/rk3368/rk3399
family SoCs in linux kernel.

Let's add the other SoCs, in order to a better understanding from the
rockchip spi document.

Signed-off-by: Caesar Wang <w...@rock-chips.com>
Cc: Rob Herring <rob...@kernel.org>
Cc: Mark Brown <bro...@kernel.org>
Cc: Heiko Stuebner <he...@sntech.de>
Cc: linux-r...@lists.infradead.org
---

Documentation/devicetree/bindings/spi/spi-rockchip.txt | 3 +++
1 file changed, 3 insertions(+)

diff --git a/Documentation/devicetree/bindings/spi/spi-rockchip.txt b/Documentation/devicetree/bindings/spi/spi-rockchip.txt
index 1b14d69..305b542 100644
--- a/Documentation/devicetree/bindings/spi/spi-rockchip.txt
+++ b/Documentation/devicetree/bindings/spi/spi-rockchip.txt
@@ -6,9 +6,12 @@ and display controllers using the SPI communication interface.
Required Properties:

- compatible: should be one of the following.
+ "rockchip,rk3036-spi" for rk3036.
"rockchip,rk3066-spi" for rk3066.
"rockchip,rk3188-spi", "rockchip,rk3066-spi" for rk3188.
+ "rockchip,rk3228-spi", "rockchip,rk3066-spi" for rk3228.
"rockchip,rk3288-spi", "rockchip,rk3066-spi" for rk3288.
+ "rockchip,rk3368-spi", "rockchip,rk3066-spi" for rk3368.
"rockchip,rk3399-spi", "rockchip,rk3066-spi" for rk3399.
- reg: physical base address of the controller and length of memory mapped
region.
--
2.7.4

Caesar Wang

unread,
May 19, 2016, 11:50:08 AM5/19/16
to
In gerenal, the "rockchip,rockchip-spi" string will match the dts
that's great in spi driver. After all the most of rockchip SoCs ar
same spi controller.

Then, we should keep the old style to match the dts various.

Signed-off-by: Caesar Wang <w...@rock-chips.com>
Cc: Mark Brown <bro...@kernel.org>
Cc: Heiko Stuebner <he...@sntech.de>
Cc: linux-r...@lists.infradead.org
---

drivers/spi/spi-rockchip.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index 6c6c001..dd08b68 100644
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -893,9 +893,12 @@ static const struct dev_pm_ops rockchip_spi_pm = {
};

static const struct of_device_id rockchip_spi_dt_match[] = {
+ { .compatible = "rockchip,rk3036-spi", },
{ .compatible = "rockchip,rk3066-spi", },
{ .compatible = "rockchip,rk3188-spi", },
+ { .compatible = "rockchip,rk3228-spi", },
{ .compatible = "rockchip,rk3288-spi", },
+ { .compatible = "rockchip,rk3368-spi", },
{ .compatible = "rockchip,rk3399-spi", },
{ },
};
--
2.7.4

Heiko Stuebner

unread,
May 19, 2016, 12:00:07 PM5/19/16
to
Am Donnerstag, 19. Mai 2016, 23:47:02 schrieb Caesar Wang:
> We had supported the rk3036/rk3066/rk3188/rk3228/rk3288/rk3368/rk3399
> family SoCs in linux kernel.
>
> Let's add the other SoCs, in order to a better understanding from the
> rockchip spi document.
>
> Signed-off-by: Caesar Wang <w...@rock-chips.com>
> Cc: Rob Herring <rob...@kernel.org>
> Cc: Mark Brown <bro...@kernel.org>
> Cc: Heiko Stuebner <he...@sntech.de>
> Cc: linux-r...@lists.infradead.org
> ---
>
> Documentation/devicetree/bindings/spi/spi-rockchip.txt | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/spi/spi-rockchip.txt
> b/Documentation/devicetree/bindings/spi/spi-rockchip.txt index
> 1b14d69..305b542 100644
> --- a/Documentation/devicetree/bindings/spi/spi-rockchip.txt
> +++ b/Documentation/devicetree/bindings/spi/spi-rockchip.txt
> @@ -6,9 +6,12 @@ and display controllers using the SPI communication
> interface. Required Properties:
>
> - compatible: should be one of the following.
> + "rockchip,rk3036-spi" for rk3036.

shouldn't the rk3036 also get the rk3066 fallback. Looking at the driver
part (patch2) the rk3036 still is the same IP as for every other soc in
here.

Caesar Wang

unread,
May 19, 2016, 12:20:07 PM5/19/16
to
Yep, the same IP.

Do you think we should keep the below style?

1)
"rockchip,rk3036-spi", "rockchip,rk3066-spi" for rk3036.
"rockchip,rk3066-spi" for rk3066.
"rockchip,rk3188-spi", "rockchip,rk3066-spi" for rk3188.
...

or
2)
"rockchip,rk3066-spi" for rk3066.
"rockchip,rk3036-spi", "rockchip,rk3066-spi" for rk3036.
"rockchip,rk3188-spi", "rockchip,rk3066-spi" for rk3188
..

or
3)
"rockchip, rockchip-spi" for rk3036 rk3066.......

Think about the 1) will be googd select.

-Caesar

Heiko Stuebner

unread,
May 19, 2016, 12:30:14 PM5/19/16
to
or
(4) drop the fallbacks. We match against each compatible all the time
anyway, so you could also simply do

"rockchip,rk3036-spi" for rk3036
"rockchip,rk3066-spi" for rk3066
"rockchip,rk3188-spi" for rk3188

Maybe leave the fallbacks for existing socs, and just add the new ones
without the fallbacks.

rockchip,rockchip-spi is not future proof ... i.e. in some future soc
somebody might want to exchange the IP block against a different one, so
being specific saves us from hassle then :-)


Heiko

Caesar Wang

unread,
May 19, 2016, 8:00:06 PM5/19/16
to
In gerenal, the "rockchip,rockchip-spi" string will match the dts
that's great in spi driver. After all the most of rockchip SoCs ar
same spi controller.

Then, we should keep the old style to match the dts various.

Signed-off-by: Caesar Wang <w...@rock-chips.com>
Cc: Mark Brown <bro...@kernel.org>
Cc: Heiko Stuebner <he...@sntech.de>
Cc: linux-r...@lists.infradead.org
---

Changes in v2: None

drivers/spi/spi-rockchip.c | 3 +++
1 file changed, 3 insertions(+)

Caesar Wang

unread,
May 19, 2016, 8:00:07 PM5/19/16
to
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 <w...@rock-chips.com>
Cc: Heiko Stuebner <he...@sntech.de>
Cc: linux-r...@lists.infradead.org

---

Changes in v2: None

Shawn Lin

unread,
May 20, 2016, 8:40:07 AM5/20/16
to
在 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" ?

Caesar Wang

unread,
May 20, 2016, 9:00:10 AM5/20/16
to

于 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 <w...@rock-chips.com>
>> Cc: Heiko Stuebner <he...@sntech.de>
>> Cc: linux-r...@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 | software engineer | w...@rock-chip.com

Heiko Stuebner

unread,
May 20, 2016, 9:00:11 AM5/20/16
to
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

Shawn Lin

unread,
May 20, 2016, 9:10:07 AM5/20/16
to
在 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?
Best Regards
Shawn Lin

Shawn Lin

unread,
May 20, 2016, 9:20:06 AM5/20/16
to
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 <w...@rock-chips.com>
>>> Cc: Heiko Stuebner <he...@sntech.de>
>>> Cc: linux-r...@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>;
>
>


Mark Brown

unread,
May 31, 2016, 1:50:07 PM5/31/16
to
The patch

spi/rockchip: add the rk3036/rk3228/rk3368 to match for driver

has been applied to the spi tree at

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

From aa29ea3df27dbba19ef59023d0f7330f2fdc58ae Mon Sep 17 00:00:00 2001
From: Caesar Wang <w...@rock-chips.com>
Date: Fri, 20 May 2016 07:56:21 +0800
Subject: [PATCH] spi/rockchip: add the rk3036/rk3228/rk3368 to match for
driver

In gerenal, the "rockchip,rockchip-spi" string will match the dts
that's great in spi driver. After all the most of rockchip SoCs ar
same spi controller.

Then, we should keep the old style to match the dts various.

Signed-off-by: Caesar Wang <w...@rock-chips.com>
Signed-off-by: Mark Brown <bro...@kernel.org>
---
drivers/spi/spi-rockchip.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index cd89682065b9..bead5bfcbb0c 100644
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -892,9 +892,12 @@ static const struct dev_pm_ops rockchip_spi_pm = {
};

static const struct of_device_id rockchip_spi_dt_match[] = {
+ { .compatible = "rockchip,rk3036-spi", },
{ .compatible = "rockchip,rk3066-spi", },
{ .compatible = "rockchip,rk3188-spi", },
+ { .compatible = "rockchip,rk3228-spi", },
{ .compatible = "rockchip,rk3288-spi", },
+ { .compatible = "rockchip,rk3368-spi", },
{ .compatible = "rockchip,rk3399-spi", },
{ },
};
--
2.8.1
0 new messages