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

Commit 6816bfa3 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'renesas-sh73a0' into renesas-soc 

* renesas-sh73a0:
  ARM: shmobile: sh73a0: add FSI clock
parents 147d1ffd ea7e1a5a

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

+3 −1
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ enum { MSTP001, 
	MSTP129, MSTP128, MSTP127, MSTP126, MSTP125, MSTP118, MSTP116, MSTP100,

	MSTP219, MSTP218,

	MSTP207, MSTP206, MSTP204, MSTP203, MSTP202, MSTP201, MSTP200,

	MSTP331, MSTP329, MSTP325, MSTP323,

	MSTP331, MSTP329, MSTP328, MSTP325, MSTP323,

	MSTP314, MSTP313, MSTP312, MSTP311,

	MSTP303, MSTP302, MSTP301, MSTP300,

	MSTP411, MSTP410, MSTP403,
@@ -507,6 +507,7 @@ static struct clk mstp_clks[MSTP_NR] = { 
	[MSTP200] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR2, 0, 0), /* SCIFA4 */

	[MSTP331] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR3, 31, 0), /* SCIFA6 */

	[MSTP329] = MSTP(&r_clk, SMSTPCR3, 29, 0), /* CMT10 */

	[MSTP328] = MSTP(&div4_clks[DIV4_HP], SMSTPCR3, 28, 0), /*FSI*/

	[MSTP325] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR3, 25, 0), /* IrDA */

	[MSTP323] = MSTP(&div4_clks[DIV4_HP], SMSTPCR3, 23, 0), /* IIC1 */

	[MSTP314] = MSTP(&div6_clks[DIV6_SDHI0], SMSTPCR3, 14, 0), /* SDHI0 */
@@ -562,6 +563,7 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP200]), /* SCIFA4 */

	CLKDEV_DEV_ID("sh-sci.6", &mstp_clks[MSTP331]), /* SCIFA6 */

	CLKDEV_DEV_ID("sh_cmt.10", &mstp_clks[MSTP329]), /* CMT10 */

	CLKDEV_DEV_ID("sh_fsi2", &mstp_clks[MSTP328]), /* FSI */

	CLKDEV_DEV_ID("sh_irda.0", &mstp_clks[MSTP325]), /* IrDA */

	CLKDEV_DEV_ID("i2c-sh_mobile.1", &mstp_clks[MSTP323]), /* I2C1 */

	CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP314]), /* SDHI0 */