[meta-freescale] [meta-fsl-arm-extra][PATCH 4/4] linux-compulab: update cm-fx6 3.14.28 kernel configuration

[Valentin Raevsky]

1) Add the patch that fixes the SD card boot issue.
2) Add the "regulators always-on" patch.

Signed-off-by: Valentin Raevsky <valentin at compulab.co.il>
---
 .../0060-ARM-i.MX6-dts-regulators-always-on.patch  | 49 +++++++++++++++++++
 ...6-cm-fx6-Fix-usdhc3-controller-s-property.patch | 56 ++++++++++++++++++++++
 2 files changed, 105 insertions(+)
 create mode 100644 recipes-kernel/linux/linux-compulab-3.14.28/0060-ARM-i.MX6-dts-regulators-always-on.patch
 create mode 100644 recipes-kernel/linux/linux-compulab-3.14.28/0061-ARM-i.MX6-cm-fx6-Fix-usdhc3-controller-s-property.patch

diff --git a/recipes-kernel/linux/linux-compulab-3.14.28/0060-ARM-i.MX6-dts-regulators-always-on.patch b/recipes-kernel/linux/linux-compulab-3.14.28/0060-ARM-i.MX6-dts-regulators-always-on.patch
new file mode 100644
index 0000000..899700b
--- /dev/null
+++ b/recipes-kernel/linux/linux-compulab-3.14.28/0060-ARM-i.MX6-dts-regulators-always-on.patch
@@ -0,0 +1,49 @@
+From d05c003c32f0d911011747cd1ad7f52839aaa27e Mon Sep 17 00:00:00 2001
+From: Valentin Raevsky <valentin at compulab.co.il>
+Date: Thu, 30 Apr 2015 13:26:48 +0300
+Subject: [PATCH 60/61] ARM: i.MX6: dts: regulators always-on
+
+Turn some regulators into always-on in order to make them work
+acording to the new regulator core rules.
+
+Signed-off-by: Valentin Raevsky <valentin at compulab.co.il>
+---
+ arch/arm/boot/dts/imx6q-cm-fx6.dtsi   | 1 +
+ arch/arm/boot/dts/imx6qdl-cm-fx6.dtsi | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/arch/arm/boot/dts/imx6q-cm-fx6.dtsi b/arch/arm/boot/dts/imx6q-cm-fx6.dtsi
+index 3a10e5e..010b74b 100644
+--- a/arch/arm/boot/dts/imx6q-cm-fx6.dtsi
++++ b/arch/arm/boot/dts/imx6q-cm-fx6.dtsi
+@@ -82,6 +82,7 @@
+ 			startup-delay-us = <100>;
+ 			enable-active-high;
+ 			regulator-boot-on;
++			regulator-always-on;
+ 			vin-supply = <&reg_sata_nstandby1>;
+ 		};
+ 
+diff --git a/arch/arm/boot/dts/imx6qdl-cm-fx6.dtsi b/arch/arm/boot/dts/imx6qdl-cm-fx6.dtsi
+index e8f80bc..d8aaaea 100644
+--- a/arch/arm/boot/dts/imx6qdl-cm-fx6.dtsi
++++ b/arch/arm/boot/dts/imx6qdl-cm-fx6.dtsi
+@@ -50,6 +50,7 @@
+ 			regulator-name = "regulator-pcie-power-on-gpio";
+ 			regulator-min-microvolt = <3300000>;
+ 			regulator-max-microvolt = <3300000>;
++			regulator-always-on;
+ 			gpio = <&gpio2 24 0>;
+ 			enable-active-high;
+ 		};
+@@ -80,6 +81,7 @@
+ 			regulator-name = "regulator-awnh387-wifi-nreset";
+ 			regulator-min-microvolt = <3300000>;
+ 			regulator-max-microvolt = <3300000>;
++			regulator-always-on;
+ 			gpio = <&gpio6 16 0>;
+ 			startup-delay-us = <10000>;
+ 		};
+-- 
+1.9.1
+
diff --git a/recipes-kernel/linux/linux-compulab-3.14.28/0061-ARM-i.MX6-cm-fx6-Fix-usdhc3-controller-s-property.patch b/recipes-kernel/linux/linux-compulab-3.14.28/0061-ARM-i.MX6-cm-fx6-Fix-usdhc3-controller-s-property.patch
new file mode 100644
index 0000000..33434e1
--- /dev/null
+++ b/recipes-kernel/linux/linux-compulab-3.14.28/0061-ARM-i.MX6-cm-fx6-Fix-usdhc3-controller-s-property.patch
@@ -0,0 +1,56 @@
+From 0c05543b40b627cc4ad842d4d99265c3943a71fa Mon Sep 17 00:00:00 2001
+From: Valentin Raevsky <valentin at compulab.co.il>
+Date: Sun, 6 Sep 2015 18:53:20 +0300
+Subject: [PATCH 61/61] ARM: i.MX6: cm-fx6: Fix usdhc3 controller's property
+
+Fix usdhc3 controller's property in ordert to match
+the sbc-fx6, sbc-fx6m hw implementation.
+
+Signed-off-by: Valentin Raevsky <valentin at compulab.co.il>
+---
+ arch/arm/boot/dts/imx6qdl-sb-fx6.dtsi  | 1 +
+ arch/arm/boot/dts/imx6qdl-sb-fx6m.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-sb-fx6x.dtsi | 2 +-
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/imx6qdl-sb-fx6.dtsi b/arch/arm/boot/dts/imx6qdl-sb-fx6.dtsi
+index 85836d7..fb389fb 100644
+--- a/arch/arm/boot/dts/imx6qdl-sb-fx6.dtsi
++++ b/arch/arm/boot/dts/imx6qdl-sb-fx6.dtsi
+@@ -72,6 +72,7 @@
+ 
+ &usdhc3 {
+ 	wp-gpios = <&gpio7 0 0>;
++	cd-gpios = <&gpio7 1 0>;
+ 	status = "okay";
+ };
+ 
+diff --git a/arch/arm/boot/dts/imx6qdl-sb-fx6m.dtsi b/arch/arm/boot/dts/imx6qdl-sb-fx6m.dtsi
+index 5394364..dc6449d 100644
+--- a/arch/arm/boot/dts/imx6qdl-sb-fx6m.dtsi
++++ b/arch/arm/boot/dts/imx6qdl-sb-fx6m.dtsi
+@@ -93,6 +93,7 @@
+ };
+ 
+ &usdhc3 {
++	non-removable;
+ 	status = "okay";
+ };
+ 
+diff --git a/arch/arm/boot/dts/imx6qdl-sb-fx6x.dtsi b/arch/arm/boot/dts/imx6qdl-sb-fx6x.dtsi
+index 01f73ae..f98a87d 100644
+--- a/arch/arm/boot/dts/imx6qdl-sb-fx6x.dtsi
++++ b/arch/arm/boot/dts/imx6qdl-sb-fx6x.dtsi
+@@ -103,8 +103,8 @@
+ 	pinctrl-0 = <&pinctrl_usdhc3>;
+ 	pinctrl-1 = <&pinctrl_usdhc3_100mhz>;
+ 	pinctrl-2 = <&pinctrl_usdhc3_200mhz>;
+-	cd-gpios = <&gpio7 1 0>;
+ 	no-1-8-v;
++	keep-power-in-suspend;
+ 	vmmc-supply = <&reg_3p3v>;
+ 	status = "disabled";
+ };
+-- 
+1.9.1
+
-- 
1.9.1