diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-05 23:14:24 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-05 23:14:24 +0200 |
| commit | e80c9c2c2dfb45ce872aaec153ca01b40a08415e (patch) | |
| tree | 9743d0dbf85cb7a0abc990d70418a9e6db57c350 /include/dt-bindings/clock | |
| parent | ARM: multi_v7_defconfig: Select CONFIG_MACH_BERLIN_BG2Q (diff) | |
| parent | ARM: shmobile: r8a7790: remove old style audio clock (diff) | |
| download | linux-e80c9c2c2dfb45ce872aaec153ca01b40a08415e.tar.xz linux-e80c9c2c2dfb45ce872aaec153ca01b40a08415e.zip | |
Merge branch 'renesas/clock' into next/boards
* renesas/clock:
ARM: shmobile: r8a7790: remove old style audio clock
ARM: shmobile: r8a7778: remove old style audio clock
ARM: shmobile: r8a7791: Rename VSP1_SY clocks to VSP1_S
ARM: shmobile: r8a7790: Rename VSP1_(SY|RT) clocks to VSP1_(S|R)
ARM: shmobile: r8a7791: Fix the I2C clocks parents in legacy code
ARM: shmobile: r8a7790: Fix the I2C clocks parents in legacy code
ARM: shmobile: Introduce shmobile_clk_workaround()
ARM: shmobile: r8a7791: Use rcar_gen2_read_mode_pins() helper
Diffstat (limited to 'include/dt-bindings/clock')
| -rw-r--r-- | include/dt-bindings/clock/r8a7790-clock.h | 4 | ||||
| -rw-r--r-- | include/dt-bindings/clock/r8a7791-clock.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/dt-bindings/clock/r8a7790-clock.h b/include/dt-bindings/clock/r8a7790-clock.h index 6548a5fbcf4a..9a7c4c5a35d1 100644 --- a/include/dt-bindings/clock/r8a7790-clock.h +++ b/include/dt-bindings/clock/r8a7790-clock.h @@ -33,8 +33,8 @@ #define R8A7790_CLK_TMU0 25 #define R8A7790_CLK_VSP1_DU1 27 #define R8A7790_CLK_VSP1_DU0 28 -#define R8A7790_CLK_VSP1_RT 30 -#define R8A7790_CLK_VSP1_SY 31 +#define R8A7790_CLK_VSP1_R 30 +#define R8A7790_CLK_VSP1_S 31 /* MSTP2 */ #define R8A7790_CLK_SCIFA2 2 diff --git a/include/dt-bindings/clock/r8a7791-clock.h b/include/dt-bindings/clock/r8a7791-clock.h index 30f82f286e29..f069bc6627cb 100644 --- a/include/dt-bindings/clock/r8a7791-clock.h +++ b/include/dt-bindings/clock/r8a7791-clock.h @@ -32,7 +32,7 @@ #define R8A7791_CLK_TMU0 25 #define R8A7791_CLK_VSP1_DU1 27 #define R8A7791_CLK_VSP1_DU0 28 -#define R8A7791_CLK_VSP1_SY 31 +#define R8A7791_CLK_VSP1_S 31 /* MSTP2 */ #define R8A7791_CLK_SCIFA2 2 |