MXSCM-293-1 arm: dts: fixes for MX6 SCM devices on L4.9

- replace legacy wakeup property with 'wakeup-source'
- add "jedec,spi-nor" flash compatible binding
- fix lcd display id
- fixig typo for gpios
- use external wdog_b reset instead of issuing a sw reset
- add off-on-delay for usdhc vmmc-supply regulator on mx6sxscm
- add missing sai1 and wdog1 configs for mx6sxscm
- fix vgen6 regulator maximum microvolt for mx6dqscm
- disable CAAM since cannot coexist with LCDIF for mx6sxscm
- add the reg into the rpmsg node for mx6sxscm

Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>

7 files changed, 30 insertions, 15 deletions

diff --git a/arch/arm/boot/dts/imx6dqscm-1gb-evb-fix-ldo.dts b/arch/arm/boot/dts/imx6dqscm-1gb-evb-fix-ldo.dts
index f0dcf7dc9b96..1013cf7d3997 100644
--- a/arch/arm/boot/dts/imx6dqscm-1gb-evb-fix-ldo.dts
+++ b/arch/arm/boot/dts/imx6dqscm-1gb-evb-fix-ldo.dts
@@ -32,7 +32,7 @@
 	internal_scm_flash: m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "micron,n25q128a13";
+		compatible = "micron,n25q128a13", "jedec,spi-nor";
 		spi-max-frequency = <20000000>;
 		reg = <0>;
 	};
@@ -151,7 +151,7 @@
 
 			vgen6_reg: vgen6 {
 				regulator-min-microvolt = <1800000>;
-				regulator-max-microvolt = <3150000>;
+				regulator-max-microvolt = <3300000>;
 				regulator-always-on;
 			};
 		};
diff --git a/arch/arm/boot/dts/imx6dqscm-1gb-evb-interleave-android-ldo.dts b/arch/arm/boot/dts/imx6dqscm-1gb-evb-interleave-android-ldo.dts
index e0ca32841ced..5136cd77ed4b 100644
--- a/arch/arm/boot/dts/imx6dqscm-1gb-evb-interleave-android-ldo.dts
+++ b/arch/arm/boot/dts/imx6dqscm-1gb-evb-interleave-android-ldo.dts
@@ -28,7 +28,7 @@
 	internal_scm_flash: m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "micron,n25q128a13";
+		compatible = "micron,n25q128a13", "jedec,spi-nor";
 		spi-max-frequency = <20000000>;
 		reg = <0>;
 	};
@@ -140,7 +140,7 @@
 
 			vgen6_reg: vgen6 {
 				regulator-min-microvolt = <1800000>;
-				regulator-max-microvolt = <3150000>;
+				regulator-max-microvolt = <3300000>;
 				regulator-always-on;
 			};
 		};
diff --git a/arch/arm/boot/dts/imx6dqscm-qwks-rev2.dtsi b/arch/arm/boot/dts/imx6dqscm-qwks-rev2.dtsi
index c421e9588fbb..bc74d32f451e 100644
--- a/arch/arm/boot/dts/imx6dqscm-qwks-rev2.dtsi
+++ b/arch/arm/boot/dts/imx6dqscm-qwks-rev2.dtsi
@@ -125,7 +125,7 @@
 		power {
 			label = "Power Button";
 			gpios = <&gpio5 2 GPIO_ACTIVE_LOW>;
-			gpio-key,wakeup;
+			wakeup-source;
 			linux,code = <KEY_POWER>;
 		};
 	};
@@ -163,7 +163,7 @@
 	flash: m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "micron,n25q128a13";
+		compatible = "micron,n25q128a13", "jedec,spi-nor";
 		spi-max-frequency = <20000000>;
 		reg = <0>;
 	};
@@ -286,7 +286,7 @@
 
 			vgen6_reg: vgen6 {
 				regulator-min-microvolt = <1800000>;
-				regulator-max-microvolt = <3150000>;
+				regulator-max-microvolt = <3300000>;
 				regulator-always-on;
 			};
 		};
@@ -483,7 +483,7 @@
 
 &hdmi_core {
 	ipu_id = <0>;
-	disp_id = <0>;
+	disp_id = <1>;
 	status = "okay";
 };
 
@@ -605,6 +605,7 @@
 &wdog2 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_wdog>;
