diff options
| author | Peng Fan <Peng.Fan@freescale.com> | 2015-10-30 15:59:58 +0800 |
|---|---|---|
| committer | Peng Fan <Peng.Fan@freescale.com> | 2015-10-30 19:30:24 +0800 |
| commit | a134f9e3fc927844c47792520593b2a99f64f378 (patch) | |
| tree | 4ca14a6d06b40070767cd8eaaf8f596f78104f9f | |
| parent | 21604335a9a1985126d4ff6bde12b0618329d31c (diff) | |
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)
| -rw-r--r-- | arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-m4.dts | 21 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7d-sdb-m4.dts | 17 |
2 files changed, 6 insertions, 32 deletions
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 46b359f2a97c..1c8de620f2de 100644 --- a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-m4.dts +++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-m4.dts @@ -5,6 +5,10 @@ memory { linux,usable-memory = <0x80000000 0x3ff00000>; }; + + gpio-keys { + status = "disabled"; + }; }; &adc1 { @@ -15,17 +19,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"; }; @@ -47,11 +40,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 d0bb0496c43a..8586ed1554cd 100644 --- a/arch/arm/boot/dts/imx7d-sdb-m4.dts +++ b/arch/arm/boot/dts/imx7d-sdb-m4.dts @@ -31,17 +31,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{ |