diff options
| author | Olof Johansson <olof@lixom.net> | 2019-11-08 10:33:45 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-11-08 10:33:47 -0800 |
| commit | fa9a2f92983b6882686b1ca71cb2ebc69f126d04 (patch) | |
| tree | b5f9b0acee129b3ee70cd0186a25093a4f8cd673 /arch/arm/boot/dts/Makefile | |
| parent | 743f4e5bc01f4f5b1d041c8dac5f471c010d8d8c (diff) | |
| parent | cf79e41074b1759d8d264913b6a15b49c49f9b48 (diff) | |
Merge tag 'at91-5.5-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/dt
AT91 DT for 5.5
- New Overkiz Kizbox3 board
- Rework of the other Kizbox device trees
- New filters for i2c on sama5d4 and sama5d2
* tag 'at91-5.5-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
ARM: dts: at91: add a dts and dtsi file for kizbox2 based boards
dt-bindings: arm: at91: Document Kizbox2-2 board binding
ARM: dts: at91: sama5d4_xplained: add digital filter for i2c
ARM: dts: at91: sama5d2_xplained: add analog and digital filter for i2c
ARM: dts: at91: add Overkiz KIZBOX3 board
dt-bindings: arm: at91: Document Kizbox3 HS board binding
dt-bindings: Add vendor prefix for Overkiz SAS
ARM: dts: at91: sama5d2: add an rtc label for derived boards
ARM: dts: at91: sama5d27_som1_ek: add mmc capabilities for SDMMC0
Link: https://lore.kernel.org/r/20191108070938.GA215379@piout.net
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 847b5537f998..08011dc8c7a6 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -45,7 +45,8 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ at91sam9x25ek.dtb \ at91sam9x35ek.dtb dtb-$(CONFIG_SOC_SAM_V7) += \ - at91-kizbox2.dtb \ + at91-kizbox2-2.dtb \ + at91-kizbox3-hs.dtb \ at91-nattis-2-natte-2.dtb \ at91-sama5d27_som1_ek.dtb \ at91-sama5d2_ptc_ek.dtb \ |