diff options
| author | Olof Johansson <olof@lixom.net> | 2014-01-02 11:25:10 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-01-02 11:25:10 -0800 |
| commit | cf90bb2fe16ca811b28eef6dac236dd7ea188aa9 (patch) | |
| tree | 3d5a2d8ab69fff70f999130f691f441611face78 /arch/arm/boot/dts/Makefile | |
| parent | 160c39a2d7fe859354015dda6f0b1fbe069e5228 (diff) | |
| parent | b58c8e7b43ad804ad18b30f882b16da2e3d4ed9d (diff) | |
Merge tag 'renesas-boards2-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards
From Simon Horman:
Second Round of Renesas ARM based SoC Board updates for v3.14
* r8a7791 (R-Car M2) based Koelsch board
- Let Koelsch multiplatform boot with Koelsch DTB
- Remove non-multiplatform DT reference support
- Instantiate clkdevs for SCIF and CMT
- Remove duplicate CCF initialization
- Add Ether and DU support
* r8a7790 (R-Car H2) based Lager board
- Let Lager multiplatform boot with Lager DTB
- Remove non-multiplatform DT reference support
- Instantiate clkdevs for SCIF and CMT
- Enable multiplaform kernel support
* r8a7740 (R-Mobile A1) based Armadillo board
- Set backlight enable GPIO
* sh7374 (SH-Mobile AP4) based Mackerel board
- Correct USBHS pinconf entry
* tag 'renesas-boards2-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (25 commits)
ARM: shmobile: mackerel: Fix USBHS pinconf entry
ARM: shmobile: Let Koelsch multiplatform boot with Koelsch DTB
ARM: shmobile: Let Lager multiplatform boot with Lager DTB
ARM: shmobile: Remove non-multiplatform Koelsch reference support
ARM: shmobile: Remove non-multiplatform Lager reference support
ARM: shmobile: koelsch-reference: Instantiate clkdevs for SCIF and CMT
ARM: shmobile: lager-reference: Instantiate clkdevs for SCIF and CMT
ARM: shmobile: koelsch-reference: Remove duplicate CCF initialization
ARM: shmobile: lager-reference: Enable multiplaform kernel support
ARM: shmobile: armadillo: Set backlight enable GPIO
ARM: shmobile: Koelsch: add Ether support
ARM: shmobile: koelsch: Add DU device
arm: shmobile: clks: remove duplicated clock from r7s72100
ARM: shmobile: koelsch: Conditionally select MICREL_PHY
ARM: shmobile: rcar-gen2: Initialize CCF before clock sources
ARM: shmobile: r8a7791: Add clock index macros for DT sources
ARM: shmobile: r8a7790: Add clock index macros for DT sources
ARM: shmobile: Add select MIGHT_HAVE_PCI for PCI-AHB bridge code
ARM: shmobile: r8a7778: add USB Func DMAEngine support
ARM: rcar-gen2: Do not setup timer in non-secure mode
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 4179056f4584..6f527e1faeb6 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -233,7 +233,6 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \ r8a7779-marzen-reference.dtb \ r8a7791-koelsch.dtb \ r8a7790-lager.dtb \ - r8a7790-lager-reference.dtb \ sh73a0-kzm9g.dtb \ sh73a0-kzm9g-reference.dtb \ r8a73a4-ape6evm.dtb \ @@ -241,7 +240,8 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \ sh7372-mackerel.dtb dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \ r7s72100-genmai-reference.dtb \ - r8a7791-koelsch-reference.dtb + r8a7791-koelsch.dtb \ + r8a7790-lager.dtb dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \ socfpga_cyclone5_socdk.dtb \ socfpga_cyclone5_sockit.dtb \ |