diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-03-11 16:14:55 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-03-11 16:14:55 -0400 |
| commit | 369237ab1fe5539091320f47781d6fe2db0241b9 (patch) | |
| tree | dde849f93c9d7f9b9cef8128030dbaa939f77265 /arch/arm/boot/dts/Makefile | |
| parent | 605e0f904bb6b9ba13f8d7918f3c016ac00b86bc (diff) | |
| parent | 3915d36fabf143dffdf91c5372d3b0a23722af52 (diff) | |
Merge tag 'renesas-r8a7778-ccf-and-multiplatform-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/multiplatform
Pull "Renesas ARM Based SoC r8a7778 CCF and Multiplatform Updates
for v4.1" from Simon Horman:
* Add CCF and them multiplatform support to r8a7778 SoC and its
bockw board.
* tag 'renesas-r8a7778-ccf-and-multiplatform-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (21 commits)
ARM: shmobile: r8a7778: enable multiplatform target
ARM: shmobile: bockw: add sound to DT
ARM: shmobile: r8a7778: add sound to DT
ARM: shmobile: bockw: add devices hooked up to i2c0 to DT
DT: i2c: add trivial binding for OKI ML86V7667 video decoder
ARM: shmobile: r8a7778: common clock framework CPG driver
ARM: shmobile: bockw dts: set extal clock frequency
ARM: shmobile: bockw dts: Move Ethernet node to BSC
ARM: shmobile: r8a7778 dtsi: Add Bus State Controller node
ARM: shmobile: bockw: add USB, VIN pin descriptions to DT
ARM: shmobile: r8a7778: add internal ethernet controller to DT
ARM: shmobile: r8a7778: add MSTP clock assignments to DT
ARM: shmobile: r8a7778: implement SoC and board CCF support
ARM: shmobile: r8a7778: Common clock framework DT description
ARM: shmobile: r8a7778: add CPG register bits header
ARM: shmobile: r8a7778: synchronize dts with reference platform
drivers: bus: Add Simple Power-Managed Bus Driver
drivers: bus: Add Renesas Bus State Controller (BSC) DT Bindings
drivers: bus: Add Simple Power-Managed Bus DT Bindings
drivers: bus: Sort Makefile entries alphabetically
...
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 0d467b877ec7..16f4a6761f5e 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile | |||
| @@ -477,6 +477,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \ | |||
| 477 | r7s72100-genmai.dtb \ | 477 | r7s72100-genmai.dtb \ |
| 478 | r8a73a4-ape6evm.dtb \ | 478 | r8a73a4-ape6evm.dtb \ |
| 479 | r8a7740-armadillo800eva.dtb \ | 479 | r8a7740-armadillo800eva.dtb \ |
| 480 | r8a7778-bockw.dtb \ | ||
| 480 | r8a7779-marzen.dtb \ | 481 | r8a7779-marzen.dtb \ |
| 481 | r8a7790-lager.dtb \ | 482 | r8a7790-lager.dtb \ |
| 482 | r8a7791-henninger.dtb \ | 483 | r8a7791-henninger.dtb \ |