LinuxLists.cc - [PATCH v4 0/3] wlcore/wl12xx: spi: add wifi support to cm-t335

[permalink] [raw]

Subject: [PATCH v4 3/3] wlcore/wl12xx: spi: add wifi support to cm-t335

Device tree modifications:
- Pinmux for SPI0 and WiFi GPIOs.
- SPI0 node with wlcore as a child node.

Cc: Tony Lindgren <[email protected]>
Signed-off-by: Uri Mashiach <[email protected]>
---
v1 -> v2: Replace interrupts and interrupt-parent with interrupts-extended.
v2 -> v3: Move the pinctrl-0 = <&wifi_pins> to the wlcore node.
v3 -> v4: replace interrupts-extended with interrupts and interrupt-parent. (revert v2 modification).
According to Rob Herring and Documentation/devicetree/bindings/interrupt-controller/interrupts.txt,
interrupts-extended should only be used when a device has multiple interrupt parents.

arch/arm/boot/dts/am335x-cm-t335.dts | 55 ++++++++++++++++++++++++++++++++++++
1 file changed, 55 insertions(+)

diff --git a/arch/arm/boot/dts/am335x-cm-t335.dts b/arch/arm/boot/dts/am335x-cm-t335.dts
index 42e9b66..65f1099 100644
--- a/arch/arm/boot/dts/am335x-cm-t335.dts
+++ b/arch/arm/boot/dts/am335x-cm-t335.dts
@@ -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@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,23 @@ 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@1 {
+ compatible = "ti,wl1271";
+ pinctrl-names = "default";
+ pinctrl-0 = <&wifi_pins>;
+ reg = <1>;
+ spi-max-frequency = <48000000>;
+ clock-xtal;
+ ref-clock-frequency = <38400000>;
+ interrupt-parent = <&gpio3>;
+ interrupts = <8 IRQ_TYPE_LEVEL_HIGH>;
+ vwlan-supply = <&vwlan_fixed>;
+ };
+};
--
2.5.0

2015-12-30 13:36:05

[permalink] [raw]

Subject: [PATCH v4 2/3] wlcore/wl12xx: spi: add device tree support

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: Rob Herring <[email protected]>
---
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().
v3 -> v4: replace interrupts-extended with interrupts and interrupt-parent. (revert v2 modification).
According to Rob Herring and Documentation/devicetree/bindings/interrupt-controller/interrupts.txt,
interrupts-extended should only be used when a device has multiple interrupt parents.

.../bindings/net/wireless/ti,wlcore,spi.txt | 36 +++++++++++++++++
drivers/net/wireless/ti/wlcore/Kconfig | 2 +-
drivers/net/wireless/ti/wlcore/spi.c | 47 ++++++++++++++++++++--
3 files changed, 80 insertions(+), 5 deletions(-)
create mode 100644 Documentation/devicetree/bindings/net/wireless/ti,wlcore,spi.txt

diff --git a/Documentation/devicetree/bindings/net/wireless/ti,wlcore,spi.txt b/Documentation/devicetree/bindings/net/wireless/ti,wlcore,spi.txt
new file mode 100644
index 0000000..9180724
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/wireless/ti,wlcore,spi.txt
@@ -0,0 +1,36 @@
+* 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
+- interrupt-parent, interrupts :
+ 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@1 {
+ compatible = "ti,wl1271";
+
+ reg = <1>;
+ spi-max-frequency = <48000000>;
+ clock-xtal;
+ ref-clock-frequency = <38400000>;
+ interrupt-parent = <&gpio3>;
+ interrupts = <8 IRQ_TYPE_LEVEL_HIGH>;
+ vwlan-supply = <&vwlan_fixed>;
+ };
+};
diff --git a/drivers/net/wireless/ti/wlcore/Kconfig b/drivers/net/wireless/ti/wlcore/Kconfig
index 7c09954..5918080 100644
--- a/drivers/net/wireless/ti/wlcore/Kconfig
+++ b/drivers/net/wireless/ti/wlcore/Kconfig
@@ -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
diff --git a/drivers/net/wireless/ti/wlcore/spi.c b/drivers/net/wireless/ti/wlcore/spi.c
index dec1512..020ac1a 100644
--- a/drivers/net/wireless/ti/wlcore/spi.c
+++ b/drivers/net/wireless/ti/wlcore/spi.c
@@ -30,6 +30,7 @@
#include <linux/spi/spi.h>
#include <linux/wl12xx.h>
#include <linux/platform_device.h>
+#include <linux/of_irq.h>
#include <linux/regulator/consumer.h>

