From mboxrd@z Thu Jan 1 00:00:00 1970 From: Balaji T K Subject: Re: [PATCH v2 08/10] ARM: dts: omap3: split omap3_pmx_core Date: Wed, 12 Jun 2013 22:38:31 +0530 Message-ID: <51B8AB0F.9060701@ti.com> References: <20130523184045.GD13507@atomide.com> <1370546059-24181-1-git-send-email-balajitk@ti.com> <1370546059-24181-9-git-send-email-balajitk@ti.com> <20130612143459.GY8164@atomide.com> Mime-Version: 1.0 Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from bear.ext.ti.com ([192.94.94.41]:56764 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754494Ab3FLRIn (ORCPT ); Wed, 12 Jun 2013 13:08:43 -0400 In-Reply-To: <20130612143459.GY8164@atomide.com> Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: Tony Lindgren Cc: linux-omap@vger.kernel.org, linux-mmc@vger.kernel.org, cjb@laptop.org, b-cousson@ti.com, devicetree-discuss@lists.ozlabs.org On Wednesday 12 June 2013 08:05 PM, Tony Lindgren wrote: > * Balaji T K [130606 12:20]: >> omap3_pmx_core: padconf register are in two banks 0x48003000 to 0x48002268 >> and 0x480025c0 to 0x480025f8. >> >> split omap3_pmx_core into 2 banks as register between 0x48002270 and 0x48002564 >> belongs to type pinctrl-single,bit-per-mux with access to certain bit >> fields with bit field mask. > > Is this the right patch for the description? THe patch seems to deal with > USB pins. > > Also, let's not hog any pins under the pinmux controllers, those make > unloading pinctrl-single impossible which is not nice for distros and > development. omap3_pmx_core is not continuous, so had to split into two and updated the only user in second bank (omap3_pmx_core2) which happened to be usb, CC Roger for USB dynamic pin mux selection. > > Instead, the pins should be under mmc1 in omap[345].dtsi files. > > Regards, > > Tony > >> Signed-off-by: Balaji T K >> --- >> arch/arm/boot/dts/omap3-beagle.dts | 28 ++++++++++++++++++++-------- >> arch/arm/boot/dts/omap3.dtsi | 11 ++++++++++- >> 2 files changed, 30 insertions(+), 9 deletions(-) >> >> diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts >> index 6eec699..7da9979 100644 >> --- a/arch/arm/boot/dts/omap3-beagle.dts >> +++ b/arch/arm/boot/dts/omap3-beagle.dts >> @@ -76,17 +76,11 @@ >> &omap3_pmx_core { >> pinctrl-names = "default"; >> pinctrl-0 = < >> - &hsusbb2_pins >> + &hsusbb2_pins1 >> >; >> >> - hsusbb2_pins: pinmux_hsusbb2_pins { >> + hsusbb2_pins1: pinmux_hsusbb2_pins1 { >> pinctrl-single,pins = < >> - 0x5c0 0x3 /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_clk OUTPUT */ >> - 0x5c2 0x3 /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_stp OUTPUT */ >> - 0x5c4 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dir INPUT | PULLDOWN */ >> - 0x5c6 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_nxt INPUT | PULLDOWN */ >> - 0x5c8 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat0 INPUT | PULLDOWN */ >> - 0x5cA 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat1 INPUT | PULLDOWN */ >> 0x1a4 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat2 INPUT | PULLDOWN */ >> 0x1a6 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat3 INPUT | PULLDOWN */ >> 0x1a8 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat4 INPUT | PULLDOWN */ >> @@ -97,6 +91,24 @@ >> }; >> }; >> >> +&omap3_pmx_core2 { >> + pinctrl-names = "default"; >> + pinctrl-0 = < >> + &hsusbb2_pins2 >> + >; >> + >> + hsusbb2_pins2: pinmux_hsusbb2_pins2 { >> + pinctrl-single,pins = < >> + 0x50 0x3 /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_clk OUTPUT */ >> + 0x52 0x3 /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_stp OUTPUT */ >> + 0x54 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dir INPUT | PULLDOWN */ >> + 0x56 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_nxt INPUT | PULLDOWN */ >> + 0x58 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat0 INPUT | PULLDOWN */ >> + 0x5A 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat1 INPUT | PULLDOWN */ >> + >; >> + }; >> +}; >> + >> &i2c1 { >> clock-frequency = <2600000>; >> >> diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi >> index 82a404d..caaa708 100644 >> --- a/arch/arm/boot/dts/omap3.dtsi >> +++ b/arch/arm/boot/dts/omap3.dtsi >> @@ -95,7 +95,16 @@ >> >> omap3_pmx_core: pinmux@48002030 { >> compatible = "ti,omap3-padconf", "pinctrl-single"; >> - reg = <0x48002030 0x05cc>; >> + reg = <0x48002030 0x238>; >> + #address-cells = <1>; >> + #size-cells = <0>; >> + pinctrl-single,register-width = <16>; >> + pinctrl-single,function-mask = <0x7f1f>; >> + }; >> + >> + omap3_pmx_core2: pinmux@480025a0 { >> + compatible = "ti,omap3-padconf", "pinctrl-single"; >> + reg = <0x480025a0 0x5c>; >> #address-cells = <1>; >> #size-cells = <0>; >> pinctrl-single,register-width = <16>; >> -- >> 1.7.5.4 >>