diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2017-11-21 10:46:53 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-12-24 01:27:21 +0100 |
| commit | b1780786b82503f13cd7c0a45c4b51a4cf7dede9 (patch) | |
| tree | 840fdb1176a5317ec37492b501f6237d2d4bd8d3 /arch/arm/boot/dts/imx7-colibri.dtsi | |
| parent | 865b93c6c6db49e2e5734a9a6295cbddae42f657 (diff) | |
ARM: dts: imx7d: move nodes to i.MX 7Solo device tree
With commit 08bfe5a4dc4b ("MLK-11265-1 ARM: dts: add imx7d soc
dtsi support") introduced several device tree nodes supported
in the NXP kernel. However, the nodes have been added to the
i.MX 7Dual device tree, altough also available on i.MX 7Solo.
Move the device tree nodes which are applicable for i.MX 7Solo
to the imx7s.dtsi base device tree.
This also merges some device tree nodes which have been
overwritten by the imx7d.dtsi dt before (ocotp/snvs).
Plus removes the dma_apbh and gpmi device tree nodes which previously
already got added by
commit 1a4aa043b4c1 ("ARM: dts: imx7: add GPMI NAND and APBH DMA")
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'arch/arm/boot/dts/imx7-colibri.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx7-colibri.dtsi | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi index 675a16d96ae8..2af233fafd9b 100644 --- a/arch/arm/boot/dts/imx7-colibri.dtsi +++ b/arch/arm/boot/dts/imx7-colibri.dtsi @@ -259,10 +259,6 @@ status = "okay"; }; -&snvs_pwrkey { - status = "disabled"; -}; - &uart1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1 &pinctrl_uart1_ctrl1 &pinctrl_uart1_ctrl2>; |