linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v1] ARM: dts: imx6ul: ccimx6ulsom: Add support for wireless SOM variant
@ 2018-10-22  9:27 Alex Gonzalez
  2018-10-22  9:27 ` Alex Gonzalez
  0 siblings, 1 reply; 4+ messages in thread
From: Alex Gonzalez @ 2018-10-22  9:27 UTC (permalink / raw)
  To: shawnguo
  Cc: robh+dt, mark.rutland, s.hauer, kernel, fabio.estevam, linux-imx,
	devicetree, linux-kernel, linux-arm-kernel, alex.gonzalez

The wireless variants of the ConnecCore 6UL SOM include a Qualcomm
QCA6564 wireless chip with dual WiFi and Bluetooth.

The QCA6564 uses the out-of-tree driver at:
https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/qcacld-2.0/

Blueooth uses the HCI H4 UART driver.

Changes since [1]:
* Removed extra new line

[1] https://lore.kernel.org/lkml/1539962141-32418-2-git-send-email-alex.gonzalez@digi.com/

Alex Gonzalez (1):
  ARM: dts: imx6ul: ccimx6ulsom: Add support for wireless SOM variant

 arch/arm/boot/dts/imx6ul-ccimx6ulsom.dtsi | 64 +++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)


^ permalink raw reply	[flat|nested] 4+ messages in thread
* [PATCH v1] ARM: dts: imx6ul: ccimx6ulsom: Add support for wireless SOM variant
  2018-10-22  9:27 [PATCH v1] ARM: dts: imx6ul: ccimx6ulsom: Add support for wireless SOM variant Alex Gonzalez
@ 2018-10-22  9:27 ` Alex Gonzalez
  2018-10-22 12:33   ` Fabio Estevam
  2018-11-04  7:32   ` Shawn Guo
  0 siblings, 2 replies; 4+ messages in thread
From: Alex Gonzalez @ 2018-10-22  9:27 UTC (permalink / raw)
  To: shawnguo
  Cc: robh+dt, mark.rutland, s.hauer, kernel, fabio.estevam, linux-imx,
	devicetree, linux-kernel, linux-arm-kernel, alex.gonzalez

The wireless variants of the ConnecCore 6UL SOM include a Qualcomm
QCA6564 wireless chip with dual WiFi and Bluetooth.

Both the ConnectCore 6UL SBC Express and Pro boards fit a wireless SOM.

The Wifi is connected through the SDIO interface on usdhc1 and the
Bluetooth is connected via uart1.

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
 arch/arm/boot/dts/imx6ul-ccimx6ulsom.dtsi | 64 +++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/arch/arm/boot/dts/imx6ul-ccimx6ulsom.dtsi b/arch/arm/boot/dts/imx6ul-ccimx6ulsom.dtsi
index c71a84da1af0..23bbcd4c71d1 100644
--- a/arch/arm/boot/dts/imx6ul-ccimx6ulsom.dtsi
+++ b/arch/arm/boot/dts/imx6ul-ccimx6ulsom.dtsi
@@ -161,6 +161,25 @@
 	};
 };
 
