summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
AgeCommit message (Collapse)Author
2020-02-09ARM: dts: imx6ull-colibri-aster: Follow pinctrl naming from mainlineMax Krummenacher
While at it, add the dtbs for Aster Carrier Board to the Makefile. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-02-09ARM: dts: imx6ull-colibri: add missing #endifMax Krummenacher
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-02-09ARM: dts (ds): imx6ull*colibri*: Merge changes from 4.9-2.3.x-imx-nextPhilippe Schenker
In 4.14 devicetress are based on the mainline DT's and only necessary stuff for downstream is put into those devicetrees. This commit holds the changes for imx6ull*colibri* from 4.9. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: dts: imx6ull-colibri: Add touchscreens used with Eval BoardPhilippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: dts: imx6ull-colibri: Add general wakeup key used on ColibriPhilippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: dts: imx6ull: improve can templatesMax Krummenacher
Add the pinmuxing and a inactive node for flexcan1 on SODIMM 55/63 and move the inactive flexcan modes to imx6ull-colibri-eval-v3.dtsi where they belong. Note that this commit does not enable flexcan functionality, but rather eases the effort needed to do so. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit 983ff8a6b61e9466beb6b4781fb370a6a7da937a) Conflicts: arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi arch/arm/boot/dts/imx6ull-colibri.dtsi Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com
2020-02-09ARM: dts: imx6ull: add Toradex Colibri iMX6ULL supportStefan Agner
Add support for the Computer on Module Colibri iMX6ULL and its Bluetooth/Wifi variant along with the development/evaluation carrier board device trees. Follow the usual hierarchic include model, maintaining shared configuration in imx6ull-colibri.dtsi and imx6ull-colibri-eval-v3.dtsi respectively. Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Shawn Guo <shawnguo@kernel.org> (cherry picked from commit c2e4987e0e02095ed3d19e958b3891954ef38243)