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

Commit d3a088d4 authored by Simon Horman's avatar Simon Horman
Browse files

Merge tag 'renesas-clock-for-v3.16' into cmt-mtu2-tmu-cleanups-for-v3.16 

Renesas ARM Based SoC Clock Updates for v3.16

SH Mobile shared clock code
* Introduce shmobile_clk_workaround()

r8a7791 (R-Car M2) SoC
* Rename VSP1_SY clocks to VSP1_S
* Correct the I2C clocks parents

r8a7790 (R-Car H2) SoC
* Remove old style audio clock
* Rename VSP1_(SY|RT) clocks to VSP1_(S|R)
* Fix the I2C clocks parents

r8a7778 (R-Car M1) SoC
* Remove old style audio clock
parents a09b2f0b 932616ee

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

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