MLK-11286-2 ARM: dts: enable rpmsg support on imx7d

- enable rpmsg on imx7d platforms
- since there are some modules conflictions between A# and m4,
add new *-m4.dts files, that used when m4 core is kicked off.

Signed-off-by: Richard Zhu <Richard.Zhu@freescale.com>

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index d76ba18..2d68805 100644 (file)
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -431,9 +431,11 @@ dtb-$(CONFIG_SOC_IMX7D) += \
        imx7d-nitrogen7.dtb \
        imx7d-sbc-imx7.dtb \
        imx7d-sdb.dtb \
+       imx7d-sdb-m4.dtb \
        imx7s-colibri-eval-v3.dtb \
        imx7s-warp.dtb \
-       imx7d-12x12-lpddr3-arm2.dtb
+       imx7d-12x12-lpddr3-arm2.dtb \
+       imx7d-12x12-lpddr3-arm2-m4.dtb
 dtb-$(CONFIG_SOC_LS1021A) += \
        ls1021a-qds.dtb \
        ls1021a-twr.dtb

diff --git a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-m4.dts b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-m4.dts
new file mode 100644 (file)
index 0000000..b20593c
--- /dev/null
+++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-m4.dts
@@ -0,0 +1,64 @@
+
+#include "imx7d-12x12-lpddr3-arm2.dts"
+
+/ {
+       memory {
+               linux,usable-memory = <0x80000000 0x3ff00000>;
+       };
+};
+
+&adc1 {
+       status = "disabled";
+};
+
+&adc2 {
+       status = "disabled";
+};
+
+
+&i2c1 {
+       status = "disabled";
+};
+
+&flexcan1 {
+       status = "disabled";
+};
+
+&flexcan2 {
+       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";
+};
+
+&gpt4 {
+       status = "disabled";
+};
+
+&rpmsg{
+       status = "okay";
+};
+
+&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";
+};
+
+&wdog3{
+       status = "disabled";
+};

diff --git a/arch/arm/boot/dts/imx7d-sdb-m4.dts b/arch/arm/boot/dts/imx7d-sdb-m4.dts
new file mode 100644 (file)
index 0000000..f22b48b
--- /dev/null
+++ b/arch/arm/boot/dts/imx7d-sdb-m4.dts
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2015 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "imx7d-sdb.dts"
+
+/ {
+       memory {
+               linux,usable-memory = <0x80000000 0x3ff00000>;
+               reg = <0x80000000 0x80000000>;
+       };
+};
+
+&adc1 {
+       status = "disabled";
+};
+
+&adc2 {
+       status = "disabled";
+};
+
+&flexcan1 {
+       status = "disabled";
+};
+
+&flexcan2 {
+       status = "disabled";
+};
+
+&i2c2 {
+       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";
+};
+
+&gpt4 {
+       status = "disabled";
+};
+
+&rpmsg{
+       status = "okay";
+};
+
+&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";
+};
+
+&wdog3{
+       status = "disabled";
+};

diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi
index d4a450e..7f9e3d2 100644 (file)
--- a/arch/arm/boot/dts/imx7d.dtsi
+++ b/arch/arm/boot/dts/imx7d.dtsi
@@ -420,16 +420,6 @@
                status = "okay";
        };
 
-       mcctest: mcctest{
-               compatible = "fsl,imx6sx-mcc-test";
-               status = "disabled";
-       };
-
-       mcctty: mcctty{
-               compatible = "fsl,imx6sx-mcc-tty";
-               status = "disabled";
-       };
-
        rpmsg: rpmsg{
                compatible = "fsl,imx7d-rpmsg";
                status = "disabled";