diff options
| author | Olof Johansson <olof@lixom.net> | 2018-12-12 12:55:34 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-12-12 12:55:34 -0800 |
| commit | 2b6464560852f6c2ee2a37230cf29a23f324737c (patch) | |
| tree | 5e06fad2ce80142394c16c091732de9fa7b9c9d4 /arch/arm/boot/dts/Makefile | |
| parent | 80b451cd68b490ee612c7f5ca04854d488b4a20d (diff) | |
| parent | 7f68ffe0617b44fe189271701f6443beb23907ad (diff) | |
Merge tag 'imx7d-pico-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt
i.MX7D PICO boards update for 4.21:
- It contains a series from Otavio Salvador that improves i.MX7D PICO
SoM, and then adds Hobbit baseboard support on top of the improvement.
* tag 'imx7d-pico-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: dts: imx7d-pico: Add the imx7d-pico-hobbit variant
ARM: dts: imx7d-pico-pi: Extend peripherals support
ARM: dts: imx7d-pico: Extend peripherals support
ARM: dts: imx7d-pico: Improve WiFi regulator name
ARM: dts: imx7d-pico: Pass the Ethernet PHY reset GPIO
ARM: dts: imx7d-pico: Pass the USBOTG1_PWR pinctrl
ARM: dts: imx7d-pico-pi: Move SoM related part to imx7d-pico.dtsi
ARM: dts: imx7d-pico: Switch to SPDX identifier
ARM: dts: imx7d-pico: Do not harcode the memory size
ARM: dts: imx7d-nitrogen7: Fix the description of the Wifi clock
ARM: imx: update the cpu power up timing setting on i.mx6sx
ARM: dts: imx7d-pico: Describe the Wifi clock
ARM: dts: imx51-zii-rdu1: Remove EEPROM node
Signed-off-by: Olof Johansson <olof@lixom.net>
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 17212ce006e6..e6bbcf5ad829 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -573,6 +573,7 @@ dtb-$(CONFIG_SOC_IMX7D) += \ imx7d-colibri-emmc-eval-v3.dtb \ imx7d-colibri-eval-v3.dtb \ imx7d-nitrogen7.dtb \ + imx7d-pico-hobbit.dtb \ imx7d-pico-pi.dtb \ imx7d-sbc-imx7.dtb \ imx7d-sdb.dtb \ |