diff options
| author | Luwei Zhou <b45643@freescale.com> | 2015-04-08 15:21:09 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2015-05-08 17:24:31 +0800 |
| commit | 9eca634c1bcfb4f3e5b2b1f98bc67dc08aded991 (patch) | |
| tree | d119132993f328c4494ffc39d11bf857fe584857 /arch | |
| parent | d98d921d9d5f0610a416a10162ce1f922d8331d4 (diff) | |
MLK-10600-4 ARM: dts: imx7d: Enable the SIM1 devicetree on the i.MX7d-12x12-arm2 platform.
The SIM1 has the pin conflict with Flexcan1, Flexcan2 and SAI1. Need to rework. So create
a new device tree to enable SIM1 dts.
Signed-off-by: Luwei Zhou <b45643@freescale.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/imx7d-12x12-arm2-sim.dts | 29 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7d-12x12-arm2.dts | 19 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7d.dtsi | 2 |
3 files changed, 50 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx7d-12x12-arm2-sim.dts b/arch/arm/boot/dts/imx7d-12x12-arm2-sim.dts new file mode 100644 index 000000000000..4224b1d8e128 --- /dev/null +++ b/arch/arm/boot/dts/imx7d-12x12-arm2-sim.dts @@ -0,0 +1,29 @@ +/* + * 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-12x12-arm2.dts" + +/* + * The sim1 has pin conflicts with flexcan1,flexcan2 and sai1. + * Need to rework the pin and disable the conflict modules. + */ +&flexcan1 { + status = "disabled"; +}; + +&flexcan2 { + status = "disabled"; +}; + +&sai1 { + status = "disabled"; +}; + +&sim1 { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/imx7d-12x12-arm2.dts b/arch/arm/boot/dts/imx7d-12x12-arm2.dts index 801db1a717cb..93645a355923 100644 --- a/arch/arm/boot/dts/imx7d-12x12-arm2.dts +++ b/arch/arm/boot/dts/imx7d-12x12-arm2.dts @@ -329,6 +329,12 @@ status = "okay"; }; +&sim1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sim1_1>; + status = "disabled"; +}; + &uart1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1_1>; @@ -588,6 +594,19 @@ }; }; + sim1 { + pinctrl_sim1_1: sim1grp-1 { + fsl,pins = < + MX7D_PAD_SAI1_TX_SYNC__SIM1_PORT1_RST_B 0x77 + MX7D_PAD_SAI1_RX_SYNC__SIM1_PORT1_PD 0x77 + MX7D_PAD_SAI1_TX_DATA__SIM1_PORT1_SVEN 0x77 + MX7D_PAD_SAI1_TX_BCLK__SIM1_PORT1_CLK 0x73 + MX7D_PAD_SAI1_RX_DATA__SIM1_PORT1_TRXD 0x73 + + >; + }; + }; + uart1 { pinctrl_uart1_1: uart1grp-1 { fsl,pins = < diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi index 0e3fa9cd9be2..f3f019365c55 100644 --- a/arch/arm/boot/dts/imx7d.dtsi +++ b/arch/arm/boot/dts/imx7d.dtsi @@ -1169,6 +1169,8 @@ compatible = "fsl,imx7d-sim"; reg = <0x30b90000 0x10000>; interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clks IMX7D_SIM1_ROOT_CLK>; + clock-names = "sim"; status = "disabled"; }; |