diff options
| author | Olof Johansson <olof@lixom.net> | 2016-07-04 21:15:39 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-07-04 21:15:39 -0700 |
| commit | 35902cf1dae06f36e5304b79a7a540169e809969 (patch) | |
| tree | f63500d44eb0bf3c0eb4abb92d090b08bd652fee /arch/arm/boot/dts/Makefile | |
| parent | 64f618a7a17c7cd143cca911a527dfc7833d9f96 (diff) | |
| parent | b8bca7eaef9eeda4876b8ded1f49862b0b85181c (diff) | |
| download | blackbird-obmc-linux-35902cf1dae06f36e5304b79a7a540169e809969.tar.gz blackbird-obmc-linux-35902cf1dae06f36e5304b79a7a540169e809969.zip | |
Merge tag 'at91-ab-4.8-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt
DT Changes for 4.8 #2:
- New board: at91sam9260ek
- Fixes for the sam9_l9260
- Sama5d2 Xplained PMIC fix
- Addition of the PMU node for the sama5d2
* tag 'at91-ab-4.8-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
ARM: dts: at91: sama5d2_xplained: Update the pmic node
ARM: dts: at91: sama5d2: add PMU node
ARM: dts: at91: sam9_l9260: Modify information in LED nodes.
ARM: dts: at91: sam9_l9260: Add pinctrl information to ethernet node.
ARM: dts: at91: add at91sam9260ek board DT
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 141f2e7a2e97..6dfefa36e7de 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -17,6 +17,7 @@ dtb-$(CONFIG_SOC_SAM_V4_V5) += \ evk-pro3.dtb \ tny_a9260.dtb \ usb_a9260.dtb \ + at91sam9260ek.dtb \ at91sam9261ek.dtb \ at91sam9263ek.dtb \ at91-sam9_l9260.dtb \ |
