summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx7s-colibri.dtsi
AgeCommit message (Collapse)Author
2020-02-09ARM: dts: enable gpmi for the iMX7 eMMC 1GB variantPhilippe Schenker
Enable gpmi part nessesary for Colibri iMX7 Dual 1GB (eMMC). Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: dts: imx7: Fix memory node duplicationFabio Estevam
Boards based on imx7 have duplicate memory nodes: - One coming from the board dts file: memory@ - One coming from the imx7s.dtsi file. Fix the duplication by removing the memory node from the dtsi file and by adding 'device_type = "memory";' in the board dts. Reported-by: Rob Herring <robh@kernel.org> Signed-off-by: Fabio Estevam <festevam@gmail.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org> (cherry picked from commit 29988e867cb17de7119e971f9acfad2c3fccdb47) Conflicts: arch/arm/boot/dts/imx7d-cl-som-imx7.dts arch/arm/boot/dts/imx7d-colibri-emmc.dtsi arch/arm/boot/dts/imx7d-colibri.dtsi arch/arm/boot/dts/imx7d-nitrogen7.dts arch/arm/boot/dts/imx7d-pico.dtsi arch/arm/boot/dts/imx7d-sdb.dts arch/arm/boot/dts/imx7s-colibri.dtsi arch/arm/boot/dts/imx7s-warp.dts arch/arm/boot/dts/imx7s.dtsi Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2016-06-28ARM: dts: imx7: add Toradex Colibri iMX7S/iMX7D supportStefan Agner
Add support for the Computer on Module Colibri iMX7S/iMX7D along with the development/evaluation carrier board device trees. Follow the usual hierarchic include model, maintaining shared configuration in imx7-colibri.dtsi and imx7-colibri-eval-v3.dtsi respectively. Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Shawn Guo <shawnguo@kernel.org>