mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
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: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Acked-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
This commit is contained in:
parent
1270f86517
commit
fa3d39bf25
10 changed files with 54 additions and 47 deletions
|
@ -115,7 +115,14 @@ static struct clk_lookup lookups[] = {
|
||||||
CLKDEV_CON_ID("peripheral_clk", &div4_clks[DIV4_P]),
|
CLKDEV_CON_ID("peripheral_clk", &div4_clks[DIV4_P]),
|
||||||
|
|
||||||
/* MSTP clocks */
|
/* 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_CON_ID("vdc3", &mstp_clks[MSTP74]),
|
||||||
CLKDEV_ICK_ID("fck", "sh-cmt-16.0", &mstp_clks[MSTP72]),
|
CLKDEV_ICK_ID("fck", "sh-cmt-16.0", &mstp_clks[MSTP72]),
|
||||||
CLKDEV_CON_ID("usb0", &mstp_clks[MSTP60]),
|
CLKDEV_CON_ID("usb0", &mstp_clks[MSTP60]),
|
||||||
|
|
|
@ -150,14 +150,14 @@ static struct clk_lookup lookups[] = {
|
||||||
CLKDEV_CON_ID("bus_clk", &div4_clks[DIV4_B]),
|
CLKDEV_CON_ID("bus_clk", &div4_clks[DIV4_B]),
|
||||||
|
|
||||||
/* MSTP clocks */
|
/* MSTP clocks */
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[MSTP47]),
|
CLKDEV_ICK_ID("fck", "sh-sci.0", &mstp_clks[MSTP47]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &mstp_clks[MSTP46]),
|
CLKDEV_ICK_ID("fck", "sh-sci.1", &mstp_clks[MSTP46]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &mstp_clks[MSTP45]),
|
CLKDEV_ICK_ID("fck", "sh-sci.2", &mstp_clks[MSTP45]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.3", &mstp_clks[MSTP44]),
|
CLKDEV_ICK_ID("fck", "sh-sci.3", &mstp_clks[MSTP44]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.4", &mstp_clks[MSTP43]),
|
CLKDEV_ICK_ID("fck", "sh-sci.4", &mstp_clks[MSTP43]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.5", &mstp_clks[MSTP42]),
|
CLKDEV_ICK_ID("fck", "sh-sci.5", &mstp_clks[MSTP42]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.6", &mstp_clks[MSTP41]),
|
CLKDEV_ICK_ID("fck", "sh-sci.6", &mstp_clks[MSTP41]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.7", &mstp_clks[MSTP40]),
|
CLKDEV_ICK_ID("fck", "sh-sci.7", &mstp_clks[MSTP40]),
|
||||||
CLKDEV_ICK_ID("fck", "sh-cmt-16.0", &mstp_clks[MSTP72]),
|
CLKDEV_ICK_ID("fck", "sh-cmt-16.0", &mstp_clks[MSTP72]),
|
||||||
CLKDEV_CON_ID("usb0", &mstp_clks[MSTP60]),
|
CLKDEV_CON_ID("usb0", &mstp_clks[MSTP60]),
|
||||||
CLKDEV_ICK_ID("fck", "sh-mtu2", &mstp_clks[MSTP35]),
|
CLKDEV_ICK_ID("fck", "sh-mtu2", &mstp_clks[MSTP35]),
|
||||||
|
|
|
@ -232,10 +232,10 @@ static struct clk_lookup lookups[] = {
|
||||||
CLKDEV_CON_ID("mfi0", &mstp_clks[MSTP011]),
|
CLKDEV_CON_ID("mfi0", &mstp_clks[MSTP011]),
|
||||||
CLKDEV_CON_ID("flctl0", &mstp_clks[MSTP010]),
|
CLKDEV_CON_ID("flctl0", &mstp_clks[MSTP010]),
|
||||||
|
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[MSTP007]),
|
CLKDEV_ICK_ID("fck", "sh-sci.0", &mstp_clks[MSTP007]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &mstp_clks[MSTP006]),
|
CLKDEV_ICK_ID("fck", "sh-sci.1", &mstp_clks[MSTP006]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &mstp_clks[MSTP005]),
|
CLKDEV_ICK_ID("fck", "sh-sci.2", &mstp_clks[MSTP005]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.3", &mstp_clks[MSTP004]),
|
CLKDEV_ICK_ID("fck", "sh-sci.3", &mstp_clks[MSTP004]),
|
||||||
|
|
||||||
CLKDEV_CON_ID("sio0", &mstp_clks[MSTP003]),
|
CLKDEV_CON_ID("sio0", &mstp_clks[MSTP003]),
|
||||||
CLKDEV_CON_ID("siof0", &mstp_clks[MSTP002]),
|
CLKDEV_CON_ID("siof0", &mstp_clks[MSTP002]),
|
||||||
|
|
|
@ -230,9 +230,9 @@ static struct clk_lookup lookups[] = {
|
||||||
CLKDEV_CON_ID("mfi0", &mstp_clks[MSTP011]),
|
CLKDEV_CON_ID("mfi0", &mstp_clks[MSTP011]),
|
||||||
CLKDEV_CON_ID("flctl0", &mstp_clks[MSTP010]),
|
CLKDEV_CON_ID("flctl0", &mstp_clks[MSTP010]),
|
||||||
|
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[MSTP007]),
|
CLKDEV_ICK_ID("fck", "sh-sci.0", &mstp_clks[MSTP007]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &mstp_clks[MSTP006]),
|
CLKDEV_ICK_ID("fck", "sh-sci.1", &mstp_clks[MSTP006]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &mstp_clks[MSTP005]),
|
CLKDEV_ICK_ID("fck", "sh-sci.2", &mstp_clks[MSTP005]),
|
||||||
|
|
||||||
CLKDEV_CON_ID("msiof0", &mstp_clks[MSTP002]),
|
CLKDEV_CON_ID("msiof0", &mstp_clks[MSTP002]),
|
||||||
CLKDEV_CON_ID("sbr0", &mstp_clks[MSTP001]),
|
CLKDEV_CON_ID("sbr0", &mstp_clks[MSTP001]),
|
||||||
|
|
|
@ -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.0", &mstp_clks[HWBLK_TMU0]),
|
||||||
CLKDEV_ICK_ID("fck", "sh-tmu.1", &mstp_clks[HWBLK_TMU1]),
|
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("fck", "sh-sci.0", &mstp_clks[HWBLK_SCIF0]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &mstp_clks[HWBLK_SCIF1]),
|
CLKDEV_ICK_ID("fck", "sh-sci.1", &mstp_clks[HWBLK_SCIF1]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &mstp_clks[HWBLK_SCIF2]),
|
CLKDEV_ICK_ID("fck", "sh-sci.2", &mstp_clks[HWBLK_SCIF2]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.3", &mstp_clks[HWBLK_SCIF3]),
|
CLKDEV_ICK_ID("fck", "sh-sci.3", &mstp_clks[HWBLK_SCIF3]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.4", &mstp_clks[HWBLK_SCIF4]),
|
CLKDEV_ICK_ID("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.5", &mstp_clks[HWBLK_SCIF5]),
|
||||||
|
|
||||||
CLKDEV_DEV_ID("sh_mobile_lcdc_fb.0", &mstp_clks[HWBLK_LCDC]),
|
CLKDEV_DEV_ID("sh_mobile_lcdc_fb.0", &mstp_clks[HWBLK_LCDC]),
|
||||||
};
|
};
|
||||||
|
|
|
@ -194,12 +194,12 @@ static struct clk_lookup lookups[] = {
|
||||||
/* MSTP32 clocks */
|
/* MSTP32 clocks */
|
||||||
CLKDEV_DEV_ID("i2c-sh7734.0", &mstp_clks[MSTP030]),
|
CLKDEV_DEV_ID("i2c-sh7734.0", &mstp_clks[MSTP030]),
|
||||||
CLKDEV_DEV_ID("i2c-sh7734.1", &mstp_clks[MSTP029]),
|
CLKDEV_DEV_ID("i2c-sh7734.1", &mstp_clks[MSTP029]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[MSTP026]),
|
CLKDEV_ICK_ID("fck", "sh-sci.0", &mstp_clks[MSTP026]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &mstp_clks[MSTP025]),
|
CLKDEV_ICK_ID("fck", "sh-sci.1", &mstp_clks[MSTP025]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &mstp_clks[MSTP024]),
|
CLKDEV_ICK_ID("fck", "sh-sci.2", &mstp_clks[MSTP024]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.3", &mstp_clks[MSTP023]),
|
CLKDEV_ICK_ID("fck", "sh-sci.3", &mstp_clks[MSTP023]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.4", &mstp_clks[MSTP022]),
|
CLKDEV_ICK_ID("fck", "sh-sci.4", &mstp_clks[MSTP022]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.5", &mstp_clks[MSTP021]),
|
CLKDEV_ICK_ID("fck", "sh-sci.5", &mstp_clks[MSTP021]),
|
||||||
CLKDEV_CON_ID("hscif", &mstp_clks[MSTP019]),
|
CLKDEV_CON_ID("hscif", &mstp_clks[MSTP019]),
|
||||||
CLKDEV_ICK_ID("fck", "sh-tmu.0", &mstp_clks[MSTP016]),
|
CLKDEV_ICK_ID("fck", "sh-tmu.0", &mstp_clks[MSTP016]),
|
||||||
CLKDEV_ICK_ID("fck", "sh-tmu.1", &mstp_clks[MSTP015]),
|
CLKDEV_ICK_ID("fck", "sh-tmu.1", &mstp_clks[MSTP015]),
|
||||||
|
|
|
@ -125,9 +125,9 @@ static struct clk_lookup lookups[] = {
|
||||||
|
|
||||||
CLKDEV_ICK_ID("fck", "sh-tmu.0", &mstp_clks[MSTP113]),
|
CLKDEV_ICK_ID("fck", "sh-tmu.0", &mstp_clks[MSTP113]),
|
||||||
CLKDEV_ICK_ID("fck", "sh-tmu.1", &mstp_clks[MSTP114]),
|
CLKDEV_ICK_ID("fck", "sh-tmu.1", &mstp_clks[MSTP114]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &mstp_clks[MSTP112]),
|
CLKDEV_ICK_ID("fck", "sh-sci.2", &mstp_clks[MSTP112]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &mstp_clks[MSTP111]),
|
CLKDEV_ICK_ID("fck", "sh-sci.1", &mstp_clks[MSTP111]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[MSTP110]),
|
CLKDEV_ICK_ID("fck", "sh-sci.0", &mstp_clks[MSTP110]),
|
||||||
|
|
||||||
CLKDEV_CON_ID("usb_fck", &mstp_clks[MSTP103]),
|
CLKDEV_CON_ID("usb_fck", &mstp_clks[MSTP103]),
|
||||||
CLKDEV_DEV_ID("renesas_usbhs.0", &mstp_clks[MSTP102]),
|
CLKDEV_DEV_ID("renesas_usbhs.0", &mstp_clks[MSTP102]),
|
||||||
|
|
|
@ -132,12 +132,12 @@ static struct clk_lookup lookups[] = {
|
||||||
CLKDEV_CON_ID("cpu_clk", &div4_clks[DIV4_I]),
|
CLKDEV_CON_ID("cpu_clk", &div4_clks[DIV4_I]),
|
||||||
|
|
||||||
/* MSTP32 clocks */
|
/* MSTP32 clocks */
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.5", &mstp_clks[MSTP029]),
|
CLKDEV_ICK_ID("fck", "sh-sci.5", &mstp_clks[MSTP029]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.4", &mstp_clks[MSTP028]),
|
CLKDEV_ICK_ID("fck", "sh-sci.4", &mstp_clks[MSTP028]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.3", &mstp_clks[MSTP027]),
|
CLKDEV_ICK_ID("fck", "sh-sci.3", &mstp_clks[MSTP027]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &mstp_clks[MSTP026]),
|
CLKDEV_ICK_ID("fck", "sh-sci.2", &mstp_clks[MSTP026]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &mstp_clks[MSTP025]),
|
CLKDEV_ICK_ID("fck", "sh-sci.1", &mstp_clks[MSTP025]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[MSTP024]),
|
CLKDEV_ICK_ID("fck", "sh-sci.0", &mstp_clks[MSTP024]),
|
||||||
|
|
||||||
CLKDEV_CON_ID("ssi1_fck", &mstp_clks[MSTP021]),
|
CLKDEV_CON_ID("ssi1_fck", &mstp_clks[MSTP021]),
|
||||||
CLKDEV_CON_ID("ssi0_fck", &mstp_clks[MSTP020]),
|
CLKDEV_CON_ID("ssi0_fck", &mstp_clks[MSTP020]),
|
||||||
|
|
|
@ -139,12 +139,12 @@ static struct clk_lookup lookups[] = {
|
||||||
CLKDEV_CON_ID("cpu_clk", &div4_clks[DIV4_I]),
|
CLKDEV_CON_ID("cpu_clk", &div4_clks[DIV4_I]),
|
||||||
|
|
||||||
/* MSTP32 clocks */
|
/* MSTP32 clocks */
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.5", &mstp_clks[MSTP029]),
|
CLKDEV_ICK_ID("fck", "sh-sci.5", &mstp_clks[MSTP029]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.4", &mstp_clks[MSTP028]),
|
CLKDEV_ICK_ID("fck", "sh-sci.4", &mstp_clks[MSTP028]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.3", &mstp_clks[MSTP027]),
|
CLKDEV_ICK_ID("fck", "sh-sci.3", &mstp_clks[MSTP027]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &mstp_clks[MSTP026]),
|
CLKDEV_ICK_ID("fck", "sh-sci.2", &mstp_clks[MSTP026]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &mstp_clks[MSTP025]),
|
CLKDEV_ICK_ID("fck", "sh-sci.1", &mstp_clks[MSTP025]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[MSTP024]),
|
CLKDEV_ICK_ID("fck", "sh-sci.0", &mstp_clks[MSTP024]),
|
||||||
|
|
||||||
CLKDEV_CON_ID("ssi3_fck", &mstp_clks[MSTP023]),
|
CLKDEV_CON_ID("ssi3_fck", &mstp_clks[MSTP023]),
|
||||||
CLKDEV_CON_ID("ssi2_fck", &mstp_clks[MSTP022]),
|
CLKDEV_CON_ID("ssi2_fck", &mstp_clks[MSTP022]),
|
||||||
|
|
|
@ -114,10 +114,10 @@ static struct clk_lookup lookups[] = {
|
||||||
CLKDEV_CON_ID("cpu_clk", &div4_clks[DIV4_I]),
|
CLKDEV_CON_ID("cpu_clk", &div4_clks[DIV4_I]),
|
||||||
|
|
||||||
/* MSTP32 clocks */
|
/* MSTP32 clocks */
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.3", &mstp_clks[MSTP027]),
|
CLKDEV_ICK_ID("fck", "sh-sci.3", &mstp_clks[MSTP027]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &mstp_clks[MSTP026]),
|
CLKDEV_ICK_ID("fck", "sh-sci.2", &mstp_clks[MSTP026]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &mstp_clks[MSTP025]),
|
CLKDEV_ICK_ID("fck", "sh-sci.1", &mstp_clks[MSTP025]),
|
||||||
CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[MSTP024]),
|
CLKDEV_ICK_ID("fck", "sh-sci.0", &mstp_clks[MSTP024]),
|
||||||
|
|
||||||
CLKDEV_CON_ID("h8ex_fck", &mstp_clks[MSTP003]),
|
CLKDEV_CON_ID("h8ex_fck", &mstp_clks[MSTP003]),
|
||||||
CLKDEV_CON_ID("csm_fck", &mstp_clks[MSTP002]),
|
CLKDEV_CON_ID("csm_fck", &mstp_clks[MSTP002]),
|
||||||
|
|
Loading…
Reference in a new issue