From: Mark Rutland Subject: Re: [PATCH] ARM: dts: Disable Exynos5250 I2S controllers by default Date: Tue, 10 Sep 2013 18:35:48 +0100 Message-ID: <20130910173548.GA18878@e106331-lin.cambridge.arm.com> References: <1378491435-15624-1-git-send-email-broonie@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from fw-tnat.cambridge.arm.com ([217.140.96.21]:51077 "EHLO cam-smtp0.cambridge.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753882Ab3IJRgK (ORCPT ); Tue, 10 Sep 2013 13:36:10 -0400 Content-Disposition: inline In-Reply-To: <1378491435-15624-1-git-send-email-broonie@kernel.org> Sender: linux-samsung-soc-owner@vger.kernel.org List-Id: linux-samsung-soc@vger.kernel.org To: Mark Brown Cc: "rob.herring@calxeda.com" , Pawel Moll , Stephen Warren , Kukjin Kim , "linux-samsung-soc@vger.kernel.org" , "linaro-kernel@lists.linaro.org" , Mark Brown On Fri, Sep 06, 2013 at 07:17:15PM +0100, Mark Brown wrote: > From: Mark Brown > > Rather than requiring each board to explicitly disable the I2S controllers > it is not using instead require boards to enable those that they are using. > > This is required for audio operation on Arndale, one of the unused I2S > controllers is pinmuxed with the LDO enable GPIOs for the WM1811A. > > Signed-off-by: Mark Brown > --- > > This seems like a more robust approach to handling the externally > visible IPs - if this is OK I can go through and do further updates for > other devices. Acked-by: Mark Rutland It seems far more sensible to me to mark devices disabled by default in shared dtsi files and then okay them as needed in particular dts files. I'd be happy with more of this. > > arch/arm/boot/dts/exynos5250-arndale.dts | 4 ++++ > arch/arm/boot/dts/exynos5250-smdk5250.dts | 8 -------- > arch/arm/boot/dts/exynos5250.dtsi | 3 +++ > 3 files changed, 7 insertions(+), 8 deletions(-) > > diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts > index cee55fa..4687fa0 100644 > --- a/arch/arm/boot/dts/exynos5250-arndale.dts > +++ b/arch/arm/boot/dts/exynos5250-arndale.dts > @@ -412,6 +412,10 @@ > status = "disabled"; > }; > > + i2s0: i2s@03830000 { > + status = "okay"; > + }; > + > spi_0: spi@12d20000 { > status = "disabled"; > }; > diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts > index 2538b32..f86d567 100644 > --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts > +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts > @@ -231,14 +231,6 @@ > status = "okay"; > }; > > - i2s1: i2s@12D60000 { > - status = "disabled"; > - }; > - > - i2s2: i2s@12D70000 { > - status = "disabled"; > - }; > - > sound { > compatible = "samsung,smdk-wm8994"; > > diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi > index 7d7cc77..c863113 100644 > --- a/arch/arm/boot/dts/exynos5250.dtsi > +++ b/arch/arm/boot/dts/exynos5250.dtsi > @@ -417,6 +417,7 @@ > > i2s0: i2s@03830000 { > compatible = "samsung,s5pv210-i2s"; > + status = "disabled"; > reg = <0x03830000 0x100>; > dmas = <&pdma0 10 > &pdma0 9 > @@ -433,6 +434,7 @@ > > i2s1: i2s@12D60000 { > compatible = "samsung,s3c6410-i2s"; > + status = "disabled"; > reg = <0x12D60000 0x100>; > dmas = <&pdma1 12 > &pdma1 11>; > @@ -445,6 +447,7 @@ > > i2s2: i2s@12D70000 { > compatible = "samsung,s3c6410-i2s"; > + status = "disabled"; > reg = <0x12D70000 0x100>; > dmas = <&pdma0 12 > &pdma0 11>; > -- > 1.8.4.rc3 > >