+/* UART1 (Bluetooth) */
+&uart1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_uart1>;
+	uart-has-rtscts;
+	status = "okay";
+};
+
+/* USDHC1 (Wireless) */
+&usdhc1 {
+	pinctrl-names = "default", "sleep";
+	pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_wifibt_ctrl>;
+	pinctrl-1 = <&pinctrl_usdhc1_sleep &pinctrl_wifibt_ctrl_sleep>;
+	non-removable;
+	no-1-8-v;
+	bus-width = <4>;
+	status = "okay";
+};
+
 &iomuxc {
 	pinctrl_gpmi_nand: gpmigrp {
 		fsl,pins = <
@@ -188,6 +207,51 @@
 			MX6UL_PAD_UART4_RX_DATA__I2C1_SDA 0x4001b8b0
 			>;
 		};
+
+	pinctrl_uart1: uart1grp {
+		fsl,pins = <
+			MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX   0x1b0b1
+			MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX   0x1b0b1
+			MX6UL_PAD_UART1_RTS_B__UART1_DCE_RTS    0x1b0b1
+			MX6UL_PAD_UART1_CTS_B__UART1_DCE_CTS    0x1b0b1
+		>;
+	};
+
+	pinctrl_usdhc1: usdhc1grp {
+		fsl,pins = <
+			MX6UL_PAD_SD1_CMD__USDHC1_CMD           0x17059
+			MX6UL_PAD_SD1_CLK__USDHC1_CLK           0x17051
+			MX6UL_PAD_SD1_DATA0__USDHC1_DATA0       0x17059
+			MX6UL_PAD_SD1_DATA1__USDHC1_DATA1       0x17059
+			MX6UL_PAD_SD1_DATA2__USDHC1_DATA2       0x17059
+			MX6UL_PAD_SD1_DATA3__USDHC1_DATA3       0x17059
+			 >;
+		};
+
+	pinctrl_usdhc1_sleep: usdhc1grp-sleep {
+		fsl,pins = <
+			MX6UL_PAD_SD1_CMD__GPIO2_IO16           0x3000
+			MX6UL_PAD_SD1_CLK__GPIO2_IO17           0x3000
+			MX6UL_PAD_SD1_DATA0__GPIO2_IO18         0x3000
+			MX6UL_PAD_SD1_DATA1__GPIO2_IO19         0x3000
+			MX6UL_PAD_SD1_DATA2__GPIO2_IO20         0x3000
+			MX6UL_PAD_SD1_DATA3__GPIO2_IO21         0x3000
+			 >;
+	};
+
+	pinctrl_wifibt_ctrl: wifibt-ctrl-grp {
+		fsl,pins = <
+			MX6UL_PAD_SNVS_TAMPER0__GPIO5_IO00      0x08a0
+			MX6UL_PAD_SNVS_TAMPER9__GPIO5_IO09      0x08a0
+			  >;
+	};
+
+	pinctrl_wifibt_ctrl_sleep: wifibt-ctrl-grp-sleep {
+		fsl,pins = <
+			MX6UL_PAD_SNVS_TAMPER0__GPIO5_IO00      0x3000
+			MX6UL_PAD_SNVS_TAMPER9__GPIO5_IO09      0x3000
+			 >;
+	};
 };
 
 &reg_arm {

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH v1] ARM: dts: imx6ul: ccimx6ulsom: Add support for wireless SOM variant
  2018-10-22  9:27 ` Alex Gonzalez
@ 2018-10-22 12:33   ` Fabio Estevam
  2018-11-04  7:32   ` Shawn Guo
  1 sibling, 0 replies; 4+ messages in thread
From: Fabio Estevam @ 2018-10-22 12:33 UTC (permalink / raw)
  To: Gonzalez, Alex
  Cc: Shawn Guo, Mark Rutland,
	open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
	Sascha Hauer, linux-kernel, Rob Herring, NXP Linux Team,
	Sascha Hauer, Fabio Estevam,
	moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE

On Mon, Oct 22, 2018 at 6:28 AM Alex Gonzalez <alex.gonzalez@digi.com> wrote:
>
> The wireless variants of the ConnecCore 6UL SOM include a Qualcomm
> QCA6564 wireless chip with dual WiFi and Bluetooth.
>
> Both the ConnectCore 6UL SBC Express and Pro boards fit a wireless SOM.
>
> The Wifi is connected through the SDIO interface on usdhc1 and the
> Bluetooth is connected via uart1.
>
> Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>

Reviewed-by: Fabio Estevam <festevam@gmail.com>

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH v1] ARM: dts: imx6ul: ccimx6ulsom: Add support for wireless SOM variant
  2018-10-22  9:27 ` Alex Gonzalez
  2018-10-22 12:33   ` Fabio Estevam
@ 2018-11-04  7:32   ` Shawn Guo
  1 sibling, 0 replies; 4+ messages in thread
From: Shawn Guo @ 2018-11-04  7:32 UTC (permalink / raw)
  To: Alex Gonzalez
  Cc: robh+dt, mark.rutland, s.hauer, kernel, fabio.estevam, linux-imx,
	devicetree, linux-kernel, linux-arm-kernel

