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

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

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
parents f1e9637f 932616ee

arch/arm/boot/dts/r8a7790.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -673,7 +673,7 @@ 
			renesas,clock-indices = <

				R8A7790_CLK_TMU1 R8A7790_CLK_TMU3 R8A7790_CLK_TMU2

				R8A7790_CLK_CMT0 R8A7790_CLK_TMU0 R8A7790_CLK_VSP1_DU1

				R8A7790_CLK_VSP1_DU0 R8A7790_CLK_VSP1_RT R8A7790_CLK_VSP1_SY

				R8A7790_CLK_VSP1_DU0 R8A7790_CLK_VSP1_R R8A7790_CLK_VSP1_S

			>;

			clock-output-names =

				"tmu1", "tmu3", "tmu2", "cmt0", "tmu0", "vsp1-du1",

arch/arm/boot/dts/r8a7791.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -688,7 +688,7 @@ 
			renesas,clock-indices = <

				R8A7791_CLK_TMU1 R8A7791_CLK_TMU3 R8A7791_CLK_TMU2

				R8A7791_CLK_CMT0 R8A7791_CLK_TMU0 R8A7791_CLK_VSP1_DU1

				R8A7791_CLK_VSP1_DU0 R8A7791_CLK_VSP1_SY

				R8A7791_CLK_VSP1_DU0 R8A7791_CLK_VSP1_S

			>;

			clock-output-names =

				"tmu1", "tmu3", "tmu2", "cmt0", "tmu0", "vsp1-du1",

arch/arm/mach-shmobile/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ obj-$(CONFIG_ARCH_EMEV2) += setup-emev2.o 
obj-$(CONFIG_ARCH_R7S72100)	+= setup-r7s72100.o



# Clock objects

ifndef CONFIG_COMMON_CLK

obj-y				+= clock.o

ifndef CONFIG_COMMON_CLK

obj-$(CONFIG_ARCH_SH7372)	+= clock-sh7372.o

obj-$(CONFIG_ARCH_SH73A0)	+= clock-sh73a0.o

obj-$(CONFIG_ARCH_R8A73A4)	+= clock-r8a73a4.o

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

+9 −13
Original line number Diff line number Diff line
@@ -175,10 +175,6 @@ static struct clk mstp_clks[MSTP_NR] = { 


static struct clk_lookup lookups[] = {

	/* main */

	CLKDEV_CON_ID("audio_clk_a",	&audio_clk_a),

	CLKDEV_CON_ID("audio_clk_b",	&audio_clk_b),

	CLKDEV_CON_ID("audio_clk_c",	&audio_clk_c),

	CLKDEV_CON_ID("audio_clk_internal",	&s1_clk),

	CLKDEV_CON_ID("shyway_clk",	&s_clk),

	CLKDEV_CON_ID("peripheral_clk",	&p_clk),
@@ -234,15 +230,15 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_ICK_ID("ssi.6", "rcar_sound", &mstp_clks[MSTP309]),

	CLKDEV_ICK_ID("ssi.7", "rcar_sound", &mstp_clks[MSTP308]),

	CLKDEV_ICK_ID("ssi.8", "rcar_sound", &mstp_clks[MSTP307]),

	CLKDEV_ICK_ID("scu.0", "rcar_sound", &mstp_clks[MSTP531]),

	CLKDEV_ICK_ID("scu.1", "rcar_sound", &mstp_clks[MSTP530]),

	CLKDEV_ICK_ID("scu.2", "rcar_sound", &mstp_clks[MSTP529]),

	CLKDEV_ICK_ID("scu.3", "rcar_sound", &mstp_clks[MSTP528]),

	CLKDEV_ICK_ID("scu.4", "rcar_sound", &mstp_clks[MSTP527]),

	CLKDEV_ICK_ID("scu.5", "rcar_sound", &mstp_clks[MSTP526]),

	CLKDEV_ICK_ID("scu.6", "rcar_sound", &mstp_clks[MSTP525]),

	CLKDEV_ICK_ID("scu.7", "rcar_sound", &mstp_clks[MSTP524]),

	CLKDEV_ICK_ID("scu.8", "rcar_sound", &mstp_clks[MSTP523]),

	CLKDEV_ICK_ID("src.0", "rcar_sound", &mstp_clks[MSTP531]),

	CLKDEV_ICK_ID("src.1", "rcar_sound", &mstp_clks[MSTP530]),

	CLKDEV_ICK_ID("src.2", "rcar_sound", &mstp_clks[MSTP529]),

	CLKDEV_ICK_ID("src.3", "rcar_sound", &mstp_clks[MSTP528]),

	CLKDEV_ICK_ID("src.4", "rcar_sound", &mstp_clks[MSTP527]),

	CLKDEV_ICK_ID("src.5", "rcar_sound", &mstp_clks[MSTP526]),

	CLKDEV_ICK_ID("src.6", "rcar_sound", &mstp_clks[MSTP525]),

	CLKDEV_ICK_ID("src.7", "rcar_sound", &mstp_clks[MSTP524]),

	CLKDEV_ICK_ID("src.8", "rcar_sound", &mstp_clks[MSTP523]),

};



void __init r8a7778_clock_init(void)

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

+14 −18
Original line number Diff line number Diff line
@@ -249,10 +249,10 @@ static struct clk mstp_clks[MSTP_NR] = { 
	[MSTP1007] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR10, 7, MSTPSR10, 0), /* SSI8 */

	[MSTP1006] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR10, 6, MSTPSR10, 0), /* SSI9 */

	[MSTP1005] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR10, 5, MSTPSR10, 0), /* SSI ALL */

	[MSTP931] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR9, 31, MSTPSR9, 0), /* I2C0 */

	[MSTP930] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR9, 30, MSTPSR9, 0), /* I2C1 */

	[MSTP929] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR9, 29, MSTPSR9, 0), /* I2C2 */

	[MSTP928] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR9, 28, MSTPSR9, 0), /* I2C3 */

	[MSTP931] = SH_CLK_MSTP32_STS(&hp_clk, SMSTPCR9, 31, MSTPSR9, 0), /* I2C0 */

	[MSTP930] = SH_CLK_MSTP32_STS(&hp_clk, SMSTPCR9, 30, MSTPSR9, 0), /* I2C1 */

	[MSTP929] = SH_CLK_MSTP32_STS(&hp_clk, SMSTPCR9, 29, MSTPSR9, 0), /* I2C2 */

	[MSTP928] = SH_CLK_MSTP32_STS(&hp_clk, SMSTPCR9, 28, MSTPSR9, 0), /* I2C3 */

	[MSTP917] = SH_CLK_MSTP32_STS(&qspi_clk, SMSTPCR9, 17, MSTPSR9, 0), /* QSPI */

	[MSTP815] = SH_CLK_MSTP32_STS(&zs_clk, SMSTPCR8, 15, MSTPSR8, 0), /* SATA0 */

	[MSTP814] = SH_CLK_MSTP32_STS(&zs_clk, SMSTPCR8, 14, MSTPSR8, 0), /* SATA1 */
