ARM: dts: STi: STih407: Switch LPC mode from RTC to Clocksource

[deliverable/linux.git] / arch / arm / boot / dts / omap3-n950-n9.dtsi

diff --git a/arch/arm/boot/dts/omap3-n950-n9.dtsi b/arch/arm/boot/dts/omap3-n950-n9.dtsi
index a2c2b8d8dd2c70a2ab5a8007b0cc2e24faeaafd0..858a25048102de016793d30a229aba0ae55dd5ff 100644 (file)
--- a/arch/arm/boot/dts/omap3-n950-n9.dtsi
+++ b/arch/arm/boot/dts/omap3-n950-n9.dtsi
@@ -31,6 +31,14 @@
                startup-delay-us = <150>;
                enable-active-high;
        };
+
+       vwlan_fixed: fixedregulator@2 {
+               compatible = "regulator-fixed";
+               regulator-name = "VWLAN";
+               gpio = <&gpio2 3 GPIO_ACTIVE_HIGH>; /* gpio 35 */
+               enable-active-high;
+               regulator-boot-off;
+       };
 };
 
 &omap3_pmx_core {
@@ -44,6 +52,55 @@
                        OMAP3_CORE1_IOPAD(0x2162, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat3 */
                >;
        };
+
+       wlan_pins: pinmux_wlan_pins {
+               pinctrl-single,pins = <
+                       OMAP3_CORE1_IOPAD(0x207c, PIN_OUTPUT | MUX_MODE4) /* gpio 35 - wlan enable */
+                       OMAP3_CORE1_IOPAD(0x208a, PIN_INPUT | MUX_MODE4) /* gpio 42 - wlan irq */
+               >;
+       };
+
+       ssi_pins: pinmux_ssi_pins {
+               pinctrl-single,pins = <
+                       OMAP3_CORE1_IOPAD(0x217c, PIN_OUTPUT | MUX_MODE1)            /* ssi1_dat_tx */
+                       OMAP3_CORE1_IOPAD(0x217e, PIN_OUTPUT | MUX_MODE1)            /* ssi1_flag_tx */
+                       OMAP3_CORE1_IOPAD(0x2180, PIN_INPUT_PULLUP | MUX_MODE1)      /* ssi1_rdy_tx */
+                       OMAP3_CORE1_IOPAD(0x2182, PIN_INPUT | WAKEUP_EN | MUX_MODE4) /* ssi1_wake_tx (cawake) */
+                       OMAP3_CORE1_IOPAD(0x2184, PIN_INPUT | MUX_MODE1)             /* ssi1_dat_rx */
+                       OMAP3_CORE1_IOPAD(0x2186, PIN_INPUT | MUX_MODE1)             /* ssi1_flag_rx */
+                       OMAP3_CORE1_IOPAD(0x2188, PIN_OUTPUT | MUX_MODE1)            /* ssi1_rdy_rx */
+                       OMAP3_CORE1_IOPAD(0x218a, PIN_OUTPUT | MUX_MODE1)            /* ssi1_wake */
+               >;
+       };
+
+       ssi_pins_idle: pinmux_ssi_pins_idle {
+               pinctrl-single,pins = <
+                       OMAP3_CORE1_IOPAD(0x217c, PIN_OUTPUT | MUX_MODE7)            /* ssi1_dat_tx */
+                       OMAP3_CORE1_IOPAD(0x217e, PIN_OUTPUT | MUX_MODE7)            /* ssi1_flag_tx */
+                       OMAP3_CORE1_IOPAD(0x2180, PIN_INPUT_PULLDOWN | MUX_MODE7)    /* ssi1_rdy_tx */
+                       OMAP3_CORE1_IOPAD(0x2182, PIN_INPUT | WAKEUP_EN | MUX_MODE4) /* ssi1_wake_tx (cawake) */
+                       OMAP3_CORE1_IOPAD(0x2184, PIN_INPUT | MUX_MODE7)             /* ssi1_dat_rx */
+                       OMAP3_CORE1_IOPAD(0x2186, PIN_INPUT | MUX_MODE7)             /* ssi1_flag_rx */
+                       OMAP3_CORE1_IOPAD(0x2188, PIN_OUTPUT | MUX_MODE4)            /* ssi1_rdy_rx */
+                       OMAP3_CORE1_IOPAD(0x218a, PIN_OUTPUT | MUX_MODE7)            /* ssi1_wake */
+               >;
+       };
+
+       modem_pins1: pinmux_modem_core1_pins {
+               pinctrl-single,pins = <
+                       OMAP3_CORE1_IOPAD(0x207a, PIN_INPUT | WAKEUP_EN | MUX_MODE4) /* gpio_34 (ape_rst_rq) */
+                       OMAP3_CORE1_IOPAD(0x2100, PIN_OUTPUT | MUX_MODE4)            /* gpio_88 (cmt_rst_rq) */
+                       OMAP3_CORE1_IOPAD(0x210a, PIN_OUTPUT | MUX_MODE4)            /* gpio_93 (cmt_apeslpx) */
+               >;
+       };
+};
+
+&omap3_pmx_core2 {
+       modem_pins2: pinmux_modem_core2_pins {
+               pinctrl-single,pins = <
+                       OMAP3630_CORE2_IOPAD(0x25ec, PIN_OUTPUT | MUX_MODE4)         /* gpio_23 (cmt_en) */
+               >;
+       };
 };
 
 &i2c1 {
@@ -191,3 +248,39 @@
                };
        };
 };
+
+&ssi_port1 {
+       pinctrl-names = "default", "idle";
+       pinctrl-0 = <&ssi_pins>;
+       pinctrl-1 = <&ssi_pins_idle>;
+
+       ti,ssi-cawake-gpio = <&gpio5 23 GPIO_ACTIVE_HIGH>; /* 151 */
+
+       modem: hsi-client {
+               pinctrl-names = "default";
+               pinctrl-0 = <&modem_pins1 &modem_pins2>;
+
+               hsi-channel-ids = <0>, <1>, <2>, <3>;
+               hsi-channel-names = "mcsaab-control",
+                                   "speech-control",
+                                   "speech-data",
+                                   "mcsaab-data";
+               hsi-speed-kbps = <96000>;
+               hsi-mode = "frame";
+               hsi-flow = "synchronized";
+               hsi-arb-mode = "round-robin";
+
+               interrupts-extended = <&gpio2 2 IRQ_TYPE_EDGE_RISING>; /* gpio 34 */
+
+               gpios = <&gpio3 29 GPIO_ACTIVE_HIGH>, /* gpio 93 */
+                       <&gpio3 24 GPIO_ACTIVE_HIGH>, /* gpio 88 */
+                       <&gpio1 23 GPIO_ACTIVE_HIGH>; /* gpio 23 */
+               gpio-names = "cmt_apeslpx",
+                            "cmt_rst_rq",
+                            "cmt_en";
+       };
+};
+
+&ssi_port2 {
+       status = "disabled";
+};