ARM: dts: TWL4030: fix mux and wakeup for SYS_NIRQ line

On most OMAP3 platforms, the twl4030 IRQ line is connected to the
SYS_NIRQ line on OMAP.  Add another DTS include file
(twl4030_omap3.dtsi) for boards that hook up the twl4030 this way
to include.

This allows RTC wake from off-mode to work again on OMAP3-based
platforms with twl4030.  Tested on 3530/Beagle, 3730/Beagle-xM,
3530/Overo, 3730/Overo-STORM.

Special thanks to Florian Vaussard for suggesting use of preprocessor
feature.

Cc: Florian Vaussard <florian.vaussard@epfl.ch>
Cc: Benoit Cousson <b-cousson@ti.com>
Cc: Nishanth Menon <nm@ti.com>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Benoit Cousson <benoit.cousson@linaro.org>
This commit is contained in:
Kevin Hilman 2013-05-31 14:09:34 -07:00 committed by Benoit Cousson
parent d641c3d587
commit f96884574d
8 changed files with 32 additions and 0 deletions

View File

@ -96,6 +96,7 @@ codec {
};
#include "twl4030.dtsi"
#include "twl4030_omap3.dtsi"
&i2c2 {
clock-frequency = <400000>;

View File

@ -135,6 +135,7 @@ twl: twl@48 {
};
#include "twl4030.dtsi"
#include "twl4030_omap3.dtsi"
&mmc1 {
vmmc-supply = <&vmmc1>;

View File

@ -81,6 +81,7 @@ &i2c3 {
};
#include "twl4030.dtsi"
#include "twl4030_omap3.dtsi"
&mmc1 {
vmmc-supply = <&vmmc1>;

View File

@ -45,6 +45,7 @@ twl: twl@48 {
};
#include "twl4030.dtsi"
#include "twl4030_omap3.dtsi"
&i2c2 {
clock-frequency = <400000>;

View File

@ -87,6 +87,7 @@ codec {
};
#include "twl4030.dtsi"
#include "twl4030_omap3.dtsi"
&i2c2 {
clock-frequency = <400000>;

View File

@ -50,6 +50,7 @@ codec {
};
#include "twl4030.dtsi"
#include "twl4030_omap3.dtsi"
/* i2c2 pins are used for gpio */
&i2c2 {

View File

@ -29,6 +29,7 @@ twl: twl@48 {
};
#include "twl4030.dtsi"
#include "twl4030_omap3.dtsi"
&mmc1 {
vmmc-supply = <&vmmc1>;

View File

@ -0,0 +1,25 @@
/*
* Copyright (C) 2013 Linaro, Ltd.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
&twl {
pinctrl-names = "default";
pinctrl-0 = <&twl4030_pins>;
};
&omap3_pmx_core {
/*
* On most OMAP3 platforms, the twl4030 IRQ line is connected
* to the SYS_NIRQ line on OMAP. Therefore, configure the
* defaults for the SYS_NIRQ pin here.
*/
twl4030_pins: pinmux_twl4030_pins {
pinctrl-single,pins = <
0x1b0 (PIN_INPUT_PULLUP | PIN_OFF_WAKEUPENABLE | MUX_MODE0) /* sys_nirq.sys_nirq */
>;
};
};