aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorVaibhav Hiremath <hvaibhav@ti.com>2013-05-20 09:28:10 -0400
committerBenoit Cousson <benoit.cousson@linaro.org>2013-06-18 19:53:35 -0400
commit4d9275709649f82dcec157766e86318f6c2c61f6 (patch)
treea1257e4759b8787d885f85f23d13da00df352b67 /arch/arm
parent9f2fbe174124f9ec0bb4e690f303d342dfa8b3dd (diff)
ARM: dts: AM33XX: Set pinmux for clkout2 pad used for clock output
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> Signed-off-by: Benoit Cousson <benoit.cousson@linaro.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/am335x-bone.dts8
-rw-r--r--arch/arm/boot/dts/am335x-evm.dts8
-rw-r--r--arch/arm/boot/dts/am335x-evmsk.dts8
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 bfba6fc9e868..74bfcc611051 100644
--- a/arch/arm/boot/dts/am335x-bone.dts
+++ b/arch/arm/boot/dts/am335x-bone.dts
@@ -26,7 +26,7 @@
26 26
27 am33xx_pinmux: pinmux@44e10800 { 27 am33xx_pinmux: pinmux@44e10800 {
28 pinctrl-names = "default"; 28 pinctrl-names = "default";
29 pinctrl-0 = <>; 29 pinctrl-0 = <&clkout2_pin>;
30 30
31 user_leds_s0: user_leds_s0 { 31 user_leds_s0: user_leds_s0 {
32 pinctrl-single,pins = < 32 pinctrl-single,pins = <
@@ -50,6 +50,12 @@
50 0x174 0x00 /* uart0_txd.uart0_txd PULLDOWN | MODE0 */ 50 0x174 0x00 /* uart0_txd.uart0_txd PULLDOWN | MODE0 */
51 >; 51 >;
52 }; 52 };
53
54 clkout2_pin: pinmux_clkout2_pin {
55 pinctrl-single,pins = <
56 0x1b4 0x03 /* xdma_event_intr1.clkout2 OMAP_MUX_MODE3 | AM33XX_PIN_OUTPUT */
57 >;
58 };
53 }; 59 };
54 60
55 ocp { 61 ocp {
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index 7647c9d2c813..896d392dc14d 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -26,7 +26,7 @@
26 26
27 am33xx_pinmux: pinmux@44e10800 { 27 am33xx_pinmux: pinmux@44e10800 {
28 pinctrl-names = "default"; 28 pinctrl-names = "default";
29 pinctrl-0 = <&matrix_keypad_s0 &volume_keys_s0>; 29 pinctrl-0 = <&matrix_keypad_s0 &volume_keys_s0 &clkout2_pin>;
30 30
31 matrix_keypad_s0: matrix_keypad_s0 { 31 matrix_keypad_s0: matrix_keypad_s0 {
32 pinctrl-single,pins = < 32 pinctrl-single,pins = <
@@ -65,6 +65,12 @@
65 0x174 0x00 /* uart0_txd.uart0_txd PULLDOWN | MODE0 */ 65 0x174 0x00 /* uart0_txd.uart0_txd PULLDOWN | MODE0 */
66 >; 66 >;
67 }; 67 };
68
69 clkout2_pin: pinmux_clkout2_pin {
70 pinctrl-single,pins = <
71 0x1b4 0x03 /* xdma_event_intr1.clkout2 OMAP_MUX_MODE3 | AM33XX_PIN_OUTPUT */
72 >;
73 };
68 }; 74 };
69 75
70 ocp { 76 ocp {
diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
index 0eec644471c4..4d81dbcb53ea 100644
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@ -32,7 +32,7 @@
32 32
33 am33xx_pinmux: pinmux@44e10800 { 33 am33xx_pinmux: pinmux@44e10800 {
34 pinctrl-names = "default"; 34 pinctrl-names = "default";
35 pinctrl-0 = <&gpio_keys_s0>; 35 pinctrl-0 = <&gpio_keys_s0 &clkout2_pin>;
36 36
37 user_leds_s0: user_leds_s0 { 37 user_leds_s0: user_leds_s0 {
38 pinctrl-single,pins = < 38 pinctrl-single,pins = <
@@ -65,6 +65,12 @@
65 0x174 0x00 /* uart0_txd.uart0_txd PULLDOWN | MODE0 */ 65 0x174 0x00 /* uart0_txd.uart0_txd PULLDOWN | MODE0 */
66 >; 66 >;
67 }; 67 };
68
69 clkout2_pin: pinmux_clkout2_pin {
70 pinctrl-single,pins = <
71 0x1b4 0x03 /* xdma_event_intr1.clkout2 OMAP_MUX_MODE3 | AM33XX_PIN_OUTPUT */
72 >;
73 };
68 }; 74 };
69 75
70 ocp { 76 ocp {