diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-05-26 00:22:39 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-05-26 00:22:40 +0200 |
| commit | d39b6ae4be3f57bfea5b36d81e88dd5429086ddf (patch) | |
| tree | f29e9e19c609ee997ad4cc32cd5653e4f22837ea /arch/arm/boot/dts/Makefile | |
| parent | 48d44c2e5f305a3bab92b9901384d62c463be6e4 (diff) | |
| parent | 103515d91832bb837159c37f0cb69d59d68a1dc2 (diff) | |
Merge tag 'imx-dt-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/dt
i.MX device tree changes for 5.8:
- A series from Anson Huang updating SRC devices to match bindings
schema definition.
- Correct CPU supply name and add cpu1 supply for i.MX7D.
- Convert thermal device to use nvmem interface to get fuse data
for imx6qdl and imx6sl.
- A series from Tim Harvey to update imx6qdl-gw devices, adding support
of LSM9DS1 IIO imu/magn, USB OTG, bcm4330-bt, etc.
- Add input MUX for ENET2 MDIO into IMX7D pin functions.
- Misc random device addition or update.
* tag 'imx-dt-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (22 commits)
ARM: dts: imx53-cx9020: Group port definitions for the dvi-converter
ARM: dts: imx5: make src node name generic
ARM: dts: imx50: Add src node interrupt
ARM: dts: imx: make src node name generic
ARM: dts: imx7d-pinfunc: add input mux for ENET2 mdio
ARM: dts: imx6sl: Use nvmem interface to get fuse data
ARM: dts: imx6qdl: Use nvmem interface to get fuse data
ARM: dts: imx6qdl-gw5910: fix wlan regulator
ARM: dts: imx6qdl-gw5910: add support for bcm4330-bt
ARM: dts: imx6qdl-gw5904: add lsm9ds1 iio imu/magn support
ARM: dts: imx6qdl-gw560x: add lsm9ds1 iio imu/magn support
ARM: dts: imx53: Add src node interrupt
ARM: dts: imx51: Add src node interrupt
ARM: dts: imx50: Remove unused iomuxc-gpr node
ARM: dts: imx6qdl-gw552x: add USB OTG support
ARM: dts: imx6-sr-som: add ethernet PHY configuration
arm: dts: ls1021atwr: Add QSPI node properties
ARM: dts: e60k02: add interrupt for PMIC
ARM: dts: colibri: introduce device trees with UHS-I support
ARM: dts: imx7d: Add cpu1 supply
...
Link: https://lore.kernel.org/r/20200523032516.11016-4-shawnguo@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 5edffa372785..e6a1cac0bfc7 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -416,6 +416,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6dl-aristainetos2_4.dtb \ imx6dl-aristainetos2_7.dtb \ imx6dl-colibri-eval-v3.dtb \ + imx6dl-colibri-v1_1-eval-v3.dtb \ imx6dl-cubox-i.dtb \ imx6dl-cubox-i-emmc-som-v15.dtb \ imx6dl-cubox-i-som-v15.dtb \ |