2017-07-27 08:16:24

by Sugar Zhang

Subject: [PATCH v1 0/2] Patches to add i2s, spdif node for rk3328

These patches to add i2s, spdif dt nodes for rk3328 soc.


Sugar Zhang (2):
arm64: dts: rockchip: add rk3328 i2s nodes
arm64: dts: rockchip: add rk3328 spdif node

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

--
2.7.4

2017-07-27 08:16:26

by Sugar Zhang

Subject: [PATCH v1 1/2] arm64: dts: rockchip: add rk3328 i2s nodes

This patch add the i2s dt nodes for rk3328.

Signed-off-by: Sugar Zhang <[email protected]>
---

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

diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
index 0be96ce..f1a284b 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -156,6 +156,39 @@
clock-output-names = "xin24m";
};

+ i2s0: i2s@ff000000 {
+ compatible = "rockchip,rk3328-i2s", "rockchip,rk3066-i2s";
+ reg = <0x0 0xff000000 0x0 0x1000>;
+ interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cru SCLK_I2S0>, <&cru HCLK_I2S0_8CH>;
+ clock-names = "i2s_clk", "i2s_hclk";
+ dmas = <&dmac 11>, <&dmac 12>;
+ dma-names = "tx", "rx";
+ status = "disabled";
+ };
+
+ i2s1: i2s@ff010000 {
+ compatible = "rockchip,rk3328-i2s", "rockchip,rk3066-i2s";
+ reg = <0x0 0xff010000 0x0 0x1000>;
+ interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cru SCLK_I2S1>, <&cru HCLK_I2S1_8CH>;
+ clock-names = "i2s_clk", "i2s_hclk";
+ dmas = <&dmac 14>, <&dmac 15>;
+ dma-names = "tx", "rx";
+ status = "disabled";
+ };
+
+ i2s2: i2s@ff020000 {
+ compatible = "rockchip,rk3328-i2s", "rockchip,rk3066-i2s";
+ reg = <0x0 0xff020000 0x0 0x1000>;
+ interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cru SCLK_I2S2>, <&cru HCLK_I2S2_2CH>;
+ clock-names = "i2s_clk", "i2s_hclk";
+ dmas = <&dmac 0>, <&dmac 1>;
+ dma-names = "tx", "rx";
+ status = "disabled";
+ };
+
grf: syscon@ff100000 {
compatible = "rockchip,rk3328-grf", "syscon", "simple-mfd";
reg = <0x0 0xff100000 0x0 0x1000>;
--
2.7.4

2017-07-27 08:16:33

by Sugar Zhang

Subject: [PATCH v1 2/2] arm64: dts: rockchip: add rk3328 spdif node

This patch add the spdif dt node for rk3328.

Signed-off-by: Sugar Zhang <[email protected]>

---

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

diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
index f1a284b..d278670 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -189,6 +189,19 @@
status = "disabled";
};

+ spdif: spdif@ff030000 {
+ compatible = "rockchip,rk3328-spdif";
+ reg = <0x0 0xff030000 0x0 0x1000>;
+ interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cru SCLK_SPDIF>, <&cru HCLK_SPDIF_8CH>;
+ clock-names = "mclk", "hclk";
+ dmas = <&dmac 10>;
+ dma-names = "tx";
+ pinctrl-names = "default";
+ pinctrl-0 = <&spdifm2_tx>;
+ status = "disabled";
+ };
+
grf: syscon@ff100000 {
compatible = "rockchip,rk3328-grf", "syscon", "simple-mfd";
reg = <0x0 0xff100000 0x0 0x1000>;
--
2.7.4

2017-07-29 21:09:58

by Heiko Stübner

Subject: Re: [PATCH v1 1/2] arm64: dts: rockchip: add rk3328 i2s nodes

Am Donnerstag, 27. Juli 2017, 16:16:03 CEST schrieb Sugar Zhang:
> This patch add the i2s dt nodes for rk3328.
>
> Signed-off-by: Sugar Zhang <[email protected]>
> ---
>
> arch/arm64/boot/dts/rockchip/rk3328.dtsi | 33 ++++++++++++++++++++++++++++++++
> 1 file changed, 33 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
> index 0be96ce..f1a284b 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
> @@ -156,6 +156,39 @@
> clock-output-names = "xin24m";
> };
>
> + i2s0: i2s@ff000000 {
> + compatible = "rockchip,rk3328-i2s", "rockchip,rk3066-i2s";

It looks like the rockchip,rk3328-i2s compatible is missing in the binding
documentation (Documentation/devicetree/bindings/sound/rockchip-i2s.txt)

Send a patch adding it first please.


Heiko

2017-07-29 21:12:17

by Heiko Stübner

Subject: Re: [PATCH v1 2/2] arm64: dts: rockchip: add rk3328 spdif node

Am Donnerstag, 27. Juli 2017, 16:16:04 CEST schrieb Sugar Zhang:
> This patch add the spdif dt node for rk3328.
>
> Signed-off-by: Sugar Zhang <[email protected]>
>
> ---
>
> arch/arm64/boot/dts/rockchip/rk3328.dtsi | 13 +++++++++++++
> 1 file changed, 13 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
> index f1a284b..d278670 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
> @@ -189,6 +189,19 @@
> status = "disabled";
> };
>

I've adapted the patch so that it can exist without the previous one
and applied it for 4.14.


Thanks
Heiko


> + spdif: spdif@ff030000 {
> + compatible = "rockchip,rk3328-spdif";
> + reg = <0x0 0xff030000 0x0 0x1000>;
> + interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&cru SCLK_SPDIF>, <&cru HCLK_SPDIF_8CH>;
> + clock-names = "mclk", "hclk";
> + dmas = <&dmac 10>;
> + dma-names = "tx";
> + pinctrl-names = "default";
> + pinctrl-0 = <&spdifm2_tx>;
> + status = "disabled";
> + };
> +
> grf: syscon@ff100000 {
> compatible = "rockchip,rk3328-grf", "syscon", "simple-mfd";
> reg = <0x0 0xff100000 0x0 0x1000>;
>

2017-08-07 21:31:08

by Heiko Stübner

Subject: Re: [PATCH v1 1/2] arm64: dts: rockchip: add rk3328 i2s nodes

Am Donnerstag, 27. Juli 2017, 16:16:03 CEST schrieb Sugar Zhang:
> This patch add the i2s dt nodes for rk3328.
>
> Signed-off-by: Sugar Zhang <[email protected]>

as the binding patch got applied I've now also applied thos one for 4.14


Heiko