Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751451AbaJOOJw (ORCPT ); Wed, 15 Oct 2014 10:09:52 -0400 Received: from gloria.sntech.de ([95.129.55.99]:60841 "EHLO gloria.sntech.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751191AbaJOOJu (ORCPT ); Wed, 15 Oct 2014 10:09:50 -0400 From: Heiko =?ISO-8859-1?Q?St=FCbner?= To: Julien CHAUVEAU Cc: Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Russell King , "moderated list:ARM/Rockchip SoC..." , "open list:ARM/Rockchip SoC..." , "open list:OPEN FIRMWARE AND..." , open list Subject: Re: [PATCH v2] ARM: dts: rockchip: add I2S controllers for rk3066 and rk3188 Date: Wed, 15 Oct 2014 16:07:55 +0200 Message-ID: <5010451.G368NqnOYK@phil> User-Agent: KMail/4.11.5 (Linux/3.13-1-amd64; KDE/4.11.3; x86_64; ; ) In-Reply-To: <1413274597-15788-1-git-send-email-julien.chauveau@neo-technologies.fr> References: <1413274597-15788-1-git-send-email-julien.chauveau@neo-technologies.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Julien, Am Dienstag, 14. Oktober 2014, 10:16:37 schrieb Julien CHAUVEAU: > Add the I2S/PCM controller nodes and pin controls for rk3066 and rk3188. > > Signed-off-by: Julien CHAUVEAU I've added the patch to my wip dts branch on github - which will move to kernel.org after -rc1 > --- In the future for v2 and onwards patches, please provide a changelog in the comment section (after the "---"), so people can see what changed, like: changes since v1: - declare i2s nodes separately on rk3066 and rk3188 as the controllers differ This doesn't get into the kernel itself, but is helpful for people reviewing the patch. > arch/arm/boot/dts/rk3066a.dtsi | 81 > ++++++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3188.dtsi | > 26 ++++++++++++++ > 2 files changed, 107 insertions(+) > > diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi > index ad9c2db..d75b01a 100644 > --- a/arch/arm/boot/dts/rk3066a.dtsi > +++ b/arch/arm/boot/dts/rk3066a.dtsi > @@ -53,6 +53,51 @@ > }; > }; > > + i2s0: i2s@10118000 { > + compatible = "rockchip,rk3066-i2s"; > + reg = <0x10118000 0x2000>; > + interrupts = ; > + #address-cells = <1>; > + #size-cells = <0>; > + pinctrl-names = "default"; > + pinctrl-0 = <&i2s0_bus>; > + 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@1011a000 { > + compatible = "rockchip,rk3066-i2s"; > + reg = <0x1011a000 0x2000>; > + interrupts = ; > + #address-cells = <1>; > + #size-cells = <0>; > + pinctrl-names = "default"; > + pinctrl-0 = <&i2s1_bus>; > + 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@1011c000 { > + compatible = "rockchip,rk3066-i2s"; > + reg = <0x1011c000 0x2000>; > + interrupts = ; > + #address-cells = <1>; > + #size-cells = <0>; > + pinctrl-names = "default"; > + pinctrl-0 = <&i2s2_bus>; > + 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"; > + }; > + > cru: clock-controller@20000000 { > compatible = "rockchip,rk3066a-cru"; > reg = <0x20000000 0x1000>; > @@ -405,6 +450,42 @@ > ; > }; > }; > + > + i2s0 { > + i2s0_bus: i2s0-bus { > + rockchip,pins = , > + , > + , > + , > + , > + , > + , > + , > + ; > + }; > + }; > + > + i2s1 { > + i2s1_bus: i2s1-bus { > + rockchip,pins = , > + , > + , > + , > + , > + ; > + }; > + }; > + > + i2s2 { > + i2s2_bus: i2s2-bus { > + rockchip,pins = , > + , > + , > + , > + , > + ; > + }; > + }; > }; > }; > > diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi > index ddaada7..fa3665a 100644 > --- a/arch/arm/boot/dts/rk3188.dtsi > +++ b/arch/arm/boot/dts/rk3188.dtsi > @@ -65,6 +65,21 @@ > }; > }; > > + i2s0: i2s@1011a000 { > + compatible = "rockchip,rk3188-i2s", "rockchip,rk3066-i2s"; > + reg = <0x1011a000 0x2000>; > + interrupts = ; > + #address-cells = <1>; > + #size-cells = <0>; > + pinctrl-names = "default"; > + pinctrl-0 = <&i2s0_bus>; > + 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"; > + }; > + > cru: clock-controller@20000000 { > compatible = "rockchip,rk3188-cru"; > reg = <0x20000000 0x1000>; > @@ -395,6 +410,17 @@ > ; > }; > }; > + > + i2s0 { > + i2s0_bus: i2s0-bus { > + rockchip,pins = , > + , > + , > + , > + , > + ; > + }; > + }; > }; > }; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/