Merge branch 'scif-clk-sck-brg-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into tty-next

Geert writes:

Summary:
  - Clean up the naming of clocks in the sh-sci driver and its DT bindings,
  - Add support for the optional external clock on (H)SCI(F), where this pin
    can serve as a clock input,
  - Add support for the optional clock sources for the Baud Rate
    Generator for External Clock (BRG), as found on some SCIF variants
    and on HSCIF.

12 files changed, 60 insertions, 54 deletions

diff --git a/arch/sh/kernel/cpu/clock-cpg.c b/arch/sh/kernel/cpu/clock-cpg.c
index 8525a671266f..786c0769b4c3 100644
--- a/arch/sh/kernel/cpu/clock-cpg.c
+++ b/arch/sh/kernel/cpu/clock-cpg.c
@@ -63,7 +63,6 @@ int __init __deprecated cpg_clk_init(void)
         clk_add_alias("fck", "sh-mtu2", "peripheral_clk", NULL);
         clk_add_alias("fck", "sh-cmt-16.0", "peripheral_clk", NULL);
         clk_add_alias("fck", "sh-cmt-32.0", "peripheral_clk", NULL);
-        clk_add_alias("sci_ick", NULL, "peripheral_clk", NULL);
 
         return ret;
 }
diff --git a/arch/sh/kernel/cpu/sh2a/clock-sh7264.c b/arch/sh/kernel/cpu/sh2a/clock-sh7264.c
index 8638fba6cd7f..7e06e39b0958 100644
--- a/arch/sh/kernel/cpu/sh2a/clock-sh7264.c
+++ b/arch/sh/kernel/cpu/sh2a/clock-sh7264.c
@@ -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]),
diff --git a/arch/sh/kernel/cpu/sh2a/clock-sh7269.c b/arch/sh/kernel/cpu/sh2a/clock-sh7269.c
index f8a5c2abdfb3..663a97bed554 100644
--- a/arch/sh/kernel/cpu/sh2a/clock-sh7269.c
+++ b/arch/sh/kernel/cpu/sh2a/clock-sh7269.c
@@ -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]),
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7343.c b/arch/sh/kernel/cpu/sh4a/clock-sh7343.c
index 9edc06c02dcf..a907ee2388bf 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7343.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7343.c
@@ -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]),
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7366.c b/arch/sh/kernel/cpu/sh4a/clock-sh7366.c
index 955b9add7810..ac9854179dee 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7366.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7366.c
@@ -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]),
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7723.c b/arch/sh/kernel/cpu/sh4a/clock-sh7723.c
index ccbcab550df2..fe844222f3f6 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7723.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7723.c
@@ -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]),
 };
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7734.c b/arch/sh/kernel/cpu/sh4a/clock-sh7734.c
index 7f54bf2f453d..354dcac5e4cd 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7734.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7734.c
@@ -194,12 +194,12 @@ static struct clk_lookup lookups[] = {
         /* MSTP32 clocks */
         CLKDEV_DEV_ID("i2c-sh7734.0", &mstp_clks[MSTP030]),
         CLKDEV_DEV_ID("i2c-sh7734.1", &mstp_clks[MSTP029]),
-        CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[MSTP026]),
-        CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &mstp_clks[MSTP025]),
-        CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &mstp_clks[MSTP024]),
-        CLKDEV_ICK_ID("sci_fck", "sh-sci.3", &mstp_clks[MSTP023]),
-        CLKDEV_ICK_ID("sci_fck", "sh-sci.4", &mstp_clks[MSTP022]),
-        CLKDEV_ICK_ID("sci_fck", "sh-sci.5", &mstp_clks[MSTP021]),
+        CLKDEV_ICK_ID("fck", "sh-sci.0", &mstp_clks[MSTP026]),
+        CLKDEV_ICK_ID("fck", "sh-sci.1", &mstp_clks[MSTP025]),
+        CLKDEV_ICK_ID("fck", "sh-sci.2", &mstp_clks[MSTP024]),
+        CLKDEV_ICK_ID("fck", "sh-sci.3", &mstp_clks[MSTP023]),
+        CLKDEV_ICK_ID("fck", "sh-sci.4", &mstp_clks[MSTP022]),
+        CLKDEV_ICK_ID("fck", "sh-sci.5", &mstp_clks[MSTP021]),
         CLKDEV_CON_ID("hscif", &mstp_clks[MSTP019]),
         CLKDEV_ICK_ID("fck", "sh-tmu.0", &mstp_clks[MSTP016]),
         CLKDEV_ICK_ID("fck", "sh-tmu.1", &mstp_clks[MSTP015]),
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7757.c b/arch/sh/kernel/cpu/sh4a/clock-sh7757.c
index e40ec2c97ad1..b10af2ae9f35 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7757.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7757.c
@@ -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.1", &mstp_clks[MSTP114]),
-        CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &mstp_clks[MSTP112]),
-        CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &mstp_clks[MSTP111]),
-        CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[MSTP110]),
+        CLKDEV_ICK_ID("fck", "sh-sci.2", &mstp_clks[MSTP112]),
+        CLKDEV_ICK_ID("fck", "sh-sci.1", &mstp_clks[MSTP111]),
+        CLKDEV_ICK_ID("fck", "sh-sci.0", &mstp_clks[MSTP110]),
 
         CLKDEV_CON_ID("usb_fck", &mstp_clks[MSTP103]),
         CLKDEV_DEV_ID("renesas_usbhs.0", &mstp_clks[MSTP102]),
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7785.c b/arch/sh/kernel/cpu/sh4a/clock-sh7785.c
index 8eb6e62340c9..1aafd5496752 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7785.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7785.c
@@ -132,12 +132,12 @@ static struct clk_lookup lookups[] = {
         CLKDEV_CON_ID("cpu_clk", &div4_clks[DIV4_I]),
 
         /* MSTP32 clocks */
-        CLKDEV_ICK_ID("sci_fck", "sh-sci.5", &mstp_clks[MSTP029]),
-        CLKDEV_ICK_ID("sci_fck", "sh-sci.4", &mstp_clks[MSTP028]),
-        CLKDEV_ICK_ID("sci_fck", "sh-sci.3", &mstp_clks[MSTP027]),
-        CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &mstp_clks[MSTP026]),
-        CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &mstp_clks[MSTP025]),
-        CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[MSTP024]),
+        CLKDEV_ICK_ID("fck", "sh-sci.5", &mstp_clks[MSTP029]),
+        CLKDEV_ICK_ID("fck", "sh-sci.4", &mstp_clks[MSTP028]),
+        CLKDEV_ICK_ID("fck", "sh-sci.3", &mstp_clks[MSTP027]),
+        CLKDEV_ICK_ID("fck", "sh-sci.2", &mstp_clks[MSTP026]),
+        CLKDEV_ICK_ID("fck", "sh-sci.1", &mstp_clks[MSTP025]),
+        CLKDEV_ICK_ID("fck", "sh-sci.0", &mstp_clks[MSTP024]),
 
         CLKDEV_CON_ID("ssi1_fck", &mstp_clks[MSTP021]),
         CLKDEV_CON_ID("ssi0_fck", &mstp_clks[MSTP020]),
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7786.c b/arch/sh/kernel/cpu/sh4a/clock-sh7786.c
index 5e50e7ebeff0..ac3dcfe5d303 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7786.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7786.c
@@ -139,12 +139,12 @@ static struct clk_lookup lookups[] = {
         CLKDEV_CON_ID("cpu_clk", &div4_clks[DIV4_I]),
 
         /* MSTP32 clocks */
-        CLKDEV_ICK_ID("sci_fck", "sh-sci.5", &mstp_clks[MSTP029]),
-        CLKDEV_ICK_ID("sci_fck", "sh-sci.4", &mstp_clks[MSTP028]),
-        CLKDEV_ICK_ID("sci_fck", "sh-sci.3", &mstp_clks[MSTP027]),
-        CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &mstp_clks[MSTP026]),
-        CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &mstp_clks[MSTP025]),
-        CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[MSTP024]),
+        CLKDEV_ICK_ID("fck", "sh-sci.5", &mstp_clks[MSTP029]),
+        CLKDEV_ICK_ID("fck", "sh-sci.4", &mstp_clks[MSTP028]),
+        CLKDEV_ICK_ID("fck", "sh-sci.3", &mstp_clks[MSTP027]),
+        CLKDEV_ICK_ID("fck", "sh-sci.2", &mstp_clks[MSTP026]),
+        CLKDEV_ICK_ID("fck", "sh-sci.1", &mstp_clks[MSTP025]),
+        CLKDEV_ICK_ID("fck", "sh-sci.0", &mstp_clks[MSTP024]),
 
         CLKDEV_CON_ID("ssi3_fck", &mstp_clks[MSTP023]),
         CLKDEV_CON_ID("ssi2_fck", &mstp_clks[MSTP022]),