#include "wlcore.h"
@@ -357,6 +358,39 @@ static struct wl1271_if_operations spi_ops = {
.set_block_size = NULL,
};

+static const struct of_device_id wlcore_spi_of_match_table[] = {
+ { .compatible = "ti,wl1271" },
+ { }
+};
+MODULE_DEVICE_TABLE(of, wlcore_spi_of_match_table);
+
+/**
+ * wlcore_probe_of - DT node parsing.
+ * @spi: SPI slave device parameters.
+ * @res: resource parameters.
+ * @glue: wl12xx SPI bus to slave device glue parameters.
+ * @pdev_data: wlcore device parameters
+ */
+static int wlcore_probe_of(struct spi_device *spi, struct wl12xx_spi_glue *glue,
+ struct wlcore_platdev_data *pdev_data)
+{
+ struct device_node *dt_node = spi->dev.of_node;
+ int ret;
+
+ if (of_find_property(dt_node, "clock-xtal", NULL))
+ pdev_data->ref_clock_xtal = true;
+
+ ret = of_property_read_u32(dt_node, "ref-clock-frequency",
+ &pdev_data->ref_clock_freq);
+ if (IS_ERR_VALUE(ret)) {
+ dev_err(glue->dev,
+ "can't get reference clock frequency (%d)\n", ret);
+ return ret;
+ }
+
+ return 0;
+}
+
static int wl1271_probe(struct spi_device *spi)
{
struct wl12xx_spi_glue *glue;
@@ -366,8 +400,6 @@ static int wl1271_probe(struct spi_device *spi)

memset(&pdev_data, 0x00, sizeof(pdev_data));

- /* TODO: add DT parsing when needed */
-
pdev_data.if_ops = &spi_ops;

glue = devm_kzalloc(&spi->dev, sizeof(*glue), GFP_KERNEL);
@@ -392,6 +424,13 @@ static int wl1271_probe(struct spi_device *spi)
return PTR_ERR(glue->reg);
}

+ ret = wlcore_probe_of(spi, glue, &pdev_data);
+ if (IS_ERR_VALUE(ret)) {
+ dev_err(glue->dev,
+ "can't get device tree parameters (%d)\n", ret);
+ return ret;
+ }
+
ret = spi_setup(spi);
if (ret < 0) {
dev_err(glue->dev, "spi_setup failed\n");
@@ -409,7 +448,7 @@ static int wl1271_probe(struct spi_device *spi)
memset(res, 0x00, sizeof(res));

res[0].start = spi->irq;
- res[0].flags = IORESOURCE_IRQ;
+ res[0].flags = IORESOURCE_IRQ | irq_get_trigger_type(spi->irq);
res[0].name = "irq";

ret = platform_device_add_resources(glue->core, res, ARRAY_SIZE(res));
@@ -447,10 +486,10 @@ static int wl1271_remove(struct spi_device *spi)
return 0;
}

-
static struct spi_driver wl1271_spi_driver = {
.driver = {
.name = "wl1271_spi",
+ .of_match_table = of_match_ptr(wlcore_spi_of_match_table),
},

.probe = wl1271_probe,
--
2.5.0

2015-12-30 13:36:02

[permalink] [raw]

Subject: [PATCH v4 1/3] wlcore/wl12xx: spi: add power operation function

The power function uses a consumer regulator access to update the WiFi
enable GPIO value.

Signed-off-by: Uri Mashiach <[email protected]>
---
v1 -> v2: oops fix was removed to a separate fix.
v2 -> v3: no changes
v3 -> v4: update devm_regulator_get() error handling.

drivers/net/wireless/ti/wlcore/spi.c | 39 ++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)

