diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-07-15 23:00:19 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-07-15 23:00:19 +0200 |
| commit | cd06b2a573d4a6cb37092235d084ae99e30493e0 (patch) | |
| tree | 7629a546b1b19a09627244b211c1529e29b585ec /arch/arm/boot/dts/Makefile | |
| parent | cda1c2bdf6df90c12363877fda594a0a1b7ac74a (diff) | |
| parent | 7aff0f29cdb484a5d9692a4d6c9e4b908a848688 (diff) | |
| download | op-kernel-dev-cd06b2a573d4a6cb37092235d084ae99e30493e0.zip op-kernel-dev-cd06b2a573d4a6cb37092235d084ae99e30493e0.tar.gz | |
Merge tag 'at91-ab-4.8-dt3' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt
Merge "DT Changes for 4.8 #3" from Alexandre Belloni:
- Lot of fixes for dtc warnings
- Separate dtb compilation for ARMv4 and ARMv5
* tag 'at91-ab-4.8-dt3' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
ARM: dts: at91: Don't build unnecessary dtbs
ARM: dts: at91: sama5d3x: separate motherboard gmac and emac definitions
ARM: dts: at91: at91sam9g25ek: fix isi endpoint node
ARM: dts: at91: move isi definition to at91sam9g25ek
ARM: dts: at91: fix i2c-gpio node name
ARM: dts: at91: vinco: fix regulator name
ARM: dts: at91: ariag25 : fix onewire node
ARM: dts: at91: sama5d4_ma5d4evk: fix regulator names
ARM: dts: at91: sama5d4_ma5d4: fix regulator names
ARM: dts: at91: sama5d4_xplained: fix regulator names
ARM: dts: at91: sama5d3_xplained: fix regulator name
ARM: dts: at91: sama5d4ek: remove useless lcd_bus
ARM: dts: at91: Fix USB endpoint nodes
Documentation: dt: usb: atmel-usb: add unit-address
ARM: dts: at91: Fix ADC trigger nodes
Documentation: dt: iio: at91_adc: fix trigger node names
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index b25cc6a..9f0ae00 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -7,9 +7,10 @@ dtb-$(CONFIG_MACH_ARTPEC6) += \ dtb-$(CONFIG_MACH_ASM9260) += \ alphascale-asm9260-devkit.dtb # Keep at91 dtb files sorted alphabetically for each SoC -dtb-$(CONFIG_SOC_SAM_V4_V5) += \ +dtb-$(CONFIG_SOC_AT91RM9200) += \ at91rm9200ek.dtb \ - mpa1600.dtb \ + mpa1600.dtb +dtb-$(CONFIG_SOC_AT91SAM9) += \ animeo_ip.dtb \ at91-qil_a9260.dtb \ aks-cdu.dtb \ |
