[PATCHv2 0/4] Motorola Droid 4: Add WL1285C support

[PATCHv2 0/4] Motorola Droid 4: Add WL1285C support

[Sebastian Reichel]

Hi,

Motorola Droid 4 uses a WL1285C, as visible on iFixit [0]. This
fixes the DT file to use correct compatible for the wifi node
and adds the bluetooth node.

[0] https://www.ifixit.com/Teardown/Motorola+Droid+4+Teardown/7759#s31961

Changes to PATCHv1:
 - use proper compatible value for bluetooth / shared transport
 - add patches fixing wlcore compatible for Droid 4

-- Sebastian

Sebastian Reichel (4):
  wlcore: add wl1285 compatible
  ARM: dts: omap4-droid4: Use wl1285 for wifi compatible
  Bluetooth: hci_ll: Add compatible values for more WL chips
  ARM: dts: omap4-droid4: Add bluetooth

 .../devicetree/bindings/net/ti,wilink-st.txt       |  6 ++++++
 .../devicetree/bindings/net/wireless/ti,wlcore.txt |  1 +
 arch/arm/boot/dts/omap4-droid4-xt894.dts           | 22 +++++++++++++++++++++-
 drivers/bluetooth/hci_ll.c                         |  8 ++++++++
 drivers/net/wireless/ti/wlcore/sdio.c              |  1 +
 drivers/net/wireless/ti/wlcore/spi.c               |  1 +
 6 files changed, 38 insertions(+), 1 deletion(-)

-- 
2.11.0

[PATCHv2 1/4] wlcore: add wl1285 compatible

[Sebastian Reichel]

Motorola Droid 4 uses a WL 1285C. With differences between
chips not being public let's add explicit binding for wl1285
instead of relying on wl1283 being very similar.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
---
 Documentation/devicetree/bindings/net/wireless/ti,wlcore.txt | 1 +
 drivers/net/wireless/ti/wlcore/sdio.c                        | 1 +
 drivers/net/wireless/ti/wlcore/spi.c                         | 1 +
 3 files changed, 3 insertions(+)

diff --git a/Documentation/devicetree/bindings/net/wireless/ti,wlcore.txt b/Documentation/devicetree/bindings/net/wireless/ti,wlcore.txt
index 2a3d90de18ee..7b2cbb14113e 100644
--- a/Documentation/devicetree/bindings/net/wireless/ti,wlcore.txt
+++ b/Documentation/devicetree/bindings/net/wireless/ti,wlcore.txt
@@ -10,6 +10,7 @@ Required properties:
     * "ti,wl1273"
     * "ti,wl1281"
     * "ti,wl1283"
+    * "ti,wl1285"
     * "ti,wl1801"
     * "ti,wl1805"
     * "ti,wl1807"
