aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/omap4-panda-common.dtsi
diff options
context:
space:
mode:
authorRuslan Bilovol <ruslan.bilovol@ti.com>2013-08-14 11:35:47 +0300
committerBenoit Cousson <bcousson@baylibre.com>2013-10-08 17:51:41 +0200
commit06a9ea5d76fdff82d9792d8cc315de4c43086780 (patch)
treedd90662951ac75c375190356595a7b0edefcf612 /arch/arm/boot/dts/omap4-panda-common.dtsi
parentARM: dts: Remove '0x's from OMAP5 DTS file (diff)
downloadlinux-dev-06a9ea5d76fdff82d9792d8cc315de4c43086780.tar.xz
linux-dev-06a9ea5d76fdff82d9792d8cc315de4c43086780.zip
ARM: dts: twl6030: Move common configuration for OMAP4 boards in a separate dtsi file
The OMAP4 SoC family uses specially-designed PMIC (power management IC) companion chip for power management needs: TWL6030/TWL6032. Therefore there is a typical connection of PMIC to OMAP4 so we can move it into separate .dtsi file and do not duplicate over board-specific files. Tested on OMAP4 SDP board and Pandaboard ES2. Signed-off-by: Ruslan Bilovol <ruslan.bilovol@ti.com> Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Diffstat (limited to 'arch/arm/boot/dts/omap4-panda-common.dtsi')
-rw-r--r--arch/arm/boot/dts/omap4-panda-common.dtsi21
1 files changed, 1 insertions, 20 deletions
diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi
index 814ab67c8c29..43b7661cfe24 100644
--- a/arch/arm/boot/dts/omap4-panda-common.dtsi
+++ b/arch/arm/boot/dts/omap4-panda-common.dtsi
@@ -122,23 +122,9 @@
};
};
-&omap4_pmx_wkup {
- pinctrl-names = "default";
- pinctrl-0 = <
- &twl6030_wkup_pins
- >;
-
- twl6030_wkup_pins: pinmux_twl6030_wkup_pins {
- pinctrl-single,pins = <
- 0x14 (PIN_OUTPUT | MUX_MODE2) /* fref_clk0_out.sys_drm_msecure */
- >;
- };
-};
-
&omap4_pmx_core {
pinctrl-names = "default";
pinctrl-0 = <
- &twl6030_pins
&twl6040_pins
&mcpdm_pins
&mcbsp1_pins
@@ -147,12 +133,6 @@
&hsusbb1_pins
>;
- twl6030_pins: pinmux_twl6030_pins {
- pinctrl-single,pins = <
- 0x15e (WAKEUP_EN | PIN_INPUT_PULLUP | MUX_MODE0) /* sys_nirq1.sys_nirq1 */
- >;
- };
-
twl6040_pins: pinmux_twl6040_pins {
pinctrl-single,pins = <
0xe0 (PIN_OUTPUT | MUX_MODE3) /* hdq_sio.gpio_127 */
@@ -305,6 +285,7 @@
};
#include "twl6030.dtsi"
+#include "twl6030_omap4.dtsi"
&i2c2 {
pinctrl-names = "default";