@@ -294,10 +294,6 @@ static struct clk mstp_clks[MSTP_NR] = { 
static struct clk_lookup lookups[] = {



	/* main clocks */

	CLKDEV_CON_ID("audio_clk_a",	&audio_clk_a),

	CLKDEV_CON_ID("audio_clk_b",	&audio_clk_b),

	CLKDEV_CON_ID("audio_clk_c",	&audio_clk_c),

	CLKDEV_CON_ID("audio_clk_internal",	&m2_clk),

	CLKDEV_CON_ID("extal",		&extal_clk),

	CLKDEV_CON_ID("extal_div2",	&extal_div2_clk),

	CLKDEV_CON_ID("main",		&main_clk),
@@ -381,16 +377,16 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_ICK_ID("clk_b", "rcar_sound", &audio_clk_b),

	CLKDEV_ICK_ID("clk_c", "rcar_sound", &audio_clk_c),

	CLKDEV_ICK_ID("clk_i", "rcar_sound", &m2_clk),

	CLKDEV_ICK_ID("scu.0", "rcar_sound", &mstp_clks[MSTP1031]),

	CLKDEV_ICK_ID("scu.1", "rcar_sound", &mstp_clks[MSTP1030]),

	CLKDEV_ICK_ID("scu.2", "rcar_sound", &mstp_clks[MSTP1029]),

	CLKDEV_ICK_ID("scu.3", "rcar_sound", &mstp_clks[MSTP1028]),

	CLKDEV_ICK_ID("scu.4", "rcar_sound", &mstp_clks[MSTP1027]),

	CLKDEV_ICK_ID("scu.5", "rcar_sound", &mstp_clks[MSTP1026]),

	CLKDEV_ICK_ID("scu.6", "rcar_sound", &mstp_clks[MSTP1025]),

	CLKDEV_ICK_ID("scu.7", "rcar_sound", &mstp_clks[MSTP1024]),

	CLKDEV_ICK_ID("scu.8", "rcar_sound", &mstp_clks[MSTP1023]),

	CLKDEV_ICK_ID("scu.9", "rcar_sound", &mstp_clks[MSTP1022]),

	CLKDEV_ICK_ID("src.0", "rcar_sound", &mstp_clks[MSTP1031]),

	CLKDEV_ICK_ID("src.1", "rcar_sound", &mstp_clks[MSTP1030]),

	CLKDEV_ICK_ID("src.2", "rcar_sound", &mstp_clks[MSTP1029]),

	CLKDEV_ICK_ID("src.3", "rcar_sound", &mstp_clks[MSTP1028]),

	CLKDEV_ICK_ID("src.4", "rcar_sound", &mstp_clks[MSTP1027]),

	CLKDEV_ICK_ID("src.5", "rcar_sound", &mstp_clks[MSTP1026]),

	CLKDEV_ICK_ID("src.6", "rcar_sound", &mstp_clks[MSTP1025]),

	CLKDEV_ICK_ID("src.7", "rcar_sound", &mstp_clks[MSTP1024]),

	CLKDEV_ICK_ID("src.8", "rcar_sound", &mstp_clks[MSTP1023]),

	CLKDEV_ICK_ID("src.9", "rcar_sound", &mstp_clks[MSTP1022]),

	CLKDEV_ICK_ID("ssi.0", "rcar_sound", &mstp_clks[MSTP1015]),

	CLKDEV_ICK_ID("ssi.1", "rcar_sound", &mstp_clks[MSTP1014]),

	CLKDEV_ICK_ID("ssi.2", "rcar_sound", &mstp_clks[MSTP1013]),