* [PATCH 0/3] gose: Enable QSPI @ 2015-11-10 7:13 ` Simon Horman 0 siblings, 0 replies; 16+ messages in thread From: Simon Horman @ 2015-11-10 7:13 UTC (permalink / raw) To: linux-arm-kernel Hi, this short series adds QSPI to the r8a7793 and gose device tree. DMA is enabled for QSPI and accordingly DMAC nodes are also added to the r8a7793 device tree. Based on renesas-devel-20151110-v4.3. Simon Horman (3): ARM: shmobile: r8a7793: Add DMAC devices to DT ARM: shmobile: r8a7793: Add QSPI device to DT ARM: shmobile: gose: Add QSPI device to DT arch/arm/boot/dts/r8a7793-gose.dts | 40 ++++++++++++++++ arch/arm/boot/dts/r8a7793.dtsi | 98 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+) -- 2.1.4 ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 0/3] gose: Enable QSPI @ 2015-11-10 7:13 ` Simon Horman 0 siblings, 0 replies; 16+ messages in thread From: Simon Horman @ 2015-11-10 7:13 UTC (permalink / raw) To: linux-arm-kernel Hi, this short series adds QSPI to the r8a7793 and gose device tree. DMA is enabled for QSPI and accordingly DMAC nodes are also added to the r8a7793 device tree. Based on renesas-devel-20151110-v4.3. Simon Horman (3): ARM: shmobile: r8a7793: Add DMAC devices to DT ARM: shmobile: r8a7793: Add QSPI device to DT ARM: shmobile: gose: Add QSPI device to DT arch/arm/boot/dts/r8a7793-gose.dts | 40 ++++++++++++++++ arch/arm/boot/dts/r8a7793.dtsi | 98 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+) -- 2.1.4 ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 1/3] ARM: shmobile: r8a7793: Add DMAC devices to DT 2015-11-10 7:13 ` Simon Horman @ 2015-11-10 7:13 ` Simon Horman -1 siblings, 0 replies; 16+ messages in thread From: Simon Horman @ 2015-11-10 7:13 UTC (permalink / raw) To: linux-arm-kernel Instantiate the two system DMA controllers in the r8a7793 device tree. Based on similar work for the r8a7793 by Laurent Pinchart. Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/boot/dts/r8a7793.dtsi | 72 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi index 4f6480f8845f..187a82dc7d9f 100644 --- a/arch/arm/boot/dts/r8a7793.dtsi +++ b/arch/arm/boot/dts/r8a7793.dtsi @@ -128,6 +128,68 @@ #gpio-range-cells = <3>; }; + dmac0: dma-controller@e6700000 { + compatible = "renesas,rcar-dmac"; + reg = <0 0xe6700000 0 0x20000>; + interrupts = <0 197 IRQ_TYPE_LEVEL_HIGH + 0 200 IRQ_TYPE_LEVEL_HIGH + 0 201 IRQ_TYPE_LEVEL_HIGH + 0 202 IRQ_TYPE_LEVEL_HIGH + 0 203 IRQ_TYPE_LEVEL_HIGH + 0 204 IRQ_TYPE_LEVEL_HIGH + 0 205 IRQ_TYPE_LEVEL_HIGH + 0 206 IRQ_TYPE_LEVEL_HIGH + 0 207 IRQ_TYPE_LEVEL_HIGH + 0 208 IRQ_TYPE_LEVEL_HIGH + 0 209 IRQ_TYPE_LEVEL_HIGH + 0 210 IRQ_TYPE_LEVEL_HIGH + 0 211 IRQ_TYPE_LEVEL_HIGH + 0 212 IRQ_TYPE_LEVEL_HIGH + 0 213 IRQ_TYPE_LEVEL_HIGH + 0 214 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "error", + "ch0", "ch1", "ch2", "ch3", + "ch4", "ch5", "ch6", "ch7", + "ch8", "ch9", "ch10", "ch11", + "ch12", "ch13", "ch14"; + clocks = <&mstp2_clks R8A7793_CLK_SYS_DMAC0>; + clock-names = "fck"; + power-domains = <&cpg_clocks>; + #dma-cells = <1>; + dma-channels = <15>; + }; + + dmac1: dma-controller@e6720000 { + compatible = "renesas,rcar-dmac"; + reg = <0 0xe6720000 0 0x20000>; + interrupts = <0 220 IRQ_TYPE_LEVEL_HIGH + 0 216 IRQ_TYPE_LEVEL_HIGH + 0 217 IRQ_TYPE_LEVEL_HIGH + 0 218 IRQ_TYPE_LEVEL_HIGH + 0 219 IRQ_TYPE_LEVEL_HIGH + 0 308 IRQ_TYPE_LEVEL_HIGH + 0 309 IRQ_TYPE_LEVEL_HIGH + 0 310 IRQ_TYPE_LEVEL_HIGH + 0 311 IRQ_TYPE_LEVEL_HIGH + 0 312 IRQ_TYPE_LEVEL_HIGH + 0 313 IRQ_TYPE_LEVEL_HIGH + 0 314 IRQ_TYPE_LEVEL_HIGH + 0 315 IRQ_TYPE_LEVEL_HIGH + 0 316 IRQ_TYPE_LEVEL_HIGH + 0 317 IRQ_TYPE_LEVEL_HIGH + 0 318 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "error", + "ch0", "ch1", "ch2", "ch3", + "ch4", "ch5", "ch6", "ch7", + "ch8", "ch9", "ch10", "ch11", + "ch12", "ch13", "ch14"; + clocks = <&mstp2_clks R8A7793_CLK_SYS_DMAC1>; + clock-names = "fck"; + power-domains = <&cpg_clocks>; + #dma-cells = <1>; + dma-channels = <15>; + }; + scif0: serial@e6e60000 { compatible = "renesas,scif-r8a7793", "renesas,scif"; reg = <0 0xe6e60000 0 64>; @@ -313,6 +375,16 @@ "tmu3", "tmu2", "cmt0", "tmu0", "vsp1-du1", "vsp1-du0", "vsps"; }; + mstp2_clks: mstp2_clks@e6150138 { + compatible = "renesas,r8a7793-mstp-clocks", "renesas,cpg-mstp-clocks"; + reg = <0 0xe6150138 0 4>, <0 0xe6150040 0 4>; + clocks = <&zs_clk>, <&zs_clk>; + #clock-cells = <1>; + clock-indices = < + R8A7793_CLK_SYS_DMAC1 R8A7793_CLK_SYS_DMAC0 + >; + clock-output-names = "sys-dmac1", "sys-dmac0"; + }; mstp3_clks: mstp3_clks@e615013c { compatible = "renesas,r8a7793-mstp-clocks", "renesas,cpg-mstp-clocks"; -- 2.1.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 1/3] ARM: shmobile: r8a7793: Add DMAC devices to DT @ 2015-11-10 7:13 ` Simon Horman 0 siblings, 0 replies; 16+ messages in thread From: Simon Horman @ 2015-11-10 7:13 UTC (permalink / raw) To: linux-arm-kernel Instantiate the two system DMA controllers in the r8a7793 device tree. Based on similar work for the r8a7793 by Laurent Pinchart. Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/boot/dts/r8a7793.dtsi | 72 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi index 4f6480f8845f..187a82dc7d9f 100644 --- a/arch/arm/boot/dts/r8a7793.dtsi +++ b/arch/arm/boot/dts/r8a7793.dtsi @@ -128,6 +128,68 @@ #gpio-range-cells = <3>; }; + dmac0: dma-controller at e6700000 { + compatible = "renesas,rcar-dmac"; + reg = <0 0xe6700000 0 0x20000>; + interrupts = <0 197 IRQ_TYPE_LEVEL_HIGH + 0 200 IRQ_TYPE_LEVEL_HIGH + 0 201 IRQ_TYPE_LEVEL_HIGH + 0 202 IRQ_TYPE_LEVEL_HIGH + 0 203 IRQ_TYPE_LEVEL_HIGH + 0 204 IRQ_TYPE_LEVEL_HIGH + 0 205 IRQ_TYPE_LEVEL_HIGH + 0 206 IRQ_TYPE_LEVEL_HIGH + 0 207 IRQ_TYPE_LEVEL_HIGH + 0 208 IRQ_TYPE_LEVEL_HIGH + 0 209 IRQ_TYPE_LEVEL_HIGH + 0 210 IRQ_TYPE_LEVEL_HIGH + 0 211 IRQ_TYPE_LEVEL_HIGH + 0 212 IRQ_TYPE_LEVEL_HIGH + 0 213 IRQ_TYPE_LEVEL_HIGH + 0 214 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "error", + "ch0", "ch1", "ch2", "ch3", + "ch4", "ch5", "ch6", "ch7", + "ch8", "ch9", "ch10", "ch11", + "ch12", "ch13", "ch14"; + clocks = <&mstp2_clks R8A7793_CLK_SYS_DMAC0>; + clock-names = "fck"; + power-domains = <&cpg_clocks>; + #dma-cells = <1>; + dma-channels = <15>; + }; + + dmac1: dma-controller at e6720000 { + compatible = "renesas,rcar-dmac"; + reg = <0 0xe6720000 0 0x20000>; + interrupts = <0 220 IRQ_TYPE_LEVEL_HIGH + 0 216 IRQ_TYPE_LEVEL_HIGH + 0 217 IRQ_TYPE_LEVEL_HIGH + 0 218 IRQ_TYPE_LEVEL_HIGH + 0 219 IRQ_TYPE_LEVEL_HIGH + 0 308 IRQ_TYPE_LEVEL_HIGH + 0 309 IRQ_TYPE_LEVEL_HIGH + 0 310 IRQ_TYPE_LEVEL_HIGH + 0 311 IRQ_TYPE_LEVEL_HIGH + 0 312 IRQ_TYPE_LEVEL_HIGH + 0 313 IRQ_TYPE_LEVEL_HIGH + 0 314 IRQ_TYPE_LEVEL_HIGH + 0 315 IRQ_TYPE_LEVEL_HIGH + 0 316 IRQ_TYPE_LEVEL_HIGH + 0 317 IRQ_TYPE_LEVEL_HIGH + 0 318 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "error", + "ch0", "ch1", "ch2", "ch3", + "ch4", "ch5", "ch6", "ch7", + "ch8", "ch9", "ch10", "ch11", + "ch12", "ch13", "ch14"; + clocks = <&mstp2_clks R8A7793_CLK_SYS_DMAC1>; + clock-names = "fck"; + power-domains = <&cpg_clocks>; + #dma-cells = <1>; + dma-channels = <15>; + }; + scif0: serial at e6e60000 { compatible = "renesas,scif-r8a7793", "renesas,scif"; reg = <0 0xe6e60000 0 64>; @@ -313,6 +375,16 @@ "tmu3", "tmu2", "cmt0", "tmu0", "vsp1-du1", "vsp1-du0", "vsps"; }; + mstp2_clks: mstp2_clks at e6150138 { + compatible = "renesas,r8a7793-mstp-clocks", "renesas,cpg-mstp-clocks"; + reg = <0 0xe6150138 0 4>, <0 0xe6150040 0 4>; + clocks = <&zs_clk>, <&zs_clk>; + #clock-cells = <1>; + clock-indices = < + R8A7793_CLK_SYS_DMAC1 R8A7793_CLK_SYS_DMAC0 + >; + clock-output-names = "sys-dmac1", "sys-dmac0"; + }; mstp3_clks: mstp3_clks at e615013c { compatible = "renesas,r8a7793-mstp-clocks", "renesas,cpg-mstp-clocks"; -- 2.1.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 1/3] ARM: shmobile: r8a7793: Add DMAC devices to DT 2015-11-10 7:13 ` Simon Horman @ 2015-11-10 9:11 ` Laurent Pinchart -1 siblings, 0 replies; 16+ messages in thread From: Laurent Pinchart @ 2015-11-10 9:11 UTC (permalink / raw) To: linux-arm-kernel Hi Simon, Thank you for the patch. On Tuesday 10 November 2015 16:13:59 Simon Horman wrote: > Instantiate the two system DMA controllers in the r8a7793 device tree. > > Based on similar work for the r8a7793 by Laurent Pinchart. > > Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > --- > arch/arm/boot/dts/r8a7793.dtsi | 72 +++++++++++++++++++++++++++++++++++++++ > 1 file changed, 72 insertions(+) > > diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi > index 4f6480f8845f..187a82dc7d9f 100644 > --- a/arch/arm/boot/dts/r8a7793.dtsi > +++ b/arch/arm/boot/dts/r8a7793.dtsi > @@ -128,6 +128,68 @@ > #gpio-range-cells = <3>; > }; > > + dmac0: dma-controller@e6700000 { > + compatible = "renesas,rcar-dmac"; > + reg = <0 0xe6700000 0 0x20000>; > + interrupts = <0 197 IRQ_TYPE_LEVEL_HIGH > + 0 200 IRQ_TYPE_LEVEL_HIGH > + 0 201 IRQ_TYPE_LEVEL_HIGH > + 0 202 IRQ_TYPE_LEVEL_HIGH > + 0 203 IRQ_TYPE_LEVEL_HIGH > + 0 204 IRQ_TYPE_LEVEL_HIGH > + 0 205 IRQ_TYPE_LEVEL_HIGH > + 0 206 IRQ_TYPE_LEVEL_HIGH > + 0 207 IRQ_TYPE_LEVEL_HIGH > + 0 208 IRQ_TYPE_LEVEL_HIGH > + 0 209 IRQ_TYPE_LEVEL_HIGH > + 0 210 IRQ_TYPE_LEVEL_HIGH > + 0 211 IRQ_TYPE_LEVEL_HIGH > + 0 212 IRQ_TYPE_LEVEL_HIGH > + 0 213 IRQ_TYPE_LEVEL_HIGH > + 0 214 IRQ_TYPE_LEVEL_HIGH>; > + interrupt-names = "error", > + "ch0", "ch1", "ch2", "ch3", > + "ch4", "ch5", "ch6", "ch7", > + "ch8", "ch9", "ch10", "ch11", > + "ch12", "ch13", "ch14"; > + clocks = <&mstp2_clks R8A7793_CLK_SYS_DMAC0>; > + clock-names = "fck"; > + power-domains = <&cpg_clocks>; > + #dma-cells = <1>; > + dma-channels = <15>; > + }; > + > + dmac1: dma-controller@e6720000 { > + compatible = "renesas,rcar-dmac"; > + reg = <0 0xe6720000 0 0x20000>; > + interrupts = <0 220 IRQ_TYPE_LEVEL_HIGH > + 0 216 IRQ_TYPE_LEVEL_HIGH > + 0 217 IRQ_TYPE_LEVEL_HIGH > + 0 218 IRQ_TYPE_LEVEL_HIGH > + 0 219 IRQ_TYPE_LEVEL_HIGH > + 0 308 IRQ_TYPE_LEVEL_HIGH > + 0 309 IRQ_TYPE_LEVEL_HIGH > + 0 310 IRQ_TYPE_LEVEL_HIGH > + 0 311 IRQ_TYPE_LEVEL_HIGH > + 0 312 IRQ_TYPE_LEVEL_HIGH > + 0 313 IRQ_TYPE_LEVEL_HIGH > + 0 314 IRQ_TYPE_LEVEL_HIGH > + 0 315 IRQ_TYPE_LEVEL_HIGH > + 0 316 IRQ_TYPE_LEVEL_HIGH > + 0 317 IRQ_TYPE_LEVEL_HIGH > + 0 318 IRQ_TYPE_LEVEL_HIGH>; > + interrupt-names = "error", > + "ch0", "ch1", "ch2", "ch3", > + "ch4", "ch5", "ch6", "ch7", > + "ch8", "ch9", "ch10", "ch11", > + "ch12", "ch13", "ch14"; > + clocks = <&mstp2_clks R8A7793_CLK_SYS_DMAC1>; > + clock-names = "fck"; > + power-domains = <&cpg_clocks>; > + #dma-cells = <1>; > + dma-channels = <15>; > + }; > + > scif0: serial@e6e60000 { > compatible = "renesas,scif-r8a7793", "renesas,scif"; > reg = <0 0xe6e60000 0 64>; > @@ -313,6 +375,16 @@ > "tmu3", "tmu2", "cmt0", "tmu0", "vsp1-du1", > "vsp1-du0", "vsps"; > }; > + mstp2_clks: mstp2_clks@e6150138 { > + compatible = "renesas,r8a7793-mstp-clocks", "renesas,cpg-mstp- clocks"; > + reg = <0 0xe6150138 0 4>, <0 0xe6150040 0 4>; > + clocks = <&zs_clk>, <&zs_clk>; > + #clock-cells = <1>; > + clock-indices = < > + R8A7793_CLK_SYS_DMAC1 R8A7793_CLK_SYS_DMAC0 > + >; > + clock-output-names = "sys-dmac1", "sys-dmac0"; > + }; > mstp3_clks: mstp3_clks@e615013c { > compatible = "renesas,r8a7793-mstp-clocks", > "renesas,cpg-mstp-clocks"; -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 1/3] ARM: shmobile: r8a7793: Add DMAC devices to DT @ 2015-11-10 9:11 ` Laurent Pinchart 0 siblings, 0 replies; 16+ messages in thread From: Laurent Pinchart @ 2015-11-10 9:11 UTC (permalink / raw) To: linux-arm-kernel Hi Simon, Thank you for the patch. On Tuesday 10 November 2015 16:13:59 Simon Horman wrote: > Instantiate the two system DMA controllers in the r8a7793 device tree. > > Based on similar work for the r8a7793 by Laurent Pinchart. > > Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > --- > arch/arm/boot/dts/r8a7793.dtsi | 72 +++++++++++++++++++++++++++++++++++++++ > 1 file changed, 72 insertions(+) > > diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi > index 4f6480f8845f..187a82dc7d9f 100644 > --- a/arch/arm/boot/dts/r8a7793.dtsi > +++ b/arch/arm/boot/dts/r8a7793.dtsi > @@ -128,6 +128,68 @@ > #gpio-range-cells = <3>; > }; > > + dmac0: dma-controller at e6700000 { > + compatible = "renesas,rcar-dmac"; > + reg = <0 0xe6700000 0 0x20000>; > + interrupts = <0 197 IRQ_TYPE_LEVEL_HIGH > + 0 200 IRQ_TYPE_LEVEL_HIGH > + 0 201 IRQ_TYPE_LEVEL_HIGH > + 0 202 IRQ_TYPE_LEVEL_HIGH > + 0 203 IRQ_TYPE_LEVEL_HIGH > + 0 204 IRQ_TYPE_LEVEL_HIGH > + 0 205 IRQ_TYPE_LEVEL_HIGH > + 0 206 IRQ_TYPE_LEVEL_HIGH > + 0 207 IRQ_TYPE_LEVEL_HIGH > + 0 208 IRQ_TYPE_LEVEL_HIGH > + 0 209 IRQ_TYPE_LEVEL_HIGH > + 0 210 IRQ_TYPE_LEVEL_HIGH > + 0 211 IRQ_TYPE_LEVEL_HIGH > + 0 212 IRQ_TYPE_LEVEL_HIGH > + 0 213 IRQ_TYPE_LEVEL_HIGH > + 0 214 IRQ_TYPE_LEVEL_HIGH>; > + interrupt-names = "error", > + "ch0", "ch1", "ch2", "ch3", > + "ch4", "ch5", "ch6", "ch7", > + "ch8", "ch9", "ch10", "ch11", > + "ch12", "ch13", "ch14"; > + clocks = <&mstp2_clks R8A7793_CLK_SYS_DMAC0>; > + clock-names = "fck"; > + power-domains = <&cpg_clocks>; > + #dma-cells = <1>; > + dma-channels = <15>; > + }; > + > + dmac1: dma-controller at e6720000 { > + compatible = "renesas,rcar-dmac"; > + reg = <0 0xe6720000 0 0x20000>; > + interrupts = <0 220 IRQ_TYPE_LEVEL_HIGH > + 0 216 IRQ_TYPE_LEVEL_HIGH > + 0 217 IRQ_TYPE_LEVEL_HIGH > + 0 218 IRQ_TYPE_LEVEL_HIGH > + 0 219 IRQ_TYPE_LEVEL_HIGH > + 0 308 IRQ_TYPE_LEVEL_HIGH > + 0 309 IRQ_TYPE_LEVEL_HIGH > + 0 310 IRQ_TYPE_LEVEL_HIGH > + 0 311 IRQ_TYPE_LEVEL_HIGH > + 0 312 IRQ_TYPE_LEVEL_HIGH > + 0 313 IRQ_TYPE_LEVEL_HIGH > + 0 314 IRQ_TYPE_LEVEL_HIGH > + 0 315 IRQ_TYPE_LEVEL_HIGH > + 0 316 IRQ_TYPE_LEVEL_HIGH > + 0 317 IRQ_TYPE_LEVEL_HIGH > + 0 318 IRQ_TYPE_LEVEL_HIGH>; > + interrupt-names = "error", > + "ch0", "ch1", "ch2", "ch3", > + "ch4", "ch5", "ch6", "ch7", > + "ch8", "ch9", "ch10", "ch11", > + "ch12", "ch13", "ch14"; > + clocks = <&mstp2_clks R8A7793_CLK_SYS_DMAC1>; > + clock-names = "fck"; > + power-domains = <&cpg_clocks>; > + #dma-cells = <1>; > + dma-channels = <15>; > + }; > + > scif0: serial at e6e60000 { > compatible = "renesas,scif-r8a7793", "renesas,scif"; > reg = <0 0xe6e60000 0 64>; > @@ -313,6 +375,16 @@ > "tmu3", "tmu2", "cmt0", "tmu0", "vsp1-du1", > "vsp1-du0", "vsps"; > }; > + mstp2_clks: mstp2_clks at e6150138 { > + compatible = "renesas,r8a7793-mstp-clocks", "renesas,cpg-mstp- clocks"; > + reg = <0 0xe6150138 0 4>, <0 0xe6150040 0 4>; > + clocks = <&zs_clk>, <&zs_clk>; > + #clock-cells = <1>; > + clock-indices = < > + R8A7793_CLK_SYS_DMAC1 R8A7793_CLK_SYS_DMAC0 > + >; > + clock-output-names = "sys-dmac1", "sys-dmac0"; > + }; > mstp3_clks: mstp3_clks at e615013c { > compatible = "renesas,r8a7793-mstp-clocks", > "renesas,cpg-mstp-clocks"; -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/3] ARM: shmobile: r8a7793: Add DMAC devices to DT 2015-11-10 7:13 ` Simon Horman @ 2015-11-10 16:58 ` Magnus Damm -1 siblings, 0 replies; 16+ messages in thread From: Magnus Damm @ 2015-11-10 16:58 UTC (permalink / raw) To: linux-arm-kernel Hi Simon, On Tue, Nov 10, 2015 at 4:13 PM, Simon Horman <horms+renesas@verge.net.au> wrote: > Instantiate the two system DMA controllers in the r8a7793 device tree. > > Based on similar work for the r8a7793 by Laurent Pinchart. > > Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > --- > arch/arm/boot/dts/r8a7793.dtsi | 72 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 72 insertions(+) > > diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi > index 4f6480f8845f..187a82dc7d9f 100644 > --- a/arch/arm/boot/dts/r8a7793.dtsi > +++ b/arch/arm/boot/dts/r8a7793.dtsi > @@ -128,6 +128,68 @@ > #gpio-range-cells = <3>; > }; > > + dmac0: dma-controller@e6700000 { > + compatible = "renesas,rcar-dmac"; Thanks for cooking up this patch. It looks fine to me, but it reminds me about compat string handling. Is there any special reason why we don't use the SoC part number in the compatible string for DMAC devices? Cheers, / magnus ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 1/3] ARM: shmobile: r8a7793: Add DMAC devices to DT @ 2015-11-10 16:58 ` Magnus Damm 0 siblings, 0 replies; 16+ messages in thread From: Magnus Damm @ 2015-11-10 16:58 UTC (permalink / raw) To: linux-arm-kernel Hi Simon, On Tue, Nov 10, 2015 at 4:13 PM, Simon Horman <horms+renesas@verge.net.au> wrote: > Instantiate the two system DMA controllers in the r8a7793 device tree. > > Based on similar work for the r8a7793 by Laurent Pinchart. > > Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > --- > arch/arm/boot/dts/r8a7793.dtsi | 72 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 72 insertions(+) > > diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi > index 4f6480f8845f..187a82dc7d9f 100644 > --- a/arch/arm/boot/dts/r8a7793.dtsi > +++ b/arch/arm/boot/dts/r8a7793.dtsi > @@ -128,6 +128,68 @@ > #gpio-range-cells = <3>; > }; > > + dmac0: dma-controller at e6700000 { > + compatible = "renesas,rcar-dmac"; Thanks for cooking up this patch. It looks fine to me, but it reminds me about compat string handling. Is there any special reason why we don't use the SoC part number in the compatible string for DMAC devices? Cheers, / magnus ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/3] ARM: shmobile: r8a7793: Add DMAC devices to DT 2015-11-10 16:58 ` Magnus Damm @ 2015-11-12 1:24 ` Simon Horman -1 siblings, 0 replies; 16+ messages in thread From: Simon Horman @ 2015-11-12 1:24 UTC (permalink / raw) To: linux-arm-kernel On Wed, Nov 11, 2015 at 01:58:09AM +0900, Magnus Damm wrote: > Hi Simon, > > On Tue, Nov 10, 2015 at 4:13 PM, Simon Horman > <horms+renesas@verge.net.au> wrote: > > Instantiate the two system DMA controllers in the r8a7793 device tree. > > > > Based on similar work for the r8a7793 by Laurent Pinchart. > > > > Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > --- > > arch/arm/boot/dts/r8a7793.dtsi | 72 ++++++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 72 insertions(+) > > > > diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi > > index 4f6480f8845f..187a82dc7d9f 100644 > > --- a/arch/arm/boot/dts/r8a7793.dtsi > > +++ b/arch/arm/boot/dts/r8a7793.dtsi > > @@ -128,6 +128,68 @@ > > #gpio-range-cells = <3>; > > }; > > > > + dmac0: dma-controller@e6700000 { > > + compatible = "renesas,rcar-dmac"; > > Thanks for cooking up this patch. It looks fine to me, but it reminds > me about compat string handling. > > Is there any special reason why we don't use the SoC part number in > the compatible string for DMAC devices? Thanks. I will try and resolve that separately to this patchset. ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 1/3] ARM: shmobile: r8a7793: Add DMAC devices to DT @ 2015-11-12 1:24 ` Simon Horman 0 siblings, 0 replies; 16+ messages in thread From: Simon Horman @ 2015-11-12 1:24 UTC (permalink / raw) To: linux-arm-kernel On Wed, Nov 11, 2015 at 01:58:09AM +0900, Magnus Damm wrote: > Hi Simon, > > On Tue, Nov 10, 2015 at 4:13 PM, Simon Horman > <horms+renesas@verge.net.au> wrote: > > Instantiate the two system DMA controllers in the r8a7793 device tree. > > > > Based on similar work for the r8a7793 by Laurent Pinchart. > > > > Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > --- > > arch/arm/boot/dts/r8a7793.dtsi | 72 ++++++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 72 insertions(+) > > > > diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi > > index 4f6480f8845f..187a82dc7d9f 100644 > > --- a/arch/arm/boot/dts/r8a7793.dtsi > > +++ b/arch/arm/boot/dts/r8a7793.dtsi > > @@ -128,6 +128,68 @@ > > #gpio-range-cells = <3>; > > }; > > > > + dmac0: dma-controller at e6700000 { > > + compatible = "renesas,rcar-dmac"; > > Thanks for cooking up this patch. It looks fine to me, but it reminds > me about compat string handling. > > Is there any special reason why we don't use the SoC part number in > the compatible string for DMAC devices? Thanks. I will try and resolve that separately to this patchset. ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 2/3] ARM: shmobile: r8a7793: Add QSPI device to DT 2015-11-10 7:13 ` Simon Horman @ 2015-11-10 7:14 ` Simon Horman -1 siblings, 0 replies; 16+ messages in thread From: Simon Horman @ 2015-11-10 7:14 UTC (permalink / raw) To: linux-arm-kernel Instantiate the QSPI controller in the r8a7793 device tree. Based similar work for the r8a7794 by by Hisashi Nakamura and Sergei Shtylyov. Cc: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com> Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/boot/dts/r8a7793.dtsi | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi index 187a82dc7d9f..aa9b64c14a09 100644 --- a/arch/arm/boot/dts/r8a7793.dtsi +++ b/arch/arm/boot/dts/r8a7793.dtsi @@ -18,6 +18,10 @@ #address-cells = <2>; #size-cells = <2>; + aliases { + spi0 = &qspi; + }; + cpus { #address-cells = <1>; #size-cells = <0>; @@ -222,6 +226,20 @@ status = "disabled"; }; + qspi: spi@e6b10000 { + compatible = "renesas,qspi-r8a7793", "renesas,qspi"; + reg = <0 0xe6b10000 0 0x2c>; + interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp9_clks R8A7793_CLK_QSPI_MOD>; + dmas = <&dmac0 0x17>, <&dmac0 0x18>; + dma-names = "tx", "rx"; + power-domains = <&cpg_clocks>; + num-cs = <1>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + clocks { #address-cells = <2>; #size-cells = <2>; @@ -463,6 +481,14 @@ "ipmmu_sgx", "vin2", "vin1", "vin0", "ether", "sata1", "sata0"; }; + mstp9_clks: mstp9_clks@e6150994 { + compatible = "renesas,r8a7793-mstp-clocks", "renesas,cpg-mstp-clocks"; + reg = <0 0xe6150994 0 4>, <0 0xe61509a4 0 4>; + clocks = <&cpg_clocks R8A7793_CLK_QSPI>; + #clock-cells = <1>; + clock-indices = <R8A7793_CLK_QSPI_MOD>; + clock-output-names = "qspi_mod"; + }; }; ipmmu_sy0: mmu@e6280000 { -- 2.1.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 2/3] ARM: shmobile: r8a7793: Add QSPI device to DT @ 2015-11-10 7:14 ` Simon Horman 0 siblings, 0 replies; 16+ messages in thread From: Simon Horman @ 2015-11-10 7:14 UTC (permalink / raw) To: linux-arm-kernel Instantiate the QSPI controller in the r8a7793 device tree. Based similar work for the r8a7794 by by Hisashi Nakamura and Sergei Shtylyov. Cc: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com> Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/boot/dts/r8a7793.dtsi | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi index 187a82dc7d9f..aa9b64c14a09 100644 --- a/arch/arm/boot/dts/r8a7793.dtsi +++ b/arch/arm/boot/dts/r8a7793.dtsi @@ -18,6 +18,10 @@ #address-cells = <2>; #size-cells = <2>; + aliases { + spi0 = &qspi; + }; + cpus { #address-cells = <1>; #size-cells = <0>; @@ -222,6 +226,20 @@ status = "disabled"; }; + qspi: spi at e6b10000 { + compatible = "renesas,qspi-r8a7793", "renesas,qspi"; + reg = <0 0xe6b10000 0 0x2c>; + interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp9_clks R8A7793_CLK_QSPI_MOD>; + dmas = <&dmac0 0x17>, <&dmac0 0x18>; + dma-names = "tx", "rx"; + power-domains = <&cpg_clocks>; + num-cs = <1>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + clocks { #address-cells = <2>; #size-cells = <2>; @@ -463,6 +481,14 @@ "ipmmu_sgx", "vin2", "vin1", "vin0", "ether", "sata1", "sata0"; }; + mstp9_clks: mstp9_clks at e6150994 { + compatible = "renesas,r8a7793-mstp-clocks", "renesas,cpg-mstp-clocks"; + reg = <0 0xe6150994 0 4>, <0 0xe61509a4 0 4>; + clocks = <&cpg_clocks R8A7793_CLK_QSPI>; + #clock-cells = <1>; + clock-indices = <R8A7793_CLK_QSPI_MOD>; + clock-output-names = "qspi_mod"; + }; }; ipmmu_sy0: mmu at e6280000 { -- 2.1.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 3/3] ARM: shmobile: gose: Add QSPI device to DT 2015-11-10 7:13 ` Simon Horman @ 2015-11-10 7:14 ` Simon Horman -1 siblings, 0 replies; 16+ messages in thread From: Simon Horman @ 2015-11-10 7:14 UTC (permalink / raw) To: linux-arm-kernel Enable the QSPI controller in the gose device tree. Based similar work for the silk board by by Vladimir Barinov and Sergei Shtylyov. Cc: Vladimir Barinov <vladimir.barinov@cogentembedded.com> Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- Tested: Read /dev/mtd0 with 512K blocks at 1.7MB/s --- arch/arm/boot/dts/r8a7793-gose.dts | 40 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/arch/arm/boot/dts/r8a7793-gose.dts b/arch/arm/boot/dts/r8a7793-gose.dts index 1575ef759047..3bc4230aa2b5 100644 --- a/arch/arm/boot/dts/r8a7793-gose.dts +++ b/arch/arm/boot/dts/r8a7793-gose.dts @@ -57,6 +57,11 @@ renesas,groups = "intc_irq0"; renesas,function = "intc"; }; + + qspi_pins: spi0 { + renesas,groups = "qspi_ctrl", "qspi_data4"; + renesas,function = "qspi"; + }; }; ðer { @@ -92,3 +97,38 @@ status = "okay"; }; + +&qspi { + pinctrl-0 = <&qspi_pins>; + pinctrl-names = "default"; + + status = "okay"; + + flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "spansion,s25fl512s", "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <30000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; + spi-cpol; + spi-cpha; + m25p,fast-read; + + partition@0 { + label = "loader"; + reg = <0x00000000 0x00040000>; + read-only; + }; + partition@40000 { + label = "user"; + reg = <0x00040000 0x00400000>; + read-only; + }; + partition@440000 { + label = "flash"; + reg = <0x00440000 0x03bc0000>; + }; + }; +}; -- 2.1.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 3/3] ARM: shmobile: gose: Add QSPI device to DT @ 2015-11-10 7:14 ` Simon Horman 0 siblings, 0 replies; 16+ messages in thread From: Simon Horman @ 2015-11-10 7:14 UTC (permalink / raw) To: linux-arm-kernel Enable the QSPI controller in the gose device tree. Based similar work for the silk board by by Vladimir Barinov and Sergei Shtylyov. Cc: Vladimir Barinov <vladimir.barinov@cogentembedded.com> Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- Tested: Read /dev/mtd0 with 512K blocks at 1.7MB/s --- arch/arm/boot/dts/r8a7793-gose.dts | 40 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/arch/arm/boot/dts/r8a7793-gose.dts b/arch/arm/boot/dts/r8a7793-gose.dts index 1575ef759047..3bc4230aa2b5 100644 --- a/arch/arm/boot/dts/r8a7793-gose.dts +++ b/arch/arm/boot/dts/r8a7793-gose.dts @@ -57,6 +57,11 @@ renesas,groups = "intc_irq0"; renesas,function = "intc"; }; + + qspi_pins: spi0 { + renesas,groups = "qspi_ctrl", "qspi_data4"; + renesas,function = "qspi"; + }; }; ðer { @@ -92,3 +97,38 @@ status = "okay"; }; + +&qspi { + pinctrl-0 = <&qspi_pins>; + pinctrl-names = "default"; + + status = "okay"; + + flash at 0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "spansion,s25fl512s", "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <30000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; + spi-cpol; + spi-cpha; + m25p,fast-read; + + partition at 0 { + label = "loader"; + reg = <0x00000000 0x00040000>; + read-only; + }; + partition at 40000 { + label = "user"; + reg = <0x00040000 0x00400000>; + read-only; + }; + partition at 440000 { + label = "flash"; + reg = <0x00440000 0x03bc0000>; + }; + }; +}; -- 2.1.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 3/3] ARM: shmobile: gose: Add QSPI device to DT 2015-11-10 7:14 ` Simon Horman @ 2015-11-10 8:37 ` Geert Uytterhoeven -1 siblings, 0 replies; 16+ messages in thread From: Geert Uytterhoeven @ 2015-11-10 8:37 UTC (permalink / raw) To: linux-arm-kernel Hi Simon, On Tue, Nov 10, 2015 at 8:14 AM, Simon Horman <horms+renesas@verge.net.au> wrote: > Enable the QSPI controller in the gose device tree. > > Based similar work for the silk board by by Vladimir Barinov and > Sergei Shtylyov. > > Cc: Vladimir Barinov <vladimir.barinov@cogentembedded.com> > Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > --- > Tested: Read /dev/mtd0 with 512K blocks at 1.7MB/s > --- > arch/arm/boot/dts/r8a7793-gose.dts | 40 ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 40 insertions(+) > > diff --git a/arch/arm/boot/dts/r8a7793-gose.dts b/arch/arm/boot/dts/r8a7793-gose.dts > index 1575ef759047..3bc4230aa2b5 100644 > --- a/arch/arm/boot/dts/r8a7793-gose.dts > +++ b/arch/arm/boot/dts/r8a7793-gose.dts > @@ -92,3 +97,38 @@ > > status = "okay"; > }; > + > +&qspi { > + pinctrl-0 = <&qspi_pins>; > + pinctrl-names = "default"; > + > + status = "okay"; > + > + flash@0 { > + #address-cells = <1>; > + #size-cells = <1>; > + compatible = "spansion,s25fl512s", "jedec,spi-nor"; > + reg = <0>; > + spi-max-frequency = <30000000>; > + spi-tx-bus-width = <4>; > + spi-rx-bus-width = <4>; > + spi-cpol; > + spi-cpha; > + m25p,fast-read; > + > + partition@0 { > + label = "loader"; > + reg = <0x00000000 0x00040000>; > + read-only; > + }; > + partition@40000 { > + label = "user"; > + reg = <0x00040000 0x00400000>; > + read-only; > + }; > + partition@440000 { > + label = "flash"; > + reg = <0x00440000 0x03bc0000>; > + }; > + }; Please move the partitions inside a "partitions" subnode, cfr. the patch I've just sent for Koelsch ("[PATCH] ARM: shmobile: koelsch: Move SPI FLASH partitions to subnode"). I haven't updated the other DTSes yet. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 3/3] ARM: shmobile: gose: Add QSPI device to DT @ 2015-11-10 8:37 ` Geert Uytterhoeven 0 siblings, 0 replies; 16+ messages in thread From: Geert Uytterhoeven @ 2015-11-10 8:37 UTC (permalink / raw) To: linux-arm-kernel Hi Simon, On Tue, Nov 10, 2015 at 8:14 AM, Simon Horman <horms+renesas@verge.net.au> wrote: > Enable the QSPI controller in the gose device tree. > > Based similar work for the silk board by by Vladimir Barinov and > Sergei Shtylyov. > > Cc: Vladimir Barinov <vladimir.barinov@cogentembedded.com> > Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > --- > Tested: Read /dev/mtd0 with 512K blocks at 1.7MB/s > --- > arch/arm/boot/dts/r8a7793-gose.dts | 40 ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 40 insertions(+) > > diff --git a/arch/arm/boot/dts/r8a7793-gose.dts b/arch/arm/boot/dts/r8a7793-gose.dts > index 1575ef759047..3bc4230aa2b5 100644 > --- a/arch/arm/boot/dts/r8a7793-gose.dts > +++ b/arch/arm/boot/dts/r8a7793-gose.dts > @@ -92,3 +97,38 @@ > > status = "okay"; > }; > + > +&qspi { > + pinctrl-0 = <&qspi_pins>; > + pinctrl-names = "default"; > + > + status = "okay"; > + > + flash at 0 { > + #address-cells = <1>; > + #size-cells = <1>; > + compatible = "spansion,s25fl512s", "jedec,spi-nor"; > + reg = <0>; > + spi-max-frequency = <30000000>; > + spi-tx-bus-width = <4>; > + spi-rx-bus-width = <4>; > + spi-cpol; > + spi-cpha; > + m25p,fast-read; > + > + partition at 0 { > + label = "loader"; > + reg = <0x00000000 0x00040000>; > + read-only; > + }; > + partition at 40000 { > + label = "user"; > + reg = <0x00040000 0x00400000>; > + read-only; > + }; > + partition at 440000 { > + label = "flash"; > + reg = <0x00440000 0x03bc0000>; > + }; > + }; Please move the partitions inside a "partitions" subnode, cfr. the patch I've just sent for Koelsch ("[PATCH] ARM: shmobile: koelsch: Move SPI FLASH partitions to subnode"). I haven't updated the other DTSes yet. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds ^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2015-11-12 1:24 UTC | newest] Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2015-11-10 7:13 [PATCH 0/3] gose: Enable QSPI Simon Horman 2015-11-10 7:13 ` Simon Horman 2015-11-10 7:13 ` [PATCH 1/3] ARM: shmobile: r8a7793: Add DMAC devices to DT Simon Horman 2015-11-10 7:13 ` Simon Horman 2015-11-10 9:11 ` Laurent Pinchart 2015-11-10 9:11 ` Laurent Pinchart 2015-11-10 16:58 ` Magnus Damm 2015-11-10 16:58 ` Magnus Damm 2015-11-12 1:24 ` Simon Horman 2015-11-12 1:24 ` Simon Horman 2015-11-10 7:14 ` [PATCH 2/3] ARM: shmobile: r8a7793: Add QSPI device " Simon Horman 2015-11-10 7:14 ` Simon Horman 2015-11-10 7:14 ` [PATCH 3/3] ARM: shmobile: gose: " Simon Horman 2015-11-10 7:14 ` Simon Horman 2015-11-10 8:37 ` Geert Uytterhoeven 2015-11-10 8:37 ` Geert Uytterhoeven
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.