diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 17:36:23 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 17:36:23 +0100 |
| commit | ec498f8e5178b5f1ff431464f4aa17e94fdbb5a0 (patch) | |
| tree | 8cbc0c1d2eda5fba2806172f4098246289df5d65 /arch/arm/boot/dts/Makefile | |
| parent | 3af1fda393e08f2e6e095d6e89299b30b35677fe (diff) | |
| parent | 3ece2c2be34f2fe6254b49dffa5815e2fc7f1b71 (diff) | |
Merge tag 'sti-dt-for-v3.19-2' of git://git.stlinux.com/devel/kernel/linux-sti into next/dt
Pull "STi DT updates for v3.19, round 2" from Maxime Coquelin:
Highlights:
-----------
- Refactor STiH407 SoC and board to add STiH410 SoC support
- Add USB support to STiH416 SoC
* tag 'sti-dt-for-v3.19-2' of git://git.stlinux.com/devel/kernel/linux-sti:
ARM: STi: DT: STiH416: Change miphy356 node name to phy@fe382000
ARM: STi: DT: STih407: STih410: Add clk_ignore_unused to kernel bootargs
ARM: STi: DT: STiH410: Add STiH410 SoC and b2120 board support.
ARM: STi: DT: STih407: Abstract common dt nodes into shared files.
ARM: STi: DT: STiH410: Add pinctl config for usb controllers.
ARM: STi: DT: STiH410: Add defines for STiH410 DT clocks
ARM: STi: DT: STiH416: Add DT nodes for the ehci and ohci usb controllers.
ARM: STi: DT: STiH416: Add DT node for the stih415/6 usb2 phy
ARM: STi: DT: STiH416: Add pinctl setup for usb controllers.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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 9bcee719c697..95f181079e4e 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -420,6 +420,7 @@ dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \ spear320-hmi.dtb dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb dtb-$(CONFIG_ARCH_STI)+= stih407-b2120.dtb \ + stih410-b2120.dtb \ stih415-b2000.dtb \ stih415-b2020.dtb \ stih416-b2000.dtb \ |