diff options
| author | Olof Johansson <olof@lixom.net> | 2015-08-05 10:39:05 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-08-05 10:39:05 +0200 |
| commit | 85a82c55e28088c56ec47435d6e797a52c69e2c8 (patch) | |
| tree | 4c636420d8e15d551b874ae610e6deea961cb6de /arch/arm/boot/dts/Makefile | |
| parent | 46a51abbda4ed0d09cc1ea6937f31e322a88c517 (diff) | |
| parent | 22b5a0f7bc07ac4b4e4aab9a7f8cf2521819c1c4 (diff) | |
| download | op-kernel-dev-85a82c55e28088c56ec47435d6e797a52c69e2c8.zip op-kernel-dev-85a82c55e28088c56ec47435d6e797a52c69e2c8.tar.gz | |
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.3:
- some fixes on sama5d4 ADC definition
- adding Image Sensor Interface (aka ISI) on at91sam9m10g45ek board
- update rst controller compatible string on sama5 machines
- new sama5d2 DT definition and its reference board:
the sama5d2 Xplained. Minimal configuration for now.
* tag 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
ARM: at91/dt: add minimal sama5d2 Xplained board
ARM: at91/dt: add basic dtsi for sama5d2 SoC
ARM: at91/dt: sama5: update rstc to correct compatible string
ARM: at91/dt: add isi & ov2640 dt nodes for at91sam9m10g45ek board
ARM: at91/dt: sama5d4: move ADC pinctrl to board device trees
ARM: at91/dt: sama5d4: fix external trigger property
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 4afd369..0ebd0d0 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -41,6 +41,7 @@ dtb-$(CONFIG_SOC_SAM_V4_V5) += \ at91sam9x35ek.dtb dtb-$(CONFIG_SOC_SAM_V7) += \ at91-kizbox2.dtb \ + at91-sama5d2_xplained.dtb \ at91-sama5d3_xplained.dtb \ sama5d31ek.dtb \ sama5d33ek.dtb \ |
