Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1603019 > unrolled thread

[PATCH 0/3] arm64: dts: rockchip: rk3368 add dmac and i2s nodes

Started byJianqun Xu <jay.xu@rock-chips.com>
First post2017-03-17 04:50 +0100
Last post2017-03-17 12:20 +0100
Articles 5 — 2 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH 0/3] arm64: dts: rockchip: rk3368 add dmac and i2s nodes Jianqun Xu <jay.xu@rock-chips.com> - 2017-03-17 04:50 +0100
    [PATCH v2 1/3] arm64: dts: rockchip: add amba node support for RK3368 SoCs Jianqun Xu <jay.xu@rock-chips.com> - 2017-03-17 04:50 +0100
      Re: [PATCH v2 1/3] arm64: dts: rockchip: add amba node support for RK3368 SoCs Heiko Stuebner <heiko@sntech.de> - 2017-03-17 12:40 +0100
    [PATCH v2 2/3] arm64: dts: rockchip: add i2s nodes support for RK3368 SoCs Jianqun Xu <jay.xu@rock-chips.com> - 2017-03-17 04:50 +0100
      Re: [PATCH v2 2/3] arm64: dts: rockchip: add i2s nodes support for RK3368 SoCs Heiko Stuebner <heiko@sntech.de> - 2017-03-17 12:20 +0100

#1603019 — [PATCH 0/3] arm64: dts: rockchip: rk3368 add dmac and i2s nodes

FromJianqun Xu <jay.xu@rock-chips.com>
Date2017-03-17 04:50 +0100
Subject[PATCH 0/3] arm64: dts: rockchip: rk3368 add dmac and i2s nodes
Message-ID<tlQUa-8mg-7@gated-at.bofh.it>
These patches add dmac, i2s nodes, and disable mailbox.

Jianqun Xu (3):
  arm64: dts: rockchip: add amba node support for RK3368 SoCs
  arm64: dts: rockchip: add i2s nodes support for RK3368 SoCs
  arm64: dts: rockchip: disable mailbox of RK3368 SoCs defaultly

 arch/arm64/boot/dts/rockchip/rk3368.dtsi | 70 ++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

-- 
1.9.1

[toc] | [next] | [standalone]

#1603020 — [PATCH v2 1/3] arm64: dts: rockchip: add amba node support for RK3368 SoCs

FromJianqun Xu <jay.xu@rock-chips.com>
Date2017-03-17 04:50 +0100
Subject[PATCH v2 1/3] arm64: dts: rockchip: add amba node support for RK3368 SoCs
Message-ID<tlR3Q-8qq-5@gated-at.bofh.it>
In reply to#1603019
There are two dmacs found on RK3368 SoCs, peripher dmac and bus dmac,
and the dmacs are same as previous SoCs' dmac.

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
---
changes since v1:
- none

 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";
-- 
1.9.1

[toc] | [prev] | [next] | [standalone]

#1603231 — Re: [PATCH v2 1/3] arm64: dts: rockchip: add amba node support for RK3368 SoCs

FromHeiko Stuebner <heiko@sntech.de>
Date2017-03-17 12:40 +0100
SubjectRe: [PATCH v2 1/3] arm64: dts: rockchip: add amba node support for RK3368 SoCs
Message-ID<tlYoF-5Lp-17@gated-at.bofh.it>
In reply to#1603020
Am Freitag, 17. März 2017, 11:32:42 CET schrieb Jianqun Xu:
> There are two dmacs found on RK3368 SoCs, peripher dmac and bus dmac,
> and the dmacs are same as previous SoCs' dmac.
> 
> Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>

I've picked the identical patch from Huibin Hong instead, as he was here first.


Heiko

[toc] | [prev] | [next] | [standalone]

#1603022 — [PATCH v2 2/3] arm64: dts: rockchip: add i2s nodes support for RK3368 SoCs

