linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] arm64: dts: rockchip: add dmac nodes for rk3368 SoCs
@ 2017-03-03  9:49 Huibin Hong
  2017-03-17 11:04 ` Heiko Stuebner
  0 siblings, 1 reply; 4+ messages in thread
From: Huibin Hong @ 2017-03-03  9:49 UTC (permalink / raw)
  To: robh+dt, mark.rutland, catalin.marinas, will.deacon, heiko
  Cc: wxt, andy.yan, felipe.balbi, jic23, jh80.chung, johnyoun,
	devicetree, linux-arm-kernel, linux-rockchip, linux-kernel,
	Huibin Hong

Addd dmac bus and dmac peri dts nodes for peripherals,
such as I2S, SPI, UART and so on.

Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
---
 arch/arm64/boot/dts/rockchip/rk3368.dtsi | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
index a635adc..c9be1b2 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
@@ -204,6 +204,37 @@
 				     <&cpu_b2>, <&cpu_b3>;
 	};
 
+	amba {
+		compatible = "simple-bus";
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+
+		dmac_peri: dma-controller@ff250000 {
+			compatible = "arm,pl330", "arm,primecell";
+			reg = <0x0 0xff250000 0x0 0x4000>;
+			interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
+			#dma-cells = <1>;
+			clocks = <&cru ACLK_DMAC_PERI>;
+			clock-names = "apb_pclk";
+			arm,pl330-broken-no-flushp;
+			peripherals-req-type-burst;
+		};
+
+		dmac_bus: dma-controller@ff600000 {
+			compatible = "arm,pl330", "arm,primecell";
+			reg = <0x0 0xff600000 0x0 0x4000>;
+			interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
+			#dma-cells = <1>;
+			clocks = <&cru ACLK_DMAC_BUS>;
+			clock-names = "apb_pclk";
+			arm,pl330-broken-no-flushp;
+			peripherals-req-type-burst;
+		};
+	};
+
 	psci {
 		compatible = "arm,psci-0.2";
 		method = "smc";
-- 
2.0.0

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] arm64: dts: rockchip: add dmac nodes for rk3368 SoCs
  2017-03-03  9:49 [PATCH] arm64: dts: rockchip: add dmac nodes for rk3368 SoCs Huibin Hong
@ 2017-03-17 11:04 ` Heiko Stuebner
  0 siblings, 0 replies; 4+ messages in thread
From: Heiko Stuebner @ 2017-03-17 11:04 UTC (permalink / raw)
  To: Huibin Hong
  Cc: robh+dt, mark.rutland, catalin.marinas, will.deacon, wxt,
	andy.yan, felipe.balbi, jic23, jh80.chung, johnyoun, devicetree,
	linux-arm-kernel, linux-rockchip, linux-kernel

Am Freitag, 3. März 2017, 17:49:09 CET schrieb Huibin Hong:
> Addd dmac bus and dmac peri dts nodes for peripherals,
> such as I2S, SPI, UART and so on.
> 
> Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>

applied for 4.12, with the changes described below