diff --git a/drivers/net/wireless/ti/wlcore/sdio.c b/drivers/net/wireless/ti/wlcore/sdio.c
index 287023ef4a78..2fb38717346f 100644
--- a/drivers/net/wireless/ti/wlcore/sdio.c
+++ b/drivers/net/wireless/ti/wlcore/sdio.c
@@ -237,6 +237,7 @@ static const struct of_device_id wlcore_sdio_of_match_table[] = {
 	{ .compatible = "ti,wl1273", .data = &wl127x_data },
 	{ .compatible = "ti,wl1281", .data = &wl128x_data },
 	{ .compatible = "ti,wl1283", .data = &wl128x_data },
+	{ .compatible = "ti,wl1285", .data = &wl128x_data },
 	{ .compatible = "ti,wl1801", .data = &wl18xx_data },
 	{ .compatible = "ti,wl1805", .data = &wl18xx_data },
 	{ .compatible = "ti,wl1807", .data = &wl18xx_data },
diff --git a/drivers/net/wireless/ti/wlcore/spi.c b/drivers/net/wireless/ti/wlcore/spi.c
index f949ad2bd898..1f5d9ebb0925 100644
--- a/drivers/net/wireless/ti/wlcore/spi.c
+++ b/drivers/net/wireless/ti/wlcore/spi.c
@@ -433,6 +433,7 @@ static const struct of_device_id wlcore_spi_of_match_table[] = {
 	{ .compatible = "ti,wl1273", .data = &wl127x_data},
 	{ .compatible = "ti,wl1281", .data = &wl128x_data},
 	{ .compatible = "ti,wl1283", .data = &wl128x_data},
+	{ .compatible = "ti,wl1285", .data = &wl128x_data},
 	{ .compatible = "ti,wl1801", .data = &wl18xx_data},
 	{ .compatible = "ti,wl1805", .data = &wl18xx_data},
 	{ .compatible = "ti,wl1807", .data = &wl18xx_data},
-- 
2.11.0

[PATCHv2 2/4] ARM: dts: omap4-droid4: Use wl1285 for wifi compatible

[Sebastian Reichel]

The Motorola Droid 4 uses a WL 1285C, so let's use correct
compatible value instead of relying on WL 1283 being very
similar.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
---
 arch/arm/boot/dts/omap4-droid4-xt894.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts
index 89eb607f4a9e..c09b51d6ccf7 100644
--- a/arch/arm/boot/dts/omap4-droid4-xt894.dts
+++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts
@@ -301,7 +301,7 @@
 	#address-cells = <1>;
 	#size-cells = <0>;
 	wlcore: wlcore@2 {
-		compatible = "ti,wl1283";
+		compatible = "ti,wl1285";
 		reg = <2>;
 		interrupt-parent = <&gpio4>;
 		interrupts = <4 IRQ_TYPE_LEVEL_HIGH>; /* gpio100 */
-- 
2.11.0

[PATCHv2 3/4] Bluetooth: hci_ll: Add compatible values for more WL chips

[Sebastian Reichel]

Add compatible values for WiLink chips from 128x and 180x series.
Also the DT binding already contained compatible values for the 127x
series, but the driver did not. This brings the list on par with
the list from wlcore (the wifi driver).

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
---
 Documentation/devicetree/bindings/net/ti,wilink-st.txt | 6 ++++++
 drivers/bluetooth/hci_ll.c                             | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/Documentation/devicetree/bindings/net/ti,wilink-st.txt b/Documentation/devicetree/bindings/net/ti,wilink-st.txt
index cbad73a84ac4..b1a421e2fde3 100644
--- a/Documentation/devicetree/bindings/net/ti,wilink-st.txt
+++ b/Documentation/devicetree/bindings/net/ti,wilink-st.txt
@@ -14,6 +14,12 @@ Required properties:
  - compatible: should be one of the following:
     "ti,wl1271-st"
     "ti,wl1273-st"
+    "ti,wl1281-st"
+    "ti,wl1283-st"
+    "ti,wl1285-st"
+    "ti,wl1801-st"
+    "ti,wl1805-st"
+    "ti,wl1807-st"
     "ti,wl1831-st"
     "ti,wl1835-st"
     "ti,wl1837-st"
diff --git a/drivers/bluetooth/hci_ll.c b/drivers/bluetooth/hci_ll.c
index adc444f309a3..d2f32a994daa 100644
--- a/drivers/bluetooth/hci_ll.c
+++ b/drivers/bluetooth/hci_ll.c
@@ -740,6 +740,14 @@ static void hci_ti_remove(struct serdev_device *serdev)
 }
 
 static const struct of_device_id hci_ti_of_match[] = {
+	{ .compatible = "ti,wl1271-st" },
+	{ .compatible = "ti,wl1273-st" },
+	{ .compatible = "ti,wl1281-st" },
+	{ .compatible = "ti,wl1283-st" },
+	{ .compatible = "ti,wl1285-st" },
+	{ .compatible = "ti,wl1801-st" },
+	{ .compatible = "ti,wl1805-st" },
+	{ .compatible = "ti,wl1807-st" },
 	{ .compatible = "ti,wl1831-st" },
 	{ .compatible = "ti,wl1835-st" },
 	{ .compatible = "ti,wl1837-st" },
-- 
2.11.0

[PATCHv2 4/4] ARM: dts: omap4-droid4: Add bluetooth

[Sebastian Reichel]

Droid 4 has WL 1285C connected to the OMAP's UART4 port, which is
used for Bluetooth and most likely can also be used for controlling
the FM radio and GPS receivers.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
---
 arch/arm/boot/dts/omap4-droid4-xt894.dts | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts
index c09b51d6ccf7..bd7f1cc55371 100644
--- a/arch/arm/boot/dts/omap4-droid4-xt894.dts
+++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts
@@ -453,6 +453,15 @@
 		OMAP4_IOPAD(0x1c8, PIN_INPUT_PULLUP | MUX_MODE7)
 		>;
 	};
+
+	uart4_pins: pinmux_uart4_pins {
+		pinctrl-single,pins = <
+		OMAP4_IOPAD(0x15c, PIN_INPUT | MUX_MODE0)		/* uart4_rx */
+		OMAP4_IOPAD(0x15e, PIN_OUTPUT | MUX_MODE0)		/* uart4_tx */
+		OMAP4_IOPAD(0x110, PIN_INPUT_PULLUP | MUX_MODE5)	/* uart4_cts */
+		OMAP4_IOPAD(0x112, PIN_OUTPUT_PULLUP | MUX_MODE5)	/* uart4_rts */
+		>;
+	};
 };
 
 &omap4_pmx_wkup {
@@ -469,6 +478,17 @@
 			       &omap4_pmx_core 0x17c>;
 };
 
+&uart4 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart4_pins>;
+
+	bluetooth {
+		compatible = "ti,wl1285-st";
+		enable-gpios = <&gpio6 14 GPIO_ACTIVE_HIGH>; /* gpio 174 */
+		max-speed = <3686400>;
+	};
+};
+
 &usbhsehci {
 	phys = <&hsusb1_phy>;
 };
