[PATCH v2 1/3] ARM: dts: udoo_neo: Add UDOO Neo USB OTG1 and OTG2 support

All of lore.kernel.org
 help / color / mirror / Atom feed

* [PATCH v2 1/3] ARM: dts: udoo_neo: Add UDOO Neo USB OTG1 and OTG2 support
@ 2017-01-19 16:30 Breno Lima
  2017-01-19 16:30 ` [PATCH v2 2/3] ARM: dts: udoo_neo: Add Wifi support Breno Lima
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Breno Lima @ 2017-01-19 16:30 UTC (permalink / raw)
  To: linux-arm-kernel

Add support for micro USB (OTG1) and USB Host (OTG2) for UDOO Neo board.

Tested on a UDOO Neo Full board by mounting a mass storage device
on both ports.

Signed-off-by: Breno Lima <breno.lima@nxp.com>
---
Changes since v1:
- imx6-usb-charger-detection property removed.

 arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 59 ++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
index 2b65d26..e9d0596 100644
--- a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
+++ b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
@@ -75,6 +75,28 @@
 		regulator-max-microvolt = <3300000>;
 		regulator-boot-on;
 	};
+
+	reg_usb_otg1_vbus: usb-otg1-vbus {
+		compatible = "regulator-fixed";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_otg1_reg>;
+		regulator-name = "usb_otg1_vbus";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+	};
+
+	reg_usb_otg2_vbus: usb-otg2-vbus {
+		compatible = "regulator-fixed";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_otg2_reg>;
+		regulator-name = "usb_otg2_vbus";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		gpio = <&gpio4 12 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+	};
 };
 
 &cpu0 {
@@ -241,6 +263,28 @@
 			<MX6SX_PAD_CSI_DATA07__UART6_CTS_B	0x1b0b1>;
 	};
 
+	pinctrl_otg1_reg: otg1grp {
+		fsl,pins =
+			<MX6SX_PAD_GPIO1_IO09__GPIO1_IO_9        0x10b0>;
+	};
+
+
+	pinctrl_otg2_reg: otg2grp {
+		fsl,pins =
+			<MX6SX_PAD_NAND_RE_B__GPIO4_IO_12        0x10b0>;
+	};
+
+	pinctrl_usb_otg1: usbotg1grp {
+		fsl,pins =
+			<MX6SX_PAD_GPIO1_IO10__ANATOP_OTG1_ID    0x17059>,
+			<MX6SX_PAD_GPIO1_IO08__USB_OTG1_OC       0x10b0>;
+	};
+
+	pinctrl_usb_otg2: usbot2ggrp {
+		fsl,pins =
+			<MX6SX_PAD_QSPI1A_DATA0__USB_OTG2_OC     0x10b0>;
+	};
+
 	pinctrl_usdhc2: usdhc2grp {
 		fsl,pins =
 			<MX6SX_PAD_SD2_CMD__USDHC2_CMD		0x17059>,
@@ -280,6 +324,21 @@
 	status = "disabled";
 };
 
+&usbotg1 { /* J2 micro USB port */
+	vbus-supply = <&reg_usb_otg1_vbus>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usb_otg1>;
+	status = "okay";
+};
+
+&usbotg2 { /* J3 host USB port */
+	vbus-supply = <&reg_usb_otg2_vbus>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usb_otg2>;
+	dr_mode = "host";
+	status = "okay";
+};
+
 &usdhc2 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usdhc2>;
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH v2 2/3] ARM: dts: udoo_neo: Add Wifi support
  2017-01-19 16:30 [PATCH v2 1/3] ARM: dts: udoo_neo: Add UDOO Neo USB OTG1 and OTG2 support Breno Lima
@ 2017-01-19 16:30 ` Breno Lima
  2017-01-23  7:15   ` Shawn Guo
  2017-01-19 16:30 ` [PATCH v3 3/3] ARM: dts: udoo_neo: Add Bluetooth support Breno Lima
  2017-01-23  7:12 ` [PATCH v2 1/3] ARM: dts: udoo_neo: Add UDOO Neo USB OTG1 and OTG2 support Shawn Guo
  2 siblings, 1 reply; 5+ messages in thread
From: Breno Lima @ 2017-01-19 16:30 UTC (permalink / raw)
  To: linux-arm-kernel

Udoo Neo has a TI WL1831 Wifi chip connected to the USDHC3 port.

Add support for it.

Signed-off-by: Breno Lima <breno.lima@nxp.com>
---
Changes since v1:
- Newly introduced in this series

 arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 45 ++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
index e9d0596..6787a83 100644
--- a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
+++ b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
@@ -97,6 +97,16 @@
 		gpio = <&gpio4 12 GPIO_ACTIVE_HIGH>;
 		enable-active-high;
 	};
+
+	reg_wlan: regulator-wlan {
+		compatible = "regulator-fixed";
+		regulator-name = "wlan-en-regulator";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		gpio = <&gpio2 12 GPIO_ACTIVE_HIGH>;
+		startup-delay-us = <70000>;
+		enable-active-high;
+	};
 };
 
 &cpu0 {
@@ -295,6 +305,19 @@
 			<MX6SX_PAD_SD2_DATA3__USDHC2_DATA3	0x17059>,
 			<MX6SX_PAD_SD1_DATA0__GPIO6_IO_2	0x17059>; /* CD */
 	};
+
+	pinctrl_usdhc3: usdhc3grp {
+		fsl,pins =
+			<MX6SX_PAD_KEY_COL2__GPIO2_IO_12	0x15059>,
+			<MX6SX_PAD_KEY_ROW1__GPIO2_IO_16	0x13059>,
+			<MX6SX_PAD_SD3_DATA0__USDHC3_DATA0	0x17069>,
+			<MX6SX_PAD_SD3_DATA1__USDHC3_DATA1	0x17069>,
+			<MX6SX_PAD_SD3_DATA2__USDHC3_DATA2	0x17069>,
+			<MX6SX_PAD_SD3_DATA3__USDHC3_DATA3	0x17069>,
+			<MX6SX_PAD_SD3_CMD__USDHC3_CMD		0x17069>,
+			<MX6SX_PAD_SD3_CLK__USDHC3_CLK		0x10069>,
+			<MX6SX_PAD_CSI_MCLK__OSC32K_32K_OUT	0x10059>;
+	};
 };
 
 &uart1 {
@@ -350,3 +373,25 @@
 	wakeup-source;
 	status = "okay";
 };
+
+&usdhc3 { /* Wi-Fi */
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usdhc3>;
+	non-removable;
+	vmmc-supply = <&reg_wlan>;
+	cap-power-off-card;
+	wakeup-source;
+	keep-power-in-suspend;
+	status = "okay";
+
+	#address-cells = <1>;
+	#size-cells = <0>;
+	wlcore: wlcore at 2 {
+		compatible = "ti,wl1831";
+		reg = <2>;
+		interrupt-parent = <&gpio2>;
+		interrupts = <16 IRQ_TYPE_EDGE_RISING>;
+		ref-clock-frequency = <38400000>;
+		tcxo-clock-frequency = <26000000>;
+	};
+};
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH v2 2/3] ARM: dts: udoo_neo: Add Wifi support
  2017-01-19 16:30 ` [PATCH v2 2/3] ARM: dts: udoo_neo: Add Wifi support Breno Lima
