[PATCH v3] ARM: dts: cubox-i: add support for Broadcom Wifi/Bluetooth devices

[PATCH v3] ARM: dts: cubox-i: add support for Broadcom Wifi/Bluetooth devices

[Fabio Estevam]

Add DT support for the Broadcom Wifi/Bluetooth devices found on the
microsom board.

[Modified original Russell King's patch to use mmc-pwrseq]

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v2:
- Remove 'clocks' container as suggested by Shawn
Changes since v1:
- Do not permanently keep the oscillator on. Use the proper clk bindings
from mmc-powerseq.

 arch/arm/boot/dts/imx6qdl-microsom.dtsi | 103 ++++++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)

diff --git a/arch/arm/boot/dts/imx6qdl-microsom.dtsi b/arch/arm/boot/dts/imx6qdl-microsom.dtsi
index 349f82b..ec6c7c7 100644
--- a/arch/arm/boot/dts/imx6qdl-microsom.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-microsom.dtsi
@@ -39,15 +39,98 @@
  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
+#include <dt-bindings/gpio/gpio.h>
+/ {
+	clk_sdio: sdio-clock {
+		compatible = "gpio-gate-clock";
+		#clock-cells = <0>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_microsom_brcm_osc>;
+		enable-gpios = <&gpio5 5 GPIO_ACTIVE_HIGH>;
+	};
+
+	regulators {
+		compatible = "simple-bus";
+
+		reg_brcm: brcm-reg {
+			compatible = "regulator-fixed";
+			enable-active-high;
+			gpio = <&gpio3 19 0>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_microsom_brcm_reg>;
+			regulator-name = "brcm_reg";
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3300000>;
+			startup-delay-us = <200000>;
+		};
+	};
+
+	usdhc1_pwrseq: usdhc1_pwrseq {
+		compatible = "mmc-pwrseq-simple";
+		reset-gpios = <&gpio5 26 GPIO_ACTIVE_LOW>,
+			      <&gpio6 0 GPIO_ACTIVE_LOW>;
+		clocks = <&clk_sdio>;
+		clock-names = "ext_clock";
+	};
+};
 
 &iomuxc {
 	microsom {
+		pinctrl_microsom_brcm_bt: microsom-brcm-bt {
+			fsl,pins = <
+				MX6QDL_PAD_CSI0_DAT14__GPIO6_IO00	0x40013070
+				MX6QDL_PAD_CSI0_DAT15__GPIO6_IO01	0x40013070
+				MX6QDL_PAD_CSI0_DAT18__GPIO6_IO04	0x40013070
+			>;
+		};
+
+		pinctrl_microsom_brcm_osc: microsom-brcm-osc {
+			fsl,pins = <
+				MX6QDL_PAD_DISP0_DAT11__GPIO5_IO05	0x40013070
+			>;
+		};
+
+		pinctrl_microsom_brcm_reg: microsom-brcm-reg {
+			fsl,pins = <
+				MX6QDL_PAD_EIM_D19__GPIO3_IO19		0x40013070
+			>;
+		};
+
+		pinctrl_microsom_brcm_wifi: microsom-brcm-wifi {
+			fsl,pins = <
+				MX6QDL_PAD_GPIO_8__XTALOSC_REF_CLK_32K	0x1b0b0
+				MX6QDL_PAD_CSI0_DATA_EN__GPIO5_IO20	0x40013070
+				MX6QDL_PAD_CSI0_DAT8__GPIO5_IO26	0x40013070
+				MX6QDL_PAD_CSI0_DAT9__GPIO5_IO27	0x40013070
+			>;
+		};
+
 		pinctrl_microsom_uart1: microsom-uart1 {
 			fsl,pins = <
 				MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA	0x1b0b1
 				MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA	0x1b0b1
 			>;
 		};
+
+		pinctrl_microsom_uart4: microsom-uart4 {
+			fsl,pins = <
+				MX6QDL_PAD_CSI0_DAT12__UART4_TX_DATA 0x1b0b1
+				MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
+				MX6QDL_PAD_CSI0_DAT16__UART4_RTS_B 0x1b0b1
+				MX6QDL_PAD_CSI0_DAT17__UART4_CTS_B 0x1b0b1
+			>;
+		};
+
+		pinctrl_microsom_usdhc1: microsom-usdhc1 {
+			fsl,pins = <
+				MX6QDL_PAD_SD1_CMD__SD1_CMD    0x17059
+				MX6QDL_PAD_SD1_CLK__SD1_CLK    0x10059
+				MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x17059
+				MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17059
+				MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17059
+				MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17059
+			>;
+		};
 	};
 };
 