diff --git a/drivers/net/wireless/ti/wlcore/spi.c b/drivers/net/wireless/ti/wlcore/spi.c
index 44f059f..dec1512 100644
--- a/drivers/net/wireless/ti/wlcore/spi.c
+++ b/drivers/net/wireless/ti/wlcore/spi.c
@@ -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,14 @@ 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 (PTR_ERR(glue->reg) == -EPROBE_DEFER)
+ return -EPROBE_DEFER;
+ 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");
--
2.5.0

2016-01-14 09:08:29

by Arend van Spriel

[permalink] [raw]

Subject: Re: [PATCH v4 3/3] wlcore/wl12xx: spi: add wifi support to cm-t335

On 01/14/2016 08:05 AM, Kalle Valo wrote:
> Tony Lindgren <[email protected]> writes:
>
>>>>> arch/arm/boot/dts/am335x-cm-t335.dts | 55 ++++++++++++++++++++++++++++++++++++
>>>>> 1 file changed, 55 insertions(+)
>>>>
>>>> To what tree should this patch go? My wireless-drivers-next tree doesn't
>>>> even have this file.
>>>
>>> Right. It will hit the mainline during this merge window through Tony's and
>>> arm-soc trees.
>>>
>>> Do you think it will be sensible if you take 1/3 and 2/3 patches and Tony
>>> will take the 3/3 (there is no code dependency between first two and the last one),
>>> or we can just wait till arm-soc hits the mainline, so you will have the
>>> needed code?
>>
>> Yeah I'll pick the dts changes separately after the merge window as
>> there is no dependency to the driver changes.
>
> Ok, I'll then take patches 1 and 2 once the merge window opens.

I guess it is semantics, but the merge window is open right now so you
probably mean to say after the merge window closes, ie. when 4.5-rc1 is
ready.

Regards,
Arend

2016-01-09 02:54:04

by Sebastian Reichel

[permalink] [raw]

Subject: Re: [PATCH v4 1/3] wlcore/wl12xx: spi: add power operation function

Hi,

On Wed, Dec 30, 2015 at 03:35:31PM +0200, Uri Mashiach wrote:
> The power function uses a consumer regulator access to update the WiFi
> enable GPIO value.
>
> Signed-off-by: Uri Mashiach <[email protected]>

[On Nokia N950]
Tested-By: Sebastian Reichel <[email protected]>

-- Sebastian

Attachments:

(No filename) (301.00 B)
signature.asc (819.00 B)
Download all attachments

2016-01-13 06:03:18

[permalink] [raw]

Subject: Re: [PATCH v4 1/3] wlcore/wl12xx: spi: add power operation function

On 12/30/15 15:35, Uri Mashiach wrote:
> The power function uses a consumer regulator access to update the WiFi
> enable GPIO value.
>
> Signed-off-by: Uri Mashiach <[email protected]>

Acked-by: Igor Grinberg <[email protected]>

--
Regards,
Igor.

2016-01-09 02:56:51

by Sebastian Reichel

[permalink] [raw]

Subject: Re: [PATCH v4 2/3] wlcore/wl12xx: spi: add device tree support

Hi,

On Wed, Dec 30, 2015 at 03:35:32PM +0200, Uri Mashiach wrote:
> 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: Rob Herring <[email protected]>

[On Nokia N950]
Tested-By: Sebastian Reichel <[email protected]>

-- Sebastian

Attachments:

(No filename) (344.00 B)
signature.asc (819.00 B)
Download all attachments

2016-01-14 09:11:42

[permalink] [raw]

Subject: Re: [PATCH v4 3/3] wlcore/wl12xx: spi: add wifi support to cm-t335

Arend van Spriel <[email protected]> writes:

> On 01/14/2016 08:05 AM, Kalle Valo wrote:
>> Tony Lindgren <[email protected]> writes:
>>
>>> Yeah I'll pick the dts changes separately after the merge window as
>>> there is no dependency to the driver changes.
>>
>> Ok, I'll then take patches 1 and 2 once the merge window opens.
>
> I guess it is semantics, but the merge window is open right now so you
> probably mean to say after the merge window closes, ie. when 4.5-rc1
> is ready.