> ---
>  arch/arm64/boot/dts/rockchip/rk3368.dtsi | 31
> +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi
> b/arch/arm64/boot/dts/rockchip/rk3368.dtsi index a635adc..c9be1b2 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
> @@ -204,6 +204,37 @@
>  				     <&cpu_b2>, <&cpu_b3>;
>  	};
> 
> +	amba {

moved "amba" above "arm-pmu", please mind the alphabetical ordering in the 
future.

> +		compatible = "simple-bus";
> +		#address-cells = <2>;
> +		#size-cells = <2>;
> +		ranges;
> +
> +		dmac_peri: dma-controller@ff250000 {
> +			compatible = "arm,pl330", "arm,primecell";
> +			reg = <0x0 0xff250000 0x0 0x4000>;
> +			interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
> +				     <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
> +			#dma-cells = <1>;
> +			clocks = <&cru ACLK_DMAC_PERI>;
> +			clock-names = "apb_pclk";
> +			arm,pl330-broken-no-flushp;
> +			peripherals-req-type-burst;

dropped peripherals-req-type-burst, as it is not part of mainline (yet?).
Please send a patch readding that if it gets submitted and accepted at some 
point.


Heiko

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] arm64: dts: rockchip: add dmac nodes for rk3368 SoCs
  2017-03-22 12:03 Huibin Hong
@ 2017-03-22 12:49 ` Heiko Stübner
  0 siblings, 0 replies; 4+ messages in thread
From: Heiko Stübner @ 2017-03-22 12:49 UTC (permalink / raw)
  To: Huibin Hong
  Cc: robh+dt, mark.rutland, catalin.marinas, will.deacon, wxt,
	andy.yan, felipe.balbi, jic23, jh80.chung, johnyoun, devicetree,
	linux-arm-kernel, linux-rockchip, linux-kernel

Hi,

Am Mittwoch, 22. März 2017, 20:03:14 CET schrieb Huibin Hong:
> Add dmac bus and dmac peri dts nodes for peripherals,
> such as I2S, SPI, UART and so on.
> 
> Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>

I applied that patch already in [0], did something change?


[0] https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git/commit/?id=4b4c0db538fa6e3f31bc40ddc17c1d5facb49d36

> ---
>  arch/arm64/boot/dts/rockchip/rk3368.dtsi | 29 +++++++++++++++++++++++++++++
> 1 file changed, 29 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi
> b/arch/arm64/boot/dts/rockchip/rk3368.dtsi index a635adc..2a0422f 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
> @@ -189,6 +189,35 @@
>  		};
>  	};
> 
> +        amba {
> +                compatible = "simple-bus";
> +                #address-cells = <2>;
> +                #size-cells = <2>;
> +                ranges;
> +
> +                dmac_peri: dma-controller@ff250000 {
> +                        compatible = "arm,pl330", "arm,primecell";
> +                        reg = <0x0 0xff250000 0x0 0x4000>;
> +                        interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
> +                                     <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
> +                        #dma-cells = <1>;
> +                        clocks = <&cru ACLK_DMAC_PERI>;
> +                        clock-names = "apb_pclk";
> +                        arm,pl330-broken-no-flushp;
> +                };
> +
> +                dmac_bus: dma-controller@ff600000 {
> +                        compatible = "arm,pl330", "arm,primecell";
> +                        reg = <0x0 0xff600000 0x0 0x4000>;
> +                        interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
> +                                     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
> +                        #dma-cells = <1>;
> +                        clocks = <&cru ACLK_DMAC_BUS>;
> +                        clock-names = "apb_pclk";
> +                        arm,pl330-broken-no-flushp;
> +                };
> +        };
> +
>  	arm-pmu {
>  		compatible = "arm,armv8-pmuv3";
>  		interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>,

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH] arm64: dts: rockchip: add dmac nodes for rk3368 SoCs
@ 2017-03-22 12:03 Huibin Hong
  2017-03-22 12:49 ` Heiko Stübner
  0 siblings, 1 reply; 4+ messages in thread
From: Huibin Hong @ 2017-03-22 12:03 UTC (permalink / raw)
  To: robh+dt, mark.rutland, catalin.marinas, will.deacon, heiko
  Cc: wxt, andy.yan, felipe.balbi, jic23, jh80.chung, johnyoun,
	devicetree, linux-arm-kernel, linux-rockchip, linux-kernel,
	Huibin Hong

Add dmac bus and dmac peri dts nodes for peripherals,
such as I2S, SPI, UART and so on.

Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
---
 arch/arm64/boot/dts/rockchip/rk3368.dtsi | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
index a635adc..2a0422f 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
@@ -189,6 +189,35 @@
 		};
 	};
 
+        amba {
+                compatible = "simple-bus";
+                #address-cells = <2>;
+                #size-cells = <2>;
+                ranges;
+
+                dmac_peri: dma-controller@ff250000 {
+                        compatible = "arm,pl330", "arm,primecell";
+                        reg = <0x0 0xff250000 0x0 0x4000>;
+                        interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
+                        #dma-cells = <1>;
+                        clocks = <&cru ACLK_DMAC_PERI>;
+                        clock-names = "apb_pclk";
+                        arm,pl330-broken-no-flushp;
+                };
+
+                dmac_bus: dma-controller@ff600000 {
+                        compatible = "arm,pl330", "arm,primecell";
+                        reg = <0x0 0xff600000 0x0 0x4000>;
+                        interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
+                        #dma-cells = <1>;
+                        clocks = <&cru ACLK_DMAC_BUS>;
+                        clock-names = "apb_pclk";
+                        arm,pl330-broken-no-flushp;
+                };
+        };
+
 	arm-pmu {
 		compatible = "arm,armv8-pmuv3";
 		interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>,
-- 
2.0.0

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2017-03-22 13:30 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-03  9:49 [PATCH] arm64: dts: rockchip: add dmac nodes for rk3368 SoCs Huibin Hong
2017-03-17 11:04 ` Heiko Stuebner
2017-03-22 12:03 Huibin Hong
2017-03-22 12:49 ` Heiko Stübner

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).