@ 2017-01-23  7:15   ` Shawn Guo
  0 siblings, 0 replies; 5+ messages in thread
From: Shawn Guo @ 2017-01-23  7:15 UTC (permalink / raw)
  To: linux-arm-kernel

On Thu, Jan 19, 2017 at 02:30:04PM -0200, Breno Lima wrote:
> Udoo Neo has a TI WL1831 Wifi chip connected to the USDHC3 port.
> 
> Add support for it.
> 
> Signed-off-by: Breno Lima <breno.lima@nxp.com>
> ---
> Changes since v1:
> - Newly introduced in this series
> 
>  arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 45 ++++++++++++++++++++++++++++++++++
>  1 file changed, 45 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
> index e9d0596..6787a83 100644
> --- a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
> +++ b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
> @@ -97,6 +97,16 @@
>  		gpio = <&gpio4 12 GPIO_ACTIVE_HIGH>;
>  		enable-active-high;
>  	};
> +
> +	reg_wlan: regulator-wlan {
> +		compatible = "regulator-fixed";
> +		regulator-name = "wlan-en-regulator";
> +		regulator-min-microvolt = <1800000>;
> +		regulator-max-microvolt = <1800000>;
> +		gpio = <&gpio2 12 GPIO_ACTIVE_HIGH>;
> +		startup-delay-us = <70000>;
> +		enable-active-high;
> +	};
>  };
>  
>  &cpu0 {
> @@ -295,6 +305,19 @@
>  			<MX6SX_PAD_SD2_DATA3__USDHC2_DATA3	0x17059>,
>  			<MX6SX_PAD_SD1_DATA0__GPIO6_IO_2	0x17059>; /* CD */
>  	};
> +
> +	pinctrl_usdhc3: usdhc3grp {
> +		fsl,pins =
> +			<MX6SX_PAD_KEY_COL2__GPIO2_IO_12	0x15059>,
> +			<MX6SX_PAD_KEY_ROW1__GPIO2_IO_16	0x13059>,
> +			<MX6SX_PAD_SD3_DATA0__USDHC3_DATA0	0x17069>,
> +			<MX6SX_PAD_SD3_DATA1__USDHC3_DATA1	0x17069>,
> +			<MX6SX_PAD_SD3_DATA2__USDHC3_DATA2	0x17069>,
> +			<MX6SX_PAD_SD3_DATA3__USDHC3_DATA3	0x17069>,
> +			<MX6SX_PAD_SD3_CMD__USDHC3_CMD		0x17069>,
> +			<MX6SX_PAD_SD3_CLK__USDHC3_CLK		0x10069>,
> +			<MX6SX_PAD_CSI_MCLK__OSC32K_32K_OUT	0x10059>;
> +	};
>  };
>  
>  &uart1 {
> @@ -350,3 +373,25 @@
>  	wakeup-source;
>  	status = "okay";
>  };
> +
> +&usdhc3 { /* Wi-Fi */
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&pinctrl_usdhc3>;
> +	non-removable;
> +	vmmc-supply = <&reg_wlan>;
> +	cap-power-off-card;
> +	wakeup-source;
> +	keep-power-in-suspend;
> +	status = "okay";
> +
> +	#address-cells = <1>;
> +	#size-cells = <0>;

Please have a newline between properties and child node.

Shawn

> +	wlcore: wlcore at 2 {
> +		compatible = "ti,wl1831";
> +		reg = <2>;
> +		interrupt-parent = <&gpio2>;
> +		interrupts = <16 IRQ_TYPE_EDGE_RISING>;
> +		ref-clock-frequency = <38400000>;
> +		tcxo-clock-frequency = <26000000>;
> +	};
> +};
> -- 
> 2.7.4
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH v3 3/3] ARM: dts: udoo_neo: Add Bluetooth support
  2017-01-19 16:30 [PATCH v2 1/3] ARM: dts: udoo_neo: Add UDOO Neo USB OTG1 and OTG2 support Breno Lima
  2017-01-19 16:30 ` [PATCH v2 2/3] ARM: dts: udoo_neo: Add Wifi support Breno Lima