-- 
2.11.0

Re: [PATCHv2 4/4] ARM: dts: omap4-droid4: Add bluetooth

[Tony Lindgren]

* Sebastian Reichel <sebastian.reichel@collabora.co.uk> [170503 07:25]:
> Droid 4 has WL 1285C connected to the OMAP's UART4 port, which is
> used for Bluetooth and most likely can also be used for controlling
> the FM radio and GPS receivers.

I'm picking this patch and applying into omap-for-v4.13/dt thanks.

Tony

Re: [PATCHv2 0/4] Motorola Droid 4: Add WL1285C support

[Rob Herring]

On Wed, May 3, 2017 at 9:22 AM, Sebastian Reichel
<sebastian.reichel@collabora.co.uk> wrote:
> Hi,
>
> Motorola Droid 4 uses a WL1285C, as visible on iFixit [0]. This
> fixes the DT file to use correct compatible for the wifi node
> and adds the bluetooth node.
>
> [0] https://www.ifixit.com/Teardown/Motorola+Droid+4+Teardown/7759#s31961
>
> Changes to PATCHv1:
>  - use proper compatible value for bluetooth / shared transport
>  - add patches fixing wlcore compatible for Droid 4
>
> -- Sebastian
>
> Sebastian Reichel (4):
>   wlcore: add wl1285 compatible
>   ARM: dts: omap4-droid4: Use wl1285 for wifi compatible
>   Bluetooth: hci_ll: Add compatible values for more WL chips
>   ARM: dts: omap4-droid4: Add bluetooth

For the series,

Reviewed-by: Rob Herring <robh@kernel.org>

Re: [PATCHv2 0/4] Motorola Droid 4: Add WL1285C support

[Marcel Holtmann]

Hi Rob,

>> Motorola Droid 4 uses a WL1285C, as visible on iFixit [0]. This
>> fixes the DT file to use correct compatible for the wifi node
>> and adds the bluetooth node.
>> 
>> [0] https://www.ifixit.com/Teardown/Motorola+Droid+4+Teardown/7759#s31961
>> 
>> Changes to PATCHv1:
>> - use proper compatible value for bluetooth / shared transport
>> - add patches fixing wlcore compatible for Droid 4
>> 
>> -- Sebastian
>> 
>> Sebastian Reichel (4):
>>  wlcore: add wl1285 compatible
>>  ARM: dts: omap4-droid4: Use wl1285 for wifi compatible
>>  Bluetooth: hci_ll: Add compatible values for more WL chips
>>  ARM: dts: omap4-droid4: Add bluetooth
> 
> For the series,
> 
> Reviewed-by: Rob Herring <robh@kernel.org>

