* [PATCH 0/2] Move comon DMA nodes to exynos5.dtsi and
@ 2013-07-10 12:14 Padmavathi Venna
2013-07-10 12:14 ` [PATCH 1/2] ARM: dts: Move the common DMA controller nodes to exynos5.dtsi Padmavathi Venna
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Padmavathi Venna @ 2013-07-10 12:14 UTC (permalink / raw)
To: linux-samsung-soc, devicetree-discuss, linux-arm-kernel, padma.v,
padma.kvr
Cc: sbkim73, broonie, kgene.kim, dianders, abrestic, vinod.koul
Exynos5250 and Exynos5420 has 4 DMA controllers in common. So this patch
set moved the common nodes to exynos.dtsi keeping the clk info seperate
for both the platforms. Exynos5420 has a separate DMA controller for audio
IPs. So this patch set also adds the ADMA node on Exynos5420.
Padmavathi Venna (2):
ARM: dts: Move the common DMA controller nodes to exynos5.dtsi
ARM: dts: Add DMA controller node info on Exynos5420.
arch/arm/boot/dts/exynos5.dtsi | 44 +++++++++++++++++++++++++++++++++++++
arch/arm/boot/dts/exynos5250.dtsi | 30 -------------------------
arch/arm/boot/dts/exynos5420.dtsi | 33 +++++++++++++++++++++++++++
3 files changed, 77 insertions(+), 30 deletions(-)
--
1.7.4.4
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/2] ARM: dts: Move the common DMA controller nodes to exynos5.dtsi 2013-07-10 12:14 [PATCH 0/2] Move comon DMA nodes to exynos5.dtsi and Padmavathi Venna @ 2013-07-10 12:14 ` Padmavathi Venna 2013-08-14 9:44 ` Kukjin Kim 2013-07-10 12:14 ` [PATCH 2/2] ARM: dts: Add DMA controller node info on Exynos5420 Padmavathi Venna 2013-08-12 10:18 ` [PATCH 0/2] Move comon DMA nodes to exynos5.dtsi and Padma Venkat 2 siblings, 1 reply; 6+ messages in thread From: Padmavathi Venna @ 2013-07-10 12:14 UTC (permalink / raw) To: linux-samsung-soc, devicetree-discuss, linux-arm-kernel, padma.v, padma.kvr Cc: sbkim73, broonie, kgene.kim, dianders, abrestic, vinod.koul exynos5250 and exynos5420 has 4 DMA controllers in common. So this patch moves these nodes to common file keeping the dma controllers clk info in the exynos5250 dtsi file. Signed-off-by: Padmavathi Venna <padma.v@samsung.com> --- arch/arm/boot/dts/exynos5.dtsi | 44 +++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/exynos5250.dtsi | 30 ------------------------- 2 files changed, 44 insertions(+), 30 deletions(-) diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi index f65e124..cac35c8 100644 --- a/arch/arm/boot/dts/exynos5.dtsi +++ b/arch/arm/boot/dts/exynos5.dtsi @@ -50,6 +50,50 @@ interrupts = <1 9 0xf04>; }; + amba { + #address-cells = <1>; + #size-cells = <1>; + compatible = "arm,amba-bus"; + interrupt-parent = <&gic>; + ranges; + + pdma0: pdma@121A0000 { + compatible = "arm,pl330", "arm,primecell"; + reg = <0x121A0000 0x1000>; + interrupts = <0 34 0>; + #dma-cells = <1>; + #dma-channels = <8>; + #dma-requests = <32>; + }; + + pdma1: pdma@121B0000 { + compatible = "arm,pl330", "arm,primecell"; + reg = <0x121B0000 0x1000>; + interrupts = <0 35 0>; + #dma-cells = <1>; + #dma-channels = <8>; + #dma-requests = <32>; + }; + + mdma0: mdma@10800000 { + compatible = "arm,pl330", "arm,primecell"; + reg = <0x10800000 0x1000>; + interrupts = <0 33 0>; + #dma-cells = <1>; + #dma-channels = <8>; + #dma-requests = <1>; + }; + + mdma1: mdma@11C10000 { + compatible = "arm,pl330", "arm,primecell"; + reg = <0x11C10000 0x1000>; + interrupts = <0 124 0>; + #dma-cells = <1>; + #dma-channels = <8>; + #dma-requests = <1>; + }; + }; + dwmmc_0: dwmmc0@12200000 { compatible = "samsung,exynos5250-dw-mshc"; interrupts = <0 75 0>; diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 41cd625..3a474c4 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -511,54 +511,24 @@ }; amba { - #address-cells = <1>; - #size-cells = <1>; - compatible = "arm,amba-bus"; - interrupt-parent = <&gic>; - ranges; - pdma0: pdma@121A0000 { - compatible = "arm,pl330", "arm,primecell"; - reg = <0x121A0000 0x1000>; - interrupts = <0 34 0>; clocks = <&clock 275>; clock-names = "apb_pclk"; - #dma-cells = <1>; - #dma-channels = <8>; - #dma-requests = <32>; }; pdma1: pdma@121B0000 { - compatible = "arm,pl330", "arm,primecell"; - reg = <0x121B0000 0x1000>; - interrupts = <0 35 0>; clocks = <&clock 276>; clock-names = "apb_pclk"; - #dma-cells = <1>; - #dma-channels = <8>; - #dma-requests = <32>; }; mdma0: mdma@10800000 { - compatible = "arm,pl330", "arm,primecell"; - reg = <0x10800000 0x1000>; - interrupts = <0 33 0>; clocks = <&clock 271>; clock-names = "apb_pclk"; - #dma-cells = <1>; - #dma-channels = <8>; - #dma-requests = <1>; }; mdma1: mdma@11C10000 { - compatible = "arm,pl330", "arm,primecell"; - reg = <0x11C10000 0x1000>; - interrupts = <0 124 0>; clocks = <&clock 271>; clock-names = "apb_pclk"; - #dma-cells = <1>; - #dma-channels = <8>; - #dma-requests = <1>; }; }; -- 1.7.4.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* RE: [PATCH 1/2] ARM: dts: Move the common DMA controller nodes to exynos5.dtsi 2013-07-10 12:14 ` [PATCH 1/2] ARM: dts: Move the common DMA controller nodes to exynos5.dtsi Padmavathi Venna @ 2013-08-14 9:44 ` Kukjin Kim 0 siblings, 0 replies; 6+ messages in thread From: Kukjin Kim @ 2013-08-14 9:44 UTC (permalink / raw) To: 'Padmavathi Venna', linux-samsung-soc, devicetree-discuss, linux-arm-kernel, padma.kvr Cc: sbkim73, broonie, dianders, abrestic, vinod.koul Padmavathi Venna wrote: > > exynos5250 and exynos5420 has 4 DMA controllers in common. So this patch > moves these nodes to common file keeping the dma controllers clk info in > the exynos5250 dtsi file. > > Signed-off-by: Padmavathi Venna <padma.v@samsung.com> > --- > arch/arm/boot/dts/exynos5.dtsi | 44 > +++++++++++++++++++++++++++++++++++++ > arch/arm/boot/dts/exynos5250.dtsi | 30 ------------------------- > 2 files changed, 44 insertions(+), 30 deletions(-) > > diff --git a/arch/arm/boot/dts/exynos5.dtsi > b/arch/arm/boot/dts/exynos5.dtsi > index f65e124..cac35c8 100644 > --- a/arch/arm/boot/dts/exynos5.dtsi > +++ b/arch/arm/boot/dts/exynos5.dtsi > @@ -50,6 +50,50 @@ > interrupts = <1 9 0xf04>; > }; > > + amba { > + #address-cells = <1>; > + #size-cells = <1>; > + compatible = "arm,amba-bus"; > + interrupt-parent = <&gic>; > + ranges; > + > + pdma0: pdma@121A0000 { > + compatible = "arm,pl330", "arm,primecell"; > + reg = <0x121A0000 0x1000>; > + interrupts = <0 34 0>; > + #dma-cells = <1>; > + #dma-channels = <8>; > + #dma-requests = <32>; > + }; > + > + pdma1: pdma@121B0000 { > + compatible = "arm,pl330", "arm,primecell"; > + reg = <0x121B0000 0x1000>; > + interrupts = <0 35 0>; > + #dma-cells = <1>; > + #dma-channels = <8>; > + #dma-requests = <32>; > + }; > + > + mdma0: mdma@10800000 { > + compatible = "arm,pl330", "arm,primecell"; > + reg = <0x10800000 0x1000>; > + interrupts = <0 33 0>; > + #dma-cells = <1>; > + #dma-channels = <8>; > + #dma-requests = <1>; > + }; > + > + mdma1: mdma@11C10000 { > + compatible = "arm,pl330", "arm,primecell"; > + reg = <0x11C10000 0x1000>; > + interrupts = <0 124 0>; > + #dma-cells = <1>; > + #dma-channels = <8>; > + #dma-requests = <1>; > + }; > + }; > + > dwmmc_0: dwmmc0@12200000 { > compatible = "samsung,exynos5250-dw-mshc"; > interrupts = <0 75 0>; > diff --git a/arch/arm/boot/dts/exynos5250.dtsi > b/arch/arm/boot/dts/exynos5250.dtsi > index 41cd625..3a474c4 100644 > --- a/arch/arm/boot/dts/exynos5250.dtsi > +++ b/arch/arm/boot/dts/exynos5250.dtsi > @@ -511,54 +511,24 @@ > }; > > amba { > - #address-cells = <1>; > - #size-cells = <1>; > - compatible = "arm,amba-bus"; > - interrupt-parent = <&gic>; > - ranges; > - > pdma0: pdma@121A0000 { > - compatible = "arm,pl330", "arm,primecell"; > - reg = <0x121A0000 0x1000>; > - interrupts = <0 34 0>; > clocks = <&clock 275>; > clock-names = "apb_pclk"; > - #dma-cells = <1>; > - #dma-channels = <8>; > - #dma-requests = <32>; > }; > > pdma1: pdma@121B0000 { > - compatible = "arm,pl330", "arm,primecell"; > - reg = <0x121B0000 0x1000>; > - interrupts = <0 35 0>; > clocks = <&clock 276>; > clock-names = "apb_pclk"; > - #dma-cells = <1>; > - #dma-channels = <8>; > - #dma-requests = <32>; > }; > > mdma0: mdma@10800000 { > - compatible = "arm,pl330", "arm,primecell"; > - reg = <0x10800000 0x1000>; > - interrupts = <0 33 0>; > clocks = <&clock 271>; > clock-names = "apb_pclk"; > - #dma-cells = <1>; > - #dma-channels = <8>; > - #dma-requests = <1>; > }; > > mdma1: mdma@11C10000 { > - compatible = "arm,pl330", "arm,primecell"; > - reg = <0x11C10000 0x1000>; > - interrupts = <0 124 0>; > clocks = <&clock 271>; > clock-names = "apb_pclk"; > - #dma-cells = <1>; > - #dma-channels = <8>; > - #dma-requests = <1>; > }; > }; > > -- > 1.7.4.4 NAK, because the dmac addresses are different on upcoming exynos5 and there are 2-mdma and only one pdma. So this change can make more complicated. - Kukjin ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] ARM: dts: Add DMA controller node info on Exynos5420. 2013-07-10 12:14 [PATCH 0/2] Move comon DMA nodes to exynos5.dtsi and Padmavathi Venna 2013-07-10 12:14 ` [PATCH 1/2] ARM: dts: Move the common DMA controller nodes to exynos5.dtsi Padmavathi Venna @ 2013-07-10 12:14 ` Padmavathi Venna 2013-08-14 9:45 ` Kukjin Kim 2013-08-12 10:18 ` [PATCH 0/2] Move comon DMA nodes to exynos5.dtsi and Padma Venkat 2 siblings, 1 reply; 6+ messages in thread From: Padmavathi Venna @ 2013-07-10 12:14 UTC (permalink / raw) To: linux-samsung-soc, devicetree-discuss, linux-arm-kernel, padma.v, padma.kvr Cc: sbkim73, broonie, kgene.kim, dianders, abrestic, vinod.koul Exynos5420 has one separate DMA controller for I2S0 and PCM0. This patch adds the same node on exynos5420 dtsi and adds the DMA clk info for the remaining DMA controllers. Signed-off-by: Padmavathi Venna <padma.v@samsung.com> --- arch/arm/boot/dts/exynos5420.dtsi | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index a84f5f1..7035a4b 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi @@ -137,6 +137,39 @@ interrupts = <0 47 0>; }; + amba { + pdma0: pdma@121A0000 { + clocks = <&clock 362>; + clock-names = "apb_pclk"; + }; + + pdma1: pdma@121B0000 { + clocks = <&clock 363>; + clock-names = "apb_pclk"; + }; + + mdma0: mdma@10800000 { + clocks = <&clock 473>; + clock-names = "apb_pclk"; + }; + + mdma1: mdma@11C10000 { + clocks = <&clock 442>; + clock-names = "apb_pclk"; + }; + + adma: adma@03880000 { + compatible = "arm,pl330", "arm,primecell"; + reg = <0x03880000 0x1000>; + interrupts = <0 110 0>; + clocks = <&clock_audss EXYNOS_ADMA>; + clock-names = "apb_pclk"; + #dma-cells = <1>; + #dma-channels = <6>; + #dma-requests = <16>; + }; + }; + serial@12C00000 { clocks = <&clock 257>, <&clock 128>; clock-names = "uart", "clk_uart_baud0"; -- 1.7.4.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* RE: [PATCH 2/2] ARM: dts: Add DMA controller node info on Exynos5420. 2013-07-10 12:14 ` [PATCH 2/2] ARM: dts: Add DMA controller node info on Exynos5420 Padmavathi Venna @ 2013-08-14 9:45 ` Kukjin Kim 0 siblings, 0 replies; 6+ messages in thread From: Kukjin Kim @ 2013-08-14 9:45 UTC (permalink / raw) To: 'Padmavathi Venna', linux-samsung-soc, devicetree-discuss, linux-arm-kernel, padma.kvr Cc: sbkim73, broonie, dianders, abrestic, vinod.koul Padmavathi Venna wrote: > > Exynos5420 has one separate DMA controller for I2S0 and PCM0. This patch > adds the same node on exynos5420 dtsi and adds the DMA clk info for the > remaining DMA controllers. > > Signed-off-by: Padmavathi Venna <padma.v@samsung.com> > --- > arch/arm/boot/dts/exynos5420.dtsi | 33 +++++++++++++++++++++++++++++++++ > 1 files changed, 33 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/boot/dts/exynos5420.dtsi > b/arch/arm/boot/dts/exynos5420.dtsi > index a84f5f1..7035a4b 100644 > --- a/arch/arm/boot/dts/exynos5420.dtsi > +++ b/arch/arm/boot/dts/exynos5420.dtsi > @@ -137,6 +137,39 @@ > interrupts = <0 47 0>; > }; > > + amba { > + pdma0: pdma@121A0000 { > + clocks = <&clock 362>; > + clock-names = "apb_pclk"; > + }; > + > + pdma1: pdma@121B0000 { > + clocks = <&clock 363>; > + clock-names = "apb_pclk"; > + }; > + > + mdma0: mdma@10800000 { > + clocks = <&clock 473>; > + clock-names = "apb_pclk"; > + }; > + > + mdma1: mdma@11C10000 { > + clocks = <&clock 442>; > + clock-names = "apb_pclk"; > + }; > + > + adma: adma@03880000 { > + compatible = "arm,pl330", "arm,primecell"; > + reg = <0x03880000 0x1000>; > + interrupts = <0 110 0>; > + clocks = <&clock_audss EXYNOS_ADMA>; > + clock-names = "apb_pclk"; > + #dma-cells = <1>; > + #dma-channels = <6>; > + #dma-requests = <16>; > + }; > + }; > + > serial@12C00000 { > clocks = <&clock 257>, <&clock 128>; > clock-names = "uart", "clk_uart_baud0"; > -- > 1.7.4.4 See my comments on 1st patch and you need to re-spin for dmac on exynos5420. Thanks, Kukjin ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] Move comon DMA nodes to exynos5.dtsi and 2013-07-10 12:14 [PATCH 0/2] Move comon DMA nodes to exynos5.dtsi and Padmavathi Venna 2013-07-10 12:14 ` [PATCH 1/2] ARM: dts: Move the common DMA controller nodes to exynos5.dtsi Padmavathi Venna 2013-07-10 12:14 ` [PATCH 2/2] ARM: dts: Add DMA controller node info on Exynos5420 Padmavathi Venna @ 2013-08-12 10:18 ` Padma Venkat 2 siblings, 0 replies; 6+ messages in thread From: Padma Venkat @ 2013-08-12 10:18 UTC (permalink / raw) To: Padmavathi Venna Cc: Kukjin Kim, Sangbeom Kim, devicetree-discuss@lists.ozlabs.org, Doug Anderson, abrestic, linux-samsung-soc, broonie@kernel.org, Vinod Koul, linux-arm-kernel@lists.infradead.org Hi Kukjin, Any comment on this patch set? If not can you take into your tree? Thanks Padma On Wed, Jul 10, 2013 at 5:44 PM, Padmavathi Venna <padma.v@samsung.com> wrote: > Exynos5250 and Exynos5420 has 4 DMA controllers in common. So this patch > set moved the common nodes to exynos.dtsi keeping the clk info seperate > for both the platforms. Exynos5420 has a separate DMA controller for audio > IPs. So this patch set also adds the ADMA node on Exynos5420. > > Padmavathi Venna (2): > ARM: dts: Move the common DMA controller nodes to exynos5.dtsi > ARM: dts: Add DMA controller node info on Exynos5420. > > arch/arm/boot/dts/exynos5.dtsi | 44 +++++++++++++++++++++++++++++++++++++ > arch/arm/boot/dts/exynos5250.dtsi | 30 ------------------------- > arch/arm/boot/dts/exynos5420.dtsi | 33 +++++++++++++++++++++++++++ > 3 files changed, 77 insertions(+), 30 deletions(-) > > -- > 1.7.4.4 > ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-08-14 9:45 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-07-10 12:14 [PATCH 0/2] Move comon DMA nodes to exynos5.dtsi and Padmavathi Venna 2013-07-10 12:14 ` [PATCH 1/2] ARM: dts: Move the common DMA controller nodes to exynos5.dtsi Padmavathi Venna 2013-08-14 9:44 ` Kukjin Kim 2013-07-10 12:14 ` [PATCH 2/2] ARM: dts: Add DMA controller node info on Exynos5420 Padmavathi Venna 2013-08-14 9:45 ` Kukjin Kim 2013-08-12 10:18 ` [PATCH 0/2] Move comon DMA nodes to exynos5.dtsi and Padma Venkat
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).