Exactly. Sorry, I suck in multitasking :)

--
Kalle Valo

2016-01-13 17:27:17

by Tony Lindgren

[permalink] [raw]

Subject: Re: [PATCH v4 3/3] wlcore/wl12xx: spi: add wifi support to cm-t335

* Igor Grinberg <[email protected]> [160112 22:01]:
> Hi Kalle Valo,
>
> On 01/07/16 11:02, Kalle Valo wrote:
> > Uri Mashiach <[email protected]> writes:
> >
> >> Device tree modifications:
> >> - Pinmux for SPI0 and WiFi GPIOs.
> >> - SPI0 node with wlcore as a child node.
> >>
> >> Cc: Tony Lindgren <[email protected]>
> >> Signed-off-by: Uri Mashiach <[email protected]>
> >> ---
>
> Uri, please document the dependencies next time. Thanks!
>
> >> v1 -> v2: Replace interrupts and interrupt-parent with interrupts-extended.
> >> v2 -> v3: Move the pinctrl-0 = <&wifi_pins> to the wlcore node.
> >> v3 -> v4: replace interrupts-extended with interrupts and interrupt-parent. (revert v2 modification).
> >> According to Rob Herring and Documentation/devicetree/bindings/interrupt-controller/interrupts.txt,
> >> interrupts-extended should only be used when a device has multiple interrupt parents.
> >>
> >> arch/arm/boot/dts/am335x-cm-t335.dts | 55 ++++++++++++++++++++++++++++++++++++
> >> 1 file changed, 55 insertions(+)
> >
> > To what tree should this patch go? My wireless-drivers-next tree doesn't
> > even have this file.
>
> Right. It will hit the mainline during this merge window through Tony's and
> arm-soc trees.
>
> Do you think it will be sensible if you take 1/3 and 2/3 patches and Tony
> will take the 3/3 (there is no code dependency between first two and the last one),
> or we can just wait till arm-soc hits the mainline, so you will have the
> needed code?

Yeah I'll pick the dts changes separately after the merge window as
there is no dependency to the driver changes.

Regards,

Tony

2016-01-13 06:05:23

[permalink] [raw]

Subject: Re: [PATCH v4 2/3] wlcore/wl12xx: spi: add device tree support

On 12/30/15 15:35, Uri Mashiach wrote:
> 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: Rob Herring <[email protected]>

Acked-by: Igor Grinberg <[email protected]>

--
Regards,
Igor.

2016-01-12 11:23:04

by Grygorii Strashko

[permalink] [raw]

Subject: Re: [PATCH v4 1/3] wlcore/wl12xx: spi: add power operation function

On 01/09/2016 04:53 AM, Sebastian Reichel wrote:
> Hi,
>
> On Wed, Dec 30, 2015 at 03:35:31PM +0200, Uri Mashiach wrote:
>> The power function uses a consumer regulator access to update the WiFi
>> enable GPIO value.
>>
>> Signed-off-by: Uri Mashiach <[email protected]>
>
> [On Nokia N950]
> Tested-By: Sebastian Reichel <[email protected]>

Reviewed-by: Grygorii Strashko <[email protected]>

Thanks.
--
regards,
-grygorii

2016-01-12 11:26:28

by Grygorii Strashko

[permalink] [raw]

Subject: Re: [PATCH v4 2/3] wlcore/wl12xx: spi: add device tree support

On 01/09/2016 04:56 AM, Sebastian Reichel wrote:
> Hi,
>
> On Wed, Dec 30, 2015 at 03:35:32PM +0200, Uri Mashiach wrote:
>> 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: Rob Herring <[email protected]>
>
> [On Nokia N950]
> Tested-By: Sebastian Reichel <[email protected]>

Reviewed-by: Grygorii Strashko <[email protected]>

Thanks.--
regards,
-grygorii