so now the question is if we merge this through a single maintainer or have each maintainer take the pieces? I would almost suggest that Dave Miller takes this directly into net-next to make this smoother.

Regards

Marcel

Re: [PATCHv2 0/4] Motorola Droid 4: Add WL1285C support

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 1306 bytes --]

Hi,

On Wed, May 03, 2017 at 05:02:13PM +0200, Marcel Holtmann wrote:
> >> Motorola Droid 4 uses a WL1285C, as visible on iFixit [0]. This
> >> fixes the DT file to use correct compatible for the wifi node
> >> and adds the bluetooth node.
> >> 
> >> [0] https://www.ifixit.com/Teardown/Motorola+Droid+4+Teardown/7759#s31961
> >> 
> >> Changes to PATCHv1:
> >> - use proper compatible value for bluetooth / shared transport
> >> - add patches fixing wlcore compatible for Droid 4
> >> 
> >> -- Sebastian
> >> 
> >> Sebastian Reichel (4):
> >>  wlcore: add wl1285 compatible
> >>  ARM: dts: omap4-droid4: Use wl1285 for wifi compatible
> >>  Bluetooth: hci_ll: Add compatible values for more WL chips
> >>  ARM: dts: omap4-droid4: Add bluetooth
> > 
> > For the series,
> > 
> > Reviewed-by: Rob Herring <robh@kernel.org>
> 
> so now the question is if we merge this through a single
> maintainer or have each maintainer take the pieces? I would almost
> suggest that Dave Miller takes this directly into net-next to make
> this smoother.

I think the only complex thing is, that patch 2 should only be
applied after patch 1. So maybe patch 1 could be applied via
wireless/net-next for 4.12 and the other ones go through the
individual subsystems for 4.13?

-- Sebastian

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCHv2 0/4] Motorola Droid 4: Add WL1285C support

[Tony Lindgren]

* Sebastian Reichel <sebastian.reichel@collabora.co.uk> [170503 09:11]:
> Hi,
> 
> On Wed, May 03, 2017 at 05:02:13PM +0200, Marcel Holtmann wrote:
> > >> Motorola Droid 4 uses a WL1285C, as visible on iFixit [0]. This
> > >> fixes the DT file to use correct compatible for the wifi node
> > >> and adds the bluetooth node.
> > >> 
> > >> [0] https://www.ifixit.com/Teardown/Motorola+Droid+4+Teardown/7759#s31961
> > >> 
> > >> Changes to PATCHv1:
> > >> - use proper compatible value for bluetooth / shared transport
> > >> - add patches fixing wlcore compatible for Droid 4
> > >> 
> > >> -- Sebastian
> > >> 
> > >> Sebastian Reichel (4):
> > >>  wlcore: add wl1285 compatible
> > >>  ARM: dts: omap4-droid4: Use wl1285 for wifi compatible
> > >>  Bluetooth: hci_ll: Add compatible values for more WL chips
> > >>  ARM: dts: omap4-droid4: Add bluetooth
> > > 
> > > For the series,
> > > 
> > > Reviewed-by: Rob Herring <robh@kernel.org>
> > 
> > so now the question is if we merge this through a single
> > maintainer or have each maintainer take the pieces? I would almost
> > suggest that Dave Miller takes this directly into net-next to make
> > this smoother.
> 
> I think the only complex thing is, that patch 2 should only be
> applied after patch 1. So maybe patch 1 could be applied via
> wireless/net-next for 4.12 and the other ones go through the
> individual subsystems for 4.13?

Yeah removing dependencies where possible avoids pointless
merge conflicts later on.

Please send patches 1 and 2 together as a single patch to
Dave Miller and describe why it's needed for v4.12. The rest
can then get merged via the BT and DT trees.

Regards,

Tony