[U-Boot] [PATCH 1/2] [for v2018.03] ARM: dts: imx6qdl-icore-rqs: Sync usdhc4 node from Linux

[U-Boot] [PATCH 1/2] [for v2018.03] ARM: dts: imx6qdl-icore-rqs: Sync usdhc4 node from Linux

[Jagan Teki]

usdhc4 node need to update pinctrl, bus-width and non-removable
properties, sync the same from Linux.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
 arch/arm/dts/imx6qdl-icore-rqs.dtsi | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/arch/arm/dts/imx6qdl-icore-rqs.dtsi b/arch/arm/dts/imx6qdl-icore-rqs.dtsi
index 1623838490..4f7f10203d 100644
--- a/arch/arm/dts/imx6qdl-icore-rqs.dtsi
+++ b/arch/arm/dts/imx6qdl-icore-rqs.dtsi
@@ -115,9 +115,13 @@
 
 &usdhc4 {
 	u-boot,dm-spl;
-	pinctrl-names = "default";
+	pinctrl-names = "default", "state_100mhz", "state_200mhz";
 	pinctrl-0 = <&pinctrl_usdhc4>;
+	pinctrl-1 = <&pinctrl_usdhc4_100mhz>;
+	pinctrl-2 = <&pinctrl_usdhc4_200mhz>;
+	bus-witdh = <8>;
 	no-1-8-v;
+	non-removable;
 	status = "okay";
 };
 
@@ -198,4 +202,35 @@
 			MX6QDL_PAD_SD4_DAT7__SD4_DATA7 0x17070
 		>;
 	};
+
+	pinctrl_usdhc4_100mhz: usdhc4grp_100mhz {
+		fsl,pins = <
+			MX6QDL_PAD_SD4_CMD__SD4_CMD    0x170B1
+			MX6QDL_PAD_SD4_CLK__SD4_CLK    0x100B1
+			MX6QDL_PAD_SD4_DAT0__SD4_DATA0 0x170B1
+			MX6QDL_PAD_SD4_DAT1__SD4_DATA1 0x170B1
+			MX6QDL_PAD_SD4_DAT2__SD4_DATA2 0x170B1
+			MX6QDL_PAD_SD4_DAT3__SD4_DATA3 0x170B1
+			MX6QDL_PAD_SD4_DAT4__SD4_DATA4 0x170B1
+			MX6QDL_PAD_SD4_DAT5__SD4_DATA5 0x170B1
+			MX6QDL_PAD_SD4_DAT6__SD4_DATA6 0x170B1
+			MX6QDL_PAD_SD4_DAT7__SD4_DATA7 0x170B1
+		>;
+	};
+
+	pinctrl_usdhc4_200mhz: usdhc4grp_200mhz {
+		fsl,pins = <
+			MX6QDL_PAD_SD4_CMD__SD4_CMD    0x170F9
+			MX6QDL_PAD_SD4_CLK__SD4_CLK    0x100F9
+			MX6QDL_PAD_SD4_DAT0__SD4_DATA0 0x170F9
+			MX6QDL_PAD_SD4_DAT1__SD4_DATA1 0x170F9
+			MX6QDL_PAD_SD4_DAT2__SD4_DATA2 0x170F9
+			MX6QDL_PAD_SD4_DAT3__SD4_DATA3 0x170F9
+			MX6QDL_PAD_SD4_DAT4__SD4_DATA4 0x170F9
+			MX6QDL_PAD_SD4_DAT5__SD4_DATA5 0x170F9
+			MX6QDL_PAD_SD4_DAT6__SD4_DATA6 0x170F9
+			MX6QDL_PAD_SD4_DAT7__SD4_DATA7 0x170F9
+		>;
+	};
+
 };
-- 
2.14.3

[U-Boot] [PATCH 2/2] [for v2018.03] ARM: dts: imx6dl-icore-rqs: Fix to include correct dtsi

[Jagan Teki]

This patch fixes the wrongly included dtsi file which was
breaking mainline support for Engicam i.CoreM6 DualLite/Solo RQS.