@@ -56,3 +139,23 @@
 	pinctrl-0 = <&pinctrl_microsom_uart1>;
 	status = "okay";
 };
+
+/* UART4 - Connected to optional BRCM Wifi/BT/FM */
+&uart4 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_microsom_brcm_bt &pinctrl_microsom_uart4>;
+	fsl,uart-has-rtscts;
+	status = "okay";
+};
+
+/* USDHC1 - Connected to optional BRCM Wifi/BT/FM */
+&usdhc1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_microsom_brcm_wifi &pinctrl_microsom_usdhc1>;
+	bus-width = <4>;
+	mmc-pwrseq = <&usdhc1_pwrseq>;
+	keep-power-in-suspend;
+	non-removable;
+	vmmc-supply = <&reg_brcm>;
+	status = "okay";
+};
-- 
1.9.1

[PATCH v3] ARM: dts: cubox-i: add support for Broadcom Wifi/Bluetooth devices

[Shawn Guo]

On Mon, May 11, 2015 at 12:38:33PM -0300, Fabio Estevam wrote:
> Add DT support for the Broadcom Wifi/Bluetooth devices found on the
> microsom board.
> 
> [Modified original Russell King's patch to use mmc-pwrseq]
> 
> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Applied, thanks.

[PATCH v3] ARM: dts: cubox-i: add support for Broadcom Wifi/Bluetooth devices

[Russell King - ARM Linux]

On Mon, May 18, 2015 at 07:34:00PM +0800, Shawn Guo wrote:
> On Mon, May 11, 2015 at 12:38:33PM -0300, Fabio Estevam wrote:
> > Add DT support for the Broadcom Wifi/Bluetooth devices found on the
> > microsom board.
> > 
> > [Modified original Russell King's patch to use mmc-pwrseq]
> > 
> > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
> > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> 
> Applied, thanks.

I would have wanted to verify that this does actually work before it was
applied.

-- 
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up
according to speedtest.net.

[PATCH v3] ARM: dts: cubox-i: add support for Broadcom Wifi/Bluetooth devices

[Shawn Guo]

On Mon, May 18, 2015 at 12:55:20PM +0100, Russell King - ARM Linux wrote:
> On Mon, May 18, 2015 at 07:34:00PM +0800, Shawn Guo wrote:
> > On Mon, May 11, 2015 at 12:38:33PM -0300, Fabio Estevam wrote:
> > > Add DT support for the Broadcom Wifi/Bluetooth devices found on the
> > > microsom board.
> > > 
> > > [Modified original Russell King's patch to use mmc-pwrseq]
> > > 
> > > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
> > > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> > 
> > Applied, thanks.
> 
> I would have wanted to verify that this does actually work before it was
> applied.

Okay, dropped it, and waiting for your confirmation.

Shawn

[PATCH v3] ARM: dts: cubox-i: add support for Broadcom Wifi/Bluetooth devices

[Jon Nettleton]

okay tested.  Looks good on both the 4330 and 4329.

Signed-off-by: Jon Nettleton <jon@solid-run.com>

On Mon, May 18, 2015 at 2:14 PM, Jon Nettleton <jon.nettleton@gmail.com> wrote:
>
> On May 18, 2015 2:11 PM, "Shawn Guo" <shawnguo@kernel.org> wrote:
>>
>> On Mon, May 18, 2015 at 12:55:20PM +0100, Russell King - ARM Linux wrote:
>> > On Mon, May 18, 2015 at 07:34:00PM +0800, Shawn Guo wrote:
>> > > On Mon, May 11, 2015 at 12:38:33PM -0300, Fabio Estevam wrote:
>> > > > Add DT support for the Broadcom Wifi/Bluetooth devices found on the
>> > > > microsom board.
>> > > >
>> > > > [Modified original Russell King's patch to use mmc-pwrseq]
>> > > >
>> > > > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
>> > > > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
>> > >
>> > > Applied, thanks.
>> >
>> > I would have wanted to verify that this does actually work before it was
>> > applied.
>>
>> Okay, dropped it, and waiting for your confirmation.
>>
>
> I will test momentarily.

[PATCH v3] ARM: dts: cubox-i: add support for Broadcom Wifi/Bluetooth devices

[Fabio Estevam]

Hi Jon,

On Mon, May 18, 2015 at 9:47 AM, Jon Nettleton <jon.nettleton@gmail.com> wrote:
> okay tested.  Looks good on both the 4330 and 4329.
>
> Signed-off-by: Jon Nettleton <jon@solid-run.com>

Thanks for testing it.

Just to clarify: do you mean 'Tested-by' instead of 'Signed-off-by'?

Regards,

Fabio Estevam

[PATCH v3] ARM: dts: cubox-i: add support for Broadcom Wifi/Bluetooth devices

[Jon Nettleton]

yes.  sorry about that.  wrong copy and paste.

On Mon, May 18, 2015 at 2:56 PM, Fabio Estevam <festevam@gmail.com> wrote:
> Hi Jon,
>
> On Mon, May 18, 2015 at 9:47 AM, Jon Nettleton <jon.nettleton@gmail.com> wrote:
>> okay tested.  Looks good on both the 4330 and 4329.
>>
>> Signed-off-by: Jon Nettleton <jon@solid-run.com>
>
> Thanks for testing it.
>
> Just to clarify: do you mean 'Tested-by' instead of 'Signed-off-by'?
>
> Regards,
>
> Fabio Estevam

[PATCH v3] ARM: dts: cubox-i: add support for Broadcom Wifi/Bluetooth devices

[Russell King - ARM Linux]

On Mon, May 18, 2015 at 02:47:32PM +0200, Jon Nettleton wrote:
> okay tested.  Looks good on both the 4330 and 4329.
> 
> Signed-off-by: Jon Nettleton <jon@solid-run.com>

Seems to work on the 4329 on the Cubox-i4, although I see an additional
error which didn't appear first time with my original patches:

brcmfmac: brcmf_setup_wiphybands: rxchain error (-52)

It seems to be repeatable, and I'm guessing from a brief look at the code
that "rxchain" is something that's requested from the firmware (my 4329
firmware is v4.220.48).  Why it didn't appear first time around I've no
idea.

Apart from that, iw dev wlan0 scan appears to find my local hostap, and
as usual none of the BTHub stuff that have flooded the area.

I'll drop my patches in favour of this one.  Shawn, please go ahead and
merge it.

Tested-by: Russell King <rmk+kernel@arm.linux.org.uk>

-- 
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up
according to speedtest.net.

[PATCH v3] ARM: dts: cubox-i: add support for Broadcom Wifi/Bluetooth devices

[Shawn Guo]

On Mon, May 18, 2015 at 02:38:48PM +0100, Russell King - ARM Linux wrote:
> On Mon, May 18, 2015 at 02:47:32PM +0200, Jon Nettleton wrote:
> > okay tested.  Looks good on both the 4330 and 4329.
> > 
> > Signed-off-by: Jon Nettleton <jon@solid-run.com>
> 
> Seems to work on the 4329 on the Cubox-i4, although I see an additional
> error which didn't appear first time with my original patches:
> 
> brcmfmac: brcmf_setup_wiphybands: rxchain error (-52)
> 
> It seems to be repeatable, and I'm guessing from a brief look at the code
> that "rxchain" is something that's requested from the firmware (my 4329
> firmware is v4.220.48).  Why it didn't appear first time around I've no
> idea.
> 
> Apart from that, iw dev wlan0 scan appears to find my local hostap, and
> as usual none of the BTHub stuff that have flooded the area.
> 
> I'll drop my patches in favour of this one.  Shawn, please go ahead and
> merge it.
> 
> Tested-by: Russell King <rmk+kernel@arm.linux.org.uk>

Applied with your and Jon's Tested-by.

Shawn