FromJianqun Xu <jay.xu@rock-chips.com>
Date2017-03-17 04:50 +0100
Subject[PATCH v2 2/3] arm64: dts: rockchip: add i2s nodes support for RK3368 SoCs
Message-ID<tlR3Q-8qq-11@gated-at.bofh.it>
In reply to#1603019
I2S of RK3368 SoCs keep same as RK3066 SoCs found on Rockchip,
add nodes to support them.

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
---
changes since v1:
- fix compile error caused by dumplicate label 'i2s1'


 arch/arm64/boot/dts/rockchip/rk3368.dtsi | 38 ++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
index c9be1b2..74fbcc2 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
@@ -715,6 +715,30 @@
 		interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>;
 	};
 
+	i2s_2ch: i2s-2ch@ff890000 {
+		compatible = "rockchip,rk3368-i2s", "rockchip,rk3066-i2s";
+		reg = <0x0 0xff890000 0x0 0x1000>;
+		interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
+		dmas = <&dmac_bus 6>, <&dmac_bus 7>;
+		dma-names = "tx", "rx";
+		clock-names = "i2s_clk", "i2s_hclk";
+		clocks = <&cru SCLK_I2S_2CH>, <&cru HCLK_I2S_2CH>;
+		status = "disabled";
+	};
+
+	i2s_8ch: i2s-8ch@ff898000 {
+		compatible = "rockchip,rk3368-i2s", "rockchip,rk3066-i2s";
+		reg = <0x0 0xff898000 0x0 0x1000>;
+		interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
+		dmas = <&dmac_bus 0>, <&dmac_bus 1>;
+		dma-names = "tx", "rx";
+		clock-names = "i2s_clk", "i2s_hclk";
+		clocks = <&cru SCLK_I2S_8CH>, <&cru HCLK_I2S_8CH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&i2s_8ch_bus>;
+		status = "disabled";
+	};
+
 	gic: interrupt-controller@ffb71000 {
 		compatible = "arm,gic-400";
 		interrupt-controller;
@@ -917,6 +941,20 @@
 			};
 		};
 
+		i2s {
+			i2s_8ch_bus: i2s-8ch-bus {
+				rockchip,pins = <2 12 RK_FUNC_1 &pcfg_pull_none>,
+						<2 13 RK_FUNC_1 &pcfg_pull_none>,
+						<2 14 RK_FUNC_1 &pcfg_pull_none>,
+						<2 15 RK_FUNC_1 &pcfg_pull_none>,
+						<2 16 RK_FUNC_1 &pcfg_pull_none>,
+						<2 17 RK_FUNC_1 &pcfg_pull_none>,
+						<2 18 RK_FUNC_1 &pcfg_pull_none>,
+						<2 19 RK_FUNC_1 &pcfg_pull_none>,
+						<2 20 RK_FUNC_1 &pcfg_pull_none>;
+			};
+		};
+
 		pwm0 {
 			pwm0_pin: pwm0-pin {
 				rockchip,pins = <3 8 RK_FUNC_2 &pcfg_pull_none>;
-- 
1.9.1

[toc] | [prev] | [next] | [standalone]

#1603211 — Re: [PATCH v2 2/3] arm64: dts: rockchip: add i2s nodes support for RK3368 SoCs

FromHeiko Stuebner <heiko@sntech.de>
Date2017-03-17 12:20 +0100
SubjectRe: [PATCH v2 2/3] arm64: dts: rockchip: add i2s nodes support for RK3368 SoCs
Message-ID<tlY5j-5AZ-17@gated-at.bofh.it>
In reply to#1603022
Am Freitag, 17. März 2017, 11:32:43 CET schrieb Jianqun Xu:
> I2S of RK3368 SoCs keep same as RK3066 SoCs found on Rockchip,
> add nodes to support them.
> 
> Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>

applied for 4.12 after moving the clocks property above "dma*"


Thanks
Heiko

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web