summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/r8a7792.dtsi
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-12-21 18:19:42 +0300
committerArnd Bergmann <arnd@arndb.de>2017-12-21 18:19:42 +0300
commit2c2529176236c870693290d314c06652f5f3fe47 (patch)
tree2d63f366fe6c9260038602cc77ab8338d9e22638 /arch/arm/boot/dts/r8a7792.dtsi
parent74f256a5cc0a51e8db44abdc241239db6e904e2a (diff)
parent7f32eddb81ecc06131a643babe2d0f961fbd7f08 (diff)
downloadlinux-2c2529176236c870693290d314c06652f5f3fe47.tar.xz
Merge tag 'renesas-dt-for-v4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
Pull "Renesas ARM Based SoC DT Updates for v4.16" from Simon Horman: * Convert to named i2c-gpio bindings Geert Uytterhoeven says "Commits 7d29f509d2cfd807 ("dt-bindings: i2c: i2c-gpio: Add support for named gpios") and 05c74778858d7d99 ("i2c: gpio: Add support for named gpios in DT") introduced named i2c-gpio DT bindings, and deprecated the more error-prone unnamed variant. This patch series switches all Renesas boards to the new bindings, and adds the missing GPIO_OPEN_DRAIN I/O flags, which were implicitly assumed before..." ... Note that after this series is applied, the i2c-gpio buses are no longer detected when booting new DTBs on old (v4.14 and older) kernels, which should not be an issue. Booting old DTBs on new kernels is not affected." * Update DTS for CMT DT binding rework Geert Uytterhoeven says "This patch series updates the CMT device nodes in the various Renesas DTS files sh_cmt clocksource driver for the recent DT binding rework that was merged in v4.14-rc1 and v4.15-rc1..." * Add SMP support to r8a7794 (R-Car E2) SoC Sergei Shtylyov says "Add the device tree node for the Advanced Power Management Unit (APMU). Use the "enable-method" prop to point out that the APMU should be used for the SMP support." * Correct primary compatible value for eeprom on r7s72100 (RZ/A1H) genmai and r8a7791 (R-Car M2-W) koelsh boards Geert Uytterhoeven says "The Renesas part numbers of the two-wire serial interface EEPROMs do not follow the 24Cxx pattern, but the R1EX24xxx pattern. Hence change the primary compatible values to the appropriate variant of "renesas,r1ex24xxx", like is already done on Gose."" * Move cec_clock to root node on r8a7791 (R-Car M2-W) koelsh board r8a7791 (R-Car M2-W) koelsh board * Use R-Car SDHI and Ether Gen1 and 2 fallback compat strings Use recently posted R-Car SDHI and Ether Gen 1 and 2 fallback compat strings in the DT of Renesas ARM based SoCs. * Add IIC cores to dtsi of r8a7745 (RZ/G1E) SoC * Rework DT architecture for r8a7745 (RZ/G1E) iW-RainboW-G22D development platform and add serial support. Fabrizio Castro says "... define a new DT architecture for the iW-RainboW-G22D SODIMM Development Platform to include the configuration with the HDMI daughter board and to define the serial interfaces." * Add USB function support to r8a7745 (RZ/G1E) iW-RainboW-G22D development platform * Add PCIEC and ttySC3 support to r8a7743 (RZ/G1M) iW-RainboW-G20M-Qseven SoM * Add VIN support to r8a7743 (RZ/G1M) and r8a7745 (RZ/G1E) SoCs * Add CAN and HDMI support to r8a7743 (RZ/G1M) iW-RainboW-G20D-Qseven and r8a7745 (RZ/G1E) iW-RainboW-G22D development platforms * tag 'renesas-dt-for-v4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (61 commits) ARM: dts: alt: Convert to named i2c-gpio bindings ARM: dts: koelsch: Convert to named i2c-gpio bindings ARM: dts: lager: Convert to named i2c-gpio bindings ARM: dts: armadillo800eva: Convert to named i2c-gpio bindings ARM: dts: sh73a0: Remove CMT renesas,channels-mask ARM: dts: r8a7794: Remove CMT renesas,channels-mask ARM: dts: r8a7793: Remove CMT renesas,channels-mask ARM: dts: r8a7791: Remove CMT renesas,channels-mask ARM: dts: r8a7790: Remove CMT renesas,channels-mask ARM: dts: r8a7740: Remove CMT renesas,channels-mask ARM: dts: r8a73a4: Remove CMT renesas,channels-mask ARM: dts: r8a7794: Update CMT compat strings ARM: dts: r8a7793: Update CMT compat strings ARM: dts: r8a7791: Update CMT compat strings ARM: dts: r8a7790: Update CMT compat strings ARM: dts: r8a73a4: Update CMT compat string ARM: dts: r8a7794: Add SMP support ARM: dts: genmai: Correct primary compatible value for eeprom ARM: dts: koelsch: Correct primary compatible value for eeprom ARM: dts: r8a7745: add VIN dt support ...
Diffstat (limited to 'arch/arm/boot/dts/r8a7792.dtsi')
-rw-r--r--arch/arm/boot/dts/r8a7792.dtsi3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/r8a7792.dtsi b/arch/arm/boot/dts/r8a7792.dtsi
index 3d080e07374c..ac05fdb91798 100644
--- a/arch/arm/boot/dts/r8a7792.dtsi
+++ b/arch/arm/boot/dts/r8a7792.dtsi
@@ -507,7 +507,8 @@
};
sdhi0: sd@ee100000 {
- compatible = "renesas,sdhi-r8a7792";
+ compatible = "renesas,sdhi-r8a7792",
+ "renesas,rcar-gen2-sdhi";
reg = <0 0xee100000 0 0x328>;
interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&dmac0 0xcd>, <&dmac0 0xce>,