From patchwork Thu Jun 6 19:14:19 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: 2683071 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id EE9CCDFF68 for ; Thu, 6 Jun 2013 19:16:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753078Ab3FFTPH (ORCPT ); Thu, 6 Jun 2013 15:15:07 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:41250 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752830Ab3FFTOy (ORCPT ); Thu, 6 Jun 2013 15:14:54 -0400 Received: from dbdlxv05.itg.ti.com ([172.24.171.60]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id r56JEnR0005964; 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 r56JEcQ4019005; 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 r56JEZkM019795; Fri, 7 Jun 2013 00:44:39 +0530 From: Balaji T K To: , , , , , CC: Balaji T K Subject: [PATCH v2 10/10] ARM: dts: omap4: add pbias and mmc_init pinctrl states Date: Fri, 7 Jun 2013 00:44:19 +0530 Message-ID: <1370546059-24181-11-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 sd/mmc1 pull strength values for control_mmc1 in mmc_init pinctrl state Signed-off-by: Balaji T K --- arch/arm/boot/dts/omap4-panda-common.dtsi | 34 +++++++++++++++++++++++++++++ arch/arm/boot/dts/omap4-sdp.dts | 34 +++++++++++++++++++++++++++++ arch/arm/boot/dts/omap4.dtsi | 11 +++++++++ 3 files changed, 79 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi index 03bd60d..d6ffbb1 100644 --- a/arch/arm/boot/dts/omap4-panda-common.dtsi +++ b/arch/arm/boot/dts/omap4-panda-common.dtsi @@ -137,6 +137,34 @@ }; }; +&omap4_padconf_global { + pinctrl-names = "default"; + pinctrl-0 = <>; + pbias_off: pinmux_pbias_off { + pinctrl-single,bits = < + 0x60 0x00000000 0x07e00000 /* pbias */ + >; + }; + + pbias_1v8: pinmux_pbias_1v8 { + pinctrl-single,bits = < + 0x60 0x04400000 0x07e00000 /* pbias */ + >; + }; + + pbias_3v: pinmux_pbias_3v { + pinctrl-single,bits = < + 0x60 0x04600000 0x07e00000 /* pbias */ + >; + }; + + mmc1_init: pinmux_mmc1_init { + pinctrl-single,bits = < + 0x88 0xce000000 0xfe000000 /* control_mmc1 */ + >; + }; +}; + &i2c1 { pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins>; @@ -197,6 +225,12 @@ }; &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 = <&vmmc>; bus-width = <8>; }; diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts index a35d9cd..b1c0e86 100644 --- a/arch/arm/boot/dts/omap4-sdp.dts +++ b/arch/arm/boot/dts/omap4-sdp.dts @@ -142,6 +142,34 @@ }; }; +&omap4_padconf_global { + pinctrl-names = "default"; + pinctrl-0 = <>; + pbias_off: pinmux_pbias_off { + pinctrl-single,bits = < + 0x60 0x00000000 0x07e00000 /* pbias */ + >; + }; + + pbias_1v8: pinmux_pbias_1v8 { + pinctrl-single,bits = < + 0x60 0x04400000 0x07e00000 /* pbias */ + >; + }; + + pbias_3v: pinmux_pbias_3v { + pinctrl-single,bits = < + 0x60 0x04600000 0x07e00000 /* pbias */ + >; + }; + + mmc1_init: pinmux_mmc1_init { + pinctrl-single,bits = < + 0x88 0xce000000 0xfe000000 /* control_mmc1 */ + >; + }; +}; + &omap4_pmx_core { pinctrl-names = "default"; pinctrl-0 = < @@ -381,6 +409,12 @@ }; &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 = <&vmmc>; bus-width = <8>; }; diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index 2a56428..41f575d 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi @@ -114,6 +114,17 @@ pinctrl-single,register-width = <16>; pinctrl-single,function-mask = <0x7fff>; }; + + omap4_padconf_global: pinmux@4a100600 { + compatible = "ti,omap4-padconf", "pinctrl-single"; + reg = <0x4a1005a0 0x170>; + #address-cells = <1>; + #size-cells = <0>; + pinctrl-single,bit-per-mux; + pinctrl-single,register-width = <32>; + pinctrl-single,function-mask = <0xffffffff>; + }; + omap4_pmx_wkup: pinmux@4a31e040 { compatible = "ti,omap4-padconf", "pinctrl-single"; reg = <0x4a31e040 0x0038>;