Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd46edb9 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-clock2-for-v3.16' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 5fe0163a a505daa5

arch/arm/mach-shmobile/clock-r8a7740.c

+1 −1
Original line number Diff line number Diff line
@@ -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]),

include/dt-bindings/clock/r8a7791-clock.h

+2 −1
Original line number Diff line number Diff line
@@ -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