Merge branch 'core-objtool-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/arch/arm/boot/dts/omap3-n950.dts b/arch/arm/boot/dts/omap3-n950.dts
index 0885b34d5d7da252953c3aaef287a1e20b9dda63..7f219a9dc5be08f1dba3111d623862b03af887d2 100644 (file)
--- a/arch/arm/boot/dts/omap3-n950.dts
+++ b/arch/arm/boot/dts/omap3-n950.dts
@@ -17,6 +17,17 @@
        compatible = "nokia,omap3-n950", "ti,omap36xx", "ti,omap3";
 };
 
+&omap3_pmx_core {
+       spi4_pins: pinmux_spi4_pins {
+               pinctrl-single,pins = <
+                       OMAP3_CORE1_IOPAD(0x218c, PIN_INPUT_PULLDOWN | MUX_MODE1) /* mcspi4_clk */
+                       OMAP3_CORE1_IOPAD(0x2190, PIN_OUTPUT | MUX_MODE1) /* mcspi4_simo */
+                       OMAP3_CORE1_IOPAD(0x2192, PIN_INPUT_PULLDOWN | MUX_MODE1) /* mcspi4_somi */
+                       OMAP3_CORE1_IOPAD(0x2196, PIN_OUTPUT | MUX_MODE1) /* mcspi4_cs0 */
+               >;
+       };
+};
+
 &i2c2 {
        smia_1: camera@10 {
                compatible = "nokia,smia";
@@ -53,3 +64,25 @@
                };
        };
 };
+
+&mcspi4 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&spi4_pins>;
+
+       wlcore: wlcore@0 {
+               compatible = "ti,wl1271";
+               pinctrl-names = "default";
+               pinctrl-0 = <&wlan_pins>;
+               reg = <0>;
+               spi-max-frequency = <48000000>;
+               clock-xtal;
+               ref-clock-frequency = <38400000>;
+               interrupts-extended = <&gpio2 10 IRQ_TYPE_LEVEL_HIGH>; /* gpio 42 */
+               vwlan-supply = <&vwlan_fixed>;
+       };
+};
+
+&modem {
+       compatible = "nokia,n950-modem";
+};