diff options
| author | Olof Johansson <olof@lixom.net> | 2015-12-22 20:52:40 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-12-22 20:52:40 (GMT) |
| commit | 0d639e0a65af84a2cf636f1aaa7775131931356f (patch) | |
| tree | 9ab44bc524fa4b7d586cd4a92c3600e0a3c970c8 /include/dt-bindings | |
| parent | 8eb1f10ee94abc4d6cd4bd4a3e4f240ec0054ba8 (diff) | |
| parent | d01c8bec91414f2110370dfcb9dd33fc0e573cee (diff) | |
| download | linux-0d639e0a65af84a2cf636f1aaa7775131931356f.tar.xz | |
Merge tag 'renesas-dt3-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
Third Round of Renesas ARM Based SoC DT Updates for v4.5
* Use SoC-specific usb-dmac and IPMMU compatibility strings
* Add internal delay for i2c IPs
* Add missing serial devices to r8a7793
* Enable DMA for r8a7793 serial devices
* Add serial port config to chosen/stdout-path
* Tidyup #sound-dai-cells settings for r8a7798/bockw
* Remove deprecated #gpio-range-cells from r8a7793
* Add EtherAVB support to r8a7791
* Add MSIOF support to sh73a0
* tag 'renesas-dt3-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (25 commits)
ARM: shmobile: r8a779x: use SoC-specific usb-dmac compatibility strings
ARM: shmobile: r8a7794: IPMMU compat string SoC part number update
ARM: shmobile: r8a7793: IPMMU compat string SoC part number update
ARM: shmobile: r8a7791: IPMMU compat string SoC part number update
ARM: shmobile: r8a7790: IPMMU compat string SoC part number update
ARM: shmobile: r8a7794: dtsi: add internal delay for i2c IPs
ARM: shmobile: r8a7791: dtsi: add internal delay for i2c IPs
ARM: shmobile: r8a7790: dtsi: add internal delay for i2c IPs
ARM: shmobile: r8a7793: Describe DMA for the serial ports
ARM: shmobile: r8a7793: Add missing serial devices to DT
ARM: shmobile: lager dts: Add serial port config to chosen/stdout-path
ARM: shmobile: porter dts: Add serial port config to chosen/stdout-path
ARM: shmobile: silk dts: Add serial port config to chosen/stdout-path
ARM: shmobile: gose dts: Add serial port config to chosen/stdout-path
ARM: shmobile: bockw dts: Update console parameters
ARM: shmobile: ape6evm dts: Add serial port config to chosen/stdout-path
ARM: shmobile: alt dts: Add serial port config to chosen/stdout-path
ARM: shmobile: koelsch dts: Add serial port config to chosen/stdout-path
ARM: shmobile: r8a7778: tidyup #sound-dai-cells settings
ARM: shmobile: bockw dts: Override #sound-dai-cells to zero
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/dt-bindings')
| -rw-r--r-- | include/dt-bindings/clock/r8a7791-clock.h | 1 | ||||
| -rw-r--r-- | include/dt-bindings/clock/sh73a0-clock.h | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/dt-bindings/clock/r8a7791-clock.h b/include/dt-bindings/clock/r8a7791-clock.h index dd09b73..ffa1137 100644 --- a/include/dt-bindings/clock/r8a7791-clock.h +++ b/include/dt-bindings/clock/r8a7791-clock.h @@ -102,6 +102,7 @@ #define R8A7791_CLK_VIN2 9 #define R8A7791_CLK_VIN1 10 #define R8A7791_CLK_VIN0 11 +#define R8A7791_CLK_ETHERAVB 12 #define R8A7791_CLK_ETHER 13 #define R8A7791_CLK_SATA1 14 #define R8A7791_CLK_SATA0 15 diff --git a/include/dt-bindings/clock/sh73a0-clock.h b/include/dt-bindings/clock/sh73a0-clock.h index 5336956..2eca353 100644 --- a/include/dt-bindings/clock/sh73a0-clock.h +++ b/include/dt-bindings/clock/sh73a0-clock.h @@ -28,7 +28,8 @@ #define SH73A0_CLK_HP 14 /* MSTP0 */ -#define SH73A0_CLK_IIC2 1 +#define SH73A0_CLK_IIC2 1 +#define SH73A0_CLK_MSIOF0 0 /* MSTP1 */ #define SH73A0_CLK_CEU1 29 @@ -45,8 +46,11 @@ #define SH73A0_CLK_SCIFA7 19 #define SH73A0_CLK_SY_DMAC 18 #define SH73A0_CLK_MP_DMAC 17 +#define SH73A0_CLK_MSIOF3 15 +#define SH73A0_CLK_MSIOF1 8 #define SH73A0_CLK_SCIFA5 7 #define SH73A0_CLK_SCIFB 6 +#define SH73A0_CLK_MSIOF2 5 #define SH73A0_CLK_SCIFA0 4 #define SH73A0_CLK_SCIFA1 3 #define SH73A0_CLK_SCIFA2 2 |