ARM: dts: OMAP3-N950-N9: Enable modem

The Nokia N950 and Nokia N9 have a modem attached to their
first ssi port. This change adds the modem to the SSI port.

Signed-off-by: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/boot/dts/omap3-n9.dts b/arch/arm/boot/dts/omap3-n9.dts
index f2e2139..5c67429 100644 (file)
--- a/arch/arm/boot/dts/omap3-n9.dts
+++ b/arch/arm/boot/dts/omap3-n9.dts
@@ -53,3 +53,7 @@
                };
        };
 };
+
+&modem {
+       compatible = "nokia,n9-modem";
+};

diff --git a/arch/arm/boot/dts/omap3-n950-n9.dtsi b/arch/arm/boot/dts/omap3-n950-n9.dtsi
index e89a40e..702062e 100644 (file)
--- a/arch/arm/boot/dts/omap3-n950-n9.dtsi
+++ b/arch/arm/boot/dts/omap3-n950-n9.dtsi
@@ -72,6 +72,22 @@
                        OMAP3_CORE1_IOPAD(0x218a, PIN_OUTPUT | MUX_MODE1)            /* 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 {
@@ -225,6 +241,30 @@
        pinctrl-0 = <&ssi_pins>;
 
        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 {

diff --git a/arch/arm/boot/dts/omap3-n950.dts b/arch/arm/boot/dts/omap3-n950.dts
index e596726..7f219a9 100644 (file)
--- a/arch/arm/boot/dts/omap3-n950.dts
+++ b/arch/arm/boot/dts/omap3-n950.dts
@@ -82,3 +82,7 @@
                vwlan-supply = <&vwlan_fixed>;
        };
 };
+
+&modem {
+       compatible = "nokia,n950-modem";
+};