2016-01-29 09:11:06

[permalink] [raw]

Subject: Re: [v4,1/3] wlcore/wl12xx: spi: add power operation function

> The power function uses a consumer regulator access to update the WiFi
> enable GPIO value.
>
> Signed-off-by: Uri Mashiach <[email protected]>
> Tested-By: Sebastian Reichel <[email protected]>
> Reviewed-by: Grygorii Strashko <[email protected]>
> Acked-by: Igor Grinberg <[email protected]>

Thanks, 2 patches applied to wireless-drivers-next.git:

4c1ce07bcf62 wlcore/wl12xx: spi: add power operation function
04654c386145 wlcore/wl12xx: spi: add device tree support

Kalle Valo

2016-01-27 18:41:04

by Tony Lindgren

[permalink] [raw]

Subject: Re: [PATCH v4 3/3] wlcore/wl12xx: spi: add wifi support to cm-t335

* Igor Grinberg <[email protected]> [160112 22:09]:
>
>
> On 12/30/15 15:35, Uri Mashiach wrote:
> > Device tree modifications:
> > - Pinmux for SPI0 and WiFi GPIOs.
> > - SPI0 node with wlcore as a child node.
> >
> > Cc: Tony Lindgren <[email protected]>
> > Signed-off-by: Uri Mashiach <[email protected]>
>
> Acked-by: Igor Grinberg <[email protected]>

Applying into omap-for-v4.6/dt thanks.

Tony

2016-01-14 07:05:57

[permalink] [raw]

Subject: Re: [PATCH v4 3/3] wlcore/wl12xx: spi: add wifi support to cm-t335

Tony Lindgren <[email protected]> writes:

>> >> arch/arm/boot/dts/am335x-cm-t335.dts | 55 ++++++++++++++++++++++++++++++++++++
>> >> 1 file changed, 55 insertions(+)
>> >
>> > To what tree should this patch go? My wireless-drivers-next tree doesn't
>> > even have this file.
>>
>> Right. It will hit the mainline during this merge window through Tony's and
>> arm-soc trees.
>>
>> Do you think it will be sensible if you take 1/3 and 2/3 patches and Tony
>> will take the 3/3 (there is no code dependency between first two and the last one),
>> or we can just wait till arm-soc hits the mainline, so you will have the
>> needed code?
>
> Yeah I'll pick the dts changes separately after the merge window as
> there is no dependency to the driver changes.

Ok, I'll then take patches 1 and 2 once the merge window opens.

--
Kalle Valo

2016-01-13 06:09:14

[permalink] [raw]

Subject: Re: [PATCH v4 3/3] wlcore/wl12xx: spi: add wifi support to cm-t335

On 12/30/15 15:35, Uri Mashiach wrote:
> Device tree modifications:
> - Pinmux for SPI0 and WiFi GPIOs.
> - SPI0 node with wlcore as a child node.
>
> Cc: Tony Lindgren <[email protected]>
> Signed-off-by: Uri Mashiach <[email protected]>

Acked-by: Igor Grinberg <[email protected]>

--
Regards,
Igor.

2016-01-27 18:40:48

by Tony Lindgren

[permalink] [raw]

Subject: Re: [PATCH v4 3/3] wlcore/wl12xx: spi: add wifi support to cm-t335