+	fsl,ext-reset-output;
 	fsl,wdog_b;
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx6sxscm-1gb-evb-lcdif1-ldo.dts b/arch/arm/boot/dts/imx6sxscm-1gb-evb-lcdif1-ldo.dts
index 5b3e05416b1c..03ddbe9e6525 100644
--- a/arch/arm/boot/dts/imx6sxscm-1gb-evb-lcdif1-ldo.dts
+++ b/arch/arm/boot/dts/imx6sxscm-1gb-evb-lcdif1-ldo.dts
@@ -35,4 +35,8 @@
 
 &ov5640 {
 	status = "disabled";
-};
\ No newline at end of file
+};
+
+&crypto {
+	status = "disabled";
+};
diff --git a/arch/arm/boot/dts/imx6sxscm-1gb-evb-m4-ldo.dts b/arch/arm/boot/dts/imx6sxscm-1gb-evb-m4-ldo.dts
index 8839631b3404..af0e8be603ed 100644
--- a/arch/arm/boot/dts/imx6sxscm-1gb-evb-m4-ldo.dts
+++ b/arch/arm/boot/dts/imx6sxscm-1gb-evb-m4-ldo.dts
@@ -56,6 +56,8 @@
 };
 
 &rpmsg{
+	vdev-nums = <1>;
+	reg = <0xbfff0000 0x10000>;
 	status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx6sxscm-512mb-evb-m4-ldo.dts b/arch/arm/boot/dts/imx6sxscm-512mb-evb-m4-ldo.dts
index a43f8d724a19..240859445747 100644
--- a/arch/arm/boot/dts/imx6sxscm-512mb-evb-m4-ldo.dts
+++ b/arch/arm/boot/dts/imx6sxscm-512mb-evb-m4-ldo.dts
@@ -14,5 +14,6 @@
 };
 
 &rpmsg{
-	reg = <0x9FFF0000 0x8000>;
+	vdev-nums = <1>;
+	reg = <0x9FFF0000 0x10000>;
 };
diff --git a/arch/arm/boot/dts/imx6sxscm-evb.dts b/arch/arm/boot/dts/imx6sxscm-evb.dts
index a905b7105655..97651e7e6b6c 100644
--- a/arch/arm/boot/dts/imx6sxscm-evb.dts
+++ b/arch/arm/boot/dts/imx6sxscm-evb.dts
@@ -85,6 +85,7 @@
 			regulator-min-microvolt = <3000000>;
 			regulator-max-microvolt = <3000000>;
 			gpio = <&gpio2 11 GPIO_ACTIVE_HIGH>;
+			off-on-delay = <20000>;
 			enable-active-high;
 		};
 
@@ -136,7 +137,7 @@
 			regulator-name = "peri_3v3";
 			regulator-min-microvolt = <3300000>;
 			regulator-max-microvolt = <3300000>;
-			gpios = <&gpio4 16 GPIO_ACTIVE_HIGH>;
+			gpio = <&gpio4 16 GPIO_ACTIVE_HIGH>;
 			enable-active-high;
 			regulator-always-on;
 		};
@@ -548,7 +549,7 @@
 	display = <&display0>;
 	status = "disabled";
 
-	display0: display {
+	display0: display@0 {
 		bits-per-pixel = <16>;
 		bus-width = <24>;
 
@@ -578,7 +579,7 @@
 	disp-dev = "ldb";
 	status = "okay";
 
-	display1: display {
+	display1: display@1 {
 		bits-per-pixel = <16>;
 		bus-width = <18>;
 	};
@@ -630,6 +631,12 @@
 	status = "okay";
 };
 
+&sai1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_sai1>;
+	status = "disabled";
+};
+
 &spdif {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_spdif>;
@@ -668,7 +675,7 @@
 	wifi-host;
 	no-1-8-v;
 	keep-power-in-suspend;
-	enable-sdio-wakeup;
+	wakeup-source;
 	status = "okay";
 };
 
@@ -681,7 +688,7 @@
 	cd-gpios = <>;
 	wp-gpios = <>;
 	keep-power-in-suspend;
-	enable-sdio-wakeup;
+	wakeup-source;
 	pm-ignore-notify;
 	vmmc-supply = <>;
 	status = "okay";