diff mbox

[2/2] ARM: dts: AM33XX: Set pinmux for clkout2 pad used for clock output

Message ID 1367919574-21353-3-git-send-email-hvaibhav@ti.com (mailing list archive)
State New, archived
Headers show

Commit Message

Vaibhav Hiremath May 7, 2013, 9:39 a.m. UTC
xdma_event_intr1.clkout2 pad can be used to source clock
from either 32K OSC or any of the PLL (except MPU) outputs.
On the existing AM335x based boards (EVM, EVM-SK and Bone),
this pad is used to feed the clock to audio codes.

So, this patch configures the pinmux to get clkout2 on the pad.

Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
---
 arch/arm/boot/dts/am335x-bone.dts  |    8 +++++++-
 arch/arm/boot/dts/am335x-evm.dts   |    8 +++++++-
 arch/arm/boot/dts/am335x-evmsk.dts |    8 +++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

Comments

Paul Walmsley May 20, 2013, 2:51 a.m. UTC | #1
Hi

something that you should fix:

On Tue, 7 May 2013, Vaibhav Hiremath wrote:

> xdma_event_intr1.clkout2 pad can be used to source clock
> from either 32K OSC or any of the PLL (except MPU) outputs.
> On the existing AM335x based boards (EVM, EVM-SK and Bone),
> this pad is used to feed the clock to audio codes.
> 
> So, this patch configures the pinmux to get clkout2 on the pad.
> 
> Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
> ---
>  arch/arm/boot/dts/am335x-bone.dts  |    8 +++++++-
>  arch/arm/boot/dts/am335x-evm.dts   |    8 +++++++-
>  arch/arm/boot/dts/am335x-evmsk.dts |    8 +++++++-
>  3 files changed, 21 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
> index bfba6fc..f4630a3 100644
> --- a/arch/arm/boot/dts/am335x-bone.dts
> +++ b/arch/arm/boot/dts/am335x-bone.dts
> @@ -26,7 +26,7 @@
>  
>  	am33xx_pinmux: pinmux@44e10800 {
>  		pinctrl-names = "default";
> -		pinctrl-0 = <>;
> +		pinctrl-0 = <&clkout2_pin>;
>  
>  		user_leds_s0: user_leds_s0 {
>  			pinctrl-single,pins = <
> @@ -50,6 +50,12 @@
>  				0x174 0x00	/* uart0_txd.uart0_txd PULLDOWN | MODE0 */
>  			>;
>  		};
> +
> +		clkout2_pin: pinumx_clkout2_pin {

"pinmux" is misspelled here and in several other parts of this file.




- Paul
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Vaibhav Hiremath May 20, 2013, 5:30 a.m. UTC | #2
> -----Original Message-----
> From: Paul Walmsley [mailto:paul@pwsan.com]
> Sent: Monday, May 20, 2013 8:21 AM
> To: Hiremath, Vaibhav
> Cc: linux-omap@vger.kernel.org; tony@atomide.com; Cousson, Benoit;
> linux-arm-kernel@lists.infradead.org
> Subject: Re: [PATCH 2/2] ARM: dts: AM33XX: Set pinmux for clkout2 pad
> used for clock output
> 
> Hi
> 
> something that you should fix:
> 
> On Tue, 7 May 2013, Vaibhav Hiremath wrote:
> 
> > xdma_event_intr1.clkout2 pad can be used to source clock
> > from either 32K OSC or any of the PLL (except MPU) outputs.
> > On the existing AM335x based boards (EVM, EVM-SK and Bone),
> > this pad is used to feed the clock to audio codes.
> >
> > So, this patch configures the pinmux to get clkout2 on the pad.
> >
> > Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
> > ---
> >  arch/arm/boot/dts/am335x-bone.dts  |    8 +++++++-
> >  arch/arm/boot/dts/am335x-evm.dts   |    8 +++++++-
> >  arch/arm/boot/dts/am335x-evmsk.dts |    8 +++++++-
> >  3 files changed, 21 insertions(+), 3 deletions(-)
> >
> > diff --git a/arch/arm/boot/dts/am335x-bone.dts
> b/arch/arm/boot/dts/am335x-bone.dts
> > index bfba6fc..f4630a3 100644
> > --- a/arch/arm/boot/dts/am335x-bone.dts
> > +++ b/arch/arm/boot/dts/am335x-bone.dts
> > @@ -26,7 +26,7 @@
> >
> >  	am33xx_pinmux: pinmux@44e10800 {
> >  		pinctrl-names = "default";
> > -		pinctrl-0 = <>;
> > +		pinctrl-0 = <&clkout2_pin>;
> >
> >  		user_leds_s0: user_leds_s0 {
> >  			pinctrl-single,pins = <
> > @@ -50,6 +50,12 @@
> >  				0x174 0x00	/* uart0_txd.uart0_txd PULLDOWN |
> MODE0 */
> >  			>;
> >  		};
> > +
> > +		clkout2_pin: pinumx_clkout2_pin {
> 
> "pinmux" is misspelled here and in several other parts of this file.
> 

Very good catch. Once misspelled and it gets copy-pasted everywhere :)

Will send next version shortly.

Thanks,
Vaibhav
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
index bfba6fc..f4630a3 100644
--- a/arch/arm/boot/dts/am335x-bone.dts
+++ b/arch/arm/boot/dts/am335x-bone.dts
@@ -26,7 +26,7 @@ 
 
 	am33xx_pinmux: pinmux@44e10800 {
 		pinctrl-names = "default";
-		pinctrl-0 = <>;
+		pinctrl-0 = <&clkout2_pin>;
 
 		user_leds_s0: user_leds_s0 {
 			pinctrl-single,pins = <
@@ -50,6 +50,12 @@ 
 				0x174 0x00	/* uart0_txd.uart0_txd PULLDOWN | MODE0 */
 			>;
 		};
+
+		clkout2_pin: pinumx_clkout2_pin {
+			pinctrl-single,pins = <
+				0x1b4 0x03	/* xdma_event_intr1.clkout2 OMAP_MUX_MODE3 | AM33XX_PIN_OUTPUT */
+			>;
+		};
 	};
 
 	ocp {
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index f598ed2..0673308 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -26,7 +26,7 @@ 
 
 	am33xx_pinmux: pinmux@44e10800 {
 		pinctrl-names = "default";
-		pinctrl-0 = <&matrix_keypad_s0 &volume_keys_s0>;
+		pinctrl-0 = <&matrix_keypad_s0 &volume_keys_s0 &clkout2_pin>;
 
 		matrix_keypad_s0: matrix_keypad_s0 {
 			pinctrl-single,pins = <
@@ -65,6 +65,12 @@ 
 				0x174 0x00	/* uart0_txd.uart0_txd PULLDOWN | MODE0 */
 			>;
 		};
+
+		clkout2_pin: pinumx_clkout2_pin {
+			pinctrl-single,pins = <
+				0x1b4 0x03	/* xdma_event_intr1.clkout2 OMAP_MUX_MODE3 | AM33XX_PIN_OUTPUT */
+			>;
+		};
 	};
 
 	ocp {
diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
index 0eec644..a559389 100644
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@ -32,7 +32,7 @@ 
 
 	am33xx_pinmux: pinmux@44e10800 {
 		pinctrl-names = "default";
-		pinctrl-0 = <&gpio_keys_s0>;
+		pinctrl-0 = <&gpio_keys_s0 &clkout2_pin>;
 
 		user_leds_s0: user_leds_s0 {
 			pinctrl-single,pins = <
@@ -65,6 +65,12 @@ 
 				0x174 0x00	/* uart0_txd.uart0_txd PULLDOWN | MODE0 */
 			>;
 		};
+
+		clkout2_pin: pinumx_clkout2_pin {
+			pinctrl-single,pins = <
+				0x1b4 0x03	/* xdma_event_intr1.clkout2 OMAP_MUX_MODE3 | AM33XX_PIN_OUTPUT */
+			>;
+		};
 	};
 
 	ocp {