All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ARM: DTS: OMAP4: Panda/SDP: twl6030: fix mux for IRQ pin and msecure line
@ 2013-05-24 19:28 ` Kevin Hilman
  0 siblings, 0 replies; 36+ messages in thread
From: Kevin Hilman @ 2013-05-24 19:28 UTC (permalink / raw)
  To: Tony Lindgren, Benoit Cousson, linux-omap; +Cc: linux-arm-kernel

Earlier commits ensured proper muxing of pins related to proper
TWL6030 behavior: see commit 265a2bc8 (ARM: OMAP3: TWL4030: ensure
sys_nirq1 is mux'd and wakeup enabled) and commit 1ef43369 (ARM:
OMAP4: TWL: mux sys_drm_msecure as output for PMIC).

However these only fixed legacy boot and not DT boot.  For DT boot,
the default mux values need to be set properly in DT.

Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
---
Applies on v3.10-rc2

 arch/arm/boot/dts/omap4-panda-common.dtsi | 8 ++++++++
 arch/arm/boot/dts/omap4-sdp.dts           | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi
index 03bd60d..a7a9bc0 100644
--- a/arch/arm/boot/dts/omap4-panda-common.dtsi
+++ b/arch/arm/boot/dts/omap4-panda-common.dtsi
@@ -59,6 +59,7 @@
 &omap4_pmx_core {
 	pinctrl-names = "default";
 	pinctrl-0 = <
+			&twl6030_pins
 			&twl6040_pins
 			&mcpdm_pins
 			&mcbsp1_pins
@@ -66,6 +67,13 @@
 			&tpd12s015_pins
 	>;
 
+	twl6030_pins: pinmux_twl6030_pins {
+		pinctrl-single,pins = <
+			0x15e 0x4118	/* sys_nirq1.sys_nirq1 OMAP_WAKEUP_EN | INPUT_PULLUP | MODE0 */
+			0x14 0x0	/* fref_clk0_out.sys_drm_msecure OUTPUT */
+		>;
+	};
+
 	twl6040_pins: pinmux_twl6040_pins {
 		pinctrl-single,pins = <
 			0xe0 0x3	/* hdq_sio.gpio_127 OUTPUT | MODE3 */
diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
index a35d9cd..5ad0c10 100644
--- a/arch/arm/boot/dts/omap4-sdp.dts
+++ b/arch/arm/boot/dts/omap4-sdp.dts
@@ -145,6 +145,7 @@
 &omap4_pmx_core {
 	pinctrl-names = "default";
 	pinctrl-0 = <
+			&twl6030_pins
 			&twl6040_pins
 			&mcpdm_pins
 			&dmic_pins
@@ -179,6 +180,13 @@
 		>;
 	};
 
+	twl6030_pins: pinmux_twl6030_pins {
+		pinctrl-single,pins = <
+			0x15e 0x4118	/* sys_nirq1.sys_nirq1 OMAP_WAKEUP_EN | INPUT_PULLUP | MODE0 */
+			0x14 0x0	/* fref_clk0_out.sys_drm_msecure OUTPUT */
+		>;
+	};
+
 	twl6040_pins: pinmux_twl6040_pins {
 		pinctrl-single,pins = <
 			0xe0 0x3	/* hdq_sio.gpio_127 OUTPUT | MODE3 */
-- 
1.8.2


^ permalink raw reply related	[flat|nested] 36+ messages in thread

end of thread, other threads:[~2013-05-29 16:48 UTC | newest]

Thread overview: 36+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-24 19:28 [PATCH] ARM: DTS: OMAP4: Panda/SDP: twl6030: fix mux for IRQ pin and msecure line Kevin Hilman
2013-05-24 19:28 ` Kevin Hilman
2013-05-24 20:09 ` Nishanth Menon
2013-05-24 20:09   ` Nishanth Menon
2013-05-24 20:32   ` Nishanth Menon
2013-05-24 20:32     ` Nishanth Menon
2013-05-24 21:19     ` Kevin Hilman
2013-05-24 21:19       ` Kevin Hilman
2013-05-24 21:25       ` Nishanth Menon
2013-05-24 21:25         ` Nishanth Menon
2013-05-24 21:51         ` Kevin Hilman
2013-05-24 21:51           ` Kevin Hilman
2013-05-24 22:15           ` Kevin Hilman
2013-05-24 22:15             ` Kevin Hilman
2013-05-26 17:35             ` Nishanth Menon
2013-05-26 17:35               ` Nishanth Menon
2013-05-28 18:33               ` Kevin Hilman
2013-05-28 18:33                 ` Kevin Hilman
2013-05-29  8:36                 ` Grygorii Strashko
2013-05-29  8:36                   ` Grygorii Strashko
2013-05-29 16:12                   ` Kevin Hilman
2013-05-29 16:12                     ` Kevin Hilman
2013-05-29  9:36                 ` Cousson, Benoit
2013-05-29  9:36                   ` Cousson, Benoit
2013-05-29  9:38           ` Cousson, Benoit
2013-05-29  9:38             ` Cousson, Benoit
2013-05-29 14:03             ` Kevin Hilman
2013-05-29 14:03               ` Kevin Hilman
2013-05-29 14:23               ` Cousson, Benoit
2013-05-29 14:23                 ` Cousson, Benoit
     [not found]                 ` <CAGa+x85ZzfX400eEGmTGPzRiC21S83VRiHYj38cqsJLjDF3L7g@mail.gmail.com>
2013-05-29 16:02                   ` Cousson, Benoit
2013-05-29 16:02                     ` Cousson, Benoit
2013-05-29 16:13                     ` Kevin Hilman
2013-05-29 16:13                       ` Kevin Hilman
2013-05-29 16:48                       ` Benoit Cousson
2013-05-29 16:48                         ` Benoit Cousson

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.