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

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

Merge tag 'renesas-clock2-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers

Merge "Second Round of Renesas ARM Based SoC Clock Updates for v3.15" from
Simon Horman:

r8a7790 (R-Car H2) SoC
- Add sound SCU clock support

r8a7791 (R-Car M2) SoC
- Remove legacy clock aliases for DT devices

* tag 'renesas-clock2-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: r8a7790: add sound SCU clock support
  ARM: shmobile: r8a7791: Remove legacy clock aliases for DT devices

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 6020dd9b 9ced1d47

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

+25 −0
Original line number Diff line number Diff line
@@ -204,6 +204,10 @@ static struct clk div6_clks[DIV6_NR] = { 


/* MSTP */

enum {

	MSTP1017, /* parent of SCU */



	MSTP1031, MSTP1030,

	MSTP1029, MSTP1028, MSTP1027, MSTP1026, MSTP1025, MSTP1024, MSTP1023, MSTP1022,

	MSTP1015, MSTP1014, MSTP1013, MSTP1012, MSTP1011, MSTP1010,

	MSTP1009, MSTP1008, MSTP1007, MSTP1006, MSTP1005,

	MSTP931, MSTP930, MSTP929, MSTP928,
@@ -223,6 +227,17 @@ enum { 
};



static struct clk mstp_clks[MSTP_NR] = {

	[MSTP1031] = SH_CLK_MSTP32_STS(&mstp_clks[MSTP1017], SMSTPCR10, 31, MSTPSR10, 0), /* SCU0 */

	[MSTP1030] = SH_CLK_MSTP32_STS(&mstp_clks[MSTP1017], SMSTPCR10, 30, MSTPSR10, 0), /* SCU1 */

	[MSTP1029] = SH_CLK_MSTP32_STS(&mstp_clks[MSTP1017], SMSTPCR10, 29, MSTPSR10, 0), /* SCU2 */

	[MSTP1028] = SH_CLK_MSTP32_STS(&mstp_clks[MSTP1017], SMSTPCR10, 28, MSTPSR10, 0), /* SCU3 */

	[MSTP1027] = SH_CLK_MSTP32_STS(&mstp_clks[MSTP1017], SMSTPCR10, 27, MSTPSR10, 0), /* SCU4 */

	[MSTP1026] = SH_CLK_MSTP32_STS(&mstp_clks[MSTP1017], SMSTPCR10, 26, MSTPSR10, 0), /* SCU5 */

	[MSTP1025] = SH_CLK_MSTP32_STS(&mstp_clks[MSTP1017], SMSTPCR10, 25, MSTPSR10, 0), /* SCU6 */

	[MSTP1024] = SH_CLK_MSTP32_STS(&mstp_clks[MSTP1017], SMSTPCR10, 24, MSTPSR10, 0), /* SCU7 */

	[MSTP1023] = SH_CLK_MSTP32_STS(&mstp_clks[MSTP1017], SMSTPCR10, 23, MSTPSR10, 0), /* SCU8 */

	[MSTP1022] = SH_CLK_MSTP32_STS(&mstp_clks[MSTP1017], SMSTPCR10, 22, MSTPSR10, 0), /* SCU9 */

	[MSTP1017] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR10, 17, MSTPSR10, 0), /* SCU */

	[MSTP1015] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR10, 15, MSTPSR10, 0), /* SSI0 */

	[MSTP1014] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR10, 14, MSTPSR10, 0), /* SSI1 */

	[MSTP1013] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR10, 13, MSTPSR10, 0), /* SSI2 */
@@ -366,6 +381,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("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]),

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

+0 −1
Original line number Diff line number Diff line
@@ -267,7 +267,6 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP311]),

	CLKDEV_DEV_ID("sh_cmt.0", &mstp_clks[MSTP124]),

	CLKDEV_DEV_ID("qspi.0", &mstp_clks[MSTP917]),

	CLKDEV_DEV_ID("e61f0000.thermal", &mstp_clks[MSTP522]),

	CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),

	CLKDEV_DEV_ID("i2c-rcar_gen2.0", &mstp_clks[MSTP931]),

	CLKDEV_DEV_ID("i2c-rcar_gen2.1", &mstp_clks[MSTP930]),