diff --git a/arch/sh/kernel/cpu/sh4a/clock-shx3.c b/arch/sh/kernel/cpu/sh4a/clock-shx3.c
index 605221d1448a..b1bdbc3cbc21 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-shx3.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-shx3.c
@@ -114,10 +114,10 @@ static struct clk_lookup lookups[] = {
         CLKDEV_CON_ID("cpu_clk", &div4_clks[DIV4_I]),
 
         /* MSTP32 clocks */
-        CLKDEV_ICK_ID("sci_fck", "sh-sci.3", &mstp_clks[MSTP027]),
-        CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &mstp_clks[MSTP026]),
-        CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &mstp_clks[MSTP025]),
-        CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[MSTP024]),
+        CLKDEV_ICK_ID("fck", "sh-sci.3", &mstp_clks[MSTP027]),
+        CLKDEV_ICK_ID("fck", "sh-sci.2", &mstp_clks[MSTP026]),
+        CLKDEV_ICK_ID("fck", "sh-sci.1", &mstp_clks[MSTP025]),
+        CLKDEV_ICK_ID("fck", "sh-sci.0", &mstp_clks[MSTP024]),
 
         CLKDEV_CON_ID("h8ex_fck", &mstp_clks[MSTP003]),
         CLKDEV_CON_ID("csm_fck", &mstp_clks[MSTP002]),
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7734.c b/arch/sh/kernel/cpu/sh4a/setup-sh7734.c
index f617bcb734df..69b8a50310d9 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7734.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7734.c
@@ -28,7 +28,7 @@ static struct plat_sci_port scif0_platform_data = {
         .flags          = UPF_BOOT_AUTOCONF,
         .scscr          = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
         .type           = PORT_SCIF,
-        .regtype        = SCIx_SH4_SCIF_REGTYPE,
+        .regtype        = SCIx_SH4_SCIF_BRG_REGTYPE,
 };
 
 static struct resource scif0_resources[] = {
@@ -50,7 +50,7 @@ static struct plat_sci_port scif1_platform_data = {
         .flags          = UPF_BOOT_AUTOCONF,
         .scscr          = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
         .type           = PORT_SCIF,
-        .regtype        = SCIx_SH4_SCIF_REGTYPE,
+        .regtype        = SCIx_SH4_SCIF_BRG_REGTYPE,
 };
 
 static struct resource scif1_resources[] = {
@@ -72,7 +72,7 @@ static struct plat_sci_port scif2_platform_data = {
         .flags          = UPF_BOOT_AUTOCONF,
         .scscr          = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
         .type           = PORT_SCIF,
-        .regtype        = SCIx_SH4_SCIF_REGTYPE,
+        .regtype        = SCIx_SH4_SCIF_BRG_REGTYPE,
 };
 
 static struct resource scif2_resources[] = {
@@ -94,7 +94,7 @@ static struct plat_sci_port scif3_platform_data = {
         .flags          = UPF_BOOT_AUTOCONF,
         .scscr          = SCSCR_RE | SCSCR_TE | SCSCR_REIE | SCSCR_TOIE,
         .type           = PORT_SCIF,
-        .regtype        = SCIx_SH4_SCIF_REGTYPE,
+        .regtype        = SCIx_SH4_SCIF_BRG_REGTYPE,
 };
 
 static struct resource scif3_resources[] = {
@@ -116,7 +116,7 @@ static struct plat_sci_port scif4_platform_data = {
         .flags          = UPF_BOOT_AUTOCONF,
         .scscr          = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
         .type           = PORT_SCIF,
-        .regtype        = SCIx_SH4_SCIF_REGTYPE,
+        .regtype        = SCIx_SH4_SCIF_BRG_REGTYPE,
 };
 
 static struct resource scif4_resources[] = {
@@ -138,7 +138,7 @@ static struct plat_sci_port scif5_platform_data = {
         .flags          = UPF_BOOT_AUTOCONF,
         .scscr          = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
         .type           = PORT_SCIF,
-        .regtype                = SCIx_SH4_SCIF_REGTYPE,
+        .regtype        = SCIx_SH4_SCIF_BRG_REGTYPE,
 };
 
 static struct resource scif5_resources[] = {