From patchwork Thu Jun 6 19:14:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Balaji T K X-Patchwork-Id: 2682931 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 0ED2D40077 for ; Thu, 6 Jun 2013 19:15:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753087Ab3FFTPK (ORCPT ); Thu, 6 Jun 2013 15:15:10 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:43633 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752789Ab3FFTOx (ORCPT ); Thu, 6 Jun 2013 15:14:53 -0400 Received: from dbdlxv05.itg.ti.com ([172.24.171.60]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id r56JEmUS005893; Thu, 6 Jun 2013 14:14:49 -0500 Received: from DBDE72.ent.ti.com (dbde72.ent.ti.com [172.24.171.97]) by dbdlxv05.itg.ti.com (8.14.3/8.13.8) with ESMTP id r56JEcQ3019005; Thu, 6 Jun 2013 14:14:47 -0500 Received: from dbdp33.itg.ti.com (172.24.170.252) by DBDE72.ent.ti.com (172.24.171.97) with Microsoft SMTP Server id 14.2.342.3; Fri, 7 Jun 2013 03:14:39 +0800 Received: from ulaa0393241.apr.dhcp.ti.com (smtpvbd.itg.ti.com [172.24.170.250]) by dbdp33.itg.ti.com (8.13.8/8.13.8) with ESMTP id r56JEZkL019795; Fri, 7 Jun 2013 00:44:39 +0530 From: Balaji T K To: , , , , , CC: Balaji T K Subject: [PATCH v2 09/10] ARM: dts: omap3: add pbias and mmc_init pinctrl states Date: Fri, 7 Jun 2013 00:44:18 +0530 Message-ID: <1370546059-24181-10-git-send-email-balajitk@ti.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1370546059-24181-1-git-send-email-balajitk@ti.com> References: <20130523184045.GD13507@atomide.com> <1370546059-24181-1-git-send-email-balajitk@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org add pbias states for pbias 0, 1.8V, 3V add omap3 sd/mmc2 loop back clock config for devconf1 in mmc2_init pinctrl state add OMAP3430 sd/mmc1 loop back clock config for devconf0 in mmc1_init pinctrl state add OMAP3630 sd/mmc1 speed mode config for prog_io1 in mmc1_init pinctrl state Signed-off-by: Balaji T K --- arch/arm/boot/dts/omap3-beagle-xm.dts | 42 +++++++++++++++++++++++++++++++++ arch/arm/boot/dts/omap3-beagle.dts | 42 +++++++++++++++++++++++++++++++++ arch/arm/boot/dts/omap3.dtsi | 10 ++++++++ 3 files changed, 94 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts index 3046d1f..45d1642 100644 --- a/arch/arm/boot/dts/omap3-beagle-xm.dts +++ b/arch/arm/boot/dts/omap3-beagle-xm.dts @@ -59,6 +59,40 @@ }; }; +&omap3_pmx_general { + pinctrl-names = "default"; + pinctrl-0 = <>; + pbias_off: pinmux_pbias_off { + pinctrl-single,bits = < + 0x2b0 0x1 0x3 /* pbias */ + >; + }; + + pbias_1v8: pinmux_pbias_1v8 { + pinctrl-single,bits = < + 0x2b0 0x2 0x3 /* pbias */ + >; + }; + + pbias_3v: pinmux_pbias_3v { + pinctrl-single,bits = < + 0x2b0 0x3 0x3 /* pbias */ + >; + }; + + mmc1_init: pinmux_mmc1_init { + pinctrl-single,bits = < + 0x1d8 0x100000 0x100000 /* prog_io1 */ + >; + }; + + mmc2_init: pinmux_mmc2_init { + pinctrl-single,bits = < + 0x68 0x40 0x40 /* devconf1 */ + >; + }; +}; + &i2c1 { clock-frequency = <2600000>; @@ -95,12 +129,20 @@ }; &mmc1 { + pinctrl-names = "default", "mmc_init", "pbias_off", "pbias_1v8", "pbias_3v"; + pinctrl-0 = <>; + pinctrl-1 = <&mmc1_init>; + pinctrl-2 = <&pbias_off>; + pinctrl-3 = <&pbias_1v8>; + pinctrl-4 = <&pbias_3v>; vmmc-supply = <&vmmc1>; vmmc_aux-supply = <&vsim>; bus-width = <8>; }; &mmc2 { + pinctrl-names = "mmc_init"; + pinctrl-1 = <&mmc2_init>; status = "disabled"; }; diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts index 7da9979..14e251f 100644 --- a/arch/arm/boot/dts/omap3-beagle.dts +++ b/arch/arm/boot/dts/omap3-beagle.dts @@ -109,6 +109,40 @@ }; }; +&omap3_pmx_general { + pinctrl-names = "default"; + pinctrl-0 = <>; + pbias_off: pinmux_pbias_off { + pinctrl-single,bits = < + 0x2b0 0x5 0x7 /* pbias */ + >; + }; + + pbias_1v8: pinmux_pbias_1v8 { + pinctrl-single,bits = < + 0x2b0 0x6 0x7 /* pbias */ + >; + }; + + pbias_3v: pinmux_pbias_3v { + pinctrl-single,bits = < + 0x2b0 0x7 0x7 /* pbias */ + >; + }; + + mmc1_init: pinmux_mmc1_init { + pinctrl-single,bits = < + 0x4 0x01000000 0x01000000 /* devconf0 */ + >; + }; + + mmc2_init: pinmux_mmc2_init { + pinctrl-single,bits = < + 0x68 0x40 0x40 /* devconf1 */ + >; + }; +}; + &i2c1 { clock-frequency = <2600000>; @@ -122,12 +156,20 @@ /include/ "twl4030.dtsi" &mmc1 { + pinctrl-names = "default", "mmc_init", "pbias_off", "pbias_1v8", "pbias_3v"; + pinctrl-0 = <>; + pinctrl-1 = <&mmc1_init>; + pinctrl-2 = <&pbias_off>; + pinctrl-3 = <&pbias_1v8>; + pinctrl-4 = <&pbias_3v>; vmmc-supply = <&vmmc1>; vmmc_aux-supply = <&vsim>; bus-width = <8>; }; &mmc2 { + pinctrl-names = "mmc_init"; + pinctrl-1 = <&mmc2_init>; status = "disabled"; }; diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi index caaa708..de2940d 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi @@ -111,6 +111,16 @@ pinctrl-single,function-mask = <0x7f1f>; }; + omap3_pmx_general: pinmux@48002270 { + compatible = "ti,omap3-padconf", "pinctrl-single"; + reg = <0x48002270 0x2f4>; + #address-cells = <1>; + #size-cells = <0>; + pinctrl-single,bit-per-mux; + pinctrl-single,register-width = <32>; + pinctrl-single,function-mask = <0xffffffff>; + }; + omap3_pmx_wkup: pinmux@0x48002a00 { compatible = "ti,omap3-padconf", "pinctrl-single"; reg = <0x48002a00 0x5c>;