[PATCH] wl1251 device tree support

[PATCH] wl1251 device tree support

[Sebastian Reichel]

Hi Tony/Benoît,

The DT support for wl1251 has been merged to wireless-next [0],
so I guess it's safe to merge the following DTS addition for 3.15.

[0] https://git.kernel.org/cgit/linux/kernel/git/linville/wireless-next.git/commit/?id=07bbca6f142d02b4b09d66ed3c2cde36c77057ad

-- Sebastian

Sebastian Reichel (1):
  DTS: ARM: OMAP3-N900: Add WL1251 support

 arch/arm/boot/dts/omap3-n900.dts | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

-- 
1.9.0

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] DTS: ARM: OMAP3-N900: Add WL1251 support

[Sebastian Reichel]

Add device tree support for the wireless chip
built into the Nokia N900.

Signed-off-by: Sebastian Reichel <sre@debian.org>
---
 arch/arm/boot/dts/omap3-n900.dts | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index e91dae7..0f48b9b 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -148,6 +148,15 @@
 		>;
 	};
 
+	mcspi4_pins: pinmux_mcspi4_pins {
+		pinctrl-single,pins = <
+			0x15c (PIN_INPUT_PULLDOWN | MUX_MODE1) /* mcspi4_clk */
+			0x162 (PIN_INPUT_PULLDOWN | MUX_MODE1) /* mcspi4_somi */
+			0x160 (PIN_OUTPUT | MUX_MODE1) /* mcspi4_simo */
+			0x166 (PIN_OUTPUT | MUX_MODE1) /* mcspi4_cs0 */
+		>;
+	};
+
 	mmc1_pins: pinmux_mmc1_pins {
 		pinctrl-single,pins = <
 			0x114 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc1_clk */
@@ -203,6 +212,13 @@
 			0x15e (PIN_OUTPUT | MUX_MODE4)		/* gpio 157 => cmt_bsi */
 		>;
 	};
+
+	wl1251_pins: pinmux_wl1251 {
+		pinctrl-single,pins = <
+			0x0ce (PIN_OUTPUT | MUX_MODE4)		/* gpio 87 => wl1251 enable */
+			0x05a (PIN_INPUT | MUX_MODE4)		/* gpio 42 => wl1251 irq */
+		>;
+	};
 };
 
 &i2c1 {
@@ -603,6 +619,30 @@
 	};
 };
 
+&mcspi4 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mcspi4_pins>;
+
+	wl1251@0 {
+		pinctrl-names = "default";
+		pinctrl-0 = <&wl1251_pins>;
+
+		vio-supply = <&vio>;
+
+		compatible = "ti,wl1251";
+		reg = <0>;
+		spi-max-frequency = <48000000>;
+
+		spi-cpol;
+		spi-cpha;
+
+		ti,power-gpio = <&gpio3 23 GPIO_ACTIVE_HIGH>; /* 87 */
+
+		interrupt-parent = <&gpio2>;
+		interrupts = <10 IRQ_TYPE_NONE>; /* gpio line 42 */
+	};
+};
+
 &usb_otg_hs {
 	interface-type = <0>;
 	usb-phy = <&usb2_phy>;
-- 
1.9.0

Re: [PATCH] DTS: ARM: OMAP3-N900: Add WL1251 support

[Tony Lindgren]

* Sebastian Reichel <sre@debian.org> [140313 15:03]:
> Add device tree support for the wireless chip
> built into the Nokia N900.
> 
> Signed-off-by: Sebastian Reichel <sre@debian.org>

Thanks applying into omap-for-v3.16/dt.

Tony

> ---
>  arch/arm/boot/dts/omap3-n900.dts | 40 ++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 40 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
> index e91dae7..0f48b9b 100644
> --- a/arch/arm/boot/dts/omap3-n900.dts
> +++ b/arch/arm/boot/dts/omap3-n900.dts
> @@ -148,6 +148,15 @@
>  		>;
>  	};
>  
> +	mcspi4_pins: pinmux_mcspi4_pins {
> +		pinctrl-single,pins = <
> +			0x15c (PIN_INPUT_PULLDOWN | MUX_MODE1) /* mcspi4_clk */
> +			0x162 (PIN_INPUT_PULLDOWN | MUX_MODE1) /* mcspi4_somi */
> +			0x160 (PIN_OUTPUT | MUX_MODE1) /* mcspi4_simo */
> +			0x166 (PIN_OUTPUT | MUX_MODE1) /* mcspi4_cs0 */
> +		>;
> +	};
> +
>  	mmc1_pins: pinmux_mmc1_pins {
>  		pinctrl-single,pins = <
>  			0x114 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc1_clk */
> @@ -203,6 +212,13 @@
>  			0x15e (PIN_OUTPUT | MUX_MODE4)		/* gpio 157 => cmt_bsi */
>  		>;
>  	};
> +
> +	wl1251_pins: pinmux_wl1251 {
> +		pinctrl-single,pins = <
> +			0x0ce (PIN_OUTPUT | MUX_MODE4)		/* gpio 87 => wl1251 enable */
> +			0x05a (PIN_INPUT | MUX_MODE4)		/* gpio 42 => wl1251 irq */
> +		>;
> +	};
>  };
>  
>  &i2c1 {
> @@ -603,6 +619,30 @@
>  	};
>  };
>  
> +&mcspi4 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&mcspi4_pins>;
> +
> +	wl1251@0 {
> +		pinctrl-names = "default";
> +		pinctrl-0 = <&wl1251_pins>;
> +
> +		vio-supply = <&vio>;
> +
> +		compatible = "ti,wl1251";
> +		reg = <0>;
> +		spi-max-frequency = <48000000>;
> +
> +		spi-cpol;
> +		spi-cpha;
> +
> +		ti,power-gpio = <&gpio3 23 GPIO_ACTIVE_HIGH>; /* 87 */
> +
> +		interrupt-parent = <&gpio2>;
> +		interrupts = <10 IRQ_TYPE_NONE>; /* gpio line 42 */
> +	};
> +};
> +
>  &usb_otg_hs {
>  	interface-type = <0>;
>  	usb-phy = <&usb2_phy>;
> -- 
> 1.9.0
>