diff options
author | Arnd Bergmann <arnd@arndb.de> | 2018-10-02 11:36:53 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2018-10-02 11:41:29 +0200 |
commit | 476ca77f0f13d0dd30cdaf91d797cddab4976848 (patch) | |
tree | 6a3e5c2f3696e5b45b4323a744e70cdcba4dc965 /arch/arm/boot/dts/Makefile | |
parent | 55dc97235b6553d27661ee1fb05d882c7c776b96 (diff) | |
parent | 04007fe4c65f4cf3133dd256d9fd82169b7f2f22 (diff) |
Merge tag 'imx-dt-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt
i.MX device tree update for 4.20:
- New board support: Engicam's i.Core MX6 CPU module v1.5; ConnectCore
6UL Single Board Computer (SBC) Pro; i.MX6 ULZ based EVK board.
- Add Add SFF interface support for vf610-zii board.
- Disable unneeded devices like VPU and internal watchdog for imx51-zii
boards.
- Add 'no-sdio' and 'no-sd' property for vf610-zii-cfu1 board.
- Improve i.MX6 SLL GPIO support by adding gpio-ranges property and
clocks information.
- Update iomux header for i.MX7 Solo and i.MX6 ULL.
- Enable GPIO buttons as wakeup source for imx7d-sdb and imx6sx-sdb.
- Add GPIO keys and egalax touch screen support for imx6qdl-sabreauto.
- Switch to use SPDX-License-Identifier for more boards - vf610-twr,
imx7s-warp, Engicam boards.
- Add device tree bindings of 'fsl,pmic-stby-poweroff' property and add
the support for i.MX6 RIoTboard.
- DTC has new checks for SPI buses which will be landed on 4.20.
A patch from Rob to fix those 100+ warnings on i.MX boards. (Thanks!)
- Switch i.MX7 device tree to use updated coresight binding for
hardware ports.
- Misc small or random update and cleanup.
* tag 'imx-dt-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (50 commits)
ARM: dts: imx: add i.mx6ulz and i.mx6ulz 14x14 evk support
dt-bindings: arm: add compatible for i.MX6ULZ 14x14 EVK board
ARM: dts: imx53-ppd: Remove 'num-chipselects' property
ARM: dts: vf610-twr: Switch to SPDX identifier
ARM: dts: vf: Switch to SPDX identifier
ARM: dts: imx6qdl-zii-rdu2: Disable the internal RTC
ARM: dts: imx51-zii-rdu1: Fix the rtc compatible string
ARM: dts: imx6ul: use nvmem-cells for cpu speed grading
ARM: dts: imx: Fix SPI bus warnings
ARM: dts: imx7: Update coresight binding for hardware ports
ARM: dts: vf610-zii-cfu1: Pass the 'no-sd' property
ARM: dts: vf610-zii-cfu1: Pass the 'no-sdio' property
ARM: dts: imx51-zii-scu2-mezz: Disable the internal watchdog
ARM: dts: imx51-zii-scu2-mezz: Disable VPU
ARM: dts: imx51-zii-scu3-esb: Disable VPU
ARM: dts: imx51: Add label for VPU node
ARM: dts: imx6ull: update vdd_soc voltage for 900MHz operating point
ARM: dts: imx6ul: Add DTS for ConnectCore 6UL SBC Pro
ARM: dts: imx6: RIoTboard provide standby on power off option
dt-bindings: imx6q-clock: add new fsl,pmic-stby-poweroff property
...
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
-rw-r--r-- | arch/arm/boot/dts/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 7edf93d1ba73..b16bfb32dda5 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -550,6 +550,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \ dtb-$(CONFIG_SOC_IMX6UL) += \ imx6ul-14x14-evk.dtb \ imx6ul-ccimx6ulsbcexpress.dtb \ + imx6ul-ccimx6ulsbcpro.dtb \ imx6ul-geam.dtb \ imx6ul-isiot-emmc.dtb \ imx6ul-isiot-nand.dtb \ @@ -561,7 +562,8 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ imx6ul-tx6ul-mainboard.dtb \ imx6ull-14x14-evk.dtb \ imx6ull-colibri-eval-v3.dtb \ - imx6ull-colibri-wifi-eval-v3.dtb + imx6ull-colibri-wifi-eval-v3.dtb \ + imx6ulz-14x14-evk.dtb dtb-$(CONFIG_SOC_IMX7D) += \ imx7d-cl-som-imx7.dtb \ imx7d-colibri-emmc-eval-v3.dtb \ |