* [PATCH 1/4] ARM: dts: cm-fx6: rearrange the dts file
2014-01-21 16:13 [PATCH 0/4] ARM: dts: cm-fx6: extend board support Igor Grinberg
@ 2014-01-21 16:13 ` Igor Grinberg
2014-01-21 20:42 ` Sascha Hauer
2014-01-21 16:13 ` [PATCH 2/4] ARM: dts: cm-fx6: add SATA support Igor Grinberg
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Igor Grinberg @ 2014-01-21 16:13 UTC (permalink / raw)
To: linux-arm-kernel
Move the iomuxc definition before the devices definitions
(e.g. gpmi, fec).
Signed-off-by: Igor Grinberg <grinberg@compulab•co.il>
---
arch/arm/boot/dts/imx6q-cm-fx6.dts | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/arch/arm/boot/dts/imx6q-cm-fx6.dts b/arch/arm/boot/dts/imx6q-cm-fx6.dts
index 1a8ee79..94cc6b5 100644
--- a/arch/arm/boot/dts/imx6q-cm-fx6.dts
+++ b/arch/arm/boot/dts/imx6q-cm-fx6.dts
@@ -31,19 +31,8 @@
linux,default-trigger = "heartbeat";
};
};
-};
-&fec {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_enet>;
- phy-mode = "rgmii";
- status = "okay";
-};
-&gpmi {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_gpmi_nand>;
- status = "okay";
};
&iomuxc {
@@ -62,6 +51,19 @@
};
};
+&fec {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_enet>;
+ phy-mode = "rgmii";
+ status = "okay";
+};
+
+&gpmi {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_gpmi_nand>;
+ status = "okay";
+};
+
&uart4 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart4>;
--
1.8.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 1/4] ARM: dts: cm-fx6: rearrange the dts file
2014-01-21 16:13 ` [PATCH 1/4] ARM: dts: cm-fx6: rearrange the dts file Igor Grinberg
@ 2014-01-21 20:42 ` Sascha Hauer
2014-01-22 11:25 ` Igor Grinberg
0 siblings, 1 reply; 9+ messages in thread
From: Sascha Hauer @ 2014-01-21 20:42 UTC (permalink / raw)
To: linux-arm-kernel
Hi Igor,
On Tue, Jan 21, 2014 at 06:13:29PM +0200, Igor Grinberg wrote:
> Move the iomuxc definition before the devices definitions
> (e.g. gpmi, fec).
The nodes are sorted alphabetically. Please keep them sorted.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/4] ARM: dts: cm-fx6: rearrange the dts file
2014-01-21 20:42 ` Sascha Hauer
@ 2014-01-22 11:25 ` Igor Grinberg
0 siblings, 0 replies; 9+ messages in thread
From: Igor Grinberg @ 2014-01-22 11:25 UTC (permalink / raw)
To: linux-arm-kernel
Hi Sascha,
On 01/21/14 22:42, Sascha Hauer wrote:
> Hi Igor,
>
> On Tue, Jan 21, 2014 at 06:13:29PM +0200, Igor Grinberg wrote:
>> Move the iomuxc definition before the devices definitions
>> (e.g. gpmi, fec).
>
> The nodes are sorted alphabetically. Please keep them sorted.
Hmmm.. I missed that point... Thanks!
Will fix this up and resend.
--
Regards,
Igor.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/4] ARM: dts: cm-fx6: add SATA support
2014-01-21 16:13 [PATCH 0/4] ARM: dts: cm-fx6: extend board support Igor Grinberg
2014-01-21 16:13 ` [PATCH 1/4] ARM: dts: cm-fx6: rearrange the dts file Igor Grinberg
@ 2014-01-21 16:13 ` Igor Grinberg
2014-01-27 7:37 ` Shawn Guo
2014-01-21 16:13 ` [PATCH 3/4] ARM: dts: cm-fx6: add support for USB OTG Igor Grinberg
2014-01-21 16:13 ` [PATCH 4/4] ARM: dts: cm-fx6: add support for USB host port 1 Igor Grinberg
3 siblings, 1 reply; 9+ messages in thread
From: Igor Grinberg @ 2014-01-21 16:13 UTC (permalink / raw)
To: linux-arm-kernel
Enable SATA on cm-fx6.
Signed-off-by: Igor Grinberg <grinberg@compulab•co.il>
---
arch/arm/boot/dts/imx6q-cm-fx6.dts | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/boot/dts/imx6q-cm-fx6.dts b/arch/arm/boot/dts/imx6q-cm-fx6.dts
index 94cc6b5..07f90a5 100644
--- a/arch/arm/boot/dts/imx6q-cm-fx6.dts
+++ b/arch/arm/boot/dts/imx6q-cm-fx6.dts
@@ -69,3 +69,7 @@
pinctrl-0 = <&pinctrl_uart4>;
status = "okay";
};
+
+&sata {
+ status = "okay";
+};
--
1.8.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/4] ARM: dts: cm-fx6: add SATA support
2014-01-21 16:13 ` [PATCH 2/4] ARM: dts: cm-fx6: add SATA support Igor Grinberg
@ 2014-01-27 7:37 ` Shawn Guo
2014-01-27 9:06 ` Igor Grinberg
0 siblings, 1 reply; 9+ messages in thread
From: Shawn Guo @ 2014-01-27 7:37 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jan 21, 2014 at 06:13:30PM +0200, Igor Grinberg wrote:
> Enable SATA on cm-fx6.
>
> Signed-off-by: Igor Grinberg <grinberg@compulab•co.il>
> ---
> arch/arm/boot/dts/imx6q-cm-fx6.dts | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/arch/arm/boot/dts/imx6q-cm-fx6.dts b/arch/arm/boot/dts/imx6q-cm-fx6.dts
> index 94cc6b5..07f90a5 100644
> --- a/arch/arm/boot/dts/imx6q-cm-fx6.dts
> +++ b/arch/arm/boot/dts/imx6q-cm-fx6.dts
> @@ -69,3 +69,7 @@
> pinctrl-0 = <&pinctrl_uart4>;
> status = "okay";
> };
> +
> +&sata {
> + status = "okay";
> +};
Please sort these labeled nodes alphabetically.
Shawn
> --
> 1.8.3.2
>
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 2/4] ARM: dts: cm-fx6: add SATA support
2014-01-27 7:37 ` Shawn Guo
@ 2014-01-27 9:06 ` Igor Grinberg
0 siblings, 0 replies; 9+ messages in thread
From: Igor Grinberg @ 2014-01-27 9:06 UTC (permalink / raw)
To: linux-arm-kernel
On 01/27/14 09:37, Shawn Guo wrote:
> On Tue, Jan 21, 2014 at 06:13:30PM +0200, Igor Grinberg wrote:
>> Enable SATA on cm-fx6.
>>
>> Signed-off-by: Igor Grinberg <grinberg@compulab•co.il>
>> ---
>> arch/arm/boot/dts/imx6q-cm-fx6.dts | 4 ++++
>> 1 file changed, 4 insertions(+)
>>
>> diff --git a/arch/arm/boot/dts/imx6q-cm-fx6.dts b/arch/arm/boot/dts/imx6q-cm-fx6.dts
>> index 94cc6b5..07f90a5 100644
>> --- a/arch/arm/boot/dts/imx6q-cm-fx6.dts
>> +++ b/arch/arm/boot/dts/imx6q-cm-fx6.dts
>> @@ -69,3 +69,7 @@
>> pinctrl-0 = <&pinctrl_uart4>;
>> status = "okay";
>> };
>> +
>> +&sata {
>> + status = "okay";
>> +};
>
> Please sort these labeled nodes alphabetically.
Ok.
I'll wait for the "pingrp macros" to settle down and resend.
Thanks!
--
Regards,
Igor.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/4] ARM: dts: cm-fx6: add support for USB OTG
2014-01-21 16:13 [PATCH 0/4] ARM: dts: cm-fx6: extend board support Igor Grinberg
2014-01-21 16:13 ` [PATCH 1/4] ARM: dts: cm-fx6: rearrange the dts file Igor Grinberg
2014-01-21 16:13 ` [PATCH 2/4] ARM: dts: cm-fx6: add SATA support Igor Grinberg
@ 2014-01-21 16:13 ` Igor Grinberg
2014-01-21 16:13 ` [PATCH 4/4] ARM: dts: cm-fx6: add support for USB host port 1 Igor Grinberg
3 siblings, 0 replies; 9+ messages in thread
From: Igor Grinberg @ 2014-01-21 16:13 UTC (permalink / raw)
To: linux-arm-kernel
Setup pin control, vbus regulator and the usb otg node
to enable the USB OTG support.
Signed-off-by: Igor Grinberg <grinberg@compulab•co.il>
---
arch/arm/boot/dts/imx6q-cm-fx6.dts | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/arch/arm/boot/dts/imx6q-cm-fx6.dts b/arch/arm/boot/dts/imx6q-cm-fx6.dts
index 07f90a5..039a155 100644
--- a/arch/arm/boot/dts/imx6q-cm-fx6.dts
+++ b/arch/arm/boot/dts/imx6q-cm-fx6.dts
@@ -32,7 +32,21 @@
};
};
+ regulators {
+ compatible = "simple-bus";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg_usb_otg_vbus: regulator at 0 {
+ compatible = "regulator-fixed";
+ reg = <0>;
+ regulator-name = "usb_otg_vbus";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ gpio = <&gpio3 22 0>;
+ enable-active-high;
+ };
+ };
};
&iomuxc {
@@ -48,6 +62,10 @@
pinctrl_uart4: uart4grp {
fsl,pins = <MX6QDL_UART4_PINGRP1>;
};
+
+ pinctrl_usbotg: usbotggrp {
+ fsl,pins = <MX6QDL_USBOTG_PINGRP2>;
+ };
};
};
@@ -73,3 +91,11 @@
&sata {
status = "okay";
};
+
+&usbotg {
+ vbus-supply = <®_usb_otg_vbus>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usbotg>;
+ dr_mode = "otg";
+ status = "okay";
+};
--
1.8.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 4/4] ARM: dts: cm-fx6: add support for USB host port 1
2014-01-21 16:13 [PATCH 0/4] ARM: dts: cm-fx6: extend board support Igor Grinberg
` (2 preceding siblings ...)
2014-01-21 16:13 ` [PATCH 3/4] ARM: dts: cm-fx6: add support for USB OTG Igor Grinberg
@ 2014-01-21 16:13 ` Igor Grinberg
3 siblings, 0 replies; 9+ messages in thread
From: Igor Grinberg @ 2014-01-21 16:13 UTC (permalink / raw)
To: linux-arm-kernel
Setup pin control, vbus regulator and the usb host port 1 node
to enable the USB host port 1 support.
Signed-off-by: Igor Grinberg <grinberg@compulab•co.il>
---
arch/arm/boot/dts/imx6q-cm-fx6.dts | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/arch/arm/boot/dts/imx6q-cm-fx6.dts b/arch/arm/boot/dts/imx6q-cm-fx6.dts
index 039a155..cf4c186 100644
--- a/arch/arm/boot/dts/imx6q-cm-fx6.dts
+++ b/arch/arm/boot/dts/imx6q-cm-fx6.dts
@@ -46,6 +46,16 @@
gpio = <&gpio3 22 0>;
enable-active-high;
};
+
+ reg_usb_h1_vbus: regulator at 1 {
+ compatible = "regulator-fixed";
+ reg = <1>;
+ regulator-name = "usb_h1_vbus";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ gpio = <&gpio7 8 0>;
+ enable-active-high;
+ };
};
};
@@ -66,6 +76,12 @@
pinctrl_usbotg: usbotggrp {
fsl,pins = <MX6QDL_USBOTG_PINGRP2>;
};
+
+ pinctrl_usbh1: usbh1grp {
+ fsl,pins = <
+ MX6QDL_PAD_SD3_RST__GPIO7_IO08 0x80000000
+ >;
+ };
};
};
@@ -99,3 +115,10 @@
dr_mode = "otg";
status = "okay";
};
+
+&usbh1 {
+ vbus-supply = <®_usb_h1_vbus>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usbh1>;
+ status = "okay";
+};
--
1.8.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread