diff options
| author | Olof Johansson <olof@lixom.net> | 2020-01-16 14:07:24 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2020-01-16 14:07:25 -0800 |
| commit | e59760f70b7d93dfd33b2c8567ff0adb4bd57193 (patch) | |
| tree | 0f33feb6d48a3ad4e4589d6a8a8d3b8894f73c56 /arch/arm/boot/dts/Makefile | |
| parent | 2db34041dcacbe6de9c48888216a722caa17235d (diff) | |
| parent | a7e0f3fc01df4b1b7077df777c37feae8c9e8b6d (diff) | |
Merge tag 'at91-5.6-dt-1' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/dt
AT91 DT for 5.6
- Fix sama5d3 peripheral clock rate range
- New boards: Overkiz Smartikz and Kizbox Mini, Microchip SAMA5D27
wlsom1-ek
- sama5d2 sdmcc fixes
* tag 'at91-5.6-dt-1' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
ARM: dts: at91: sama5d3: define clock rate range for tcb1
ARM: dts: at91: sama5d3: fix maximum peripheral clock rates
ARM: dts: at91: nattis 2: remove unnecessary include
ARM: dts: at91: add smartkiz support and a common kizboxmini dtsi file
dt-bindings: arm: at91: Document Kizboxmini and Smartkiz boards binding
ARM: dts: at91: rearrange kizbox dts using aliases nodes
ARM: dts: at91: sama5d27_som1_ek: add the microchip,sdcal-inverted on sdmmc0
ARM: dts: at91: Reenable UART TX pull-ups
ARM: dts: at91: sama5d2: set the sdmmc gclk frequency
ARM: dts: at91: sama5d27_som1_ek: add i2c filters properties
ARM: dts: at91: sama5d27_wlsom1: add SAMA5D27 wlsom1 and wlsom1-ek
dt-bindings: ARM: at91: Document SAMA5D27 WLSOM1 and Evaluation Kit
ARM: dts: at91: sama5d2: mark secumod as a GPIO controller
ARM: dts: at91: sama5d2: disable pwm0 by default
Link: https://lore.kernel.org/r/20200113155423.GA1357189@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 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 6bf729efddd3..d2aff5ab27a7 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -37,7 +37,10 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ at91-ariag25.dtb \ at91-ariettag25.dtb \ at91-cosino_mega2560.dtb \ - at91-kizboxmini.dtb \ + at91-kizboxmini-base.dtb \ + at91-kizboxmini-mb.dtb \ + at91-kizboxmini-rd.dtb \ + at91-smartkiz.dtb \ at91-wb45n.dtb \ at91sam9g15ek.dtb \ at91sam9g25ek.dtb \ @@ -49,6 +52,7 @@ dtb-$(CONFIG_SOC_SAM_V7) += \ at91-kizbox3-hs.dtb \ at91-nattis-2-natte-2.dtb \ at91-sama5d27_som1_ek.dtb \ + at91-sama5d27_wlsom1_ek.dtb \ at91-sama5d2_ptc_ek.dtb \ at91-sama5d2_xplained.dtb \ at91-sama5d3_xplained.dtb \ |