summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/Makefile
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2018-03-27 13:32:53 +0200
committerArnd Bergmann <arnd@arndb.de>2018-03-27 13:32:53 +0200
commitcdcdbbf350b544a05c13108c47955d39314f605f (patch)
tree734412b6ad2b9d2404cf4d0de9681a66cfa3f622 /arch/arm/boot/dts/Makefile
parente5bdf7775eb8310a3c3a0d6ca55c94e868fcf76f (diff)
parenta24a5821a684a62ae2c53a214eaf2ad4f4f0dbcf (diff)
downloadop-kernel-dev-cdcdbbf350b544a05c13108c47955d39314f605f.zip
op-kernel-dev-cdcdbbf350b544a05c13108c47955d39314f605f.tar.gz
Merge tag 'renesas-dt-for-v4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
Pull "Renesas ARM Based SoC DT Updates for v4.17" from Simon Horman: * Silk board with R-Car E2 (r8a7794) SoC - Add r1ex24002 EEPROM to DT Magnus Damm says "Extend the Silk board support to include U14 which is an I2C based EEPROM hooked up to the I2C1 bus." - Add GPIO keys to DT Magnus Damm says "Extend the Silk board support to include SW3, SW4, SW6 and SW12. They are all connected via GPIO lines and handled by the gpio-keys driver" * Marzen board with R-Car H1 (r7a7779) SoC - Add SDHI0 VCCQ Regulator Magnus Damm says "Add support for the on-board voltage regulator hooked up to GPIO3_20 on r8a7779 Marzen. The board schematics describes the regulator as U4 TPS2110A. Input wise, U4 has D0 fixed to ground, D1 tied to GPIO3_20 while IN1 is fixed to 3.3V and IN2 is fixed to 1.8V. OUT goes to the pull-ups for the data pins of SDHI0." * Porter board with R-Car M3W (r8a7791) SoC - Fix HDMI output routing Laurent Pinchart says "The HDMI encoder is connected to the RGB output of the DU, which is port@0, not port@1." * iWave Systems RZ/G1E SODIMM System On Module (iW-RainboW-G22M-SM) and iWave Systems RZ/G1M Qseven System On Module (iW-RainboW-G20M-Qseven) - Enable cmt0 * Stout board with R-Car H2 (r8a7790) SoC - Initial support * Lager board with R-Car H2 (r8a7790) SoC - Add CEC clock for HDMI transmitter Niklas Söderlund says "The adv7511 on the Lager board has a 12 MHz fixed clock for the CEC block. Specify this in the dts to enable CEC support." - Move cec_clock to root node By definition nodes without a bus address do not belong on the bus * kzm9d board with EMMA Mobile EV2 (EMEV2) SoC - Fix "debounce-interval" property misspelling * RZ/G1M (r8a7743) and RZ/G1H (r8a7745) SoCs - Add IPMMU DT nodes - Add VSP support * R-Car Gen2 boards - Use I2C demuxer for This allows run-time switching between alternate I2C IP blocks * R-Car Gen2 and RZ/G1 SoCs - Clean up DT files to ease future maintenance + add soc node for IP attached to the bus + sort subnodes of soc and root node + consistently use single space after = * R-Car H2 (r8a7790), M3-W (r8a7791) and M3-N (r7a7793) SoCs - Reduce size of thermal registers According to the "User's Manual: Hardware" v2.00 the registers at base 0xe61f0000 extend to an offset of 0x10, rather than 0x14 which is the case on the r8a73a4 (R-Mobile APE6). This should not have any runtime affect as mapping granularity is PAGE_SIZE. * tag 'renesas-dt-for-v4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (47 commits) ARM: dts: silk: Add GPIO keys to DT ARM: dts: silk: Add r1ex24002 EEPROM to DT ARM: dts: marzen: Add SDHI0 VCCQ Regulator ARM: dts: stout: Initial r8a7790 Stout board support ARM: dts: lager: Move cec_clock to root node ARM: dts: kzm9d: Fix "debounce-interval" property misspelling ARM: dts: gose: use demuxer for I2C4 ARM: dts: gose: use demuxer for I2C2 ARM: dts: silk: use demuxer for I2C1 ARM: dts: alt: use demuxer for I2C1 ARM: dts: porter: use demuxer for I2C2 ARM: dts: koelsch: use demuxer for I2C4 ARM: dts: koelsch: use demuxer for I2C2 ARM: dts: lager: use demuxer for IIC3/I2C3 ARM: dts: lager: use demuxer for IIC2/I2C2 ARM: dts: r8a7745: Add VSP support ARM: dts: r8a7743: Add VSP support ARM: dts: r8a7745: Add IPMMU DT nodes ARM: dts: r8a7743: Add IPMMU DT nodes ARM: dts: r8a7745: sort subnodes of soc node ...
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
-rw-r--r--arch/arm/boot/dts/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 936c5ff..9be131b 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -797,6 +797,7 @@ dtb-$(CONFIG_ARCH_RENESAS) += \
r8a7778-bockw.dtb \
r8a7779-marzen.dtb \
r8a7790-lager.dtb \
+ r8a7790-stout.dtb \
r8a7791-koelsch.dtb \
r8a7791-porter.dtb \
r8a7792-blanche.dtb \
OpenPOWER on IntegriCloud