* Tony Lindgren <[email protected]> [160113 09:28]:
> * Igor Grinberg <[email protected]> [160112 22:01]:
> > Hi Kalle Valo,
> >
> > On 01/07/16 11:02, Kalle Valo wrote:
> > > Uri Mashiach <[email protected]> writes:
> > >
> > >> Device tree modifications:
> > >> - Pinmux for SPI0 and WiFi GPIOs.
> > >> - SPI0 node with wlcore as a child node.
> > >>
> > >> Cc: Tony Lindgren <[email protected]>
> > >> Signed-off-by: Uri Mashiach <[email protected]>
> > >> ---
> >
> > Uri, please document the dependencies next time. Thanks!
> >
> > >> v1 -> v2: Replace interrupts and interrupt-parent with interrupts-extended.
> > >> v2 -> v3: Move the pinctrl-0 = <&wifi_pins> to the wlcore node.
> > >> v3 -> v4: replace interrupts-extended with interrupts and interrupt-parent. (revert v2 modification).
> > >> According to Rob Herring and Documentation/devicetree/bindings/interrupt-controller/interrupts.txt,
> > >> interrupts-extended should only be used when a device has multiple interrupt parents.
> > >>
> > >> arch/arm/boot/dts/am335x-cm-t335.dts | 55 ++++++++++++++++++++++++++++++++++++
> > >> 1 file changed, 55 insertions(+)
> > >
> > > To what tree should this patch go? My wireless-drivers-next tree doesn't
> > > even have this file.
> >
> > Right. It will hit the mainline during this merge window through Tony's and
> > arm-soc trees.
> >
> > Do you think it will be sensible if you take 1/3 and 2/3 patches and Tony
> > will take the 3/3 (there is no code dependency between first two and the last one),
> > or we can just wait till arm-soc hits the mainline, so you will have the
> > needed code?
>
> Yeah I'll pick the dts changes separately after the merge window as
> there is no dependency to the driver changes.

Applying patch 3/3 into omap-for-v4.6/dt thanks.

Tony

2016-01-07 11:20:37

[permalink] [raw]

Subject: Re: [PATCH v4 3/3] wlcore/wl12xx: spi: add wifi support to cm-t335

Hi Kalle Valo,

On 01/07/2016 11:02 AM, Kalle Valo wrote:
> Uri Mashiach <[email protected]> writes:
>
>> Device tree modifications:
>> - Pinmux for SPI0 and WiFi GPIOs.
>> - SPI0 node with wlcore as a child node.
>>
>> Cc: Tony Lindgren <[email protected]>
>> Signed-off-by: Uri Mashiach <[email protected]>
>> ---
>> v1 -> v2: Replace interrupts and interrupt-parent with interrupts-extended.
>> v2 -> v3: Move the pinctrl-0 = <&wifi_pins> to the wlcore node.
>> v3 -> v4: replace interrupts-extended with interrupts and interrupt-parent. (revert v2 modification).
>> According to Rob Herring and Documentation/devicetree/bindings/interrupt-controller/interrupts.txt,
>> interrupts-extended should only be used when a device has multiple interrupt parents.
>>
>> arch/arm/boot/dts/am335x-cm-t335.dts | 55 ++++++++++++++++++++++++++++++++++++
>> 1 file changed, 55 insertions(+)
>
> To what tree should this patch go? My wireless-drivers-next tree doesn't
> even have this file.

Should be applied into omap-for-v4.x/dt

>
> https://patchwork.kernel.org/patch/7933441/
>

--
Thanks,
Uri

2016-01-07 09:03:06

[permalink] [raw]

Subject: Re: [PATCH v4 3/3] wlcore/wl12xx: spi: add wifi support to cm-t335

Uri Mashiach <[email protected]> writes:

> Device tree modifications:
> - Pinmux for SPI0 and WiFi GPIOs.
> - SPI0 node with wlcore as a child node.
>
> Cc: Tony Lindgren <[email protected]>
> Signed-off-by: Uri Mashiach <[email protected]>
> ---
> v1 -> v2: Replace interrupts and interrupt-parent with interrupts-extended.
> v2 -> v3: Move the pinctrl-0 = <&wifi_pins> to the wlcore node.
> v3 -> v4: replace interrupts-extended with interrupts and interrupt-parent. (revert v2 modification).
> According to Rob Herring and Documentation/devicetree/bindings/interrupt-controller/interrupts.txt,
> interrupts-extended should only be used when a device has multiple interrupt parents.
>
> arch/arm/boot/dts/am335x-cm-t335.dts | 55 ++++++++++++++++++++++++++++++++++++
> 1 file changed, 55 insertions(+)

To what tree should this patch go? My wireless-drivers-next tree doesn't
even have this file.

https://patchwork.kernel.org/patch/7933441/

--
Kalle Valo

2016-01-13 06:00:45