On Mon, Oct 22, 2018 at 11:27:23AM +0200, Alex Gonzalez wrote:
> The wireless variants of the ConnecCore 6UL SOM include a Qualcomm
> QCA6564 wireless chip with dual WiFi and Bluetooth.
> 
> Both the ConnectCore 6UL SBC Express and Pro boards fit a wireless SOM.
> 
> The Wifi is connected through the SDIO interface on usdhc1 and the
> Bluetooth is connected via uart1.
> 
> Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
> ---
>  arch/arm/boot/dts/imx6ul-ccimx6ulsom.dtsi | 64 +++++++++++++++++++++++++++++++
>  1 file changed, 64 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/imx6ul-ccimx6ulsom.dtsi b/arch/arm/boot/dts/imx6ul-ccimx6ulsom.dtsi
> index c71a84da1af0..23bbcd4c71d1 100644
> --- a/arch/arm/boot/dts/imx6ul-ccimx6ulsom.dtsi
> +++ b/arch/arm/boot/dts/imx6ul-ccimx6ulsom.dtsi
> @@ -161,6 +161,25 @@
>  	};
>  };
>  
> +/* UART1 (Bluetooth) */
> +&uart1 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&pinctrl_uart1>;
> +	uart-has-rtscts;
> +	status = "okay";
> +};
> +
> +/* USDHC1 (Wireless) */
> +&usdhc1 {
> +	pinctrl-names = "default", "sleep";
> +	pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_wifibt_ctrl>;
> +	pinctrl-1 = <&pinctrl_usdhc1_sleep &pinctrl_wifibt_ctrl_sleep>;
> +	non-removable;
> +	no-1-8-v;
> +	bus-width = <4>;
> +	status = "okay";
> +};
> +
>  &iomuxc {
>  	pinctrl_gpmi_nand: gpmigrp {
>  		fsl,pins = <
> @@ -188,6 +207,51 @@
>  			MX6UL_PAD_UART4_RX_DATA__I2C1_SDA 0x4001b8b0
>  			>;
>  		};

The existing indentation for gpmigrp and i2c1grp is problematic.

> +
> +	pinctrl_uart1: uart1grp {
> +		fsl,pins = <
> +			MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX   0x1b0b1
> +			MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX   0x1b0b1
> +			MX6UL_PAD_UART1_RTS_B__UART1_DCE_RTS    0x1b0b1
> +			MX6UL_PAD_UART1_CTS_B__UART1_DCE_CTS    0x1b0b1
> +		>;
> +	};

This indentation is what we want ...

> +
> +	pinctrl_usdhc1: usdhc1grp {
> +		fsl,pins = <
> +			MX6UL_PAD_SD1_CMD__USDHC1_CMD           0x17059
> +			MX6UL_PAD_SD1_CLK__USDHC1_CLK           0x17051
> +			MX6UL_PAD_SD1_DATA0__USDHC1_DATA0       0x17059
> +			MX6UL_PAD_SD1_DATA1__USDHC1_DATA1       0x17059
> +			MX6UL_PAD_SD1_DATA2__USDHC1_DATA2       0x17059
> +			MX6UL_PAD_SD1_DATA3__USDHC1_DATA3       0x17059
> +			 >;
> +		};
> +

... so please follow uart1grp style for all entries you are adding.

Shawn

> +	pinctrl_usdhc1_sleep: usdhc1grp-sleep {
> +		fsl,pins = <
> +			MX6UL_PAD_SD1_CMD__GPIO2_IO16           0x3000
> +			MX6UL_PAD_SD1_CLK__GPIO2_IO17           0x3000
> +			MX6UL_PAD_SD1_DATA0__GPIO2_IO18         0x3000
> +			MX6UL_PAD_SD1_DATA1__GPIO2_IO19         0x3000
> +			MX6UL_PAD_SD1_DATA2__GPIO2_IO20         0x3000
> +			MX6UL_PAD_SD1_DATA3__GPIO2_IO21         0x3000
> +			 >;
> +	};
> +
> +	pinctrl_wifibt_ctrl: wifibt-ctrl-grp {
> +		fsl,pins = <
> +			MX6UL_PAD_SNVS_TAMPER0__GPIO5_IO00      0x08a0
> +			MX6UL_PAD_SNVS_TAMPER9__GPIO5_IO09      0x08a0
> +			  >;
> +	};
> +
> +	pinctrl_wifibt_ctrl_sleep: wifibt-ctrl-grp-sleep {
> +		fsl,pins = <
> +			MX6UL_PAD_SNVS_TAMPER0__GPIO5_IO00      0x3000
> +			MX6UL_PAD_SNVS_TAMPER9__GPIO5_IO09      0x3000
> +			 >;
> +	};
>  };
>  
>  &reg_arm {

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-11-04  7:33 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-22  9:27 [PATCH v1] ARM: dts: imx6ul: ccimx6ulsom: Add support for wireless SOM variant Alex Gonzalez
2018-10-22  9:27 ` Alex Gonzalez
2018-10-22 12:33   ` Fabio Estevam
2018-11-04  7:32   ` Shawn Guo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).