From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752282Ab1ITRmf (ORCPT ); Tue, 20 Sep 2011 13:42:35 -0400 Received: from mail-gy0-f174.google.com ([209.85.160.174]:39625 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752205Ab1ITRmd (ORCPT ); Tue, 20 Sep 2011 13:42:33 -0400 Date: Tue, 20 Sep 2011 11:42:29 -0600 From: Grant Likely To: Stephen Warren Cc: Arnd Bergmann , nicolas.pitre@linaro.org, Olof Johansson , Shawn Guo , Chris Ball , linux-mmc@vger.kernel.org, linux-tegra@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH REPOST 1/2] arm/dt: Tegra: Update SDHCI nodes to match bindings Message-ID: <20110920174229.GH7781@ponder.secretlab.ca> References: <1316537186-26753-1-git-send-email-swarren@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1316537186-26753-1-git-send-email-swarren@nvidia.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Sep 20, 2011 at 10:46:25AM -0600, Stephen Warren wrote: > The bindings were recently updated to have separate properties for each > type of GPIO. Update the Device Tree source to match that. > > Signed-off-by: Stephen Warren > Acked-by: Olof Johansson Acked-by: Grant Likely > --- > I'd previously sent these to Grant assuming they'd go in his dt/next branch, > but perhaps these should go in through Arnd's arm-soc next/dt branch? Yes, they should probably go via Arnd's tree. g. > > arch/arm/boot/dts/tegra-harmony.dts | 12 ++++++------ > arch/arm/boot/dts/tegra-seaboard.dts | 6 +++--- > 2 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts > index 4c05334..e581866 100644 > --- a/arch/arm/boot/dts/tegra-harmony.dts > +++ b/arch/arm/boot/dts/tegra-harmony.dts > @@ -57,14 +57,14 @@ > }; > > sdhci@c8000200 { > - gpios = <&gpio 69 0>, /* cd, gpio PI5 */ > - <&gpio 57 0>, /* wp, gpio PH1 */ > - <&gpio 155 0>; /* power, gpio PT3 */ > + cd-gpios = <&gpio 69 0>; /* gpio PI5 */ > + wp-gpios = <&gpio 57 0>; /* gpio PH1 */ > + power-gpios = <&gpio 155 0>; /* gpio PT3 */ > }; > > sdhci@c8000600 { > - gpios = <&gpio 58 0>, /* cd, gpio PH2 */ > - <&gpio 59 0>, /* wp, gpio PH3 */ > - <&gpio 70 0>; /* power, gpio PI6 */ > + cd-gpios = <&gpio 58 0>; /* gpio PH2 */ > + wp-gpios = <&gpio 59 0>; /* gpio PH3 */ > + power-gpios = <&gpio 70 0>; /* gpio PI6 */ > }; > }; > diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts > index 1940cae..64cedca 100644 > --- a/arch/arm/boot/dts/tegra-seaboard.dts > +++ b/arch/arm/boot/dts/tegra-seaboard.dts > @@ -21,8 +21,8 @@ > }; > > sdhci@c8000400 { > - gpios = <&gpio 69 0>, /* cd, gpio PI5 */ > - <&gpio 57 0>, /* wp, gpio PH1 */ > - <&gpio 70 0>; /* power, gpio PI6 */ > + cd-gpios = <&gpio 69 0>; /* gpio PI5 */ > + wp-gpios = <&gpio 57 0>; /* gpio PH1 */ > + power-gpios = <&gpio 70 0>; /* gpio PI6 */ > }; > }; > -- > 1.7.0.4 >