MLK-11801 imx: mx7d: resolve conflicts with A7 and M4

M4 will use UART2, and RDC is configured that kernel can not
access. If still enable it, kernel will panic.

To validation board, disable gpio-keys, since m4 will use volume keys.

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
(cherry picked from commit ccd54fd2096b8f3443bafd0b86499e1eda027fc9)

Conflicts:
	arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-m4.dts

diff --git a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-m4.dts b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-m4.dts
index c4c6e30..ae4a080 100644 (file)
--- a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-m4.dts
+++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-m4.dts
@@ -7,6 +7,10 @@
                                <0xa0000000 0x1ff00000>,
                                <0xc0000000 0x40000000>;
        };
+
+       gpio-keys {
+               status = "disabled";
+       };
 };
 
 &adc1 {
@@ -30,17 +34,6 @@
        status = "disabled";
 };
 
-&iomuxc {
-       imx7d-12x12-lpddr3-arm2 {
-               pinctrl_uart2_1: uart2grp-1 {
-                       fsl,pins = <
-                               MX7D_PAD_UART2_RX_DATA__UART2_DCE_RX    0x79
-                               MX7D_PAD_UART2_TX_DATA__UART2_DCE_TX    0x79
-                       >;
-               };
-       };
-};
-
 &gpt3 {
        status = "disabled";
 };
@@ -58,11 +51,7 @@
 };
 
 &uart2 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart2_1>;
-       assigned-clocks = <&clks IMX7D_UART2_ROOT_SRC>;
-       assigned-clock-parents = <&clks IMX7D_OSC_24M_CLK>;
-       status = "okay";
+       status = "disabled";
 };
 
 &wdog3{

diff --git a/arch/arm/boot/dts/imx7d-sdb-m4.dts b/arch/arm/boot/dts/imx7d-sdb-m4.dts
index 2246cb3..85fb1b9 100644 (file)
--- a/arch/arm/boot/dts/imx7d-sdb-m4.dts
+++ b/arch/arm/boot/dts/imx7d-sdb-m4.dts
@@ -35,17 +35,6 @@
        status = "disabled";
 };
 
-&iomuxc {
-       imx7d-sdb {
-               pinctrl_uart2_1: uart2grp-1 {
-                       fsl,pins = <
-                               MX7D_PAD_UART2_RX_DATA__UART2_DCE_RX    0x79
-                               MX7D_PAD_UART2_TX_DATA__UART2_DCE_TX    0x79
-                       >;
-               };
-       };
-};
-
 &gpt3 {
        status = "disabled";
 };
@@ -63,11 +52,7 @@
 };
 
 &uart2 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart2_1>;
-       assigned-clocks = <&clks IMX7D_UART2_ROOT_SRC>;
-       assigned-clock-parents = <&clks IMX7D_OSC_24M_CLK>;
-       status = "okay";
+       status = "disabled";
 };
 
 &wdog3{