diff options
| author | Fugang Duan <b38611@freescale.com> | 2016-02-01 16:10:44 +0800 |
|---|---|---|
| committer | Fugang Duan <b38611@freescale.com> | 2016-02-02 16:22:09 +0800 |
| commit | 965501f82361f5014de1534380d4a506762d6935 (patch) | |
| tree | 7242308f28908e2f19663d85f3e5e0968440f82a /arch | |
| parent | e8739e093d58582ea8da1f4416496528e969ac25 (diff) | |
MLK-12370 ARM: dts: imx7d-12x12-lpddr3-arm2: disable sim1 node in flexcan dts file
The sim1 has pin conflicts with flexcan1,flexcan2 and sai1.
By default, imx7d 12x12 lpddr3 arm2 default dts enable sim1 node
and disable flexcan1, flexcan2, sai1 nodes.
The patch do two things:
- disable sim1 node in extended flexcan dts file
- remove redundant sim1 node in default dts file
Signed-off-by: Fugang Duan <B38611@freescale.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-flexcan.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-flexcan.dts b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-flexcan.dts index 1888c874da12..90ea88599b70 100644 --- a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-flexcan.dts +++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-flexcan.dts @@ -23,3 +23,7 @@ &sai1 { status = "disabled"; }; + +&sim1 { + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts index 63a840bf1763..a6317b96b3f5 100644 --- a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts +++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts @@ -905,7 +905,7 @@ pinctrl-names = "default", "sleep"; pinctrl-0 = <&pinctrl_sim1_1>; pinctrl-1 = <&pinctrl_sim1_1>; - status = "disabled"; + status = "okay"; }; &uart1 { @@ -989,12 +989,6 @@ status = "okay"; }; -&sim1 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_sim1_1>; - status = "okay"; -}; - &wdog1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_wdog>; |