@ 2017-01-19 16:30 ` Breno Lima
  2017-01-23  7:12 ` [PATCH v2 1/3] ARM: dts: udoo_neo: Add UDOO Neo USB OTG1 and OTG2 support Shawn Guo
  2 siblings, 0 replies; 5+ messages in thread
From: Breno Lima @ 2017-01-19 16:30 UTC (permalink / raw)
  To: linux-arm-kernel

Udoo Neo has a TI WL1831 Bluetooth chip connected to the UART3 port.

Add support for it.

Signed-off-by: Breno Lima <breno.lima@nxp.com>
---
Changes since v1:
- Newly introduced in this series

 arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
index 6787a83..9cc7919 100644
--- a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
+++ b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
@@ -107,6 +107,18 @@
 		startup-delay-us = <70000>;
 		enable-active-high;
 	};
+
+	reg_bt: regulator-bt {
+		compatible = "regulator-fixed";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_bt_reg>;
+		enable-active-high;
+		gpio = <&gpio2 17 GPIO_ACTIVE_HIGH>;
+		regulator-name = "bt_reg";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		regulator-always-on;
+	};
 };
 
 &cpu0 {
@@ -218,6 +230,11 @@
 };
 
 &iomuxc {
+	pinctrl_bt_reg: btreggrp {
+		fsl,pins =
+			<MX6SX_PAD_KEY_ROW2__GPIO2_IO_17        0x15059>;
+	};
+
 	pinctrl_enet1: enet1grp {
 		fsl,pins =
 			<MX6SX_PAD_ENET1_CRS__GPIO2_IO_1	0xa0b1>,
@@ -255,6 +272,14 @@
 			<MX6SX_PAD_GPIO1_IO07__UART2_RX		0x1b0b1>;
 	};
 
+	pinctrl_uart3: uart3grp {
+		fsl,pins =
+			<MX6SX_PAD_SD3_DATA4__UART3_RX          0x13059>,
+			<MX6SX_PAD_SD3_DATA5__UART3_TX          0x13059>,
+			<MX6SX_PAD_SD3_DATA6__UART3_RTS_B       0x13059>,
+			<MX6SX_PAD_SD3_DATA7__UART3_CTS_B       0x13059>;
+	};
+
 	pinctrl_uart5: uart5grp {
 		fsl,pins =
 			<MX6SX_PAD_SD4_DATA4__UART5_RX		0x1b0b1>,
@@ -333,6 +358,13 @@
 	status = "disabled";
 };
 
+&uart3 { /* Bluetooth */
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_uart3>;
+	uart-has-rtscts;
+	status = "okay";
+};
+
 /* Arduino serial */
 &uart5 {
 	pinctrl-names = "default";
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH v2 1/3] ARM: dts: udoo_neo: Add UDOO Neo USB OTG1 and OTG2 support
  2017-01-19 16:30 [PATCH v2 1/3] ARM: dts: udoo_neo: Add UDOO Neo USB OTG1 and OTG2 support Breno Lima
  2017-01-19 16:30 ` [PATCH v2 2/3] ARM: dts: udoo_neo: Add Wifi support Breno Lima
  2017-01-19 16:30 ` [PATCH v3 3/3] ARM: dts: udoo_neo: Add Bluetooth support Breno Lima
@ 2017-01-23  7:12 ` Shawn Guo
  2 siblings, 0 replies; 5+ messages in thread
From: Shawn Guo @ 2017-01-23  7:12 UTC (permalink / raw)
  To: linux-arm-kernel

On Thu, Jan 19, 2017 at 02:30:03PM -0200, Breno Lima wrote:
> Add support for micro USB (OTG1) and USB Host (OTG2) for UDOO Neo board.
> 
> Tested on a UDOO Neo Full board by mounting a mass storage device
> on both ports.
> 
> Signed-off-by: Breno Lima <breno.lima@nxp.com>
> ---
> Changes since v1:
> - imx6-usb-charger-detection property removed.
> 
>  arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 59 ++++++++++++++++++++++++++++++++++
>  1 file changed, 59 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
> index 2b65d26..e9d0596 100644
> --- a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
> +++ b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
> @@ -75,6 +75,28 @@
>  		regulator-max-microvolt = <3300000>;
>  		regulator-boot-on;
>  	};
> +
> +	reg_usb_otg1_vbus: usb-otg1-vbus {

Please name fixed regulators like:

	reg_xxx: regulator-xxx {
		...
	};

Shawn

> +		compatible = "regulator-fixed";
> +		pinctrl-names = "default";
> +		pinctrl-0 = <&pinctrl_otg1_reg>;
> +		regulator-name = "usb_otg1_vbus";
> +		regulator-min-microvolt = <5000000>;
> +		regulator-max-microvolt = <5000000>;
> +		gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
> +		enable-active-high;
> +	};
> +
> +	reg_usb_otg2_vbus: usb-otg2-vbus {
> +		compatible = "regulator-fixed";
> +		pinctrl-names = "default";
> +		pinctrl-0 = <&pinctrl_otg2_reg>;
> +		regulator-name = "usb_otg2_vbus";
> +		regulator-min-microvolt = <5000000>;
> +		regulator-max-microvolt = <5000000>;
> +		gpio = <&gpio4 12 GPIO_ACTIVE_HIGH>;
> +		enable-active-high;
> +	};
>  };
>  
>  &cpu0 {
> @@ -241,6 +263,28 @@
>  			<MX6SX_PAD_CSI_DATA07__UART6_CTS_B	0x1b0b1>;
>  	};
>  
> +	pinctrl_otg1_reg: otg1grp {
> +		fsl,pins =
> +			<MX6SX_PAD_GPIO1_IO09__GPIO1_IO_9        0x10b0>;
> +	};
> +
> +
> +	pinctrl_otg2_reg: otg2grp {
> +		fsl,pins =
> +			<MX6SX_PAD_NAND_RE_B__GPIO4_IO_12        0x10b0>;
> +	};
> +
> +	pinctrl_usb_otg1: usbotg1grp {
> +		fsl,pins =
> +			<MX6SX_PAD_GPIO1_IO10__ANATOP_OTG1_ID    0x17059>,
> +			<MX6SX_PAD_GPIO1_IO08__USB_OTG1_OC       0x10b0>;
> +	};
> +
> +	pinctrl_usb_otg2: usbot2ggrp {
> +		fsl,pins =
> +			<MX6SX_PAD_QSPI1A_DATA0__USB_OTG2_OC     0x10b0>;
> +	};
> +
>  	pinctrl_usdhc2: usdhc2grp {
>  		fsl,pins =
>  			<MX6SX_PAD_SD2_CMD__USDHC2_CMD		0x17059>,
> @@ -280,6 +324,21 @@
>  	status = "disabled";
>  };
>  
> +&usbotg1 { /* J2 micro USB port */
> +	vbus-supply = <&reg_usb_otg1_vbus>;
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&pinctrl_usb_otg1>;
> +	status = "okay";
> +};
> +
> +&usbotg2 { /* J3 host USB port */
> +	vbus-supply = <&reg_usb_otg2_vbus>;
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&pinctrl_usb_otg2>;
> +	dr_mode = "host";
> +	status = "okay";
> +};
> +
>  &usdhc2 {
>  	pinctrl-names = "default";
>  	pinctrl-0 = <&pinctrl_usdhc2>;
> -- 
> 2.7.4
> 

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2017-01-23  7:15 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-19 16:30 [PATCH v2 1/3] ARM: dts: udoo_neo: Add UDOO Neo USB OTG1 and OTG2 support Breno Lima
2017-01-19 16:30 ` [PATCH v2 2/3] ARM: dts: udoo_neo: Add Wifi support Breno Lima
2017-01-23  7:15   ` Shawn Guo
2017-01-19 16:30 ` [PATCH v3 3/3] ARM: dts: udoo_neo: Add Bluetooth support Breno Lima
2017-01-23  7:12 ` [PATCH v2 1/3] ARM: dts: udoo_neo: Add UDOO Neo USB OTG1 and OTG2 support Shawn Guo

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.