diff options
author | Olof Johansson <olof@lixom.net> | 2020-01-16 10:46:16 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2020-01-16 10:46:18 -0800 |
commit | d104b3be1bab1b74d8da5a4f826dfffd98783e6b (patch) | |
tree | d32189cbc3c636b428abdb99d033a7de4c19de2f /arch/arm/boot/dts/Makefile | |
parent | 84c2f68ed2f85611ff387daaec10ed41ab90872a (diff) | |
parent | e4018a496b721e0401b8cf2d583bb0d897f9ce5d (diff) |
Merge tag 'mvebu-dt-5.6-1' of git://git.infradead.org/linux-mvebu into arm/dt
mvebu dt for 5.6 (part 1)
- Add support for SolidRun Clearfog GTR (Armada 385 based board)
- Move i2c0 to the SoliRrun Microsom dtsi (Armada 38x based)
- Add EEPROM node on SoliRrun Microsom (rev 2.1)
- Add EEPROM node on SoliRrun ClearFog Pro
* tag 'mvebu-dt-5.6-1' of git://git.infradead.org/linux-mvebu:
ARM: dts: armada-388-clearfog: add eeprom
ARM: dts: armada-38x-solidrun-microsom: add eeprom
ARM: armada-38x-solidrun-microsom: move i2c0 to SOM DT
ARM: dts: mvebu: add support for SolidRun Clearfog GTR
Link: https://lore.kernel.org/r/874kx13nvh.fsf@FE-laptop
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
-rw-r--r-- | arch/arm/boot/dts/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 59d13d643094..3c715ecd1ae0 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1240,6 +1240,8 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \ dtb-$(CONFIG_MACH_ARMADA_375) += \ armada-375-db.dtb dtb-$(CONFIG_MACH_ARMADA_38X) += \ + armada-385-clearfog-gtr-s4.dtb \ + armada-385-clearfog-gtr-l8.dtb \ armada-385-db-88f6820-amc.dtb \ armada-385-db-ap.dtb \ armada-385-linksys-caiman.dtb \ |