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

Commit fa3d39bf authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Geert Uytterhoeven
Browse files

sh: Rename sci_ick and sci_fck clock to fck 



The SCI driver requires a functional clock named "fck" and falls back to
"sci_ick" or "sci_fck" when the "fck" clock doesn't exist. To allow
removal of the fallback code rename the sci_ick and sci_fck clocks to
fck for all SH platforms.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
parent 1270f865

arch/sh/kernel/cpu/sh2a/clock-sh7264.c

+8 −1
Original line number Diff line number Diff line
@@ -115,7 +115,14 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_CON_ID("peripheral_clk", &div4_clks[DIV4_P]),



	/* MSTP clocks */

	CLKDEV_CON_ID("sci_ick", &mstp_clks[MSTP77]),

	CLKDEV_ICK_ID("fck", "sh-sci.0", &mstp_clks[MSTP77]),

	CLKDEV_ICK_ID("fck", "sh-sci.1", &mstp_clks[MSTP77]),

	CLKDEV_ICK_ID("fck", "sh-sci.2", &mstp_clks[MSTP77]),

	CLKDEV_ICK_ID("fck", "sh-sci.3", &mstp_clks[MSTP77]),

	CLKDEV_ICK_ID("fck", "sh-sci.4", &mstp_clks[MSTP77]),

	CLKDEV_ICK_ID("fck", "sh-sci.5", &mstp_clks[MSTP77]),

	CLKDEV_ICK_ID("fck", "sh-sci.6", &mstp_clks[MSTP77]),

	CLKDEV_ICK_ID("fck", "sh-sci.7", &mstp_clks[MSTP77]),

	CLKDEV_CON_ID("vdc3", &mstp_clks[MSTP74]),

	CLKDEV_ICK_ID("fck", "sh-cmt-16.0", &mstp_clks[MSTP72]),

	CLKDEV_CON_ID("usb0", &mstp_clks[MSTP60]),

arch/sh/kernel/cpu/sh2a/clock-sh7269.c

+8 −8
Original line number Diff line number Diff line
@@ -150,14 +150,14 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_CON_ID("bus_clk", &div4_clks[DIV4_B]),



	/* MSTP clocks */

	CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[MSTP47]),

	CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &mstp_clks[MSTP46]),

	CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &mstp_clks[MSTP45]),

	CLKDEV_ICK_ID("sci_fck", "sh-sci.3", &mstp_clks[MSTP44]),

	CLKDEV_ICK_ID("sci_fck", "sh-sci.4", &mstp_clks[MSTP43]),

	CLKDEV_ICK_ID("sci_fck", "sh-sci.5", &mstp_clks[MSTP42]),

	CLKDEV_ICK_ID("sci_fck", "sh-sci.6", &mstp_clks[MSTP41]),

	CLKDEV_ICK_ID("sci_fck", "sh-sci.7", &mstp_clks[MSTP40]),

	CLKDEV_ICK_ID("fck", "sh-sci.0", &mstp_clks[MSTP47]),

	CLKDEV_ICK_ID("fck", "sh-sci.1", &mstp_clks[MSTP46]),

	CLKDEV_ICK_ID("fck", "sh-sci.2", &mstp_clks[MSTP45]),

	CLKDEV_ICK_ID("fck", "sh-sci.3", &mstp_clks[MSTP44]),

	CLKDEV_ICK_ID("fck", "sh-sci.4", &mstp_clks[MSTP43]),

	CLKDEV_ICK_ID("fck", "sh-sci.5", &mstp_clks[MSTP42]),

	CLKDEV_ICK_ID("fck", "sh-sci.6", &mstp_clks[MSTP41]),

	CLKDEV_ICK_ID("fck", "sh-sci.7", &mstp_clks[MSTP40]),

	CLKDEV_ICK_ID("fck", "sh-cmt-16.0", &mstp_clks[MSTP72]),

	CLKDEV_CON_ID("usb0", &mstp_clks[MSTP60]),

	CLKDEV_ICK_ID("fck", "sh-mtu2", &mstp_clks[MSTP35]),

