From mboxrd@z Thu Jan 1 00:00:00 1970 From: heiko@sntech.de (Heiko =?ISO-8859-1?Q?St=FCbner?=) Date: Tue, 14 Oct 2014 01:18:43 +0200 Subject: [PATCH] ARM: dts: rockchip: add I2S controllers for rk3066 and rk3188 In-Reply-To: <1413208265-20372-1-git-send-email-julien.chauveau@neo-technologies.fr> References: <1413208265-20372-1-git-send-email-julien.chauveau@neo-technologies.fr> Message-ID: <2160726.VoB23RZ6vO@phil> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Julien, Am Montag, 13. Oktober 2014, 15:51:04 schrieb Julien CHAUVEAU: > Add the I2S/PCM controller nodes and pin controls for rk3066 and rk3188. > > Signed-off-by: Julien CHAUVEAU > --- > arch/arm/boot/dts/rk3066a.dtsi | 51 > ++++++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3188.dtsi | > 16 +++++++++++++ > arch/arm/boot/dts/rk3xxx.dtsi | 39 ++++++++++++++++++++++++++++++++ > 3 files changed, 106 insertions(+) > > diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi > index ad9c2db..7c4cd86 100644 > --- a/arch/arm/boot/dts/rk3066a.dtsi > +++ b/arch/arm/boot/dts/rk3066a.dtsi > @@ -405,6 +405,42 @@ > ; > }; > }; > + > + i2s0 { > + i2s0_bus: i2s0-bus { > + rockchip,pins = , > + , > + , > + , > + , > + , > + , > + , > + ; > + }; > + }; > + > + i2s1 { > + i2s1_bus: i2s1-bus { > + rockchip,pins = , > + , > + , > + , > + , > + ; > + }; > + }; > + > + i2s2 { > + i2s2_bus: i2s2-bus { > + rockchip,pins = , > + , > + , > + , > + , > + ; > + }; > + }; > }; > }; > > @@ -473,6 +509,21 @@ > pinctrl-0 = <&spi1_clk &spi1_tx &spi1_rx &spi1_cs0>; > }; > > +&i2s0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&i2s0_bus>; > +}; > + > +&i2s1 { > + pinctrl-names = "default"; > + pinctrl-0 = <&i2s1_bus>; > +}; > + > +&i2s2 { > + pinctrl-names = "default"; > + pinctrl-0 = <&i2s2_bus>; > +}; > + > &uart0 { > pinctrl-names = "default"; > pinctrl-0 = <&uart0_xfer>; > diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi > index ddaada7..04ef487 100644 > --- a/arch/arm/boot/dts/rk3188.dtsi > +++ b/arch/arm/boot/dts/rk3188.dtsi > @@ -395,6 +395,17 @@ > ; > }; > }; > + > + i2s1 { > + i2s1_bus: i2s1-bus { rk3188 only has one i2s controller, so this should be i2s0 > + rockchip,pins = , > + , > + , > + , > + , > + ; > + }; > + }; > }; > }; > > @@ -472,6 +483,11 @@ > pinctrl-0 = <&spi1_clk &spi1_tx &spi1_rx &spi1_cs0>; > }; > > +&i2s1 { > + pinctrl-names = "default"; > + pinctrl-0 = <&i2s1_bus>; > +}; > + > &uart0 { > pinctrl-names = "default"; > pinctrl-0 = <&uart0_xfer>; > diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi > index 499468d..75b7982 100644 > --- a/arch/arm/boot/dts/rk3xxx.dtsi > +++ b/arch/arm/boot/dts/rk3xxx.dtsi > @@ -112,6 +112,45 @@ > <0x1013c100 0x0100>; > }; > > + i2s0: i2s at 10118000 { > + compatible = "rockchip,rk3066-i2s"; > + reg = <0x10118000 0x2000>; > + interrupts = ; > + #address-cells = <1>; > + #size-cells = <0>; > + dmas = <&dmac1_s 4>, <&dmac1_s 5>; > + dma-names = "tx", "rx"; > + clock-names = "i2s_hclk", "i2s_clk"; > + clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>; > + status = "disabled"; > + }; > + > + i2s1: i2s at 1011a000 { > + compatible = "rockchip,rk3066-i2s"; > + reg = <0x1011a000 0x2000>; > + interrupts = ; > + #address-cells = <1>; > + #size-cells = <0>; > + dmas = <&dmac1_s 6>, <&dmac1_s 7>; > + dma-names = "tx", "rx"; > + clock-names = "i2s_hclk", "i2s_clk"; > + clocks = <&cru HCLK_I2S1>, <&cru SCLK_I2S1>; > + status = "disabled"; > + }; > + > + i2s2: i2s at 1011c000 { > + compatible = "rockchip,rk3066-i2s"; > + reg = <0x1011c000 0x2000>; > + interrupts = ; > + #address-cells = <1>; > + #size-cells = <0>; > + dmas = <&dmac1_s 9>, <&dmac1_s 10>; > + dma-names = "tx", "rx"; > + clock-names = "i2s_hclk", "i2s_clk"; > + clocks = <&cru HCLK_I2S2>, <&cru SCLK_I2S2>; > + status = "disabled"; > + }; > + As stated above, rk3188 only has one i2s controller at all, so this block of the 3 i2s controllers should move to rk3066a.dtsi and rk3188.dtsi should get its own, like + i2s0: i2s at 1011a000 { + compatible = "rockchip,rk3066-i2s"; + reg = <0x1011a000 0x2000>; + interrupts = ; + #address-cells = <1>; + #size-cells = <0>; + dmas = <&dmac1_s 6>, <&dmac1_s 7>; + dma-names = "tx", "rx"; + clock-names = "i2s_hclk", "i2s_clk"; + clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>; + status = "disabled"; + }; Especially as the clock for the one i2s controller of the rk3188 is of course labeled xCLK_I2S0. Also, please sort device nodes by their address when adding them to the dtsi files. Thanks Heiko > uart0: serial at 10124000 { > compatible = "snps,dw-apb-uart"; > reg = <0x10124000 0x400>;