Linux commit details for the same change as
"ARM: dts: imx6dl: Include correct dtsi file for Engicam i.CoreM6
DualLite/Solo RQS"
(sha1: c0c6bb2322964bd264b4ddedaa5776f40c709f0c)

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
 arch/arm/dts/imx6dl-icore-rqs.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/dts/imx6dl-icore-rqs.dts b/arch/arm/dts/imx6dl-icore-rqs.dts
index 0f1de3f18c..820e66c724 100644
--- a/arch/arm/dts/imx6dl-icore-rqs.dts
+++ b/arch/arm/dts/imx6dl-icore-rqs.dts
@@ -41,7 +41,7 @@
 
 /dts-v1/;
 
-#include "imx6q.dtsi"
+#include "imx6dl.dtsi"
 #include "imx6qdl-icore-rqs.dtsi"
 
 / {
-- 
2.14.3

[U-Boot] [PATCH 1/2] [for v2018.03] ARM: dts: imx6qdl-icore-rqs: Sync usdhc4 node from Linux

[Fabio Estevam]

On Tue, Mar 6, 2018 at 8:45 AM, Jagan Teki <jagannadh.teki@gmail.com> wrote:
> usdhc4 node need to update pinctrl, bus-width and non-removable
> properties, sync the same from Linux.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>

Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>

[U-Boot] [PATCH 2/2] [for v2018.03] ARM: dts: imx6dl-icore-rqs: Fix to include correct dtsi

[Fabio Estevam]

On Tue, Mar 6, 2018 at 8:45 AM, Jagan Teki <jagannadh.teki@gmail.com> wrote:
> This patch fixes the wrongly included dtsi file which was
> breaking mainline support for Engicam i.CoreM6 DualLite/Solo RQS.
>
> Linux commit details for the same change as
> "ARM: dts: imx6dl: Include correct dtsi file for Engicam i.CoreM6
> DualLite/Solo RQS"
> (sha1: c0c6bb2322964bd264b4ddedaa5776f40c709f0c)
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>

Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>

[U-Boot] [PATCH 2/2] [for v2018.03] ARM: dts: imx6dl-icore-rqs: Fix to include correct dtsi

[Jagan Teki]

Hi Stefano,

On Tue, Mar 6, 2018 at 6:45 PM, Fabio Estevam <festevam@gmail.com> wrote:
> On Tue, Mar 6, 2018 at 8:45 AM, Jagan Teki <jagannadh.teki@gmail.com> wrote:
>> This patch fixes the wrongly included dtsi file which was
>> breaking mainline support for Engicam i.CoreM6 DualLite/Solo RQS.
>>
>> Linux commit details for the same change as
>> "ARM: dts: imx6dl: Include correct dtsi file for Engicam i.CoreM6
>> DualLite/Solo RQS"
>> (sha1: c0c6bb2322964bd264b4ddedaa5776f40c709f0c)
>>
>> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
>
> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>

Can you pick these two for the release?

[U-Boot] [PATCH 2/2] [for v2018.03] ARM: dts: imx6dl-icore-rqs: Fix to include correct dtsi

[Stefano Babic]

On 09/03/2018 13:13, Jagan Teki wrote:
> Hi Stefano,
> 
> On Tue, Mar 6, 2018 at 6:45 PM, Fabio Estevam <festevam@gmail.com> wrote:
>> On Tue, Mar 6, 2018 at 8:45 AM, Jagan Teki <jagannadh.teki@gmail.com> wrote:
>>> This patch fixes the wrongly included dtsi file which was
>>> breaking mainline support for Engicam i.CoreM6 DualLite/Solo RQS.
>>>
>>> Linux commit details for the same change as
>>> "ARM: dts: imx6dl: Include correct dtsi file for Engicam i.CoreM6
>>> DualLite/Solo RQS"
>>> (sha1: c0c6bb2322964bd264b4ddedaa5776f40c709f0c)
>>>
>>> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
>>
>> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
> 
> Can you pick these two for the release?
> 

Applied to -um-boot-imx, master, and I will send my PR to Tom with these
fixes.

Regards,
Stefano
-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================