diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-21 15:25:23 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-21 15:25:23 -0800 |
| commit | a315ec7b0cf1ee169827758752c60a886b191dc3 (patch) | |
| tree | 69297e9cf78af87094fb0d751d72245fcddb9f4b /arch/arm/boot/dts/Makefile | |
| parent | 56a9c909d88ab3f66e14c5d21727b8e388a8ec90 (diff) | |
| parent | b26373c0da982f8a29406f10db39e287c1f0696b (diff) | |
Merge tag 'sti-dt-for-v3.20-1' of git://git.stlinux.com/devel/kernel/linux-sti into next/dt
Merge "STi DT updates for v3.20, round 1" from Maxime Coquelin:
Highlights:
-----------
- Add USB support for STiH410 & STiH407
- Add DRM DT nodes for STiH410 & STiH407
- Add STiH418 SoC support
- Add DT nodes for MiPHY28lp PHY
* tag 'sti-dt-for-v3.20-1' of git://git.stlinux.com/devel/kernel/linux-sti:
ARM: DT: STi: STiH407: Add DT node for MiPHY28lp
ARM: dts: STiH418: Add B2199 board support
ARM: dts: Add STiH418 SoC support
ARM: DT: STiH410: Add DRM dt nodes
ARM: DT: STiH407: Add DRM dt nodes
ARM: STi: DT: STiH410: Add DT nodes for the ehci and ohci usb controllers.
ARM: STi: DT: STiH410: Add usb2 picophy dt nodes
ARM: STi: DT: STiH407: Add usb2 picophy dt nodes
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 293b80e196b..8da18561d5e 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -504,7 +504,8 @@ dtb-$(CONFIG_ARCH_STI) += \ stih415-b2020.dtb \ stih416-b2000.dtb \ stih416-b2020.dtb \ - stih416-b2020e.dtb + stih416-b2020e.dtb \ + stih418-b2199.dtb dtb-$(CONFIG_MACH_SUN4I) += \ sun4i-a10-a1000.dtb \ sun4i-a10-ba10-tvbox.dtb \ |