diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-20 06:29:24 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-20 06:29:24 (GMT) |
| commit | fd46edb9f667e0373eefb0c93745fbde0c9e8161 (patch) | |
| tree | 13d98edea0dd248e06566e4af5d3d84bb8d17bf2 | |
| parent | 5fe0163aea863b1a5f79173619fdfe9e9baad299 (diff) | |
| parent | a505daa501dc3f02b08d0b48b049bce719299b74 (diff) | |
| download | linux-fd46edb9f667e0373eefb0c93745fbde0c9e8161.tar.xz | |
Merge tag 'renesas-clock2-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
Merge "Second Round of Renesas ARM Based SoC Clock Updates for v3.16" from
Simon Horman:
r8a7791 (R-Car M2) SoC
* Correct SYS-DMAC clock defines
r8a7740 (R-Mobile A1) SoC
* Correct name of DT Ethernet clock
* tag 'renesas-clock2-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: r8a7791: Correct SYS-DMAC clock defines
ARM: shmobile: r8a7740: Correct name of DT Ethernet clock
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/mach-shmobile/clock-r8a7740.c | 2 | ||||
| -rw-r--r-- | include/dt-bindings/clock/r8a7791-clock.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/clock-r8a7740.c b/arch/arm/mach-shmobile/clock-r8a7740.c index dd989f9..433ec67 100644 --- a/arch/arm/mach-shmobile/clock-r8a7740.c +++ b/arch/arm/mach-shmobile/clock-r8a7740.c @@ -596,7 +596,7 @@ static struct clk_lookup lookups[] = { CLKDEV_DEV_ID("sh_mmcif", &mstp_clks[MSTP312]), CLKDEV_DEV_ID("e6bd0000.mmc", &mstp_clks[MSTP312]), CLKDEV_DEV_ID("r8a7740-gether", &mstp_clks[MSTP309]), - CLKDEV_DEV_ID("e9a00000.sh-eth", &mstp_clks[MSTP309]), + CLKDEV_DEV_ID("e9a00000.ethernet", &mstp_clks[MSTP309]), CLKDEV_DEV_ID("renesas-tpu-pwm", &mstp_clks[MSTP304]), CLKDEV_DEV_ID("e6600000.pwm", &mstp_clks[MSTP304]), diff --git a/include/dt-bindings/clock/r8a7791-clock.h b/include/dt-bindings/clock/r8a7791-clock.h index f069bc6..c3b0130 100644 --- a/include/dt-bindings/clock/r8a7791-clock.h +++ b/include/dt-bindings/clock/r8a7791-clock.h @@ -43,7 +43,8 @@ #define R8A7791_CLK_SCIFB1 7 #define R8A7791_CLK_MSIOF1 8 #define R8A7791_CLK_SCIFB2 16 -#define R8A7791_CLK_DMAC 18 +#define R8A7791_CLK_SYS_DMAC1 18 +#define R8A7791_CLK_SYS_DMAC0 19 /* MSTP3 */ #define R8A7791_CLK_TPU0 4 |