summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/Makefile
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2019-11-06 18:47:19 +0300
committerOlof Johansson <olof@lixom.net>2019-11-06 18:47:35 +0300
commit405b7b271c8bbcd72bab9909523d2c38c8c040e9 (patch)
tree99a399f9812639fff16b6afe668e88448bfeaee9 /arch/arm/boot/dts/Makefile
parent51535d88ac974c4965c45b9e3a5cafd83f1f6ab7 (diff)
parentcc55c85d257e5d8435592643f4aeee683a8fa46f (diff)
downloadlinux-405b7b271c8bbcd72bab9909523d2c38c8c040e9.tar.xz
Merge tag 'imx-dt-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/dt
i.MX device tree changes for 5.5: - New board support: Netronix E60K02 and Kobo Clara HD, Kontron N6311 and N6411, OPOS6UL and OPOS6ULDev. - Correct speed grading fuse settings and add opp-suspend property for i.MX7D device tree. - Move usdhc clocks assignment from SoC to board level DTS for imx7ulp, and use APLL_PFD1 as usdhc's clock source on imx7ulp-evk board. - Add missing cooling device properties for CPUs for i.MX6/7 SoCs. - Add sensor GPIO regulator and assign power supplies for magnetometer for imx6ul-14x14-evk board. - Replace "simple-bus" with "simple-mfd" for ANATOP device for i.MX6/7 SoCs. - Fix DTC W=1 warnings by not using simple-audio-card,dai-link on imx6qdl-gw551x and imx6q-gw54xx board. - Move to use DRM bindings for the Seiko 43WVF1G panel on imx53-qsb. - A series from Frieder Schrempf to support more i.MX6UL/ULL-based SoMs and boards from Kontron Electronics GmbH. - A few patches from Michal Vokáč to enable more devices support on imx6dl-yapp4 board. - A patch series from Philippe Schenker to improve i.MX6/7 Apalis and Colibri board support. - A patch series from Sébastien Szymanski to update i.MX6 APF6/APF6Dev device tree with more devices added and adopting DRM bindings for display. - Random improvements, clean-up and device additions on various boards. * tag 'imx-dt-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (68 commits) ARM: dts: imx6ul-kontron-n6x1x-s: Remove an obsolete comment and fix indentation ARM: dts: imx6ul-kontron-n6x1x-s: Add vbus-supply and overcurrent polarity to usb nodes ARM: dts: imx6ul-kontron-n6x1x: Add 'chosen' node with 'stdout-path' ARM: dts: Add support for two more Kontron evalkit boards 'N6311 S' and 'N6411 S' ARM: dts: imx6ul-kontron-n6310-s: Move common nodes to a separate file ARM: dts: imx6ul-kontron-n6310-s: Disable the snvs-poweroff driver ARM: dts: Add support for two more Kontron SoMs N6311 and N6411 ARM: dts: imx6ul-kontron-n6310: Move common SoM nodes to a separate file ARM: dts: imx7ulp-evk: Use APLL_PFD1 as usdhc's clock source ARM: dts: imx: add devicetree for Kobo Clara HD ARM: dts: add Netronix E60K02 board common file ARM: dts: vf-colibri: fix typo in top-level module compatible ARM: dts: imx53-qsb: Use DRM bindings for the Seiko 43WVF1G panel ARM: dts: imx53: Spelling s/configration/configuration/ ARM: dts: imx6ul-14x14-evk: Assign power supplies for magnetometer ARM: dts: imx6ul-14x14-evk: Fix the magnetometer node name ARM: dts: imx6ul-14x14-evk: Add sensors' GPIO regulator ARM: dts: imx6ul: Disable gpt2 by default ARM: dts: imx7d: Add missing cooling device properties for CPUs ARM: dts: imx6dl: Add missing cooling device properties for CPUs ... Link: https://lore.kernel.org/r/20191105150315.15477-4-shawnguo@kernel.org Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
-rw-r--r--arch/arm/boot/dts/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 049467078af6..7149fc1ccd90 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -555,7 +555,8 @@ dtb-$(CONFIG_SOC_IMX6SL) += \
imx6sl-evk.dtb \
imx6sl-warp.dtb
dtb-$(CONFIG_SOC_IMX6SLL) += \
- imx6sll-evk.dtb
+ imx6sll-evk.dtb \
+ imx6sll-kobo-clarahd.dtb
dtb-$(CONFIG_SOC_IMX6SX) += \
imx6sx-nitrogen6sx.dtb \
imx6sx-sabreauto.dtb \
@@ -586,6 +587,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
imx6ull-14x14-evk.dtb \
imx6ull-colibri-eval-v3.dtb \
imx6ull-colibri-wifi-eval-v3.dtb \
+ imx6ull-opos6uldev.dtb \
imx6ull-phytec-segin-ff-rdk-nand.dtb \
imx6ull-phytec-segin-ff-rdk-emmc.dtb \
imx6ull-phytec-segin-lc-rdk-nand.dtb \