arch/sh/kernel/cpu/sh4a/clock-sh7343.c

+4 −4
Original line number Diff line number Diff line
@@ -232,10 +232,10 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_CON_ID("mfi0", &mstp_clks[MSTP011]),

	CLKDEV_CON_ID("flctl0", &mstp_clks[MSTP010]),



	CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[MSTP007]),

	CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &mstp_clks[MSTP006]),

	CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &mstp_clks[MSTP005]),

	CLKDEV_ICK_ID("sci_fck", "sh-sci.3", &mstp_clks[MSTP004]),

	CLKDEV_ICK_ID("fck", "sh-sci.0", &mstp_clks[MSTP007]),

	CLKDEV_ICK_ID("fck", "sh-sci.1", &mstp_clks[MSTP006]),

	CLKDEV_ICK_ID("fck", "sh-sci.2", &mstp_clks[MSTP005]),

	CLKDEV_ICK_ID("fck", "sh-sci.3", &mstp_clks[MSTP004]),



	CLKDEV_CON_ID("sio0", &mstp_clks[MSTP003]),

	CLKDEV_CON_ID("siof0", &mstp_clks[MSTP002]),

arch/sh/kernel/cpu/sh4a/clock-sh7366.c

+3 −3
Original line number Diff line number Diff line
@@ -230,9 +230,9 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_CON_ID("mfi0", &mstp_clks[MSTP011]),

	CLKDEV_CON_ID("flctl0", &mstp_clks[MSTP010]),



	CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[MSTP007]),

	CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &mstp_clks[MSTP006]),

	CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &mstp_clks[MSTP005]),

	CLKDEV_ICK_ID("fck", "sh-sci.0", &mstp_clks[MSTP007]),

	CLKDEV_ICK_ID("fck", "sh-sci.1", &mstp_clks[MSTP006]),

	CLKDEV_ICK_ID("fck", "sh-sci.2", &mstp_clks[MSTP005]),



	CLKDEV_CON_ID("msiof0", &mstp_clks[MSTP002]),

	CLKDEV_CON_ID("sbr0", &mstp_clks[MSTP001]),

arch/sh/kernel/cpu/sh4a/clock-sh7723.c

+6 −6
Original line number Diff line number Diff line
@@ -267,12 +267,12 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_ICK_ID("fck", "sh-tmu.0", &mstp_clks[HWBLK_TMU0]),

	CLKDEV_ICK_ID("fck", "sh-tmu.1", &mstp_clks[HWBLK_TMU1]),



	CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[HWBLK_SCIF0]),

	CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &mstp_clks[HWBLK_SCIF1]),

	CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &mstp_clks[HWBLK_SCIF2]),

	CLKDEV_ICK_ID("sci_fck", "sh-sci.3", &mstp_clks[HWBLK_SCIF3]),

	CLKDEV_ICK_ID("sci_fck", "sh-sci.4", &mstp_clks[HWBLK_SCIF4]),

	CLKDEV_ICK_ID("sci_fck", "sh-sci.5", &mstp_clks[HWBLK_SCIF5]),

	CLKDEV_ICK_ID("fck", "sh-sci.0", &mstp_clks[HWBLK_SCIF0]),

	CLKDEV_ICK_ID("fck", "sh-sci.1", &mstp_clks[HWBLK_SCIF1]),

	CLKDEV_ICK_ID("fck", "sh-sci.2", &mstp_clks[HWBLK_SCIF2]),

	CLKDEV_ICK_ID("fck", "sh-sci.3", &mstp_clks[HWBLK_SCIF3]),

	CLKDEV_ICK_ID("fck", "sh-sci.4", &mstp_clks[HWBLK_SCIF4]),

	CLKDEV_ICK_ID("fck", "sh-sci.5", &mstp_clks[HWBLK_SCIF5]),



	CLKDEV_DEV_ID("sh_mobile_lcdc_fb.0", &mstp_clks[HWBLK_LCDC]),

};