diff options
| author | Olof Johansson <olof@lixom.net> | 2015-12-22 22:46:26 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-12-22 22:46:26 +0300 |
| commit | 960ac2dbeedee2d5b447037a54a8e18299f09860 (patch) | |
| tree | 8bce08dfd5a8a0fcdf7f1dbc970b3911325709ca /arch/arm/boot/dts/Makefile | |
| parent | 74386da41d49bad0efc00ff41960067747098bff (diff) | |
| parent | 0a804b5729bb0021e63662b772db0f52de653056 (diff) | |
| download | linux-960ac2dbeedee2d5b447037a54a8e18299f09860.tar.xz | |
Merge tag 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/dt
First batch of DT changes for 4.5:
- addition of nodes for sama5d2 & sama5d4
- some fixes for i2c hold time, compatible stings
- addition of a new patform by DENX: the MA5D4 SoM and EVK
* tag 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
ARM: at91/dt: sama5d2 Xplained: pmic needs a specific sda hold time
ARM: at91/dt: sama5d4: update i2c compatible string
ARM: at91/dt: sama5d4 master clock can run at 200MHz now
ARM: at91/dt: sama5d2: add watchdog node
ARM: at91/dt: sama5d4: Add support for DENX MA5D4 SoM and EVK
ARM: at91/dt: sama5d4: Add pinmux for 8-bit MMC0 bus
ARM: at91/dt: sama5d4: Fix mmc0 pinmux comments
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 be599a30fedf..39aed9183fad 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -48,6 +48,7 @@ dtb-$(CONFIG_SOC_SAM_V7) += \ sama5d34ek.dtb \ sama5d35ek.dtb \ sama5d36ek.dtb \ + at91-sama5d4_ma5d4evk.dtb \ at91-sama5d4_xplained.dtb \ at91-sama5d4ek.dtb dtb-$(CONFIG_ARCH_ATLAS6) += \ |