* [PATCH 1/3] spi/rockchip: add rk3036/rk3228/rk3368 socs for spi document @ 2016-05-19 15:47 Caesar Wang 2016-05-19 15:47 ` [PATCH 2/3] spi/rockchip: add the rk3036/rk3228/rk3368 to match for driver Caesar Wang ` (2 more replies) 0 siblings, 3 replies; 7+ messages in thread From: Caesar Wang @ 2016-05-19 15:47 UTC (permalink / raw) To: Heiko Stuebner, Mark Brown Cc: linux-rockchip, Caesar Wang, Rob Herring, devicetree, Xu Jianqun, Kumar Gala, linux-kernel, Ian Campbell, Pawel Moll, Mark Rutland, linux-arm-kernel 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 <wxt@rock-chips.com> Cc: Rob Herring <robh+dt@kernel.org> Cc: Mark Brown <broonie@kernel.org> Cc: Heiko Stuebner <heiko@sntech.de> Cc: linux-rockchip@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 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/3] spi/rockchip: add the rk3036/rk3228/rk3368 to match for driver 2016-05-19 15:47 [PATCH 1/3] spi/rockchip: add rk3036/rk3228/rk3368 socs for spi document Caesar Wang @ 2016-05-19 15:47 ` Caesar Wang 2016-05-31 17:46 ` Applied "spi/rockchip: add the rk3036/rk3228/rk3368 to match for driver" to the spi tree Mark Brown 2016-05-19 15:47 ` [PATCH 3/3] ARM: dts: rockchip: fixes the spi compatible for rk3036 Caesar Wang 2016-05-19 15:51 ` [PATCH 1/3] spi/rockchip: add rk3036/rk3228/rk3368 socs for spi document Heiko Stuebner 2 siblings, 1 reply; 7+ messages in thread From: Caesar Wang @ 2016-05-19 15:47 UTC (permalink / raw) To: Heiko Stuebner, Mark Brown Cc: linux-rockchip, Caesar Wang, linux-kernel, linux-spi, linux-arm-kernel 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 <wxt@rock-chips.com> Cc: Mark Brown <broonie@kernel.org> Cc: Heiko Stuebner <heiko@sntech.de> Cc: linux-rockchip@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 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Applied "spi/rockchip: add the rk3036/rk3228/rk3368 to match for driver" to the spi tree 2016-05-19 15:47 ` [PATCH 2/3] spi/rockchip: add the rk3036/rk3228/rk3368 to match for driver Caesar Wang @ 2016-05-31 17:46 ` Mark Brown 0 siblings, 0 replies; 7+ messages in thread From: Mark Brown @ 2016-05-31 17:46 UTC (permalink / raw) To: Caesar Wang Cc: Mark Brown, Heiko Stuebner, Mark Brown, linux-rockchip, linux-kernel, linux-spi, linux-arm-kernel 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 <wxt@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 <wxt@rock-chips.com> Signed-off-by: Mark Brown <broonie@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 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/3] ARM: dts: rockchip: fixes the spi compatible for rk3036 2016-05-19 15:47 [PATCH 1/3] spi/rockchip: add rk3036/rk3228/rk3368 socs for spi document Caesar Wang 2016-05-19 15:47 ` [PATCH 2/3] spi/rockchip: add the rk3036/rk3228/rk3368 to match for driver Caesar Wang @ 2016-05-19 15:47 ` Caesar Wang 2016-05-19 15:51 ` [PATCH 1/3] spi/rockchip: add rk3036/rk3228/rk3368 socs for spi document Heiko Stuebner 2 siblings, 0 replies; 7+ messages in thread From: Caesar Wang @ 2016-05-19 15:47 UTC (permalink / raw) To: Heiko Stuebner, Mark Brown Cc: linux-rockchip, Caesar Wang, devicetree, Kumar Gala, linux-kernel, Ian Campbell, Rob Herring, Pawel Moll, Mark Rutland, Russell King, linux-arm-kernel 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 --- 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 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] spi/rockchip: add rk3036/rk3228/rk3368 socs for spi document 2016-05-19 15:47 [PATCH 1/3] spi/rockchip: add rk3036/rk3228/rk3368 socs for spi document Caesar Wang 2016-05-19 15:47 ` [PATCH 2/3] spi/rockchip: add the rk3036/rk3228/rk3368 to match for driver Caesar Wang 2016-05-19 15:47 ` [PATCH 3/3] ARM: dts: rockchip: fixes the spi compatible for rk3036 Caesar Wang @ 2016-05-19 15:51 ` Heiko Stuebner 2016-05-19 16:04 ` Caesar Wang 2 siblings, 1 reply; 7+ messages in thread From: Heiko Stuebner @ 2016-05-19 15:51 UTC (permalink / raw) To: Caesar Wang Cc: Mark Brown, linux-rockchip, Rob Herring, devicetree, Xu Jianqun, Kumar Gala, linux-kernel, Ian Campbell, Pawel Moll, Mark Rutland, linux-arm-kernel 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 <wxt@rock-chips.com> > Cc: Rob Herring <robh+dt@kernel.org> > Cc: Mark Brown <broonie@kernel.org> > Cc: Heiko Stuebner <heiko@sntech.de> > Cc: linux-rockchip@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. > "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. ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] spi/rockchip: add rk3036/rk3228/rk3368 socs for spi document 2016-05-19 15:51 ` [PATCH 1/3] spi/rockchip: add rk3036/rk3228/rk3368 socs for spi document Heiko Stuebner @ 2016-05-19 16:04 ` Caesar Wang 2016-05-19 16:20 ` Heiko Stuebner 0 siblings, 1 reply; 7+ messages in thread From: Caesar Wang @ 2016-05-19 16:04 UTC (permalink / raw) To: Heiko Stuebner Cc: Mark Brown, linux-rockchip, Rob Herring, devicetree, Xu Jianqun, Kumar Gala, linux-kernel, Ian Campbell, Pawel Moll, Mark Rutland, linux-arm-kernel 在 2016年05月19日 23:51, Heiko Stuebner 写道: > 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 <wxt@rock-chips.com> >> Cc: Rob Herring <robh+dt@kernel.org> >> Cc: Mark Brown <broonie@kernel.org> >> Cc: Heiko Stuebner <heiko@sntech.de> >> Cc: linux-rockchip@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. 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 >> "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. > > > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] spi/rockchip: add rk3036/rk3228/rk3368 socs for spi document 2016-05-19 16:04 ` Caesar Wang @ 2016-05-19 16:20 ` Heiko Stuebner 0 siblings, 0 replies; 7+ messages in thread From: Heiko Stuebner @ 2016-05-19 16:20 UTC (permalink / raw) To: Caesar Wang Cc: Mark Brown, linux-rockchip, Rob Herring, devicetree, Xu Jianqun, Kumar Gala, linux-kernel, Ian Campbell, Pawel Moll, Mark Rutland, linux-arm-kernel Am Freitag, 20. Mai 2016, 00:04:07 schrieb Caesar Wang: > 在 2016年05月19日 23:51, Heiko Stuebner 写道: > > 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 <wxt@rock-chips.com> > >> Cc: Rob Herring <robh+dt@kernel.org> > >> Cc: Mark Brown <broonie@kernel.org> > >> Cc: Heiko Stuebner <heiko@sntech.de> > >> Cc: linux-rockchip@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. > > 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. 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 > >> "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. ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-05-31 17:47 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2016-05-19 15:47 [PATCH 1/3] spi/rockchip: add rk3036/rk3228/rk3368 socs for spi document Caesar Wang 2016-05-19 15:47 ` [PATCH 2/3] spi/rockchip: add the rk3036/rk3228/rk3368 to match for driver Caesar Wang 2016-05-31 17:46 ` Applied "spi/rockchip: add the rk3036/rk3228/rk3368 to match for driver" to the spi tree Mark Brown 2016-05-19 15:47 ` [PATCH 3/3] ARM: dts: rockchip: fixes the spi compatible for rk3036 Caesar Wang 2016-05-19 15:51 ` [PATCH 1/3] spi/rockchip: add rk3036/rk3228/rk3368 socs for spi document Heiko Stuebner 2016-05-19 16:04 ` Caesar Wang 2016-05-19 16:20 ` Heiko Stuebner
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).