From b8671992579ad5a544ebecdef3a1e80667cd002a Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 23 Nov 2013 01:04:43 +0000 Subject: [PATCH] Fix ARM Utilite DTB --- arm-imx6-utilite.patch | 19 +++++++++++++++---- kernel.spec | 3 +++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/arm-imx6-utilite.patch b/arm-imx6-utilite.patch index 8f942f014..58a839a6e 100644 --- a/arm-imx6-utilite.patch +++ b/arm-imx6-utilite.patch @@ -18,15 +18,15 @@ the Ethernet adapter and the hearbeat led. Signed-off-by: Valentin Raevsky Acked-by: Igor Grinberg --- - arch/arm/boot/dts/cm-fx6.dts | 51 ++++++++++++++++++++++++++++++++++++++++++ + arch/arm/boot/dts/imx6q-cm-fx6.dts | 51 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) - create mode 100644 arch/arm/boot/dts/cm-fx6.dts + create mode 100644 arch/arm/boot/dts/imx6q-cm-fx6.dts -diff --git a/arch/arm/boot/dts/cm-fx6.dts b/arch/arm/boot/dts/cm-fx6.dts +diff --git a/arch/arm/boot/dts/imx6q-cm-fx6.dts b/arch/arm/boot/dts/imx6q-cm-fx6.dts new file mode 100644 index 0000000..1080215 --- /dev/null -+++ b/arch/arm/boot/dts/cm-fx6.dts ++++ b/arch/arm/boot/dts/imx6q-cm-fx6.dts @@ -0,0 +1,51 @@ +/* + * Copyright 2013 CompuLab Ltd. @@ -79,6 +79,17 @@ index 0000000..1080215 + pinctrl-0 = <&pinctrl_uart4_1>; + status = "okay"; +}; +diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -137,6 +137,7 @@ + imx6dl-sabresd.dtb \ + imx6dl-wandboard.dtb \ + imx6q-arm2.dtb \ ++ imx6q-cm-fx6.dtb \ + imx6q-phytec-pbab01.dtb \ + imx6q-sabreauto.dtb \ + imx6q-sabrelite.dtb \ -- 1.7.9.5 diff --git a/kernel.spec b/kernel.spec index 449df7d9c..5d03c39f9 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2291,6 +2291,9 @@ fi # ||----w | # || || %changelog +* Fri Nov 22 2013 Peter Robinson +- Fix ARM Utilite DTB + * Fri Nov 22 2013 Josh Boyer - Add patches from Jeff Layton to fix 15sec NFS mount hang