wlcore/wl12xx: spi: add wifi support to cm-t335
v3 cover wlcore/wl12xx: spi: add wifi support to cm-t335
Add DT support for WLS1271 SPI driver.
Add power operation function to the WLS1271 SPI driver.
Uri Mashiach (3):
wlcore/wl12xx: spi: add power operation function wlcore/wl12xx: spi: add device tree support wlcore/wl12xx: spi: add wifi support to cm-t335
.../bindings/net/wireless/ti,wlcore,spi.txt | 34 +++++++++ arch/arm/boot/dts/am335x-cm-t335.dts | 54 ++++++++++++++ drivers/net/wireless/ti/wlcore/Kconfig | 2 +- drivers/net/wireless/ti/wlcore/spi.c | 84 ++++++++++++++++++++-- 4 files changed, 169 insertions(+), 5 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/wireless/ti,wlcore,spi.txt
Signature · 1 line
2.5.0
PATCH v3 1/3 wlcore/wl12xx: spi: add power operation function
The power function uses a consumer regulator access to update the WiFi enable GPIO value.
---
v1 -> v2: oops fix was removed to a separate fix.
v2 -> v3: no changes
drivers/net/wireless/ti/wlcore/spi.c | 37 ++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)
drivers/net/wireless/ti/wlcore/spi.c +37 -0
@@ -30,6 +30,7 @@#include <linux/spi/spi.h> #include <linux/wl12xx.h> #include <linux/platform_device.h> +#include <linux/regulator/consumer.h> #include "wlcore.h" #include "wl12xx_80211.h"
@@ -81,6 +82,7 @@struct wl12xx_spi_glue {struct device *dev;struct platform_device *core; +struct regulator *reg;/* Power regulator */ };static void wl12xx_spi_reset (struct device *child)
@@ -318,11 +320,40 @@ static int __must_check wl12xx_spi_raw_write(struct device *child, int addr,return 0 ; } +/** +* wl12xx_spi_set_power - power on/off the wl12xx unit +* @child: wl12xx device handle. +* @enable: true/false to power on/off the unit. +* +* use the WiFi enable regulator to enable/disable the WiFi unit. +*/ +static int wl12xx_spi_set_power (struct device *child,bool enable) +{ +int ret =0 ; +struct wl12xx_spi_glue *glue =dev_get_drvdata (child->parent); + +WARN_ON (!glue->reg); + +/* Update regulator state */ +if (enable) { + ret =regulator_enable (glue->reg); +if (ret) +dev_err (child,"Power enable failure\n" ); + }else { + ret =regulator_disable (glue->reg); +if (ret) +dev_err (child,"Power disable failure\n" ); + } + +return ret; +} +static struct wl1271_if_operations spi_ops = { .read = wl12xx_spi_raw_read, .write = wl12xx_spi_raw_write, .reset = wl12xx_spi_reset, .init = wl12xx_spi_init, + .power = wl12xx_spi_set_power, .set_block_size =NULL , };
@@ -353,6 +384,12 @@ static int wl1271_probe(struct spi_device *spi)* comes from the board-peripherals file */ spi->bits_per_word =32 ; + glue->reg =devm_regulator_get (&spi->dev,"vwlan" ); +if (IS_ERR (glue->reg)) { +dev_err (glue->dev,"can't get regulator\n" ); +return PTR_ERR (glue->reg); + } + ret =spi_setup (spi);if (ret <0 ) {dev_err (glue->dev,"spi_setup failed\n" );
Signature · 1 line
2.5.0
PATCH v3 2/3 wlcore/wl12xx: spi: add device tree support
In reply to Uri MashiachAdd DT support for the wl1271 SPI WiFi.
Add documentation file for the wl1271 SPI WiFi.
---
v1 -> v2: update interrupt documentation.
replace interrupts and interrupt-parent with interrupts-extended. IRQ parameters retrieved from spi_device instead of DT. remove redundant #ifdef CONFIG_OF
v2 -> v3: Add MODULE_DEVICE_TABLE.
Remove #ifdef CONFIG_OF.
Make the Kconfig symbol to depend on OF.
Replace irqd_get_trigger_type() with irq_get_trigger_type().
.../bindings/net/wireless/ti,wlcore,spi.txt | 34 ++++++++++++++++ drivers/net/wireless/ti/wlcore/Kconfig | 2 +- drivers/net/wireless/ti/wlcore/spi.c | 47 ++++++++++++++++++++-- 3 files changed, 78 insertions(+), 5 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/wireless/ti,wlcore,spi.txt
Documentation/devicetree/bindings/net/wireless/ti,wlcore,spi.txt new file +34 -0
@@ -0,0 +1,34 @@ +* Texas Instruments wl1271 wireless lan controller + +The wl1271 chip can be connected via SPI or via SDIO. This +document describes the binding for the SPI connected chip. + +Required properties: +- compatible : Should be "ti,wl1271" +- reg : Chip select address of device +- spi-max-frequency : Maximum SPI clocking speed of device in Hz +- ref-clock-frequency : Reference clock frequency +- interrupts-extended : Should contain parameters for 1 interrupt line. + Interrupt parameters: parent, line number, type. +- vwlan-supply : Point the node of the regulator that powers/enable the wl1271 chip + +Optional properties: +- clock-xtal : boolean, clock is generated from XTAL + +- Please consult Documentation/devicetree/bindings/spi/spi-bus.txt + for optional SPI connection related properties, + +Examples: + +&spi1 { + wl1271 at 1 { + compatible = "ti,wl1271"; + + reg = <1>; + spi-max-frequency = <48000000>; + clock-xtal; + ref-clock-frequency = <38400000>; + interrupts-extended = <&gpio3 8 IRQ_TYPE_LEVEL_HIGH>; + vwlan-supply = <&vwlan_fixed>; + }; +};
drivers/net/wireless/ti/wlcore/Kconfig +1 -1
@@ -13,7 +13,7 @@ config WLCORE config WLCORE_SPI tristate "TI wlcore SPI support" - depends on WLCORE && SPI_MASTER + depends on WLCORE && SPI_MASTER && OF select CRC7 ---help--- This module adds support for the SPI interface of adapters using
drivers/net/wireless/ti/wlcore/spi.c +43 -4
86 lines not on this page · raw message
Signature · 1 line
2.5.0
Rob Herring
maintainerPATCH v3 2/3 wlcore/wl12xx: spi: add device tree support
Quoted 9 lines · Uri Mashiach
Add DT support for the wl1271 SPI WiFi.
Add documentation file for the wl1271 SPI WiFi.
Signed-off-by Uri Mashiach <[email protected]>Acked-by Igor Grinberg <[email protected]>---
v1 -> v2: update interrupt documentation.
replace interrupts and interrupt-parent with interrupts-extended.
Why? interrupts-extended is really just for cases with 2 interrupt parents.
Quoted 8 lines
IRQ parameters retrieved from
spi_deviceinstead of DT. remove redundant #ifdefCONFIG_OF
v2 -> v3: AddMODULE_DEVICE_TABLE.
Remove #ifdefCONFIG_OF.
Make theKconfigsymbol to depend on OF.
Replaceirqd_get_trigger_type()withirq_get_trigger_type()..../bindings/net/wireless/ti,wlcore,spi.txt | 34 ++++++++++++++++
In any case:
Quoted 4 lines
drivers/net/wireless/ti/wlcore/Kconfig | 2 +- drivers/net/wireless/ti/wlcore/spi.c | 47 ++++++++++++++++++++-- 3 files changed, 78 insertions(+), 5 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/wireless/ti,wlcore,spi.txt
PATCH v3 3/3 wlcore/wl12xx: spi: add wifi support to cm-t335
In reply to Uri MashiachDevice tree modifications:
- Pinmux for SPI0 and WiFi GPIOs.
- SPI0 node with wlcore as a child node.
---
v1 -> v2: Replace interrupts and interrupt-parent with interrupts-extended. v2 -> v3: Move the pinctrl-0 = <&wifi_pins> to the wlcore node.
arch/arm/boot/dts/am335x-cm-t335.dts | 54 ++++++++++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
arch/arm/boot/dts/am335x-cm-t335.dts +54 -0
@@ -11,6 +11,7 @@ /dts-v1/; #include "am33xx.dtsi" +#include <dt-bindings/interrupt-controller/irq.h> / { model = "CompuLab CM-T335";
@@ -40,6 +41,15 @@ regulator-max-microvolt = <3300000>; }; + /* Regulator for WiFi */ + vwlan_fixed: fixedregulator at 2 { + compatible = "regulator-fixed"; + regulator-name = "vwlan_fixed"; + gpio = <&gpio0 20 GPIO_ACTIVE_HIGH>; /* gpio0_20 */ + enable-active-high; + regulator-boot-off; + }; + backlight { compatible = "pwm-backlight"; pwms = <&ecap0 0 50000 0>;
@@ -223,6 +233,21 @@ >; }; + spi0_pins: pinmux_spi0_pins { + pinctrl-single,pins = < + /* spi0_sclk.spi0_sclk */ + AM33XX_IOPAD(0x950, PIN_INPUT | MUX_MODE0) + /* spi0_d0.spi0_d0 */ + AM33XX_IOPAD(0x954, PIN_OUTPUT_PULLUP | MUX_MODE0) + /* spi0_d1.spi0_d1 */ + AM33XX_IOPAD(0x958, PIN_INPUT | MUX_MODE0) + /* spi0_cs0.spi0_cs0 */ + AM33XX_IOPAD(0x95C, PIN_OUTPUT | MUX_MODE0) + /* spi0_cs1.spi0_cs1 */ + AM33XX_IOPAD(0x960, PIN_OUTPUT | MUX_MODE0) + >; + }; + /* wl1271 bluetooth */ bluetooth_pins: pinmux_bluetooth_pins { pinctrl-single,pins = <
@@ -230,6 +255,16 @@ AM33XX_IOPAD(0x9b0, PIN_OUTPUT_PULLUP | MUX_MODE7) >; }; + + /* wl1271 WiFi */ + wifi_pins: pinmux_wifi_pins { + pinctrl-single,pins = < + /* EMU1.gpio3_8 - WiFi IRQ */ + AM33XX_IOPAD(0x9e8, PIN_INPUT_PULLUP | MUX_MODE7) + /* XDMA_EVENT_INTR1.gpio0_20 - WiFi enable */ + AM33XX_IOPAD(0x9b4, PIN_OUTPUT | MUX_MODE7) + >; + }; }; &uart0 {
@@ -394,3 +429,22 @@ status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins>; }; + +&spi0 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&spi0_pins>; + ti,pindir-d0-out-d1-in = <1>; + /* WLS1271 WiFi */ + wlcore: wlcore at 1 { + compatible = "ti,wl1271"; + pinctrl-names = "default"; + pinctrl-0 = <&wifi_pins>; + reg = <1>; + spi-max-frequency = <48000000>; + clock-xtal; + ref-clock-frequency = <38400000>; + interrupts-extended = <&gpio3 8 IRQ_TYPE_LEVEL_HIGH>; + vwlan-supply = <&vwlan_fixed>; + }; +};
Signature · 1 line
2.5.0