All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2 00/16] serial: sh-sci: Clock Cleanups
@ 2015-11-19 18:35 ` Geert Uytterhoeven
  0 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:35 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

	Hi,

The SCI driver currently handles two clocks, an interface clock named
sci_ick and a functional clock named sci_fck. Studying the datasheets of
the SH and ARM SoCs that incorportate (H)SCI(F)([AB]) instances showed
(un)surprisingly that the hardware doesn't have a separate controllable
interface clock.

All the platforms that declare an interface clock for the SCI set it to
the clock used as the SCI functional clock. The two clocks can thus be
merged on the driver side, which is what this patch series does. The
resulting clock is called "fck", and all H8/300, SH and ARM users (both
DT and non-DT) are fixed to name their SCI clocks appropriately.

Support for the "sci_ick" name is kept in the sh-sci driver to ensure DT
backward compatibility, and support for the "peripheral_clk" clock to
not break SH platforms that don't declare device-specific SCI clocks.
The latter can be removed when all SH platforms will declare their SCI
clocks properly.

This series serves as a preparatory clock cleanup for the SCI baud rate
generator clock support series. I decided to keep it separate as this
series has more stringent internal dependencies:
  - The SH patches 2-3 depend on patch 1,
  - The DT patches 4-15 depend on patch 1,
  - Cleanup patch 16 depends on SH patch 2.

Thanks for your comments!

Changes compared to v1:
  - Take over the patches from Laurent,
  - Add Acked-by,
  - Handle EPROBE_DEFER,
  - Add missing patches to convert r8a7795 and h8300.

Geert Uytterhoeven (2):
  arm64: renesas: r8a7795 dtsi: Rename the serial port clock to fck
  h8300: dts: Rename the serial port clock to fck

Laurent Pinchart (14):
  serial: sh-sci: Drop the interface clock
  sh: Rename sci_ick and sci_fck clock to fck
  sh: Remove sci_ick clock alias
  ARM: shmobile: sh73a0 dtsi: Rename the serial port clock to fck
  ARM: shmobile: r7s72100 dtsi: Rename the serial port clock to fck
  ARM: shmobile: r8a73a4 dtsi: Rename the serial port clock to fck
  ARM: shmobile: r8a7740 dtsi: Rename the serial port clock to fck
  ARM: shmobile: r8a7778 dtsi: Rename the serial port clock to fck
  ARM: shmobile: r8a7779 dtsi: Rename the serial port clock to fck
  ARM: shmobile: r8a7790 dtsi: Rename the serial port clock to fck
  ARM: shmobile: r8a7791 dtsi: Rename the serial port clock to fck
  ARM: shmobile: r8a7793 dtsi: Rename the serial port clock to fck
  ARM: shmobile: r8a7794 dtsi: Rename the serial port clock to fck
  serial: sh-sci: Drop the sci_fck clock fallback

 .../bindings/serial/renesas,sci-serial.txt         |  4 +-
 arch/arm/boot/dts/r7s72100.dtsi                    | 16 +++---
 arch/arm/boot/dts/r8a73a4.dtsi                     | 12 ++---
 arch/arm/boot/dts/r8a7740.dtsi                     | 18 +++----
 arch/arm/boot/dts/r8a7778.dtsi                     | 12 ++---
 arch/arm/boot/dts/r8a7779.dtsi                     | 12 ++---
 arch/arm/boot/dts/r8a7790.dtsi                     | 20 ++++----
 arch/arm/boot/dts/r8a7791.dtsi                     | 36 ++++++-------
 arch/arm/boot/dts/r8a7793.dtsi                     |  4 +-
 arch/arm/boot/dts/r8a7794.dtsi                     | 36 ++++++-------
 arch/arm/boot/dts/sh73a0.dtsi                      | 18 +++----
 arch/arm64/boot/dts/renesas/r8a7795.dtsi           | 22 ++++----
 arch/h8300/boot/dts/edosk2674.dts                  |  6 +--
 arch/h8300/boot/dts/h8300h_sim.dts                 |  4 +-
 arch/h8300/boot/dts/h8s_sim.dts                    |  4 +-
 arch/sh/kernel/cpu/clock-cpg.c                     |  1 -
 arch/sh/kernel/cpu/sh2a/clock-sh7264.c             |  9 +++-
 arch/sh/kernel/cpu/sh2a/clock-sh7269.c             | 16 +++---
 arch/sh/kernel/cpu/sh4a/clock-sh7343.c             |  8 +--
 arch/sh/kernel/cpu/sh4a/clock-sh7366.c             |  6 +--
 arch/sh/kernel/cpu/sh4a/clock-sh7723.c             | 12 ++---
 arch/sh/kernel/cpu/sh4a/clock-sh7734.c             | 12 ++---
 arch/sh/kernel/cpu/sh4a/clock-sh7757.c             |  6 +--
 arch/sh/kernel/cpu/sh4a/clock-sh7785.c             | 12 ++---
 arch/sh/kernel/cpu/sh4a/clock-sh7786.c             | 12 ++---
 arch/sh/kernel/cpu/sh4a/clock-shx3.c               |  8 +--
 drivers/tty/serial/sh-sci.c                        | 59 +++++++++++++---------
 27 files changed, 202 insertions(+), 183 deletions(-)

-- 
1.9.1

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

^ permalink raw reply	[flat|nested] 58+ messages in thread
* [PATCH v2 00/16] serial: sh-sci: Clock Cleanups
@ 2015-11-19 18:35 ` Geert Uytterhoeven
  0 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:35 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

	Hi,

The SCI driver currently handles two clocks, an interface clock named
sci_ick and a functional clock named sci_fck. Studying the datasheets of
the SH and ARM SoCs that incorportate (H)SCI(F)([AB]) instances showed
(un)surprisingly that the hardware doesn't have a separate controllable
interface clock.

All the platforms that declare an interface clock for the SCI set it to
the clock used as the SCI functional clock. The two clocks can thus be
merged on the driver side, which is what this patch series does. The
resulting clock is called "fck", and all H8/300, SH and ARM users (both
DT and non-DT) are fixed to name their SCI clocks appropriately.

Support for the "sci_ick" name is kept in the sh-sci driver to ensure DT
backward compatibility, and support for the "peripheral_clk" clock to
not break SH platforms that don't declare device-specific SCI clocks.
The latter can be removed when all SH platforms will declare their SCI
clocks properly.

This series serves as a preparatory clock cleanup for the SCI baud rate
generator clock support series. I decided to keep it separate as this
series has more stringent internal dependencies:
  - The SH patches 2-3 depend on patch 1,
  - The DT patches 4-15 depend on patch 1,
  - Cleanup patch 16 depends on SH patch 2.

Thanks for your comments!

Changes compared to v1:
  - Take over the patches from Laurent,
  - Add Acked-by,
  - Handle EPROBE_DEFER,
  - Add missing patches to convert r8a7795 and h8300.

Geert Uytterhoeven (2):
  arm64: renesas: r8a7795 dtsi: Rename the serial port clock to fck
  h8300: dts: Rename the serial port clock to fck

Laurent Pinchart (14):
  serial: sh-sci: Drop the interface clock
  sh: Rename sci_ick and sci_fck clock to fck
  sh: Remove sci_ick clock alias
  ARM: shmobile: sh73a0 dtsi: Rename the serial port clock to fck
  ARM: shmobile: r7s72100 dtsi: Rename the serial port clock to fck
  ARM: shmobile: r8a73a4 dtsi: Rename the serial port clock to fck
  ARM: shmobile: r8a7740 dtsi: Rename the serial port clock to fck
  ARM: shmobile: r8a7778 dtsi: Rename the serial port clock to fck
  ARM: shmobile: r8a7779 dtsi: Rename the serial port clock to fck
  ARM: shmobile: r8a7790 dtsi: Rename the serial port clock to fck
  ARM: shmobile: r8a7791 dtsi: Rename the serial port clock to fck
  ARM: shmobile: r8a7793 dtsi: Rename the serial port clock to fck
  ARM: shmobile: r8a7794 dtsi: Rename the serial port clock to fck
  serial: sh-sci: Drop the sci_fck clock fallback

 .../bindings/serial/renesas,sci-serial.txt         |  4 +-
 arch/arm/boot/dts/r7s72100.dtsi                    | 16 +++---
 arch/arm/boot/dts/r8a73a4.dtsi                     | 12 ++---
 arch/arm/boot/dts/r8a7740.dtsi                     | 18 +++----
 arch/arm/boot/dts/r8a7778.dtsi                     | 12 ++---
 arch/arm/boot/dts/r8a7779.dtsi                     | 12 ++---
 arch/arm/boot/dts/r8a7790.dtsi                     | 20 ++++----
 arch/arm/boot/dts/r8a7791.dtsi                     | 36 ++++++-------
 arch/arm/boot/dts/r8a7793.dtsi                     |  4 +-
 arch/arm/boot/dts/r8a7794.dtsi                     | 36 ++++++-------
 arch/arm/boot/dts/sh73a0.dtsi                      | 18 +++----
 arch/arm64/boot/dts/renesas/r8a7795.dtsi           | 22 ++++----
 arch/h8300/boot/dts/edosk2674.dts                  |  6 +--
 arch/h8300/boot/dts/h8300h_sim.dts                 |  4 +-
 arch/h8300/boot/dts/h8s_sim.dts                    |  4 +-
 arch/sh/kernel/cpu/clock-cpg.c                     |  1 -
 arch/sh/kernel/cpu/sh2a/clock-sh7264.c             |  9 +++-
 arch/sh/kernel/cpu/sh2a/clock-sh7269.c             | 16 +++---
 arch/sh/kernel/cpu/sh4a/clock-sh7343.c             |  8 +--
 arch/sh/kernel/cpu/sh4a/clock-sh7366.c             |  6 +--
 arch/sh/kernel/cpu/sh4a/clock-sh7723.c             | 12 ++---
 arch/sh/kernel/cpu/sh4a/clock-sh7734.c             | 12 ++---
 arch/sh/kernel/cpu/sh4a/clock-sh7757.c             |  6 +--
 arch/sh/kernel/cpu/sh4a/clock-sh7785.c             | 12 ++---
 arch/sh/kernel/cpu/sh4a/clock-sh7786.c             | 12 ++---
 arch/sh/kernel/cpu/sh4a/clock-shx3.c               |  8 +--
 drivers/tty/serial/sh-sci.c                        | 59 +++++++++++++---------
 27 files changed, 202 insertions(+), 183 deletions(-)

-- 
1.9.1

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

^ permalink raw reply	[flat|nested] 58+ messages in thread
* [PATCH v2 01/16] serial: sh-sci: Drop the interface clock
       [not found] ` <1447958173-543-1-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
@ 2015-11-19 18:35     ` Geert Uytterhoeven
  0 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:35 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial-u79uwXL29TY76Z2rM5mHXA,
	linux-sh-u79uwXL29TY76Z2rM5mHXA,
	devicetree-u79uwXL29TY76Z2rM5mHXA, Geert Uytterhoeven

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

As no platform defines an interface clock the SCI driver always falls
back to a clock named "peripheral_clk".
  - On SH platforms that clock is the base clock for the SCI functional
    clock and has the same frequency,
  - On ARM platforms that clock doesn't exist, and clk_get() will return
    the default clock for the device.
We can thus make the functional clock mandatory and drop the interface
clock.

EPROBE_DEFER is handled for clocks that may be referenced from DT (i.e.
"fck" and deprecated "sci_ick").

Cc: devicetree@vger.kernel.org
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
[geert: Handle EPROBE_DEFER, reformat description, break long comment line]
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
  - Add Acked-by,
  - Amendment by geert.
---
 .../bindings/serial/renesas,sci-serial.txt         |  4 +-
 drivers/tty/serial/sh-sci.c                        | 64 ++++++++++++++--------
 2 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt b/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
index 73f825e5e6448815..2c9e6b8477e92792 100644
--- a/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
+++ b/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
@@ -42,7 +42,7 @@ Required properties:
 
   - clocks: Must contain a phandle and clock-specifier pair for each entry
     in clock-names.
-  - clock-names: Must contain "sci_ick" for the SCIx UART interface clock.
+  - clock-names: Must contain "fck" for the SCIx UART functional clock.
 
 Note: Each enabled SCIx UART should have an alias correctly numbered in the
 "aliases" node.
@@ -63,7 +63,7 @@ Example:
 		interrupt-parent = <&gic>;
 		interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7790_CLK_SCIFA0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x21>, <&dmac0 0x22>;
 		dma-names = "tx", "rx";
 	};
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 51c7507b0444957b..3c908804cab1c88c 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -92,8 +92,6 @@ struct sci_port {
 	struct timer_list	break_timer;
 	int			break_flag;
 
-	/* Interface clock */
-	struct clk		*iclk;
 	/* Function clock */
 	struct clk		*fclk;
 
@@ -457,9 +455,8 @@ static void sci_port_enable(struct sci_port *sci_port)
 
 	pm_runtime_get_sync(sci_port->port.dev);
 
-	clk_prepare_enable(sci_port->iclk);
-	sci_port->port.uartclk = clk_get_rate(sci_port->iclk);
 	clk_prepare_enable(sci_port->fclk);
+	sci_port->port.uartclk = clk_get_rate(sci_port->fclk);
 }
 
 static void sci_port_disable(struct sci_port *sci_port)
@@ -476,7 +473,6 @@ static void sci_port_disable(struct sci_port *sci_port)
 	sci_port->break_flag = 0;
 
 	clk_disable_unprepare(sci_port->fclk);
-	clk_disable_unprepare(sci_port->iclk);
 
 	pm_runtime_put_sync(sci_port->port.dev);
 }
@@ -1622,7 +1618,7 @@ static int sci_notifier(struct notifier_block *self,
 		struct uart_port *port = &sci_port->port;
 
 		spin_lock_irqsave(&port->lock, flags);
-		port->uartclk = clk_get_rate(sci_port->iclk);
+		port->uartclk = clk_get_rate(sci_port->fclk);
 		spin_unlock_irqrestore(&port->lock, flags);
 	}
 
@@ -2241,6 +2237,42 @@ static struct uart_ops sci_uart_ops = {
 #endif
 };
 
+static int sci_init_clocks(struct sci_port *sci_port, struct device *dev)
+{
+	/* Get the SCI functional clock. It's called "fck" on ARM. */
+	sci_port->fclk = clk_get(dev, "fck");
+	if (PTR_ERR(sci_port->fclk) = -EPROBE_DEFER)
+		return -EPROBE_DEFER;
+	if (!IS_ERR(sci_port->fclk))
+		return 0;
+
+	/*
+	 * But it used to be called "sci_ick", and we need to maintain DT
+	 * backward compatibility.
+	 */
+	sci_port->fclk = clk_get(dev, "sci_ick");
+	if (PTR_ERR(sci_port->fclk) = -EPROBE_DEFER)
+		return -EPROBE_DEFER;
+	if (!IS_ERR(sci_port->fclk))
+		return 0;
+
+	/* SH has historically named the clock "sci_fck". */
+	sci_port->fclk = clk_get(dev, "sci_fck");
+	if (!IS_ERR(sci_port->fclk))
+		return 0;
+
+	/*
+	 * Not all SH platforms declare a clock lookup entry for SCI devices,
+	 * in which case we need to get the global "peripheral_clk" clock.
+	 */
+	sci_port->fclk = clk_get(dev, "peripheral_clk");
+	if (!IS_ERR(sci_port->fclk))
+		return 0;
+
+	dev_err(dev, "failed to get functional clock\n");
+	return PTR_ERR(sci_port->fclk);
+}
+
 static int sci_init_single(struct platform_device *dev,
 			   struct sci_port *sci_port, unsigned int index,
 			   struct plat_sci_port *p, bool early)
@@ -2333,22 +2365,9 @@ static int sci_init_single(struct platform_device *dev,
 		sci_port->sampling_rate = p->sampling_rate;
 
 	if (!early) {
-		sci_port->iclk = clk_get(&dev->dev, "sci_ick");
-		if (IS_ERR(sci_port->iclk)) {
-			sci_port->iclk = clk_get(&dev->dev, "peripheral_clk");
-			if (IS_ERR(sci_port->iclk)) {
-				dev_err(&dev->dev, "can't get iclk\n");
-				return PTR_ERR(sci_port->iclk);
-			}
-		}
-
-		/*
-		 * The function clock is optional, ignore it if we can't
-		 * find it.
-		 */
-		sci_port->fclk = clk_get(&dev->dev, "sci_fck");
-		if (IS_ERR(sci_port->fclk))
-			sci_port->fclk = NULL;
+		ret = sci_init_clocks(sci_port, &dev->dev);
+		if (ret < 0)
+			return ret;
 
 		port->dev = &dev->dev;
 
@@ -2405,7 +2424,6 @@ static int sci_init_single(struct platform_device *dev,
 
 static void sci_cleanup_single(struct sci_port *port)
 {
-	clk_put(port->iclk);
 	clk_put(port->fclk);
 
 	pm_runtime_disable(port->port.dev);
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 01/16] serial: sh-sci: Drop the interface clock
@ 2015-11-19 18:35     ` Geert Uytterhoeven
  0 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:35 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial-u79uwXL29TY76Z2rM5mHXA,
	linux-sh-u79uwXL29TY76Z2rM5mHXA,
	devicetree-u79uwXL29TY76Z2rM5mHXA, Geert Uytterhoeven

From: Laurent Pinchart <laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>

As no platform defines an interface clock the SCI driver always falls
back to a clock named "peripheral_clk".
  - On SH platforms that clock is the base clock for the SCI functional
    clock and has the same frequency,
  - On ARM platforms that clock doesn't exist, and clk_get() will return
    the default clock for the device.
We can thus make the functional clock mandatory and drop the interface
clock.

EPROBE_DEFER is handled for clocks that may be referenced from DT (i.e.
"fck" and deprecated "sci_ick").

Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
Acked-by: Simon Horman <horms+renesas-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org>
[geert: Handle EPROBE_DEFER, reformat description, break long comment line]
Signed-off-by: Geert Uytterhoeven <geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
---
v2:
  - Add Acked-by,
  - Amendment by geert.
---
 .../bindings/serial/renesas,sci-serial.txt         |  4 +-
 drivers/tty/serial/sh-sci.c                        | 64 ++++++++++++++--------
 2 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt b/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
index 73f825e5e6448815..2c9e6b8477e92792 100644
--- a/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
+++ b/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
@@ -42,7 +42,7 @@ Required properties:
 
   - clocks: Must contain a phandle and clock-specifier pair for each entry
     in clock-names.
-  - clock-names: Must contain "sci_ick" for the SCIx UART interface clock.
+  - clock-names: Must contain "fck" for the SCIx UART functional clock.
 
 Note: Each enabled SCIx UART should have an alias correctly numbered in the
 "aliases" node.
@@ -63,7 +63,7 @@ Example:
 		interrupt-parent = <&gic>;
 		interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7790_CLK_SCIFA0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x21>, <&dmac0 0x22>;
 		dma-names = "tx", "rx";
 	};
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 51c7507b0444957b..3c908804cab1c88c 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -92,8 +92,6 @@ struct sci_port {
 	struct timer_list	break_timer;
 	int			break_flag;
 
-	/* Interface clock */
-	struct clk		*iclk;
 	/* Function clock */
 	struct clk		*fclk;
 
@@ -457,9 +455,8 @@ static void sci_port_enable(struct sci_port *sci_port)
 
 	pm_runtime_get_sync(sci_port->port.dev);
 
-	clk_prepare_enable(sci_port->iclk);
-	sci_port->port.uartclk = clk_get_rate(sci_port->iclk);
 	clk_prepare_enable(sci_port->fclk);
+	sci_port->port.uartclk = clk_get_rate(sci_port->fclk);
 }
 
 static void sci_port_disable(struct sci_port *sci_port)
@@ -476,7 +473,6 @@ static void sci_port_disable(struct sci_port *sci_port)
 	sci_port->break_flag = 0;
 
 	clk_disable_unprepare(sci_port->fclk);
-	clk_disable_unprepare(sci_port->iclk);
 
 	pm_runtime_put_sync(sci_port->port.dev);
 }
@@ -1622,7 +1618,7 @@ static int sci_notifier(struct notifier_block *self,
 		struct uart_port *port = &sci_port->port;
 
 		spin_lock_irqsave(&port->lock, flags);
-		port->uartclk = clk_get_rate(sci_port->iclk);
+		port->uartclk = clk_get_rate(sci_port->fclk);
 		spin_unlock_irqrestore(&port->lock, flags);
 	}
 
@@ -2241,6 +2237,42 @@ static struct uart_ops sci_uart_ops = {
 #endif
 };
 
+static int sci_init_clocks(struct sci_port *sci_port, struct device *dev)
+{
+	/* Get the SCI functional clock. It's called "fck" on ARM. */
+	sci_port->fclk = clk_get(dev, "fck");
+	if (PTR_ERR(sci_port->fclk) == -EPROBE_DEFER)
+		return -EPROBE_DEFER;
+	if (!IS_ERR(sci_port->fclk))
+		return 0;
+
+	/*
+	 * But it used to be called "sci_ick", and we need to maintain DT
+	 * backward compatibility.
+	 */
+	sci_port->fclk = clk_get(dev, "sci_ick");
+	if (PTR_ERR(sci_port->fclk) == -EPROBE_DEFER)
+		return -EPROBE_DEFER;
+	if (!IS_ERR(sci_port->fclk))
+		return 0;
+
+	/* SH has historically named the clock "sci_fck". */
+	sci_port->fclk = clk_get(dev, "sci_fck");
+	if (!IS_ERR(sci_port->fclk))
+		return 0;
+
+	/*
+	 * Not all SH platforms declare a clock lookup entry for SCI devices,
+	 * in which case we need to get the global "peripheral_clk" clock.
+	 */
+	sci_port->fclk = clk_get(dev, "peripheral_clk");
+	if (!IS_ERR(sci_port->fclk))
+		return 0;
+
+	dev_err(dev, "failed to get functional clock\n");
+	return PTR_ERR(sci_port->fclk);
+}
+
 static int sci_init_single(struct platform_device *dev,
 			   struct sci_port *sci_port, unsigned int index,
 			   struct plat_sci_port *p, bool early)
@@ -2333,22 +2365,9 @@ static int sci_init_single(struct platform_device *dev,
 		sci_port->sampling_rate = p->sampling_rate;
 
 	if (!early) {
-		sci_port->iclk = clk_get(&dev->dev, "sci_ick");
-		if (IS_ERR(sci_port->iclk)) {
-			sci_port->iclk = clk_get(&dev->dev, "peripheral_clk");
-			if (IS_ERR(sci_port->iclk)) {
-				dev_err(&dev->dev, "can't get iclk\n");
-				return PTR_ERR(sci_port->iclk);
-			}
-		}
-
-		/*
-		 * The function clock is optional, ignore it if we can't
-		 * find it.
-		 */
-		sci_port->fclk = clk_get(&dev->dev, "sci_fck");
-		if (IS_ERR(sci_port->fclk))
-			sci_port->fclk = NULL;
+		ret = sci_init_clocks(sci_port, &dev->dev);
+		if (ret < 0)
+			return ret;
 
 		port->dev = &dev->dev;
 
@@ -2405,7 +2424,6 @@ static int sci_init_single(struct platform_device *dev,
 
 static void sci_cleanup_single(struct sci_port *port)
 {
-	clk_put(port->iclk);
 	clk_put(port->fclk);
 
 	pm_runtime_disable(port->port.dev);
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 02/16] sh: Rename sci_ick and sci_fck clock to fck
  2015-11-19 18:35 ` Geert Uytterhoeven
@ 2015-11-19 18:35   ` Geert Uytterhoeven
  -1 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:35 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

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>
---
v2:
  - Add Acked-by.
---
 arch/sh/kernel/cpu/sh2a/clock-sh7264.c |  9 ++++++++-
 arch/sh/kernel/cpu/sh2a/clock-sh7269.c | 16 ++++++++--------
 arch/sh/kernel/cpu/sh4a/clock-sh7343.c |  8 ++++----
 arch/sh/kernel/cpu/sh4a/clock-sh7366.c |  6 +++---
 arch/sh/kernel/cpu/sh4a/clock-sh7723.c | 12 ++++++------
 arch/sh/kernel/cpu/sh4a/clock-sh7734.c | 12 ++++++------
 arch/sh/kernel/cpu/sh4a/clock-sh7757.c |  6 +++---
 arch/sh/kernel/cpu/sh4a/clock-sh7785.c | 12 ++++++------
 arch/sh/kernel/cpu/sh4a/clock-sh7786.c | 12 ++++++------
 arch/sh/kernel/cpu/sh4a/clock-shx3.c   |  8 ++++----
 10 files changed, 54 insertions(+), 47 deletions(-)

diff --git a/arch/sh/kernel/cpu/sh2a/clock-sh7264.c b/arch/sh/kernel/cpu/sh2a/clock-sh7264.c
index 8638fba6cd7fbf08..7e06e39b095864d1 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 f8a5c2abdfb3caa1..663a97bed554ec5c 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 9edc06c02dcf1b9c..a907ee2388bfce50 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 955b9add78106360..ac9854179dee88f0 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 ccbcab550df24efc..fe844222f3f6ae5c 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 7f54bf2f453d7a7b..354dcac5e4cd9938 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 e40ec2c97ad199c9..b10af2ae9f350908 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 8eb6e62340c950bd..1aafd5496752f7f1 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 5e50e7ebeff089b9..ac3dcfe5d303d134 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 605221d1448a19a7..b1bdbc3cbc219af8 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]),
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 02/16] sh: Rename sci_ick and sci_fck clock to fck
@ 2015-11-19 18:35   ` Geert Uytterhoeven
  0 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:35 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

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>
---
v2:
  - Add Acked-by.
---
 arch/sh/kernel/cpu/sh2a/clock-sh7264.c |  9 ++++++++-
 arch/sh/kernel/cpu/sh2a/clock-sh7269.c | 16 ++++++++--------
 arch/sh/kernel/cpu/sh4a/clock-sh7343.c |  8 ++++----
 arch/sh/kernel/cpu/sh4a/clock-sh7366.c |  6 +++---
 arch/sh/kernel/cpu/sh4a/clock-sh7723.c | 12 ++++++------
 arch/sh/kernel/cpu/sh4a/clock-sh7734.c | 12 ++++++------
 arch/sh/kernel/cpu/sh4a/clock-sh7757.c |  6 +++---
 arch/sh/kernel/cpu/sh4a/clock-sh7785.c | 12 ++++++------
 arch/sh/kernel/cpu/sh4a/clock-sh7786.c | 12 ++++++------
 arch/sh/kernel/cpu/sh4a/clock-shx3.c   |  8 ++++----
 10 files changed, 54 insertions(+), 47 deletions(-)

diff --git a/arch/sh/kernel/cpu/sh2a/clock-sh7264.c b/arch/sh/kernel/cpu/sh2a/clock-sh7264.c
index 8638fba6cd7fbf08..7e06e39b095864d1 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 f8a5c2abdfb3caa1..663a97bed554ec5c 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 9edc06c02dcf1b9c..a907ee2388bfce50 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 955b9add78106360..ac9854179dee88f0 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 ccbcab550df24efc..fe844222f3f6ae5c 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 7f54bf2f453d7a7b..354dcac5e4cd9938 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 e40ec2c97ad199c9..b10af2ae9f350908 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 8eb6e62340c950bd..1aafd5496752f7f1 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 5e50e7ebeff089b9..ac3dcfe5d303d134 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 605221d1448a19a7..b1bdbc3cbc219af8 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]),
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 03/16] sh: Remove sci_ick clock alias
  2015-11-19 18:35 ` Geert Uytterhoeven
@ 2015-11-19 18:36   ` Geert Uytterhoeven
  -1 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

The sh-sci driver falls back to the peripheral clock if the sci_ick
clock doesn't exist. There's thus no need to create an alias for the
peripheral clock named sci_ick.

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>
---
v2:
  - Add Acked-by.
---
 arch/sh/kernel/cpu/clock-cpg.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/sh/kernel/cpu/clock-cpg.c b/arch/sh/kernel/cpu/clock-cpg.c
index 8525a671266fe149..786c0769b4c393b5 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;
 }
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 03/16] sh: Remove sci_ick clock alias
@ 2015-11-19 18:36   ` Geert Uytterhoeven
  0 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

The sh-sci driver falls back to the peripheral clock if the sci_ick
clock doesn't exist. There's thus no need to create an alias for the
peripheral clock named sci_ick.

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>
---
v2:
  - Add Acked-by.
---
 arch/sh/kernel/cpu/clock-cpg.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/sh/kernel/cpu/clock-cpg.c b/arch/sh/kernel/cpu/clock-cpg.c
index 8525a671266fe149..786c0769b4c393b5 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;
 }
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 04/16] ARM: shmobile: sh73a0 dtsi: Rename the serial port clock to fck
  2015-11-19 18:35 ` Geert Uytterhoeven
@ 2015-11-19 18:36   ` Geert Uytterhoeven
  -1 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

The clock is really the device functional clock, not the interface
clock. Rename it.

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>
---
v2:
  - Add Acked-by.
---
 arch/arm/boot/dts/sh73a0.dtsi | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi
index ff7c8f298f30a58d..cbc885e46c504f56 100644
--- a/arch/arm/boot/dts/sh73a0.dtsi
+++ b/arch/arm/boot/dts/sh73a0.dtsi
@@ -301,7 +301,7 @@
 		reg = <0xe6c40000 0x100>;
 		interrupts = <0 72 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks SH73A0_CLK_SCIFA0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -311,7 +311,7 @@
 		reg = <0xe6c50000 0x100>;
 		interrupts = <0 73 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks SH73A0_CLK_SCIFA1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -321,7 +321,7 @@
 		reg = <0xe6c60000 0x100>;
 		interrupts = <0 74 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks SH73A0_CLK_SCIFA2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -331,7 +331,7 @@
 		reg = <0xe6c70000 0x100>;
 		interrupts = <0 75 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks SH73A0_CLK_SCIFA3>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -341,7 +341,7 @@
 		reg = <0xe6c80000 0x100>;
 		interrupts = <0 78 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks SH73A0_CLK_SCIFA4>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -351,7 +351,7 @@
 		reg = <0xe6cb0000 0x100>;
 		interrupts = <0 79 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks SH73A0_CLK_SCIFA5>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -361,7 +361,7 @@
 		reg = <0xe6cc0000 0x100>;
 		interrupts = <0 156 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp3_clks SH73A0_CLK_SCIFA6>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -371,7 +371,7 @@
 		reg = <0xe6cd0000 0x100>;
 		interrupts = <0 143 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks SH73A0_CLK_SCIFA7>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -381,7 +381,7 @@
 		reg = <0xe6c30000 0x100>;
 		interrupts = <0 80 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks SH73A0_CLK_SCIFB>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 04/16] ARM: shmobile: sh73a0 dtsi: Rename the serial port clock to fck
@ 2015-11-19 18:36   ` Geert Uytterhoeven
  0 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

The clock is really the device functional clock, not the interface
clock. Rename it.

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>
---
v2:
  - Add Acked-by.
---
 arch/arm/boot/dts/sh73a0.dtsi | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi
index ff7c8f298f30a58d..cbc885e46c504f56 100644
--- a/arch/arm/boot/dts/sh73a0.dtsi
+++ b/arch/arm/boot/dts/sh73a0.dtsi
@@ -301,7 +301,7 @@
 		reg = <0xe6c40000 0x100>;
 		interrupts = <0 72 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks SH73A0_CLK_SCIFA0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -311,7 +311,7 @@
 		reg = <0xe6c50000 0x100>;
 		interrupts = <0 73 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks SH73A0_CLK_SCIFA1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -321,7 +321,7 @@
 		reg = <0xe6c60000 0x100>;
 		interrupts = <0 74 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks SH73A0_CLK_SCIFA2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -331,7 +331,7 @@
 		reg = <0xe6c70000 0x100>;
 		interrupts = <0 75 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks SH73A0_CLK_SCIFA3>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -341,7 +341,7 @@
 		reg = <0xe6c80000 0x100>;
 		interrupts = <0 78 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks SH73A0_CLK_SCIFA4>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -351,7 +351,7 @@
 		reg = <0xe6cb0000 0x100>;
 		interrupts = <0 79 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks SH73A0_CLK_SCIFA5>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -361,7 +361,7 @@
 		reg = <0xe6cc0000 0x100>;
 		interrupts = <0 156 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp3_clks SH73A0_CLK_SCIFA6>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -371,7 +371,7 @@
 		reg = <0xe6cd0000 0x100>;
 		interrupts = <0 143 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks SH73A0_CLK_SCIFA7>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -381,7 +381,7 @@
 		reg = <0xe6c30000 0x100>;
 		interrupts = <0 80 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks SH73A0_CLK_SCIFB>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 05/16] ARM: shmobile: r7s72100 dtsi: Rename the serial port clock to fck
  2015-11-19 18:35 ` Geert Uytterhoeven
@ 2015-11-19 18:36   ` Geert Uytterhoeven
  -1 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

The clock is really the device functional clock, not the interface
clock. Rename it.

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>
---
v2:
  - Add Acked-by.
---
 arch/arm/boot/dts/r7s72100.dtsi | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi
index 060c32cbd66923ed..5f22d6dcdd141f9c 100644
--- a/arch/arm/boot/dts/r7s72100.dtsi
+++ b/arch/arm/boot/dts/r7s72100.dtsi
@@ -157,7 +157,7 @@
 			     <0 192 IRQ_TYPE_LEVEL_HIGH>,
 			     <0 189 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp4_clks R7S72100_CLK_SCIF0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -170,7 +170,7 @@
 			     <0 196 IRQ_TYPE_LEVEL_HIGH>,
 			     <0 193 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp4_clks R7S72100_CLK_SCIF1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -183,7 +183,7 @@
 			     <0 200 IRQ_TYPE_LEVEL_HIGH>,
 			     <0 197 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp4_clks R7S72100_CLK_SCIF2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -196,7 +196,7 @@
 			     <0 204 IRQ_TYPE_LEVEL_HIGH>,
 			     <0 201 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp4_clks R7S72100_CLK_SCIF3>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -209,7 +209,7 @@
 			     <0 208 IRQ_TYPE_LEVEL_HIGH>,
 			     <0 205 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp4_clks R7S72100_CLK_SCIF4>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -222,7 +222,7 @@
 			     <0 212 IRQ_TYPE_LEVEL_HIGH>,
 			     <0 209 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp4_clks R7S72100_CLK_SCIF5>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -235,7 +235,7 @@
 			     <0 216 IRQ_TYPE_LEVEL_HIGH>,
 			     <0 213 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp4_clks R7S72100_CLK_SCIF6>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -248,7 +248,7 @@
 			     <0 220 IRQ_TYPE_LEVEL_HIGH>,
 			     <0 217 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp4_clks R7S72100_CLK_SCIF7>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 05/16] ARM: shmobile: r7s72100 dtsi: Rename the serial port clock to fck
@ 2015-11-19 18:36   ` Geert Uytterhoeven
  0 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

The clock is really the device functional clock, not the interface
clock. Rename it.

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>
---
v2:
  - Add Acked-by.
---
 arch/arm/boot/dts/r7s72100.dtsi | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi
index 060c32cbd66923ed..5f22d6dcdd141f9c 100644
--- a/arch/arm/boot/dts/r7s72100.dtsi
+++ b/arch/arm/boot/dts/r7s72100.dtsi
@@ -157,7 +157,7 @@
 			     <0 192 IRQ_TYPE_LEVEL_HIGH>,
 			     <0 189 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp4_clks R7S72100_CLK_SCIF0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -170,7 +170,7 @@
 			     <0 196 IRQ_TYPE_LEVEL_HIGH>,
 			     <0 193 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp4_clks R7S72100_CLK_SCIF1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -183,7 +183,7 @@
 			     <0 200 IRQ_TYPE_LEVEL_HIGH>,
 			     <0 197 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp4_clks R7S72100_CLK_SCIF2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -196,7 +196,7 @@
 			     <0 204 IRQ_TYPE_LEVEL_HIGH>,
 			     <0 201 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp4_clks R7S72100_CLK_SCIF3>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -209,7 +209,7 @@
 			     <0 208 IRQ_TYPE_LEVEL_HIGH>,
 			     <0 205 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp4_clks R7S72100_CLK_SCIF4>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -222,7 +222,7 @@
 			     <0 212 IRQ_TYPE_LEVEL_HIGH>,
 			     <0 209 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp4_clks R7S72100_CLK_SCIF5>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -235,7 +235,7 @@
 			     <0 216 IRQ_TYPE_LEVEL_HIGH>,
 			     <0 213 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp4_clks R7S72100_CLK_SCIF6>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -248,7 +248,7 @@
 			     <0 220 IRQ_TYPE_LEVEL_HIGH>,
 			     <0 217 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp4_clks R7S72100_CLK_SCIF7>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 06/16] ARM: shmobile: r8a73a4 dtsi: Rename the serial port clock to fck
  2015-11-19 18:35 ` Geert Uytterhoeven
@ 2015-11-19 18:36   ` Geert Uytterhoeven
  -1 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

The clock is really the device functional clock, not the interface
clock. Rename it.

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>
---
v2:
  - Add Acked-by.
---
 arch/arm/boot/dts/r8a73a4.dtsi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi
index cb4f7b2798fe23be..86fab56cd6314df7 100644
--- a/arch/arm/boot/dts/r8a73a4.dtsi
+++ b/arch/arm/boot/dts/r8a73a4.dtsi
@@ -335,7 +335,7 @@
 		reg = <0 0xe6c20000 0 0x100>;
 		interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A73A4_CLK_SCIFB0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -345,7 +345,7 @@
 		reg = <0 0xe6c30000 0 0x100>;
 		interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A73A4_CLK_SCIFB1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -355,7 +355,7 @@
 		reg = <0 0xe6c40000 0 0x100>;
 		interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A73A4_CLK_SCIFA0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -365,7 +365,7 @@
 		reg = <0 0xe6c50000 0 0x100>;
 		interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A73A4_CLK_SCIFA1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -375,7 +375,7 @@
 		reg = <0 0xe6ce0000 0 0x100>;
 		interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A73A4_CLK_SCIFB2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -385,7 +385,7 @@
 		reg = <0 0xe6cf0000 0 0x100>;
 		interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A73A4_CLK_SCIFB3>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_c4>;
 		status = "disabled";
 	};
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 06/16] ARM: shmobile: r8a73a4 dtsi: Rename the serial port clock to fck
@ 2015-11-19 18:36   ` Geert Uytterhoeven
  0 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

The clock is really the device functional clock, not the interface
clock. Rename it.

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>
---
v2:
  - Add Acked-by.
---
 arch/arm/boot/dts/r8a73a4.dtsi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi
index cb4f7b2798fe23be..86fab56cd6314df7 100644
--- a/arch/arm/boot/dts/r8a73a4.dtsi
+++ b/arch/arm/boot/dts/r8a73a4.dtsi
@@ -335,7 +335,7 @@
 		reg = <0 0xe6c20000 0 0x100>;
 		interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A73A4_CLK_SCIFB0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -345,7 +345,7 @@
 		reg = <0 0xe6c30000 0 0x100>;
 		interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A73A4_CLK_SCIFB1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -355,7 +355,7 @@
 		reg = <0 0xe6c40000 0 0x100>;
 		interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A73A4_CLK_SCIFA0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -365,7 +365,7 @@
 		reg = <0 0xe6c50000 0 0x100>;
 		interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A73A4_CLK_SCIFA1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -375,7 +375,7 @@
 		reg = <0 0xe6ce0000 0 0x100>;
 		interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A73A4_CLK_SCIFB2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -385,7 +385,7 @@
 		reg = <0 0xe6cf0000 0 0x100>;
 		interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A73A4_CLK_SCIFB3>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_c4>;
 		status = "disabled";
 	};
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 07/16] ARM: shmobile: r8a7740 dtsi: Rename the serial port clock to fck
  2015-11-19 18:35 ` Geert Uytterhoeven
@ 2015-11-19 18:36   ` Geert Uytterhoeven
  -1 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

The clock is really the device functional clock, not the interface
clock. Rename it.

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>
---
v2:
  - Add Acked-by.
---
 arch/arm/boot/dts/r8a7740.dtsi | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi
index e14cb1438216e8df..387aef60c825bc24 100644
--- a/arch/arm/boot/dts/r8a7740.dtsi
+++ b/arch/arm/boot/dts/r8a7740.dtsi
@@ -200,7 +200,7 @@
 		reg = <0xe6c40000 0x100>;
 		interrupts = <0 100 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7740_CLK_SCIFA0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -210,7 +210,7 @@
 		reg = <0xe6c50000 0x100>;
 		interrupts = <0 101 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7740_CLK_SCIFA1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -220,7 +220,7 @@
 		reg = <0xe6c60000 0x100>;
 		interrupts = <0 102 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7740_CLK_SCIFA2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -230,7 +230,7 @@
 		reg = <0xe6c70000 0x100>;
 		interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7740_CLK_SCIFA3>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -240,7 +240,7 @@
 		reg = <0xe6c80000 0x100>;
 		interrupts = <0 104 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7740_CLK_SCIFA4>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -250,7 +250,7 @@
 		reg = <0xe6cb0000 0x100>;
 		interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7740_CLK_SCIFA5>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -260,7 +260,7 @@
 		reg = <0xe6cc0000 0x100>;
 		interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7740_CLK_SCIFA6>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -270,7 +270,7 @@
 		reg = <0xe6cd0000 0x100>;
 		interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7740_CLK_SCIFA7>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -280,7 +280,7 @@
 		reg = <0xe6c30000 0x100>;
 		interrupts = <0 108 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7740_CLK_SCIFB>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 07/16] ARM: shmobile: r8a7740 dtsi: Rename the serial port clock to fck
@ 2015-11-19 18:36   ` Geert Uytterhoeven
  0 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

The clock is really the device functional clock, not the interface
clock. Rename it.

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>
---
v2:
  - Add Acked-by.
---
 arch/arm/boot/dts/r8a7740.dtsi | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi
index e14cb1438216e8df..387aef60c825bc24 100644
--- a/arch/arm/boot/dts/r8a7740.dtsi
+++ b/arch/arm/boot/dts/r8a7740.dtsi
@@ -200,7 +200,7 @@
 		reg = <0xe6c40000 0x100>;
 		interrupts = <0 100 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7740_CLK_SCIFA0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -210,7 +210,7 @@
 		reg = <0xe6c50000 0x100>;
 		interrupts = <0 101 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7740_CLK_SCIFA1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -220,7 +220,7 @@
 		reg = <0xe6c60000 0x100>;
 		interrupts = <0 102 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7740_CLK_SCIFA2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -230,7 +230,7 @@
 		reg = <0xe6c70000 0x100>;
 		interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7740_CLK_SCIFA3>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -240,7 +240,7 @@
 		reg = <0xe6c80000 0x100>;
 		interrupts = <0 104 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7740_CLK_SCIFA4>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -250,7 +250,7 @@
 		reg = <0xe6cb0000 0x100>;
 		interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7740_CLK_SCIFA5>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -260,7 +260,7 @@
 		reg = <0xe6cc0000 0x100>;
 		interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7740_CLK_SCIFA6>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -270,7 +270,7 @@
 		reg = <0xe6cd0000 0x100>;
 		interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7740_CLK_SCIFA7>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
@@ -280,7 +280,7 @@
 		reg = <0xe6c30000 0x100>;
 		interrupts = <0 108 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7740_CLK_SCIFB>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&pd_a3sp>;
 		status = "disabled";
 	};
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 08/16] ARM: shmobile: r8a7778 dtsi: Rename the serial port clock to fck
  2015-11-19 18:35 ` Geert Uytterhoeven
@ 2015-11-19 18:36   ` Geert Uytterhoeven
  -1 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

The clock is really the device functional clock, not the interface
clock. Rename it.

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>
---
v2:
  - Add Acked-by.
---
 arch/arm/boot/dts/r8a7778.dtsi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi
index 4f8e0781174642a3..da76f5d95875ce11 100644
--- a/arch/arm/boot/dts/r8a7778.dtsi
+++ b/arch/arm/boot/dts/r8a7778.dtsi
@@ -295,7 +295,7 @@
 		reg = <0xffe40000 0x100>;
 		interrupts = <0 70 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp0_clks R8A7778_CLK_SCIF0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -305,7 +305,7 @@
 		reg = <0xffe41000 0x100>;
 		interrupts = <0 71 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp0_clks R8A7778_CLK_SCIF1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -315,7 +315,7 @@
 		reg = <0xffe42000 0x100>;
 		interrupts = <0 72 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp0_clks R8A7778_CLK_SCIF2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -325,7 +325,7 @@
 		reg = <0xffe43000 0x100>;
 		interrupts = <0 73 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp0_clks R8A7778_CLK_SCIF3>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -335,7 +335,7 @@
 		reg = <0xffe44000 0x100>;
 		interrupts = <0 74 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp0_clks R8A7778_CLK_SCIF4>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -345,7 +345,7 @@
 		reg = <0xffe45000 0x100>;
 		interrupts = <0 75 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp0_clks R8A7778_CLK_SCIF5>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 08/16] ARM: shmobile: r8a7778 dtsi: Rename the serial port clock to fck
@ 2015-11-19 18:36   ` Geert Uytterhoeven
  0 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

The clock is really the device functional clock, not the interface
clock. Rename it.

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>
---
v2:
  - Add Acked-by.
---
 arch/arm/boot/dts/r8a7778.dtsi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi
index 4f8e0781174642a3..da76f5d95875ce11 100644
--- a/arch/arm/boot/dts/r8a7778.dtsi
+++ b/arch/arm/boot/dts/r8a7778.dtsi
@@ -295,7 +295,7 @@
 		reg = <0xffe40000 0x100>;
 		interrupts = <0 70 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp0_clks R8A7778_CLK_SCIF0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -305,7 +305,7 @@
 		reg = <0xffe41000 0x100>;
 		interrupts = <0 71 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp0_clks R8A7778_CLK_SCIF1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -315,7 +315,7 @@
 		reg = <0xffe42000 0x100>;
 		interrupts = <0 72 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp0_clks R8A7778_CLK_SCIF2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -325,7 +325,7 @@
 		reg = <0xffe43000 0x100>;
 		interrupts = <0 73 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp0_clks R8A7778_CLK_SCIF3>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -335,7 +335,7 @@
 		reg = <0xffe44000 0x100>;
 		interrupts = <0 74 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp0_clks R8A7778_CLK_SCIF4>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -345,7 +345,7 @@
 		reg = <0xffe45000 0x100>;
 		interrupts = <0 75 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp0_clks R8A7778_CLK_SCIF5>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 09/16] ARM: shmobile: r8a7779 dtsi: Rename the serial port clock to fck
  2015-11-19 18:35 ` Geert Uytterhoeven
@ 2015-11-19 18:36   ` Geert Uytterhoeven
  -1 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

The clock is really the device functional clock, not the interface
clock. Rename it.

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>
---
v2:
  - Add Acked-by.
---
 arch/arm/boot/dts/r8a7779.dtsi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index 6afa909865b52b71..e4054119ee7c5aa9 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -215,7 +215,7 @@
 		reg = <0xffe40000 0x100>;
 		interrupts = <0 88 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp0_clks R8A7779_CLK_SCIF0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -225,7 +225,7 @@
 		reg = <0xffe41000 0x100>;
 		interrupts = <0 89 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp0_clks R8A7779_CLK_SCIF1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -235,7 +235,7 @@
 		reg = <0xffe42000 0x100>;
 		interrupts = <0 90 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp0_clks R8A7779_CLK_SCIF2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -245,7 +245,7 @@
 		reg = <0xffe43000 0x100>;
 		interrupts = <0 91 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp0_clks R8A7779_CLK_SCIF3>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -255,7 +255,7 @@
 		reg = <0xffe44000 0x100>;
 		interrupts = <0 92 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp0_clks R8A7779_CLK_SCIF4>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -265,7 +265,7 @@
 		reg = <0xffe45000 0x100>;
 		interrupts = <0 93 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp0_clks R8A7779_CLK_SCIF5>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 09/16] ARM: shmobile: r8a7779 dtsi: Rename the serial port clock to fck
@ 2015-11-19 18:36   ` Geert Uytterhoeven
  0 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

The clock is really the device functional clock, not the interface
clock. Rename it.

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>
---
v2:
  - Add Acked-by.
---
 arch/arm/boot/dts/r8a7779.dtsi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index 6afa909865b52b71..e4054119ee7c5aa9 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -215,7 +215,7 @@
 		reg = <0xffe40000 0x100>;
 		interrupts = <0 88 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp0_clks R8A7779_CLK_SCIF0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -225,7 +225,7 @@
 		reg = <0xffe41000 0x100>;
 		interrupts = <0 89 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp0_clks R8A7779_CLK_SCIF1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -235,7 +235,7 @@
 		reg = <0xffe42000 0x100>;
 		interrupts = <0 90 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp0_clks R8A7779_CLK_SCIF2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -245,7 +245,7 @@
 		reg = <0xffe43000 0x100>;
 		interrupts = <0 91 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp0_clks R8A7779_CLK_SCIF3>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -255,7 +255,7 @@
 		reg = <0xffe44000 0x100>;
 		interrupts = <0 92 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp0_clks R8A7779_CLK_SCIF4>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -265,7 +265,7 @@
 		reg = <0xffe45000 0x100>;
 		interrupts = <0 93 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp0_clks R8A7779_CLK_SCIF5>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 10/16] ARM: shmobile: r8a7790 dtsi: Rename the serial port clock to fck
  2015-11-19 18:35 ` Geert Uytterhoeven
@ 2015-11-19 18:36   ` Geert Uytterhoeven
  -1 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

The clock is really the device functional clock, not the interface
clock. Rename it.

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>
---
v2:
  - Add Acked-by.
---
 arch/arm/boot/dts/r8a7790.dtsi | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 0612502b4a6d6750..9274641765bb79ac 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -585,7 +585,7 @@
 		reg = <0 0xe6c40000 0 64>;
 		interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7790_CLK_SCIFA0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x21>, <&dmac0 0x22>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -597,7 +597,7 @@
 		reg = <0 0xe6c50000 0 64>;
 		interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7790_CLK_SCIFA1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x25>, <&dmac0 0x26>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -609,7 +609,7 @@
 		reg = <0 0xe6c60000 0 64>;
 		interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7790_CLK_SCIFA2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x27>, <&dmac0 0x28>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -621,7 +621,7 @@
 		reg = <0 0xe6c20000 0 64>;
 		interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7790_CLK_SCIFB0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x3d>, <&dmac0 0x3e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -633,7 +633,7 @@
 		reg = <0 0xe6c30000 0 64>;
 		interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7790_CLK_SCIFB1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x19>, <&dmac0 0x1a>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -645,7 +645,7 @@
 		reg = <0 0xe6ce0000 0 64>;
 		interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7790_CLK_SCIFB2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x1d>, <&dmac0 0x1e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -657,7 +657,7 @@
 		reg = <0 0xe6e60000 0 64>;
 		interrupts = <0 152 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7790_CLK_SCIF0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x29>, <&dmac0 0x2a>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -669,7 +669,7 @@
 		reg = <0 0xe6e68000 0 64>;
 		interrupts = <0 153 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7790_CLK_SCIF1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x2d>, <&dmac0 0x2e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -681,7 +681,7 @@
 		reg = <0 0xe62c0000 0 96>;
 		interrupts = <0 154 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7790_CLK_HSCIF0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x39>, <&dmac0 0x3a>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -693,7 +693,7 @@
 		reg = <0 0xe62c8000 0 96>;
 		interrupts = <0 155 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7790_CLK_HSCIF1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x4d>, <&dmac0 0x4e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 10/16] ARM: shmobile: r8a7790 dtsi: Rename the serial port clock to fck
@ 2015-11-19 18:36   ` Geert Uytterhoeven
  0 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

The clock is really the device functional clock, not the interface
clock. Rename it.

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>
---
v2:
  - Add Acked-by.
---
 arch/arm/boot/dts/r8a7790.dtsi | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 0612502b4a6d6750..9274641765bb79ac 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -585,7 +585,7 @@
 		reg = <0 0xe6c40000 0 64>;
 		interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7790_CLK_SCIFA0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x21>, <&dmac0 0x22>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -597,7 +597,7 @@
 		reg = <0 0xe6c50000 0 64>;
 		interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7790_CLK_SCIFA1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x25>, <&dmac0 0x26>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -609,7 +609,7 @@
 		reg = <0 0xe6c60000 0 64>;
 		interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7790_CLK_SCIFA2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x27>, <&dmac0 0x28>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -621,7 +621,7 @@
 		reg = <0 0xe6c20000 0 64>;
 		interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7790_CLK_SCIFB0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x3d>, <&dmac0 0x3e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -633,7 +633,7 @@
 		reg = <0 0xe6c30000 0 64>;
 		interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7790_CLK_SCIFB1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x19>, <&dmac0 0x1a>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -645,7 +645,7 @@
 		reg = <0 0xe6ce0000 0 64>;
 		interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7790_CLK_SCIFB2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x1d>, <&dmac0 0x1e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -657,7 +657,7 @@
 		reg = <0 0xe6e60000 0 64>;
 		interrupts = <0 152 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7790_CLK_SCIF0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x29>, <&dmac0 0x2a>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -669,7 +669,7 @@
 		reg = <0 0xe6e68000 0 64>;
 		interrupts = <0 153 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7790_CLK_SCIF1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x2d>, <&dmac0 0x2e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -681,7 +681,7 @@
 		reg = <0 0xe62c0000 0 96>;
 		interrupts = <0 154 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7790_CLK_HSCIF0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x39>, <&dmac0 0x3a>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -693,7 +693,7 @@
 		reg = <0 0xe62c8000 0 96>;
 		interrupts = <0 155 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7790_CLK_HSCIF1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x4d>, <&dmac0 0x4e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 11/16] ARM: shmobile: r8a7791 dtsi: Rename the serial port clock to fck
  2015-11-19 18:35 ` Geert Uytterhoeven
@ 2015-11-19 18:36   ` Geert Uytterhoeven
  -1 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

The clock is really the device functional clock, not the interface
clock. Rename it.

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>
---
v2:
  - Add Acked-by.
---
 arch/arm/boot/dts/r8a7791.dtsi | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index d79102c0e7d346b1..684120a0a479a8d0 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -563,7 +563,7 @@
 		reg = <0 0xe6c40000 0 64>;
 		interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7791_CLK_SCIFA0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x21>, <&dmac0 0x22>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -575,7 +575,7 @@
 		reg = <0 0xe6c50000 0 64>;
 		interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7791_CLK_SCIFA1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x25>, <&dmac0 0x26>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -587,7 +587,7 @@
 		reg = <0 0xe6c60000 0 64>;
 		interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7791_CLK_SCIFA2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x27>, <&dmac0 0x28>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -599,7 +599,7 @@
 		reg = <0 0xe6c70000 0 64>;
 		interrupts = <0 29 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp11_clks R8A7791_CLK_SCIFA3>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x1b>, <&dmac0 0x1c>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -611,7 +611,7 @@
 		reg = <0 0xe6c78000 0 64>;
 		interrupts = <0 30 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp11_clks R8A7791_CLK_SCIFA4>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x1f>, <&dmac0 0x20>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -623,7 +623,7 @@
 		reg = <0 0xe6c80000 0 64>;
 		interrupts = <0 31 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp11_clks R8A7791_CLK_SCIFA5>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x23>, <&dmac0 0x24>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -635,7 +635,7 @@
 		reg = <0 0xe6c20000 0 64>;
 		interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7791_CLK_SCIFB0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x3d>, <&dmac0 0x3e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -647,7 +647,7 @@
 		reg = <0 0xe6c30000 0 64>;
 		interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7791_CLK_SCIFB1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x19>, <&dmac0 0x1a>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -659,7 +659,7 @@
 		reg = <0 0xe6ce0000 0 64>;
 		interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7791_CLK_SCIFB2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x1d>, <&dmac0 0x1e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -671,7 +671,7 @@
 		reg = <0 0xe6e60000 0 64>;
 		interrupts = <0 152 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7791_CLK_SCIF0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x29>, <&dmac0 0x2a>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -683,7 +683,7 @@
 		reg = <0 0xe6e68000 0 64>;
 		interrupts = <0 153 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7791_CLK_SCIF1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x2d>, <&dmac0 0x2e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -695,7 +695,7 @@
 		reg = <0 0xe6e58000 0 64>;
 		interrupts = <0 22 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7791_CLK_SCIF2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x2b>, <&dmac0 0x2c>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -707,7 +707,7 @@
 		reg = <0 0xe6ea8000 0 64>;
 		interrupts = <0 23 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7791_CLK_SCIF3>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x2f>, <&dmac0 0x30>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -719,7 +719,7 @@
 		reg = <0 0xe6ee0000 0 64>;
 		interrupts = <0 24 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7791_CLK_SCIF4>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0xfb>, <&dmac0 0xfc>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -731,7 +731,7 @@
 		reg = <0 0xe6ee8000 0 64>;
 		interrupts = <0 25 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7791_CLK_SCIF5>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0xfd>, <&dmac0 0xfe>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -743,7 +743,7 @@
 		reg = <0 0xe62c0000 0 96>;
 		interrupts = <0 154 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7791_CLK_HSCIF0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x39>, <&dmac0 0x3a>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -755,7 +755,7 @@
 		reg = <0 0xe62c8000 0 96>;
 		interrupts = <0 155 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7791_CLK_HSCIF1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x4d>, <&dmac0 0x4e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -767,7 +767,7 @@
 		reg = <0 0xe62d0000 0 96>;
 		interrupts = <0 21 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7791_CLK_HSCIF2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x3b>, <&dmac0 0x3c>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 11/16] ARM: shmobile: r8a7791 dtsi: Rename the serial port clock to fck
@ 2015-11-19 18:36   ` Geert Uytterhoeven
  0 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

The clock is really the device functional clock, not the interface
clock. Rename it.

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>
---
v2:
  - Add Acked-by.
---
 arch/arm/boot/dts/r8a7791.dtsi | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index d79102c0e7d346b1..684120a0a479a8d0 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -563,7 +563,7 @@
 		reg = <0 0xe6c40000 0 64>;
 		interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7791_CLK_SCIFA0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x21>, <&dmac0 0x22>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -575,7 +575,7 @@
 		reg = <0 0xe6c50000 0 64>;
 		interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7791_CLK_SCIFA1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x25>, <&dmac0 0x26>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -587,7 +587,7 @@
 		reg = <0 0xe6c60000 0 64>;
 		interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7791_CLK_SCIFA2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x27>, <&dmac0 0x28>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -599,7 +599,7 @@
 		reg = <0 0xe6c70000 0 64>;
 		interrupts = <0 29 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp11_clks R8A7791_CLK_SCIFA3>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x1b>, <&dmac0 0x1c>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -611,7 +611,7 @@
 		reg = <0 0xe6c78000 0 64>;
 		interrupts = <0 30 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp11_clks R8A7791_CLK_SCIFA4>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x1f>, <&dmac0 0x20>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -623,7 +623,7 @@
 		reg = <0 0xe6c80000 0 64>;
 		interrupts = <0 31 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp11_clks R8A7791_CLK_SCIFA5>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x23>, <&dmac0 0x24>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -635,7 +635,7 @@
 		reg = <0 0xe6c20000 0 64>;
 		interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7791_CLK_SCIFB0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x3d>, <&dmac0 0x3e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -647,7 +647,7 @@
 		reg = <0 0xe6c30000 0 64>;
 		interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7791_CLK_SCIFB1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x19>, <&dmac0 0x1a>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -659,7 +659,7 @@
 		reg = <0 0xe6ce0000 0 64>;
 		interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7791_CLK_SCIFB2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x1d>, <&dmac0 0x1e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -671,7 +671,7 @@
 		reg = <0 0xe6e60000 0 64>;
 		interrupts = <0 152 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7791_CLK_SCIF0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x29>, <&dmac0 0x2a>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -683,7 +683,7 @@
 		reg = <0 0xe6e68000 0 64>;
 		interrupts = <0 153 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7791_CLK_SCIF1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x2d>, <&dmac0 0x2e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -695,7 +695,7 @@
 		reg = <0 0xe6e58000 0 64>;
 		interrupts = <0 22 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7791_CLK_SCIF2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x2b>, <&dmac0 0x2c>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -707,7 +707,7 @@
 		reg = <0 0xe6ea8000 0 64>;
 		interrupts = <0 23 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7791_CLK_SCIF3>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x2f>, <&dmac0 0x30>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -719,7 +719,7 @@
 		reg = <0 0xe6ee0000 0 64>;
 		interrupts = <0 24 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7791_CLK_SCIF4>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0xfb>, <&dmac0 0xfc>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -731,7 +731,7 @@
 		reg = <0 0xe6ee8000 0 64>;
 		interrupts = <0 25 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7791_CLK_SCIF5>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0xfd>, <&dmac0 0xfe>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -743,7 +743,7 @@
 		reg = <0 0xe62c0000 0 96>;
 		interrupts = <0 154 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7791_CLK_HSCIF0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x39>, <&dmac0 0x3a>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -755,7 +755,7 @@
 		reg = <0 0xe62c8000 0 96>;
 		interrupts = <0 155 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7791_CLK_HSCIF1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x4d>, <&dmac0 0x4e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -767,7 +767,7 @@
 		reg = <0 0xe62d0000 0 96>;
 		interrupts = <0 21 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7791_CLK_HSCIF2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x3b>, <&dmac0 0x3c>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 12/16] ARM: shmobile: r8a7793 dtsi: Rename the serial port clock to fck
  2015-11-19 18:35 ` Geert Uytterhoeven
@ 2015-11-19 18:36   ` Geert Uytterhoeven
  -1 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

The clock is really the device functional clock, not the interface
clock. Rename it.

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>
---
v2:
  - Add Acked-by.
---
 arch/arm/boot/dts/r8a7793.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi
index aa9b64c14a09e7f7..f1018b55e4cb2491 100644
--- a/arch/arm/boot/dts/r8a7793.dtsi
+++ b/arch/arm/boot/dts/r8a7793.dtsi
@@ -199,7 +199,7 @@
 		reg = <0 0xe6e60000 0 64>;
 		interrupts = <0 152 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7793_CLK_SCIF0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -209,7 +209,7 @@
 		reg = <0 0xe6e68000 0 64>;
 		interrupts = <0 153 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7793_CLK_SCIF1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 12/16] ARM: shmobile: r8a7793 dtsi: Rename the serial port clock to fck
@ 2015-11-19 18:36   ` Geert Uytterhoeven
  0 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

The clock is really the device functional clock, not the interface
clock. Rename it.

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>
---
v2:
  - Add Acked-by.
---
 arch/arm/boot/dts/r8a7793.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi
index aa9b64c14a09e7f7..f1018b55e4cb2491 100644
--- a/arch/arm/boot/dts/r8a7793.dtsi
+++ b/arch/arm/boot/dts/r8a7793.dtsi
@@ -199,7 +199,7 @@
 		reg = <0 0xe6e60000 0 64>;
 		interrupts = <0 152 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7793_CLK_SCIF0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
@@ -209,7 +209,7 @@
 		reg = <0 0xe6e68000 0 64>;
 		interrupts = <0 153 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7793_CLK_SCIF1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		power-domains = <&cpg_clocks>;
 		status = "disabled";
 	};
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 13/16] ARM: shmobile: r8a7794 dtsi: Rename the serial port clock to fck
  2015-11-19 18:35 ` Geert Uytterhoeven
@ 2015-11-19 18:36   ` Geert Uytterhoeven
  -1 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

The clock is really the device functional clock, not the interface
clock. Rename it.

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>
---
v2:
  - Add Acked-by.
---
 arch/arm/boot/dts/r8a7794.dtsi | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index 018ff56470b6dab3..53e229a9b57d63bb 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -287,7 +287,7 @@
 		reg = <0 0xe6c40000 0 64>;
 		interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7794_CLK_SCIFA0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x21>, <&dmac0 0x22>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -299,7 +299,7 @@
 		reg = <0 0xe6c50000 0 64>;
 		interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7794_CLK_SCIFA1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x25>, <&dmac0 0x26>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -311,7 +311,7 @@
 		reg = <0 0xe6c60000 0 64>;
 		interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7794_CLK_SCIFA2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x27>, <&dmac0 0x28>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -323,7 +323,7 @@
 		reg = <0 0xe6c70000 0 64>;
 		interrupts = <0 29 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp11_clks R8A7794_CLK_SCIFA3>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x1b>, <&dmac0 0x1c>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -335,7 +335,7 @@
 		reg = <0 0xe6c78000 0 64>;
 		interrupts = <0 30 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp11_clks R8A7794_CLK_SCIFA4>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x1f>, <&dmac0 0x20>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -347,7 +347,7 @@
 		reg = <0 0xe6c80000 0 64>;
 		interrupts = <0 31 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp11_clks R8A7794_CLK_SCIFA5>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x23>, <&dmac0 0x24>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -359,7 +359,7 @@
 		reg = <0 0xe6c20000 0 64>;
 		interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7794_CLK_SCIFB0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x3d>, <&dmac0 0x3e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -371,7 +371,7 @@
 		reg = <0 0xe6c30000 0 64>;
 		interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7794_CLK_SCIFB1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x19>, <&dmac0 0x1a>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -383,7 +383,7 @@
 		reg = <0 0xe6ce0000 0 64>;
 		interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7794_CLK_SCIFB2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x1d>, <&dmac0 0x1e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -395,7 +395,7 @@
 		reg = <0 0xe6e60000 0 64>;
 		interrupts = <0 152 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7794_CLK_SCIF0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x29>, <&dmac0 0x2a>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -407,7 +407,7 @@
 		reg = <0 0xe6e68000 0 64>;
 		interrupts = <0 153 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7794_CLK_SCIF1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x2d>, <&dmac0 0x2e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -419,7 +419,7 @@
 		reg = <0 0xe6e58000 0 64>;
 		interrupts = <0 22 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7794_CLK_SCIF2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x2b>, <&dmac0 0x2c>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -431,7 +431,7 @@
 		reg = <0 0xe6ea8000 0 64>;
 		interrupts = <0 23 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7794_CLK_SCIF3>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x2f>, <&dmac0 0x30>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -443,7 +443,7 @@
 		reg = <0 0xe6ee0000 0 64>;
 		interrupts = <0 24 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7794_CLK_SCIF4>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0xfb>, <&dmac0 0xfc>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -455,7 +455,7 @@
 		reg = <0 0xe6ee8000 0 64>;
 		interrupts = <0 25 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7794_CLK_SCIF5>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0xfd>, <&dmac0 0xfe>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -467,7 +467,7 @@
 		reg = <0 0xe62c0000 0 96>;
 		interrupts = <0 154 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7794_CLK_HSCIF0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x39>, <&dmac0 0x3a>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -479,7 +479,7 @@
 		reg = <0 0xe62c8000 0 96>;
 		interrupts = <0 155 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7794_CLK_HSCIF1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x4d>, <&dmac0 0x4e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -491,7 +491,7 @@
 		reg = <0 0xe62d0000 0 96>;
 		interrupts = <0 21 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7794_CLK_HSCIF2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x3b>, <&dmac0 0x3c>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 13/16] ARM: shmobile: r8a7794 dtsi: Rename the serial port clock to fck
@ 2015-11-19 18:36   ` Geert Uytterhoeven
  0 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

The clock is really the device functional clock, not the interface
clock. Rename it.

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>
---
v2:
  - Add Acked-by.
---
 arch/arm/boot/dts/r8a7794.dtsi | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index 018ff56470b6dab3..53e229a9b57d63bb 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -287,7 +287,7 @@
 		reg = <0 0xe6c40000 0 64>;
 		interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7794_CLK_SCIFA0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x21>, <&dmac0 0x22>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -299,7 +299,7 @@
 		reg = <0 0xe6c50000 0 64>;
 		interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7794_CLK_SCIFA1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x25>, <&dmac0 0x26>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -311,7 +311,7 @@
 		reg = <0 0xe6c60000 0 64>;
 		interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7794_CLK_SCIFA2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x27>, <&dmac0 0x28>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -323,7 +323,7 @@
 		reg = <0 0xe6c70000 0 64>;
 		interrupts = <0 29 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp11_clks R8A7794_CLK_SCIFA3>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x1b>, <&dmac0 0x1c>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -335,7 +335,7 @@
 		reg = <0 0xe6c78000 0 64>;
 		interrupts = <0 30 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp11_clks R8A7794_CLK_SCIFA4>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x1f>, <&dmac0 0x20>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -347,7 +347,7 @@
 		reg = <0 0xe6c80000 0 64>;
 		interrupts = <0 31 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp11_clks R8A7794_CLK_SCIFA5>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x23>, <&dmac0 0x24>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -359,7 +359,7 @@
 		reg = <0 0xe6c20000 0 64>;
 		interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7794_CLK_SCIFB0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x3d>, <&dmac0 0x3e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -371,7 +371,7 @@
 		reg = <0 0xe6c30000 0 64>;
 		interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7794_CLK_SCIFB1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x19>, <&dmac0 0x1a>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -383,7 +383,7 @@
 		reg = <0 0xe6ce0000 0 64>;
 		interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7794_CLK_SCIFB2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x1d>, <&dmac0 0x1e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -395,7 +395,7 @@
 		reg = <0 0xe6e60000 0 64>;
 		interrupts = <0 152 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7794_CLK_SCIF0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x29>, <&dmac0 0x2a>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -407,7 +407,7 @@
 		reg = <0 0xe6e68000 0 64>;
 		interrupts = <0 153 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7794_CLK_SCIF1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x2d>, <&dmac0 0x2e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -419,7 +419,7 @@
 		reg = <0 0xe6e58000 0 64>;
 		interrupts = <0 22 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7794_CLK_SCIF2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x2b>, <&dmac0 0x2c>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -431,7 +431,7 @@
 		reg = <0 0xe6ea8000 0 64>;
 		interrupts = <0 23 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7794_CLK_SCIF3>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x2f>, <&dmac0 0x30>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -443,7 +443,7 @@
 		reg = <0 0xe6ee0000 0 64>;
 		interrupts = <0 24 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7794_CLK_SCIF4>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0xfb>, <&dmac0 0xfc>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -455,7 +455,7 @@
 		reg = <0 0xe6ee8000 0 64>;
 		interrupts = <0 25 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7794_CLK_SCIF5>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0xfd>, <&dmac0 0xfe>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -467,7 +467,7 @@
 		reg = <0 0xe62c0000 0 96>;
 		interrupts = <0 154 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7794_CLK_HSCIF0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x39>, <&dmac0 0x3a>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -479,7 +479,7 @@
 		reg = <0 0xe62c8000 0 96>;
 		interrupts = <0 155 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7794_CLK_HSCIF1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x4d>, <&dmac0 0x4e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -491,7 +491,7 @@
 		reg = <0 0xe62d0000 0 96>;
 		interrupts = <0 21 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7794_CLK_HSCIF2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x3b>, <&dmac0 0x3c>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 14/16] arm64: renesas: r8a7795 dtsi: Rename the serial port clock to fck
  2015-11-19 18:35 ` Geert Uytterhoeven
@ 2015-11-19 18:36   ` Geert Uytterhoeven
  -1 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

The clock is really the device functional clock, not the interface
clock. Rename it.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
  - New.
---
 arch/arm64/boot/dts/renesas/r8a7795.dtsi | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index 979a087d2b596c03..53a2a8fb42b7480c 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -363,7 +363,7 @@
 			reg = <0 0xe6540000 0 96>;
 			interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 520>;
-			clock-names = "sci_ick";
+			clock-names = "fck";
 			dmas = <&dmac1 0x31>, <&dmac1 0x30>;
 			dma-names = "tx", "rx";
 			power-domains = <&cpg>;
@@ -375,7 +375,7 @@
 			reg = <0 0xe6550000 0 96>;
 			interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 519>;
-			clock-names = "sci_ick";
+			clock-names = "fck";
 			dmas = <&dmac1 0x33>, <&dmac1 0x32>;
 			dma-names = "tx", "rx";
 			power-domains = <&cpg>;
@@ -387,7 +387,7 @@
 			reg = <0 0xe6560000 0 96>;
 			interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 518>;
-			clock-names = "sci_ick";
+			clock-names = "fck";
 			dmas = <&dmac1 0x35>, <&dmac1 0x34>;
 			dma-names = "tx", "rx";
 			power-domains = <&cpg>;
@@ -399,7 +399,7 @@
 			reg = <0 0xe66a0000 0 96>;
 			interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 517>;
-			clock-names = "sci_ick";
+			clock-names = "fck";
 			dmas = <&dmac0 0x37>, <&dmac0 0x36>;
 			dma-names = "tx", "rx";
 			power-domains = <&cpg>;
@@ -411,7 +411,7 @@
 			reg = <0 0xe66b0000 0 96>;
 			interrupts = <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 516>;
-			clock-names = "sci_ick";
+			clock-names = "fck";
 			dmas = <&dmac0 0x39>, <&dmac0 0x38>;
 			dma-names = "tx", "rx";
 			power-domains = <&cpg>;
@@ -423,7 +423,7 @@
 			reg = <0 0xe6e60000 0 64>;
 			interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 207>;
-			clock-names = "sci_ick";
+			clock-names = "fck";
 			dmas = <&dmac1 0x51>, <&dmac1 0x50>;
 			dma-names = "tx", "rx";
 			power-domains = <&cpg>;
@@ -435,7 +435,7 @@
 			reg = <0 0xe6e68000 0 64>;
 			interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 206>;
-			clock-names = "sci_ick";
+			clock-names = "fck";
 			dmas = <&dmac1 0x53>, <&dmac1 0x52>;
 			dma-names = "tx", "rx";
 			power-domains = <&cpg>;
@@ -447,7 +447,7 @@
 			reg = <0 0xe6e88000 0 64>;
 			interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 310>;
-			clock-names = "sci_ick";
+			clock-names = "fck";
 			dmas = <&dmac1 0x13>, <&dmac1 0x12>;
 			dma-names = "tx", "rx";
 			power-domains = <&cpg>;
@@ -459,7 +459,7 @@
 			reg = <0 0xe6c50000 0 64>;
 			interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 204>;
-			clock-names = "sci_ick";
+			clock-names = "fck";
 			dmas = <&dmac0 0x57>, <&dmac0 0x56>;
 			dma-names = "tx", "rx";
 			power-domains = <&cpg>;
@@ -471,7 +471,7 @@
 			reg = <0 0xe6c40000 0 64>;
 			interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 203>;
-			clock-names = "sci_ick";
+			clock-names = "fck";
 			dmas = <&dmac0 0x59>, <&dmac0 0x58>;
 			dma-names = "tx", "rx";
 			power-domains = <&cpg>;
@@ -483,7 +483,7 @@
 			reg = <0 0xe6f30000 0 64>;
 			interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 202>;
-			clock-names = "sci_ick";
+			clock-names = "fck";
 			dmas = <&dmac1 0x5b>, <&dmac1 0x5a>;
 			dma-names = "tx", "rx";
 			power-domains = <&cpg>;
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 14/16] arm64: renesas: r8a7795 dtsi: Rename the serial port clock to fck
@ 2015-11-19 18:36   ` Geert Uytterhoeven
  0 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

The clock is really the device functional clock, not the interface
clock. Rename it.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
  - New.
---
 arch/arm64/boot/dts/renesas/r8a7795.dtsi | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index 979a087d2b596c03..53a2a8fb42b7480c 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -363,7 +363,7 @@
 			reg = <0 0xe6540000 0 96>;
 			interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 520>;
-			clock-names = "sci_ick";
+			clock-names = "fck";
 			dmas = <&dmac1 0x31>, <&dmac1 0x30>;
 			dma-names = "tx", "rx";
 			power-domains = <&cpg>;
@@ -375,7 +375,7 @@
 			reg = <0 0xe6550000 0 96>;
 			interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 519>;
-			clock-names = "sci_ick";
+			clock-names = "fck";
 			dmas = <&dmac1 0x33>, <&dmac1 0x32>;
 			dma-names = "tx", "rx";
 			power-domains = <&cpg>;
@@ -387,7 +387,7 @@
 			reg = <0 0xe6560000 0 96>;
 			interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 518>;
-			clock-names = "sci_ick";
+			clock-names = "fck";
 			dmas = <&dmac1 0x35>, <&dmac1 0x34>;
 			dma-names = "tx", "rx";
 			power-domains = <&cpg>;
@@ -399,7 +399,7 @@
 			reg = <0 0xe66a0000 0 96>;
 			interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 517>;
-			clock-names = "sci_ick";
+			clock-names = "fck";
 			dmas = <&dmac0 0x37>, <&dmac0 0x36>;
 			dma-names = "tx", "rx";
 			power-domains = <&cpg>;
@@ -411,7 +411,7 @@
 			reg = <0 0xe66b0000 0 96>;
 			interrupts = <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 516>;
-			clock-names = "sci_ick";
+			clock-names = "fck";
 			dmas = <&dmac0 0x39>, <&dmac0 0x38>;
 			dma-names = "tx", "rx";
 			power-domains = <&cpg>;
@@ -423,7 +423,7 @@
 			reg = <0 0xe6e60000 0 64>;
 			interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 207>;
-			clock-names = "sci_ick";
+			clock-names = "fck";
 			dmas = <&dmac1 0x51>, <&dmac1 0x50>;
 			dma-names = "tx", "rx";
 			power-domains = <&cpg>;
@@ -435,7 +435,7 @@
 			reg = <0 0xe6e68000 0 64>;
 			interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 206>;
-			clock-names = "sci_ick";
+			clock-names = "fck";
 			dmas = <&dmac1 0x53>, <&dmac1 0x52>;
 			dma-names = "tx", "rx";
 			power-domains = <&cpg>;
@@ -447,7 +447,7 @@
 			reg = <0 0xe6e88000 0 64>;
 			interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 310>;
-			clock-names = "sci_ick";
+			clock-names = "fck";
 			dmas = <&dmac1 0x13>, <&dmac1 0x12>;
 			dma-names = "tx", "rx";
 			power-domains = <&cpg>;
@@ -459,7 +459,7 @@
 			reg = <0 0xe6c50000 0 64>;
 			interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 204>;
-			clock-names = "sci_ick";
+			clock-names = "fck";
 			dmas = <&dmac0 0x57>, <&dmac0 0x56>;
 			dma-names = "tx", "rx";
 			power-domains = <&cpg>;
@@ -471,7 +471,7 @@
 			reg = <0 0xe6c40000 0 64>;
 			interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 203>;
-			clock-names = "sci_ick";
+			clock-names = "fck";
 			dmas = <&dmac0 0x59>, <&dmac0 0x58>;
 			dma-names = "tx", "rx";
 			power-domains = <&cpg>;
@@ -483,7 +483,7 @@
 			reg = <0 0xe6f30000 0 64>;
 			interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 202>;
-			clock-names = "sci_ick";
+			clock-names = "fck";
 			dmas = <&dmac1 0x5b>, <&dmac1 0x5a>;
 			dma-names = "tx", "rx";
 			power-domains = <&cpg>;
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 15/16] h8300: dts: Rename the serial port clock to fck
  2015-11-19 18:35 ` Geert Uytterhoeven
@ 2015-11-19 18:36   ` Geert Uytterhoeven
  -1 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

The clock is really the device functional clock, not the interface
clock. Rename it.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
  - New.
---
 arch/h8300/boot/dts/edosk2674.dts  | 6 +++---
 arch/h8300/boot/dts/h8300h_sim.dts | 4 ++--
 arch/h8300/boot/dts/h8s_sim.dts    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/h8300/boot/dts/edosk2674.dts b/arch/h8300/boot/dts/edosk2674.dts
index 4ce9fa874a577e55..6ae884bf66a5268c 100644
--- a/arch/h8300/boot/dts/edosk2674.dts
+++ b/arch/h8300/boot/dts/edosk2674.dts
@@ -88,20 +88,20 @@
 		reg = <0xffff78 8>;
 		interrupts = <88 0>, <89 0>, <90 0>, <91 0>;
 		clocks = <&fclk>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 	};
 	sci1: serial@ffff80 {
 		compatible = "renesas,sci";
 		reg = <0xffff80 8>;
 		interrupts = <92 0>, <93 0>, <94 0>, <95 0>;
 		clocks = <&fclk>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 	};
 	sci2: serial@ffff88 {
 		compatible = "renesas,sci";
 		reg = <0xffff88 8>;
 		interrupts = <96 0>, <97 0>, <98 0>, <99 0>;
 		clocks = <&fclk>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 	};
 };
diff --git a/arch/h8300/boot/dts/h8300h_sim.dts b/arch/h8300/boot/dts/h8300h_sim.dts
index 545bfb57af9a9f2e..9c733d920f1f0dc3 100644
--- a/arch/h8300/boot/dts/h8300h_sim.dts
+++ b/arch/h8300/boot/dts/h8300h_sim.dts
@@ -83,7 +83,7 @@
 		reg = <0xffffb0 8>;
 		interrupts = <52 0>, <53 0>, <54 0>, <55 0>;
 		clocks = <&fclk>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 	};
 
 	sci1: serial@ffffb8 {
@@ -91,6 +91,6 @@
 		reg = <0xffffb8 8>;
 		interrupts = <56 0>, <57 0>, <58 0>, <59 0>;
 		clocks = <&fclk>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 	};
 };
diff --git a/arch/h8300/boot/dts/h8s_sim.dts b/arch/h8300/boot/dts/h8s_sim.dts
index bcedba5a3ce7e8ae..97e1f4b17ef067d5 100644
--- a/arch/h8300/boot/dts/h8s_sim.dts
+++ b/arch/h8300/boot/dts/h8s_sim.dts
@@ -87,13 +87,13 @@
 		reg = <0xffff78 8>;
 		interrupts = <88 0>, <89 0>, <90 0>, <91 0>;
 		clocks = <&fclk>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 	};
 	sci1: serial@ffff80 {
 		compatible = "renesas,sci";
 		reg = <0xffff80 8>;
 		interrupts = <92 0>, <93 0>, <94 0>, <95 0>;
 		clocks = <&fclk>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 	};
 };
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 15/16] h8300: dts: Rename the serial port clock to fck
@ 2015-11-19 18:36   ` Geert Uytterhoeven
  0 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

The clock is really the device functional clock, not the interface
clock. Rename it.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
  - New.
---
 arch/h8300/boot/dts/edosk2674.dts  | 6 +++---
 arch/h8300/boot/dts/h8300h_sim.dts | 4 ++--
 arch/h8300/boot/dts/h8s_sim.dts    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/h8300/boot/dts/edosk2674.dts b/arch/h8300/boot/dts/edosk2674.dts
index 4ce9fa874a577e55..6ae884bf66a5268c 100644
--- a/arch/h8300/boot/dts/edosk2674.dts
+++ b/arch/h8300/boot/dts/edosk2674.dts
@@ -88,20 +88,20 @@
 		reg = <0xffff78 8>;
 		interrupts = <88 0>, <89 0>, <90 0>, <91 0>;
 		clocks = <&fclk>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 	};
 	sci1: serial@ffff80 {
 		compatible = "renesas,sci";
 		reg = <0xffff80 8>;
 		interrupts = <92 0>, <93 0>, <94 0>, <95 0>;
 		clocks = <&fclk>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 	};
 	sci2: serial@ffff88 {
 		compatible = "renesas,sci";
 		reg = <0xffff88 8>;
 		interrupts = <96 0>, <97 0>, <98 0>, <99 0>;
 		clocks = <&fclk>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 	};
 };
diff --git a/arch/h8300/boot/dts/h8300h_sim.dts b/arch/h8300/boot/dts/h8300h_sim.dts
index 545bfb57af9a9f2e..9c733d920f1f0dc3 100644
--- a/arch/h8300/boot/dts/h8300h_sim.dts
+++ b/arch/h8300/boot/dts/h8300h_sim.dts
@@ -83,7 +83,7 @@
 		reg = <0xffffb0 8>;
 		interrupts = <52 0>, <53 0>, <54 0>, <55 0>;
 		clocks = <&fclk>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 	};
 
 	sci1: serial@ffffb8 {
@@ -91,6 +91,6 @@
 		reg = <0xffffb8 8>;
 		interrupts = <56 0>, <57 0>, <58 0>, <59 0>;
 		clocks = <&fclk>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 	};
 };
diff --git a/arch/h8300/boot/dts/h8s_sim.dts b/arch/h8300/boot/dts/h8s_sim.dts
index bcedba5a3ce7e8ae..97e1f4b17ef067d5 100644
--- a/arch/h8300/boot/dts/h8s_sim.dts
+++ b/arch/h8300/boot/dts/h8s_sim.dts
@@ -87,13 +87,13 @@
 		reg = <0xffff78 8>;
 		interrupts = <88 0>, <89 0>, <90 0>, <91 0>;
 		clocks = <&fclk>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 	};
 	sci1: serial@ffff80 {
 		compatible = "renesas,sci";
 		reg = <0xffff80 8>;
 		interrupts = <92 0>, <93 0>, <94 0>, <95 0>;
 		clocks = <&fclk>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 	};
 };
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 16/16] serial: sh-sci: Drop the sci_fck clock fallback
  2015-11-19 18:35 ` Geert Uytterhoeven
@ 2015-11-19 18:36   ` Geert Uytterhoeven
  -1 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

All platforms that used to define an sci_fck clock have now switched to
the fck name. Remove the fallback code.

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>
---
v2:
  - Add Acked-by.
---
 drivers/tty/serial/sh-sci.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 3c908804cab1c88c..bee5b7025adf45a2 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -2256,11 +2256,6 @@ static int sci_init_clocks(struct sci_port *sci_port, struct device *dev)
 	if (!IS_ERR(sci_port->fclk))
 		return 0;
 
-	/* SH has historically named the clock "sci_fck". */
-	sci_port->fclk = clk_get(dev, "sci_fck");
-	if (!IS_ERR(sci_port->fclk))
-		return 0;
-
 	/*
 	 * Not all SH platforms declare a clock lookup entry for SCI devices,
 	 * in which case we need to get the global "peripheral_clk" clock.
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* [PATCH v2 16/16] serial: sh-sci: Drop the sci_fck clock fallback
@ 2015-11-19 18:36   ` Geert Uytterhoeven
  0 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-11-19 18:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart
  Cc: linux-serial, linux-sh, Geert Uytterhoeven

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

All platforms that used to define an sci_fck clock have now switched to
the fck name. Remove the fallback code.

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>
---
v2:
  - Add Acked-by.
---
 drivers/tty/serial/sh-sci.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 3c908804cab1c88c..bee5b7025adf45a2 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -2256,11 +2256,6 @@ static int sci_init_clocks(struct sci_port *sci_port, struct device *dev)
 	if (!IS_ERR(sci_port->fclk))
 		return 0;
 
-	/* SH has historically named the clock "sci_fck". */
-	sci_port->fclk = clk_get(dev, "sci_fck");
-	if (!IS_ERR(sci_port->fclk))
-		return 0;
-
 	/*
 	 * Not all SH platforms declare a clock lookup entry for SCI devices,
 	 * in which case we need to get the global "peripheral_clk" clock.
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* Re: [PATCH v2 15/16] h8300: dts: Rename the serial port clock to fck
  2015-11-19 18:36   ` Geert Uytterhoeven
@ 2015-11-19 18:43     ` Laurent Pinchart
  -1 siblings, 0 replies; 58+ messages in thread
From: Laurent Pinchart @ 2015-11-19 18:43 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart, linux-serial, linux-sh

Hi Geert,

Thank you for the patch.

On Thursday 19 November 2015 19:36:12 Geert Uytterhoeven wrote:
> The clock is really the device functional clock, not the interface
> clock. Rename it.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
> v2:
>   - New.
> ---
>  arch/h8300/boot/dts/edosk2674.dts  | 6 +++---
>  arch/h8300/boot/dts/h8300h_sim.dts | 4 ++--
>  arch/h8300/boot/dts/h8s_sim.dts    | 4 ++--
>  3 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/h8300/boot/dts/edosk2674.dts
> b/arch/h8300/boot/dts/edosk2674.dts index
> 4ce9fa874a577e55..6ae884bf66a5268c 100644
> --- a/arch/h8300/boot/dts/edosk2674.dts
> +++ b/arch/h8300/boot/dts/edosk2674.dts
> @@ -88,20 +88,20 @@
>  		reg = <0xffff78 8>;
>  		interrupts = <88 0>, <89 0>, <90 0>, <91 0>;
>  		clocks = <&fclk>;
> -		clock-names = "sci_ick";
> +		clock-names = "fck";
>  	};
>  	sci1: serial@ffff80 {
>  		compatible = "renesas,sci";
>  		reg = <0xffff80 8>;
>  		interrupts = <92 0>, <93 0>, <94 0>, <95 0>;
>  		clocks = <&fclk>;
> -		clock-names = "sci_ick";
> +		clock-names = "fck";
>  	};
>  	sci2: serial@ffff88 {
>  		compatible = "renesas,sci";
>  		reg = <0xffff88 8>;
>  		interrupts = <96 0>, <97 0>, <98 0>, <99 0>;
>  		clocks = <&fclk>;
> -		clock-names = "sci_ick";
> +		clock-names = "fck";
>  	};
>  };
> diff --git a/arch/h8300/boot/dts/h8300h_sim.dts
> b/arch/h8300/boot/dts/h8300h_sim.dts index
> 545bfb57af9a9f2e..9c733d920f1f0dc3 100644
> --- a/arch/h8300/boot/dts/h8300h_sim.dts
> +++ b/arch/h8300/boot/dts/h8300h_sim.dts
> @@ -83,7 +83,7 @@
>  		reg = <0xffffb0 8>;
>  		interrupts = <52 0>, <53 0>, <54 0>, <55 0>;
>  		clocks = <&fclk>;
> -		clock-names = "sci_ick";
> +		clock-names = "fck";
>  	};
> 
>  	sci1: serial@ffffb8 {
> @@ -91,6 +91,6 @@
>  		reg = <0xffffb8 8>;
>  		interrupts = <56 0>, <57 0>, <58 0>, <59 0>;
>  		clocks = <&fclk>;
> -		clock-names = "sci_ick";
> +		clock-names = "fck";
>  	};
>  };
> diff --git a/arch/h8300/boot/dts/h8s_sim.dts
> b/arch/h8300/boot/dts/h8s_sim.dts index bcedba5a3ce7e8ae..97e1f4b17ef067d5
> 100644
> --- a/arch/h8300/boot/dts/h8s_sim.dts
> +++ b/arch/h8300/boot/dts/h8s_sim.dts
> @@ -87,13 +87,13 @@
>  		reg = <0xffff78 8>;
>  		interrupts = <88 0>, <89 0>, <90 0>, <91 0>;
>  		clocks = <&fclk>;
> -		clock-names = "sci_ick";
> +		clock-names = "fck";
>  	};
>  	sci1: serial@ffff80 {
>  		compatible = "renesas,sci";
>  		reg = <0xffff80 8>;
>  		interrupts = <92 0>, <93 0>, <94 0>, <95 0>;
>  		clocks = <&fclk>;
> -		clock-names = "sci_ick";
> +		clock-names = "fck";
>  	};
>  };

-- 
Regards,

Laurent Pinchart


^ permalink raw reply	[flat|nested] 58+ messages in thread
* Re: [PATCH v2 15/16] h8300: dts: Rename the serial port clock to fck
@ 2015-11-19 18:43     ` Laurent Pinchart
  0 siblings, 0 replies; 58+ messages in thread
From: Laurent Pinchart @ 2015-11-19 18:43 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart, linux-serial, linux-sh

Hi Geert,

Thank you for the patch.

On Thursday 19 November 2015 19:36:12 Geert Uytterhoeven wrote:
> The clock is really the device functional clock, not the interface
> clock. Rename it.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
> v2:
>   - New.
> ---
>  arch/h8300/boot/dts/edosk2674.dts  | 6 +++---
>  arch/h8300/boot/dts/h8300h_sim.dts | 4 ++--
>  arch/h8300/boot/dts/h8s_sim.dts    | 4 ++--
>  3 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/h8300/boot/dts/edosk2674.dts
> b/arch/h8300/boot/dts/edosk2674.dts index
> 4ce9fa874a577e55..6ae884bf66a5268c 100644
> --- a/arch/h8300/boot/dts/edosk2674.dts
> +++ b/arch/h8300/boot/dts/edosk2674.dts
> @@ -88,20 +88,20 @@
>  		reg = <0xffff78 8>;
>  		interrupts = <88 0>, <89 0>, <90 0>, <91 0>;
>  		clocks = <&fclk>;
> -		clock-names = "sci_ick";
> +		clock-names = "fck";
>  	};
>  	sci1: serial@ffff80 {
>  		compatible = "renesas,sci";
>  		reg = <0xffff80 8>;
>  		interrupts = <92 0>, <93 0>, <94 0>, <95 0>;
>  		clocks = <&fclk>;
> -		clock-names = "sci_ick";
> +		clock-names = "fck";
>  	};
>  	sci2: serial@ffff88 {
>  		compatible = "renesas,sci";
>  		reg = <0xffff88 8>;
>  		interrupts = <96 0>, <97 0>, <98 0>, <99 0>;
>  		clocks = <&fclk>;
> -		clock-names = "sci_ick";
> +		clock-names = "fck";
>  	};
>  };
> diff --git a/arch/h8300/boot/dts/h8300h_sim.dts
> b/arch/h8300/boot/dts/h8300h_sim.dts index
> 545bfb57af9a9f2e..9c733d920f1f0dc3 100644
> --- a/arch/h8300/boot/dts/h8300h_sim.dts
> +++ b/arch/h8300/boot/dts/h8300h_sim.dts
> @@ -83,7 +83,7 @@
>  		reg = <0xffffb0 8>;
>  		interrupts = <52 0>, <53 0>, <54 0>, <55 0>;
>  		clocks = <&fclk>;
> -		clock-names = "sci_ick";
> +		clock-names = "fck";
>  	};
> 
>  	sci1: serial@ffffb8 {
> @@ -91,6 +91,6 @@
>  		reg = <0xffffb8 8>;
>  		interrupts = <56 0>, <57 0>, <58 0>, <59 0>;
>  		clocks = <&fclk>;
> -		clock-names = "sci_ick";
> +		clock-names = "fck";
>  	};
>  };
> diff --git a/arch/h8300/boot/dts/h8s_sim.dts
> b/arch/h8300/boot/dts/h8s_sim.dts index bcedba5a3ce7e8ae..97e1f4b17ef067d5
> 100644
> --- a/arch/h8300/boot/dts/h8s_sim.dts
> +++ b/arch/h8300/boot/dts/h8s_sim.dts
> @@ -87,13 +87,13 @@
>  		reg = <0xffff78 8>;
>  		interrupts = <88 0>, <89 0>, <90 0>, <91 0>;
>  		clocks = <&fclk>;
> -		clock-names = "sci_ick";
> +		clock-names = "fck";
>  	};
>  	sci1: serial@ffff80 {
>  		compatible = "renesas,sci";
>  		reg = <0xffff80 8>;
>  		interrupts = <92 0>, <93 0>, <94 0>, <95 0>;
>  		clocks = <&fclk>;
> -		clock-names = "sci_ick";
> +		clock-names = "fck";
>  	};
>  };

-- 
Regards,

Laurent Pinchart


^ permalink raw reply	[flat|nested] 58+ messages in thread
* Re: [PATCH v2 14/16] arm64: renesas: r8a7795 dtsi: Rename the serial port clock to fck
  2015-11-19 18:36   ` Geert Uytterhoeven
@ 2015-11-19 18:43     ` Laurent Pinchart
  -1 siblings, 0 replies; 58+ messages in thread
From: Laurent Pinchart @ 2015-11-19 18:43 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	linux-serial, linux-sh

Hi Geert,

Thank you for the patch.

On Thursday 19 November 2015 19:36:11 Geert Uytterhoeven wrote:
> The clock is really the device functional clock, not the interface
> clock. Rename it.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
> v2:
>   - New.
> ---
>  arch/arm64/boot/dts/renesas/r8a7795.dtsi | 22 +++++++++++-----------
>  1 file changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
> b/arch/arm64/boot/dts/renesas/r8a7795.dtsi index
> 979a087d2b596c03..53a2a8fb42b7480c 100644
> --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
> +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
> @@ -363,7 +363,7 @@
>  			reg = <0 0xe6540000 0 96>;
>  			interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
>  			clocks = <&cpg CPG_MOD 520>;
> -			clock-names = "sci_ick";
> +			clock-names = "fck";
>  			dmas = <&dmac1 0x31>, <&dmac1 0x30>;
>  			dma-names = "tx", "rx";
>  			power-domains = <&cpg>;
> @@ -375,7 +375,7 @@
>  			reg = <0 0xe6550000 0 96>;
>  			interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
>  			clocks = <&cpg CPG_MOD 519>;
> -			clock-names = "sci_ick";
> +			clock-names = "fck";
>  			dmas = <&dmac1 0x33>, <&dmac1 0x32>;
>  			dma-names = "tx", "rx";
>  			power-domains = <&cpg>;
> @@ -387,7 +387,7 @@
>  			reg = <0 0xe6560000 0 96>;
>  			interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
>  			clocks = <&cpg CPG_MOD 518>;
> -			clock-names = "sci_ick";
> +			clock-names = "fck";
>  			dmas = <&dmac1 0x35>, <&dmac1 0x34>;
>  			dma-names = "tx", "rx";
>  			power-domains = <&cpg>;
> @@ -399,7 +399,7 @@
>  			reg = <0 0xe66a0000 0 96>;
>  			interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
>  			clocks = <&cpg CPG_MOD 517>;
> -			clock-names = "sci_ick";
> +			clock-names = "fck";
>  			dmas = <&dmac0 0x37>, <&dmac0 0x36>;
>  			dma-names = "tx", "rx";
>  			power-domains = <&cpg>;
> @@ -411,7 +411,7 @@
>  			reg = <0 0xe66b0000 0 96>;
>  			interrupts = <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>;
>  			clocks = <&cpg CPG_MOD 516>;
> -			clock-names = "sci_ick";
> +			clock-names = "fck";
>  			dmas = <&dmac0 0x39>, <&dmac0 0x38>;
>  			dma-names = "tx", "rx";
>  			power-domains = <&cpg>;
> @@ -423,7 +423,7 @@
>  			reg = <0 0xe6e60000 0 64>;
>  			interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
>  			clocks = <&cpg CPG_MOD 207>;
> -			clock-names = "sci_ick";
> +			clock-names = "fck";
>  			dmas = <&dmac1 0x51>, <&dmac1 0x50>;
>  			dma-names = "tx", "rx";
>  			power-domains = <&cpg>;
> @@ -435,7 +435,7 @@
>  			reg = <0 0xe6e68000 0 64>;
>  			interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
>  			clocks = <&cpg CPG_MOD 206>;
> -			clock-names = "sci_ick";
> +			clock-names = "fck";
>  			dmas = <&dmac1 0x53>, <&dmac1 0x52>;
>  			dma-names = "tx", "rx";
>  			power-domains = <&cpg>;
> @@ -447,7 +447,7 @@
>  			reg = <0 0xe6e88000 0 64>;
>  			interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>;
>  			clocks = <&cpg CPG_MOD 310>;
> -			clock-names = "sci_ick";
> +			clock-names = "fck";
>  			dmas = <&dmac1 0x13>, <&dmac1 0x12>;
>  			dma-names = "tx", "rx";
>  			power-domains = <&cpg>;
> @@ -459,7 +459,7 @@
>  			reg = <0 0xe6c50000 0 64>;
>  			interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
>  			clocks = <&cpg CPG_MOD 204>;
> -			clock-names = "sci_ick";
> +			clock-names = "fck";
>  			dmas = <&dmac0 0x57>, <&dmac0 0x56>;
>  			dma-names = "tx", "rx";
>  			power-domains = <&cpg>;
> @@ -471,7 +471,7 @@
>  			reg = <0 0xe6c40000 0 64>;
>  			interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
>  			clocks = <&cpg CPG_MOD 203>;
> -			clock-names = "sci_ick";
> +			clock-names = "fck";
>  			dmas = <&dmac0 0x59>, <&dmac0 0x58>;
>  			dma-names = "tx", "rx";
>  			power-domains = <&cpg>;
> @@ -483,7 +483,7 @@
>  			reg = <0 0xe6f30000 0 64>;
>  			interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
>  			clocks = <&cpg CPG_MOD 202>;
> -			clock-names = "sci_ick";
> +			clock-names = "fck";
>  			dmas = <&dmac1 0x5b>, <&dmac1 0x5a>;
>  			dma-names = "tx", "rx";
>  			power-domains = <&cpg>;

-- 
Regards,

Laurent Pinchart


^ permalink raw reply	[flat|nested] 58+ messages in thread
* Re: [PATCH v2 14/16] arm64: renesas: r8a7795 dtsi: Rename the serial port clock to fck
@ 2015-11-19 18:43     ` Laurent Pinchart
  0 siblings, 0 replies; 58+ messages in thread
From: Laurent Pinchart @ 2015-11-19 18:43 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	linux-serial, linux-sh

Hi Geert,

Thank you for the patch.

On Thursday 19 November 2015 19:36:11 Geert Uytterhoeven wrote:
> The clock is really the device functional clock, not the interface
> clock. Rename it.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
> v2:
>   - New.
> ---
>  arch/arm64/boot/dts/renesas/r8a7795.dtsi | 22 +++++++++++-----------
>  1 file changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
> b/arch/arm64/boot/dts/renesas/r8a7795.dtsi index
> 979a087d2b596c03..53a2a8fb42b7480c 100644
> --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
> +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
> @@ -363,7 +363,7 @@
>  			reg = <0 0xe6540000 0 96>;
>  			interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
>  			clocks = <&cpg CPG_MOD 520>;
> -			clock-names = "sci_ick";
> +			clock-names = "fck";
>  			dmas = <&dmac1 0x31>, <&dmac1 0x30>;
>  			dma-names = "tx", "rx";
>  			power-domains = <&cpg>;
> @@ -375,7 +375,7 @@
>  			reg = <0 0xe6550000 0 96>;
>  			interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
>  			clocks = <&cpg CPG_MOD 519>;
> -			clock-names = "sci_ick";
> +			clock-names = "fck";
>  			dmas = <&dmac1 0x33>, <&dmac1 0x32>;
>  			dma-names = "tx", "rx";
>  			power-domains = <&cpg>;
> @@ -387,7 +387,7 @@
>  			reg = <0 0xe6560000 0 96>;
>  			interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
>  			clocks = <&cpg CPG_MOD 518>;
> -			clock-names = "sci_ick";
> +			clock-names = "fck";
>  			dmas = <&dmac1 0x35>, <&dmac1 0x34>;
>  			dma-names = "tx", "rx";
>  			power-domains = <&cpg>;
> @@ -399,7 +399,7 @@
>  			reg = <0 0xe66a0000 0 96>;
>  			interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
>  			clocks = <&cpg CPG_MOD 517>;
> -			clock-names = "sci_ick";
> +			clock-names = "fck";
>  			dmas = <&dmac0 0x37>, <&dmac0 0x36>;
>  			dma-names = "tx", "rx";
>  			power-domains = <&cpg>;
> @@ -411,7 +411,7 @@
>  			reg = <0 0xe66b0000 0 96>;
>  			interrupts = <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>;
>  			clocks = <&cpg CPG_MOD 516>;
> -			clock-names = "sci_ick";
> +			clock-names = "fck";
>  			dmas = <&dmac0 0x39>, <&dmac0 0x38>;
>  			dma-names = "tx", "rx";
>  			power-domains = <&cpg>;
> @@ -423,7 +423,7 @@
>  			reg = <0 0xe6e60000 0 64>;
>  			interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
>  			clocks = <&cpg CPG_MOD 207>;
> -			clock-names = "sci_ick";
> +			clock-names = "fck";
>  			dmas = <&dmac1 0x51>, <&dmac1 0x50>;
>  			dma-names = "tx", "rx";
>  			power-domains = <&cpg>;
> @@ -435,7 +435,7 @@
>  			reg = <0 0xe6e68000 0 64>;
>  			interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
>  			clocks = <&cpg CPG_MOD 206>;
> -			clock-names = "sci_ick";
> +			clock-names = "fck";
>  			dmas = <&dmac1 0x53>, <&dmac1 0x52>;
>  			dma-names = "tx", "rx";
>  			power-domains = <&cpg>;
> @@ -447,7 +447,7 @@
>  			reg = <0 0xe6e88000 0 64>;
>  			interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>;
>  			clocks = <&cpg CPG_MOD 310>;
> -			clock-names = "sci_ick";
> +			clock-names = "fck";
>  			dmas = <&dmac1 0x13>, <&dmac1 0x12>;
>  			dma-names = "tx", "rx";
>  			power-domains = <&cpg>;
> @@ -459,7 +459,7 @@
>  			reg = <0 0xe6c50000 0 64>;
>  			interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
>  			clocks = <&cpg CPG_MOD 204>;
> -			clock-names = "sci_ick";
> +			clock-names = "fck";
>  			dmas = <&dmac0 0x57>, <&dmac0 0x56>;
>  			dma-names = "tx", "rx";
>  			power-domains = <&cpg>;
> @@ -471,7 +471,7 @@
>  			reg = <0 0xe6c40000 0 64>;
>  			interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
>  			clocks = <&cpg CPG_MOD 203>;
> -			clock-names = "sci_ick";
> +			clock-names = "fck";
>  			dmas = <&dmac0 0x59>, <&dmac0 0x58>;
>  			dma-names = "tx", "rx";
>  			power-domains = <&cpg>;
> @@ -483,7 +483,7 @@
>  			reg = <0 0xe6f30000 0 64>;
>  			interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
>  			clocks = <&cpg CPG_MOD 202>;
> -			clock-names = "sci_ick";
> +			clock-names = "fck";
>  			dmas = <&dmac1 0x5b>, <&dmac1 0x5a>;
>  			dma-names = "tx", "rx";
>  			power-domains = <&cpg>;

-- 
Regards,

Laurent Pinchart


^ permalink raw reply	[flat|nested] 58+ messages in thread
* Re: [PATCH v2 01/16] serial: sh-sci: Drop the interface clock
  2015-11-19 18:35     ` Geert Uytterhoeven
@ 2015-11-20 16:27       ` Rob Herring
  -1 siblings, 0 replies; 58+ messages in thread
From: Rob Herring @ 2015-11-20 16:27 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart, linux-serial, linux-sh, devicetree

On Thu, Nov 19, 2015 at 07:35:58PM +0100, Geert Uytterhoeven wrote:
> From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> 
> As no platform defines an interface clock the SCI driver always falls
> back to a clock named "peripheral_clk".
>   - On SH platforms that clock is the base clock for the SCI functional
>     clock and has the same frequency,
>   - On ARM platforms that clock doesn't exist, and clk_get() will return
>     the default clock for the device.
> We can thus make the functional clock mandatory and drop the interface
> clock.
> 
> EPROBE_DEFER is handled for clocks that may be referenced from DT (i.e.
> "fck" and deprecated "sci_ick").
> 
> Cc: devicetree@vger.kernel.org
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> Acked-by: Simon Horman <horms+renesas@verge.net.au>
> [geert: Handle EPROBE_DEFER, reformat description, break long comment line]
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

This could break users that care about the clock name. A new dtb with 
old kernel would be one example. I guess you are okay with that, so:

Acked-by: Rob Herring <robh@kernel.org>


> ---
> v2:
>   - Add Acked-by,
>   - Amendment by geert.
> ---
>  .../bindings/serial/renesas,sci-serial.txt         |  4 +-
>  drivers/tty/serial/sh-sci.c                        | 64 ++++++++++++++--------
>  2 files changed, 43 insertions(+), 25 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt b/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
> index 73f825e5e6448815..2c9e6b8477e92792 100644
> --- a/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
> +++ b/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
> @@ -42,7 +42,7 @@ Required properties:
>  
>    - clocks: Must contain a phandle and clock-specifier pair for each entry
>      in clock-names.
> -  - clock-names: Must contain "sci_ick" for the SCIx UART interface clock.
> +  - clock-names: Must contain "fck" for the SCIx UART functional clock.
>  
>  Note: Each enabled SCIx UART should have an alias correctly numbered in the
>  "aliases" node.
> @@ -63,7 +63,7 @@ Example:
>  		interrupt-parent = <&gic>;
>  		interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;
>  		clocks = <&mstp2_clks R8A7790_CLK_SCIFA0>;
> -		clock-names = "sci_ick";
> +		clock-names = "fck";
>  		dmas = <&dmac0 0x21>, <&dmac0 0x22>;
>  		dma-names = "tx", "rx";
>  	};
> diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
> index 51c7507b0444957b..3c908804cab1c88c 100644
> --- a/drivers/tty/serial/sh-sci.c
> +++ b/drivers/tty/serial/sh-sci.c
> @@ -92,8 +92,6 @@ struct sci_port {
>  	struct timer_list	break_timer;
>  	int			break_flag;
>  
> -	/* Interface clock */
> -	struct clk		*iclk;
>  	/* Function clock */
>  	struct clk		*fclk;
>  
> @@ -457,9 +455,8 @@ static void sci_port_enable(struct sci_port *sci_port)
>  
>  	pm_runtime_get_sync(sci_port->port.dev);
>  
> -	clk_prepare_enable(sci_port->iclk);
> -	sci_port->port.uartclk = clk_get_rate(sci_port->iclk);
>  	clk_prepare_enable(sci_port->fclk);
> +	sci_port->port.uartclk = clk_get_rate(sci_port->fclk);
>  }
>  
>  static void sci_port_disable(struct sci_port *sci_port)
> @@ -476,7 +473,6 @@ static void sci_port_disable(struct sci_port *sci_port)
>  	sci_port->break_flag = 0;
>  
>  	clk_disable_unprepare(sci_port->fclk);
> -	clk_disable_unprepare(sci_port->iclk);
>  
>  	pm_runtime_put_sync(sci_port->port.dev);
>  }
> @@ -1622,7 +1618,7 @@ static int sci_notifier(struct notifier_block *self,
>  		struct uart_port *port = &sci_port->port;
>  
>  		spin_lock_irqsave(&port->lock, flags);
> -		port->uartclk = clk_get_rate(sci_port->iclk);
> +		port->uartclk = clk_get_rate(sci_port->fclk);
>  		spin_unlock_irqrestore(&port->lock, flags);
>  	}
>  
> @@ -2241,6 +2237,42 @@ static struct uart_ops sci_uart_ops = {
>  #endif
>  };
>  
> +static int sci_init_clocks(struct sci_port *sci_port, struct device *dev)
> +{
> +	/* Get the SCI functional clock. It's called "fck" on ARM. */
> +	sci_port->fclk = clk_get(dev, "fck");
> +	if (PTR_ERR(sci_port->fclk) = -EPROBE_DEFER)
> +		return -EPROBE_DEFER;
> +	if (!IS_ERR(sci_port->fclk))
> +		return 0;
> +
> +	/*
> +	 * But it used to be called "sci_ick", and we need to maintain DT
> +	 * backward compatibility.
> +	 */
> +	sci_port->fclk = clk_get(dev, "sci_ick");
> +	if (PTR_ERR(sci_port->fclk) = -EPROBE_DEFER)
> +		return -EPROBE_DEFER;
> +	if (!IS_ERR(sci_port->fclk))
> +		return 0;
> +
> +	/* SH has historically named the clock "sci_fck". */
> +	sci_port->fclk = clk_get(dev, "sci_fck");
> +	if (!IS_ERR(sci_port->fclk))
> +		return 0;
> +
> +	/*
> +	 * Not all SH platforms declare a clock lookup entry for SCI devices,
> +	 * in which case we need to get the global "peripheral_clk" clock.
> +	 */
> +	sci_port->fclk = clk_get(dev, "peripheral_clk");
> +	if (!IS_ERR(sci_port->fclk))
> +		return 0;
> +
> +	dev_err(dev, "failed to get functional clock\n");
> +	return PTR_ERR(sci_port->fclk);
> +}
> +
>  static int sci_init_single(struct platform_device *dev,
>  			   struct sci_port *sci_port, unsigned int index,
>  			   struct plat_sci_port *p, bool early)
> @@ -2333,22 +2365,9 @@ static int sci_init_single(struct platform_device *dev,
>  		sci_port->sampling_rate = p->sampling_rate;
>  
>  	if (!early) {
> -		sci_port->iclk = clk_get(&dev->dev, "sci_ick");
> -		if (IS_ERR(sci_port->iclk)) {
> -			sci_port->iclk = clk_get(&dev->dev, "peripheral_clk");
> -			if (IS_ERR(sci_port->iclk)) {
> -				dev_err(&dev->dev, "can't get iclk\n");
> -				return PTR_ERR(sci_port->iclk);
> -			}
> -		}
> -
> -		/*
> -		 * The function clock is optional, ignore it if we can't
> -		 * find it.
> -		 */
> -		sci_port->fclk = clk_get(&dev->dev, "sci_fck");
> -		if (IS_ERR(sci_port->fclk))
> -			sci_port->fclk = NULL;
> +		ret = sci_init_clocks(sci_port, &dev->dev);
> +		if (ret < 0)
> +			return ret;
>  
>  		port->dev = &dev->dev;
>  
> @@ -2405,7 +2424,6 @@ static int sci_init_single(struct platform_device *dev,
>  
>  static void sci_cleanup_single(struct sci_port *port)
>  {
> -	clk_put(port->iclk);
>  	clk_put(port->fclk);
>  
>  	pm_runtime_disable(port->port.dev);
> -- 
> 1.9.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe devicetree" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 58+ messages in thread
* Re: [PATCH v2 01/16] serial: sh-sci: Drop the interface clock
@ 2015-11-20 16:27       ` Rob Herring
  0 siblings, 0 replies; 58+ messages in thread
From: Rob Herring @ 2015-11-20 16:27 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Greg Kroah-Hartman, Simon Horman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart, linux-serial, linux-sh, devicetree

On Thu, Nov 19, 2015 at 07:35:58PM +0100, Geert Uytterhoeven wrote:
> From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> 
> As no platform defines an interface clock the SCI driver always falls
> back to a clock named "peripheral_clk".
>   - On SH platforms that clock is the base clock for the SCI functional
>     clock and has the same frequency,
>   - On ARM platforms that clock doesn't exist, and clk_get() will return
>     the default clock for the device.
> We can thus make the functional clock mandatory and drop the interface
> clock.
> 
> EPROBE_DEFER is handled for clocks that may be referenced from DT (i.e.
> "fck" and deprecated "sci_ick").
> 
> Cc: devicetree@vger.kernel.org
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> Acked-by: Simon Horman <horms+renesas@verge.net.au>
> [geert: Handle EPROBE_DEFER, reformat description, break long comment line]
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

This could break users that care about the clock name. A new dtb with 
old kernel would be one example. I guess you are okay with that, so:

Acked-by: Rob Herring <robh@kernel.org>


> ---
> v2:
>   - Add Acked-by,
>   - Amendment by geert.
> ---
>  .../bindings/serial/renesas,sci-serial.txt         |  4 +-
>  drivers/tty/serial/sh-sci.c                        | 64 ++++++++++++++--------
>  2 files changed, 43 insertions(+), 25 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt b/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
> index 73f825e5e6448815..2c9e6b8477e92792 100644
> --- a/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
> +++ b/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
> @@ -42,7 +42,7 @@ Required properties:
>  
>    - clocks: Must contain a phandle and clock-specifier pair for each entry
>      in clock-names.
> -  - clock-names: Must contain "sci_ick" for the SCIx UART interface clock.
> +  - clock-names: Must contain "fck" for the SCIx UART functional clock.
>  
>  Note: Each enabled SCIx UART should have an alias correctly numbered in the
>  "aliases" node.
> @@ -63,7 +63,7 @@ Example:
>  		interrupt-parent = <&gic>;
>  		interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;
>  		clocks = <&mstp2_clks R8A7790_CLK_SCIFA0>;
> -		clock-names = "sci_ick";
> +		clock-names = "fck";
>  		dmas = <&dmac0 0x21>, <&dmac0 0x22>;
>  		dma-names = "tx", "rx";
>  	};
> diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
> index 51c7507b0444957b..3c908804cab1c88c 100644
> --- a/drivers/tty/serial/sh-sci.c
> +++ b/drivers/tty/serial/sh-sci.c
> @@ -92,8 +92,6 @@ struct sci_port {
>  	struct timer_list	break_timer;
>  	int			break_flag;
>  
> -	/* Interface clock */
> -	struct clk		*iclk;
>  	/* Function clock */
>  	struct clk		*fclk;
>  
> @@ -457,9 +455,8 @@ static void sci_port_enable(struct sci_port *sci_port)
>  
>  	pm_runtime_get_sync(sci_port->port.dev);
>  
> -	clk_prepare_enable(sci_port->iclk);
> -	sci_port->port.uartclk = clk_get_rate(sci_port->iclk);
>  	clk_prepare_enable(sci_port->fclk);
> +	sci_port->port.uartclk = clk_get_rate(sci_port->fclk);
>  }
>  
>  static void sci_port_disable(struct sci_port *sci_port)
> @@ -476,7 +473,6 @@ static void sci_port_disable(struct sci_port *sci_port)
>  	sci_port->break_flag = 0;
>  
>  	clk_disable_unprepare(sci_port->fclk);
> -	clk_disable_unprepare(sci_port->iclk);
>  
>  	pm_runtime_put_sync(sci_port->port.dev);
>  }
> @@ -1622,7 +1618,7 @@ static int sci_notifier(struct notifier_block *self,
>  		struct uart_port *port = &sci_port->port;
>  
>  		spin_lock_irqsave(&port->lock, flags);
> -		port->uartclk = clk_get_rate(sci_port->iclk);
> +		port->uartclk = clk_get_rate(sci_port->fclk);
>  		spin_unlock_irqrestore(&port->lock, flags);
>  	}
>  
> @@ -2241,6 +2237,42 @@ static struct uart_ops sci_uart_ops = {
>  #endif
>  };
>  
> +static int sci_init_clocks(struct sci_port *sci_port, struct device *dev)
> +{
> +	/* Get the SCI functional clock. It's called "fck" on ARM. */
> +	sci_port->fclk = clk_get(dev, "fck");
> +	if (PTR_ERR(sci_port->fclk) == -EPROBE_DEFER)
> +		return -EPROBE_DEFER;
> +	if (!IS_ERR(sci_port->fclk))
> +		return 0;
> +
> +	/*
> +	 * But it used to be called "sci_ick", and we need to maintain DT
> +	 * backward compatibility.
> +	 */
> +	sci_port->fclk = clk_get(dev, "sci_ick");
> +	if (PTR_ERR(sci_port->fclk) == -EPROBE_DEFER)
> +		return -EPROBE_DEFER;
> +	if (!IS_ERR(sci_port->fclk))
> +		return 0;
> +
> +	/* SH has historically named the clock "sci_fck". */
> +	sci_port->fclk = clk_get(dev, "sci_fck");
> +	if (!IS_ERR(sci_port->fclk))
> +		return 0;
> +
> +	/*
> +	 * Not all SH platforms declare a clock lookup entry for SCI devices,
> +	 * in which case we need to get the global "peripheral_clk" clock.
> +	 */
> +	sci_port->fclk = clk_get(dev, "peripheral_clk");
> +	if (!IS_ERR(sci_port->fclk))
> +		return 0;
> +
> +	dev_err(dev, "failed to get functional clock\n");
> +	return PTR_ERR(sci_port->fclk);
> +}
> +
>  static int sci_init_single(struct platform_device *dev,
>  			   struct sci_port *sci_port, unsigned int index,
>  			   struct plat_sci_port *p, bool early)
> @@ -2333,22 +2365,9 @@ static int sci_init_single(struct platform_device *dev,
>  		sci_port->sampling_rate = p->sampling_rate;
>  
>  	if (!early) {
> -		sci_port->iclk = clk_get(&dev->dev, "sci_ick");
> -		if (IS_ERR(sci_port->iclk)) {
> -			sci_port->iclk = clk_get(&dev->dev, "peripheral_clk");
> -			if (IS_ERR(sci_port->iclk)) {
> -				dev_err(&dev->dev, "can't get iclk\n");
> -				return PTR_ERR(sci_port->iclk);
> -			}
> -		}
> -
> -		/*
> -		 * The function clock is optional, ignore it if we can't
> -		 * find it.
> -		 */
> -		sci_port->fclk = clk_get(&dev->dev, "sci_fck");
> -		if (IS_ERR(sci_port->fclk))
> -			sci_port->fclk = NULL;
> +		ret = sci_init_clocks(sci_port, &dev->dev);
> +		if (ret < 0)
> +			return ret;
>  
>  		port->dev = &dev->dev;
>  
> @@ -2405,7 +2424,6 @@ static int sci_init_single(struct platform_device *dev,
>  
>  static void sci_cleanup_single(struct sci_port *port)
>  {
> -	clk_put(port->iclk);
>  	clk_put(port->fclk);
>  
>  	pm_runtime_disable(port->port.dev);
> -- 
> 1.9.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe devicetree" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 58+ messages in thread
* Re: [PATCH v2 00/16] serial: sh-sci: Clock Cleanups
  2015-11-19 18:35 ` Geert Uytterhoeven
@ 2015-11-24  2:44   ` Simon Horman
  -1 siblings, 0 replies; 58+ messages in thread
From: Simon Horman @ 2015-11-24  2:44 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Greg Kroah-Hartman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart, linux-serial, linux-sh

On Thu, Nov 19, 2015 at 07:35:57PM +0100, Geert Uytterhoeven wrote:
> 	Hi,
> 
> The SCI driver currently handles two clocks, an interface clock named
> sci_ick and a functional clock named sci_fck. Studying the datasheets of
> the SH and ARM SoCs that incorportate (H)SCI(F)([AB]) instances showed
> (un)surprisingly that the hardware doesn't have a separate controllable
> interface clock.
> 
> All the platforms that declare an interface clock for the SCI set it to
> the clock used as the SCI functional clock. The two clocks can thus be
> merged on the driver side, which is what this patch series does. The
> resulting clock is called "fck", and all H8/300, SH and ARM users (both
> DT and non-DT) are fixed to name their SCI clocks appropriately.
> 
> Support for the "sci_ick" name is kept in the sh-sci driver to ensure DT
> backward compatibility, and support for the "peripheral_clk" clock to
> not break SH platforms that don't declare device-specific SCI clocks.
> The latter can be removed when all SH platforms will declare their SCI
> clocks properly.
> 
> This series serves as a preparatory clock cleanup for the SCI baud rate
> generator clock support series. I decided to keep it separate as this
> series has more stringent internal dependencies:
>   - The SH patches 2-3 depend on patch 1,
>   - The DT patches 4-15 depend on patch 1,
>   - Cleanup patch 16 depends on SH patch 2.
> 
> Thanks for your comments!
> 
> Changes compared to v1:
>   - Take over the patches from Laurent,
>   - Add Acked-by,
>   - Handle EPROBE_DEFER,
>   - Add missing patches to convert r8a7795 and h8300.
> 
> Geert Uytterhoeven (2):
>   arm64: renesas: r8a7795 dtsi: Rename the serial port clock to fck
>   h8300: dts: Rename the serial port clock to fck
> 
> Laurent Pinchart (14):
>   serial: sh-sci: Drop the interface clock
>   sh: Rename sci_ick and sci_fck clock to fck
>   sh: Remove sci_ick clock alias
>   ARM: shmobile: sh73a0 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r7s72100 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a73a4 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a7740 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a7778 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a7779 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a7790 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a7791 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a7793 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a7794 dtsi: Rename the serial port clock to fck
>   serial: sh-sci: Drop the sci_fck clock fallback

I have marked the above shmobile patches as deferred pending
the binding changes being accepted.

^ permalink raw reply	[flat|nested] 58+ messages in thread
* Re: [PATCH v2 00/16] serial: sh-sci: Clock Cleanups
@ 2015-11-24  2:44   ` Simon Horman
  0 siblings, 0 replies; 58+ messages in thread
From: Simon Horman @ 2015-11-24  2:44 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Greg Kroah-Hartman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart, linux-serial, linux-sh

On Thu, Nov 19, 2015 at 07:35:57PM +0100, Geert Uytterhoeven wrote:
> 	Hi,
> 
> The SCI driver currently handles two clocks, an interface clock named
> sci_ick and a functional clock named sci_fck. Studying the datasheets of
> the SH and ARM SoCs that incorportate (H)SCI(F)([AB]) instances showed
> (un)surprisingly that the hardware doesn't have a separate controllable
> interface clock.
> 
> All the platforms that declare an interface clock for the SCI set it to
> the clock used as the SCI functional clock. The two clocks can thus be
> merged on the driver side, which is what this patch series does. The
> resulting clock is called "fck", and all H8/300, SH and ARM users (both
> DT and non-DT) are fixed to name their SCI clocks appropriately.
> 
> Support for the "sci_ick" name is kept in the sh-sci driver to ensure DT
> backward compatibility, and support for the "peripheral_clk" clock to
> not break SH platforms that don't declare device-specific SCI clocks.
> The latter can be removed when all SH platforms will declare their SCI
> clocks properly.
> 
> This series serves as a preparatory clock cleanup for the SCI baud rate
> generator clock support series. I decided to keep it separate as this
> series has more stringent internal dependencies:
>   - The SH patches 2-3 depend on patch 1,
>   - The DT patches 4-15 depend on patch 1,
>   - Cleanup patch 16 depends on SH patch 2.
> 
> Thanks for your comments!
> 
> Changes compared to v1:
>   - Take over the patches from Laurent,
>   - Add Acked-by,
>   - Handle EPROBE_DEFER,
>   - Add missing patches to convert r8a7795 and h8300.
> 
> Geert Uytterhoeven (2):
>   arm64: renesas: r8a7795 dtsi: Rename the serial port clock to fck
>   h8300: dts: Rename the serial port clock to fck
> 
> Laurent Pinchart (14):
>   serial: sh-sci: Drop the interface clock
>   sh: Rename sci_ick and sci_fck clock to fck
>   sh: Remove sci_ick clock alias
>   ARM: shmobile: sh73a0 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r7s72100 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a73a4 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a7740 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a7778 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a7779 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a7790 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a7791 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a7793 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a7794 dtsi: Rename the serial port clock to fck
>   serial: sh-sci: Drop the sci_fck clock fallback

I have marked the above shmobile patches as deferred pending
the binding changes being accepted.

^ permalink raw reply	[flat|nested] 58+ messages in thread
* Re: [PATCH v2 01/16] serial: sh-sci: Drop the interface clock
  2015-11-19 18:35     ` Geert Uytterhoeven
@ 2015-12-13  6:42       ` Greg Kroah-Hartman
  -1 siblings, 0 replies; 58+ messages in thread
From: Greg Kroah-Hartman @ 2015-12-13  6:42 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Simon Horman, Magnus Damm, Yoshinori Sato, Laurent Pinchart,
	linux-serial, linux-sh, devicetree

On Thu, Nov 19, 2015 at 07:35:58PM +0100, Geert Uytterhoeven wrote:
> From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> 
> As no platform defines an interface clock the SCI driver always falls
> back to a clock named "peripheral_clk".
>   - On SH platforms that clock is the base clock for the SCI functional
>     clock and has the same frequency,
>   - On ARM platforms that clock doesn't exist, and clk_get() will return
>     the default clock for the device.
> We can thus make the functional clock mandatory and drop the interface
> clock.
> 
> EPROBE_DEFER is handled for clocks that may be referenced from DT (i.e.
> "fck" and deprecated "sci_ick").
> 
> Cc: devicetree@vger.kernel.org
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> Acked-by: Simon Horman <horms+renesas@verge.net.au>
> [geert: Handle EPROBE_DEFER, reformat description, break long comment line]
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

^ permalink raw reply	[flat|nested] 58+ messages in thread
* Re: [PATCH v2 01/16] serial: sh-sci: Drop the interface clock
@ 2015-12-13  6:42       ` Greg Kroah-Hartman
  0 siblings, 0 replies; 58+ messages in thread
From: Greg Kroah-Hartman @ 2015-12-13  6:42 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Simon Horman, Magnus Damm, Yoshinori Sato, Laurent Pinchart,
	linux-serial, linux-sh, devicetree

On Thu, Nov 19, 2015 at 07:35:58PM +0100, Geert Uytterhoeven wrote:
> From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> 
> As no platform defines an interface clock the SCI driver always falls
> back to a clock named "peripheral_clk".
>   - On SH platforms that clock is the base clock for the SCI functional
>     clock and has the same frequency,
>   - On ARM platforms that clock doesn't exist, and clk_get() will return
>     the default clock for the device.
> We can thus make the functional clock mandatory and drop the interface
> clock.
> 
> EPROBE_DEFER is handled for clocks that may be referenced from DT (i.e.
> "fck" and deprecated "sci_ick").
> 
> Cc: devicetree@vger.kernel.org
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> Acked-by: Simon Horman <horms+renesas@verge.net.au>
> [geert: Handle EPROBE_DEFER, reformat description, break long comment line]
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

^ permalink raw reply	[flat|nested] 58+ messages in thread
* Re: [PATCH v2 16/16] serial: sh-sci: Drop the sci_fck clock fallback
  2015-11-19 18:36   ` Geert Uytterhoeven
@ 2015-12-13  6:42     ` Greg Kroah-Hartman
  -1 siblings, 0 replies; 58+ messages in thread
From: Greg Kroah-Hartman @ 2015-12-13  6:42 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Simon Horman, Magnus Damm, Yoshinori Sato, Laurent Pinchart,
	linux-serial, linux-sh

On Thu, Nov 19, 2015 at 07:36:13PM +0100, Geert Uytterhoeven wrote:
> From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> 
> All platforms that used to define an sci_fck clock have now switched to
> the fck name. Remove the fallback code.
> 
> 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>

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

^ permalink raw reply	[flat|nested] 58+ messages in thread
* Re: [PATCH v2 16/16] serial: sh-sci: Drop the sci_fck clock fallback
@ 2015-12-13  6:42     ` Greg Kroah-Hartman
  0 siblings, 0 replies; 58+ messages in thread
From: Greg Kroah-Hartman @ 2015-12-13  6:42 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Simon Horman, Magnus Damm, Yoshinori Sato, Laurent Pinchart,
	linux-serial, linux-sh

On Thu, Nov 19, 2015 at 07:36:13PM +0100, Geert Uytterhoeven wrote:
> From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> 
> All platforms that used to define an sci_fck clock have now switched to
> the fck name. Remove the fallback code.
> 
> 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>

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

^ permalink raw reply	[flat|nested] 58+ messages in thread
* Re: [PATCH v2 12/16] ARM: shmobile: r8a7793 dtsi: Rename the serial port clock to fck
  2015-11-19 18:36   ` Geert Uytterhoeven
@ 2015-12-14  8:15     ` Simon Horman
  -1 siblings, 0 replies; 58+ messages in thread
From: Simon Horman @ 2015-12-14  8:15 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Greg Kroah-Hartman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart, linux-serial, linux-sh

On Thu, Nov 19, 2015 at 07:36:09PM +0100, Geert Uytterhoeven wrote:
> From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> 
> The clock is really the device functional clock, not the interface
> clock. Rename it.
> 
> 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>

Some more scif nodes have been added recently.
I updated the patch accordingly before queuing it up.

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Date: Thu, 19 Nov 2015 19:36:09 +0100
Subject: [PATCH] ARM: shmobile: r8a7793 dtsi: Rename the serial port clock to
 fck

The clock is really the device functional clock, not the interface
clock. Rename it.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
[horms: updated to cover recently added (h)scif* nodes]
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm/boot/dts/r8a7793.dtsi | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi
index df607a92b2ed..5a284cd721a6 100644
--- a/arch/arm/boot/dts/r8a7793.dtsi
+++ b/arch/arm/boot/dts/r8a7793.dtsi
@@ -302,7 +302,7 @@
 		reg = <0 0xe6c40000 0 64>;
 		interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7793_CLK_SCIFA0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x21>, <&dmac0 0x22>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -314,7 +314,7 @@
 		reg = <0 0xe6c50000 0 64>;
 		interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7793_CLK_SCIFA1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x25>, <&dmac0 0x26>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -326,7 +326,7 @@
 		reg = <0 0xe6c60000 0 64>;
 		interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7793_CLK_SCIFA2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x27>, <&dmac0 0x28>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -338,7 +338,7 @@
 		reg = <0 0xe6c70000 0 64>;
 		interrupts = <0 29 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp11_clks R8A7793_CLK_SCIFA3>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x1b>, <&dmac0 0x1c>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -350,7 +350,7 @@
 		reg = <0 0xe6c78000 0 64>;
 		interrupts = <0 30 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp11_clks R8A7793_CLK_SCIFA4>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x1f>, <&dmac0 0x20>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -362,7 +362,7 @@
 		reg = <0 0xe6c80000 0 64>;
 		interrupts = <0 31 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp11_clks R8A7793_CLK_SCIFA5>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x23>, <&dmac0 0x24>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -374,7 +374,7 @@
 		reg = <0 0xe6c20000 0 64>;
 		interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7793_CLK_SCIFB0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x3d>, <&dmac0 0x3e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -386,7 +386,7 @@
 		reg = <0 0xe6c30000 0 64>;
 		interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7793_CLK_SCIFB1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x19>, <&dmac0 0x1a>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -398,7 +398,7 @@
 		reg = <0 0xe6ce0000 0 64>;
 		interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7793_CLK_SCIFB2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x1d>, <&dmac0 0x1e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -410,7 +410,7 @@
 		reg = <0 0xe6e60000 0 64>;
 		interrupts = <0 152 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7793_CLK_SCIF0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x29>, <&dmac0 0x2a>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -422,7 +422,7 @@
 		reg = <0 0xe6e68000 0 64>;
 		interrupts = <0 153 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7793_CLK_SCIF1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x2d>, <&dmac0 0x2e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -434,7 +434,7 @@
 		reg = <0 0xe6e58000 0 64>;
 		interrupts = <0 22 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7793_CLK_SCIF2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x2b>, <&dmac0 0x2c>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -446,7 +446,7 @@
 		reg = <0 0xe6ea8000 0 64>;
 		interrupts = <0 23 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7793_CLK_SCIF3>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x2f>, <&dmac0 0x30>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -458,7 +458,7 @@
 		reg = <0 0xe6ee0000 0 64>;
 		interrupts = <0 24 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7793_CLK_SCIF4>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0xfb>, <&dmac0 0xfc>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -470,7 +470,7 @@
 		reg = <0 0xe6ee8000 0 64>;
 		interrupts = <0 25 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7793_CLK_SCIF5>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0xfd>, <&dmac0 0xfe>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -482,7 +482,7 @@
 		reg = <0 0xe62c0000 0 96>;
 		interrupts = <0 154 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7793_CLK_HSCIF0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x39>, <&dmac0 0x3a>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -494,7 +494,7 @@
 		reg = <0 0xe62c8000 0 96>;
 		interrupts = <0 155 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7793_CLK_HSCIF1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x4d>, <&dmac0 0x4e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -506,7 +506,7 @@
 		reg = <0 0xe62d0000 0 96>;
 		interrupts = <0 21 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7793_CLK_HSCIF2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x3b>, <&dmac0 0x3c>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
-- 
2.1.4


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* Re: [PATCH v2 12/16] ARM: shmobile: r8a7793 dtsi: Rename the serial port clock to fck
@ 2015-12-14  8:15     ` Simon Horman
  0 siblings, 0 replies; 58+ messages in thread
From: Simon Horman @ 2015-12-14  8:15 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Greg Kroah-Hartman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart, linux-serial, linux-sh

On Thu, Nov 19, 2015 at 07:36:09PM +0100, Geert Uytterhoeven wrote:
> From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> 
> The clock is really the device functional clock, not the interface
> clock. Rename it.
> 
> 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>

Some more scif nodes have been added recently.
I updated the patch accordingly before queuing it up.

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Date: Thu, 19 Nov 2015 19:36:09 +0100
Subject: [PATCH] ARM: shmobile: r8a7793 dtsi: Rename the serial port clock to
 fck

The clock is really the device functional clock, not the interface
clock. Rename it.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
[horms: updated to cover recently added (h)scif* nodes]
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm/boot/dts/r8a7793.dtsi | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi
index df607a92b2ed..5a284cd721a6 100644
--- a/arch/arm/boot/dts/r8a7793.dtsi
+++ b/arch/arm/boot/dts/r8a7793.dtsi
@@ -302,7 +302,7 @@
 		reg = <0 0xe6c40000 0 64>;
 		interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7793_CLK_SCIFA0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x21>, <&dmac0 0x22>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -314,7 +314,7 @@
 		reg = <0 0xe6c50000 0 64>;
 		interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7793_CLK_SCIFA1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x25>, <&dmac0 0x26>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -326,7 +326,7 @@
 		reg = <0 0xe6c60000 0 64>;
 		interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7793_CLK_SCIFA2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x27>, <&dmac0 0x28>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -338,7 +338,7 @@
 		reg = <0 0xe6c70000 0 64>;
 		interrupts = <0 29 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp11_clks R8A7793_CLK_SCIFA3>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x1b>, <&dmac0 0x1c>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -350,7 +350,7 @@
 		reg = <0 0xe6c78000 0 64>;
 		interrupts = <0 30 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp11_clks R8A7793_CLK_SCIFA4>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x1f>, <&dmac0 0x20>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -362,7 +362,7 @@
 		reg = <0 0xe6c80000 0 64>;
 		interrupts = <0 31 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp11_clks R8A7793_CLK_SCIFA5>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x23>, <&dmac0 0x24>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -374,7 +374,7 @@
 		reg = <0 0xe6c20000 0 64>;
 		interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7793_CLK_SCIFB0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x3d>, <&dmac0 0x3e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -386,7 +386,7 @@
 		reg = <0 0xe6c30000 0 64>;
 		interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7793_CLK_SCIFB1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x19>, <&dmac0 0x1a>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -398,7 +398,7 @@
 		reg = <0 0xe6ce0000 0 64>;
 		interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7793_CLK_SCIFB2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x1d>, <&dmac0 0x1e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -410,7 +410,7 @@
 		reg = <0 0xe6e60000 0 64>;
 		interrupts = <0 152 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7793_CLK_SCIF0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x29>, <&dmac0 0x2a>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -422,7 +422,7 @@
 		reg = <0 0xe6e68000 0 64>;
 		interrupts = <0 153 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7793_CLK_SCIF1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x2d>, <&dmac0 0x2e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -434,7 +434,7 @@
 		reg = <0 0xe6e58000 0 64>;
 		interrupts = <0 22 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7793_CLK_SCIF2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x2b>, <&dmac0 0x2c>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -446,7 +446,7 @@
 		reg = <0 0xe6ea8000 0 64>;
 		interrupts = <0 23 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7793_CLK_SCIF3>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x2f>, <&dmac0 0x30>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -458,7 +458,7 @@
 		reg = <0 0xe6ee0000 0 64>;
 		interrupts = <0 24 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7793_CLK_SCIF4>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0xfb>, <&dmac0 0xfc>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -470,7 +470,7 @@
 		reg = <0 0xe6ee8000 0 64>;
 		interrupts = <0 25 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7793_CLK_SCIF5>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0xfd>, <&dmac0 0xfe>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -482,7 +482,7 @@
 		reg = <0 0xe62c0000 0 96>;
 		interrupts = <0 154 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7793_CLK_HSCIF0>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x39>, <&dmac0 0x3a>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -494,7 +494,7 @@
 		reg = <0 0xe62c8000 0 96>;
 		interrupts = <0 155 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7793_CLK_HSCIF1>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x4d>, <&dmac0 0x4e>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
@@ -506,7 +506,7 @@
 		reg = <0 0xe62d0000 0 96>;
 		interrupts = <0 21 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp7_clks R8A7793_CLK_HSCIF2>;
-		clock-names = "sci_ick";
+		clock-names = "fck";
 		dmas = <&dmac0 0x3b>, <&dmac0 0x3c>;
 		dma-names = "tx", "rx";
 		power-domains = <&cpg_clocks>;
-- 
2.1.4


^ permalink raw reply related	[flat|nested] 58+ messages in thread
* Re: [PATCH v2 01/16] serial: sh-sci: Drop the interface clock
  2015-12-13  6:42       ` Greg Kroah-Hartman
@ 2015-12-14  8:15         ` Simon Horman
  -1 siblings, 0 replies; 58+ messages in thread
From: Simon Horman @ 2015-12-14  8:15 UTC (permalink / raw)
  To: Greg Kroah-Hartman
  Cc: Geert Uytterhoeven, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart, linux-serial, linux-sh, devicetree

Hi Greg,

On Sat, Dec 12, 2015 at 10:42:37PM -0800, Greg Kroah-Hartman wrote:
> On Thu, Nov 19, 2015 at 07:35:58PM +0100, Geert Uytterhoeven wrote:
> > From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> > 
> > As no platform defines an interface clock the SCI driver always falls
> > back to a clock named "peripheral_clk".
> >   - On SH platforms that clock is the base clock for the SCI functional
> >     clock and has the same frequency,
> >   - On ARM platforms that clock doesn't exist, and clk_get() will return
> >     the default clock for the device.
> > We can thus make the functional clock mandatory and drop the interface
> > clock.
> > 
> > EPROBE_DEFER is handled for clocks that may be referenced from DT (i.e.
> > "fck" and deprecated "sci_ick").
> > 
> > Cc: devicetree@vger.kernel.org
> > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> > Acked-by: Simon Horman <horms+renesas@verge.net.au>
> > [geert: Handle EPROBE_DEFER, reformat description, break long comment line]
> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> 
> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

If its not too much trouble I would prefer if you took this into the serial
tree.

^ permalink raw reply	[flat|nested] 58+ messages in thread
* Re: [PATCH v2 01/16] serial: sh-sci: Drop the interface clock
@ 2015-12-14  8:15         ` Simon Horman
  0 siblings, 0 replies; 58+ messages in thread
From: Simon Horman @ 2015-12-14  8:15 UTC (permalink / raw)
  To: Greg Kroah-Hartman
  Cc: Geert Uytterhoeven, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart, linux-serial, linux-sh, devicetree

Hi Greg,

On Sat, Dec 12, 2015 at 10:42:37PM -0800, Greg Kroah-Hartman wrote:
> On Thu, Nov 19, 2015 at 07:35:58PM +0100, Geert Uytterhoeven wrote:
> > From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> > 
> > As no platform defines an interface clock the SCI driver always falls
> > back to a clock named "peripheral_clk".
> >   - On SH platforms that clock is the base clock for the SCI functional
> >     clock and has the same frequency,
> >   - On ARM platforms that clock doesn't exist, and clk_get() will return
> >     the default clock for the device.
> > We can thus make the functional clock mandatory and drop the interface
> > clock.
> > 
> > EPROBE_DEFER is handled for clocks that may be referenced from DT (i.e.
> > "fck" and deprecated "sci_ick").
> > 
> > Cc: devicetree@vger.kernel.org
> > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> > Acked-by: Simon Horman <horms+renesas@verge.net.au>
> > [geert: Handle EPROBE_DEFER, reformat description, break long comment line]
> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> 
> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

If its not too much trouble I would prefer if you took this into the serial
tree.

^ permalink raw reply	[flat|nested] 58+ messages in thread
* Re: [PATCH v2 00/16] serial: sh-sci: Clock Cleanups
  2015-11-19 18:35 ` Geert Uytterhoeven
@ 2015-12-14  8:15   ` Simon Horman
  -1 siblings, 0 replies; 58+ messages in thread
From: Simon Horman @ 2015-12-14  8:15 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Greg Kroah-Hartman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart, linux-serial, linux-sh

On Thu, Nov 19, 2015 at 07:35:57PM +0100, Geert Uytterhoeven wrote:
> 	Hi,
> 
> The SCI driver currently handles two clocks, an interface clock named
> sci_ick and a functional clock named sci_fck. Studying the datasheets of
> the SH and ARM SoCs that incorportate (H)SCI(F)([AB]) instances showed
> (un)surprisingly that the hardware doesn't have a separate controllable
> interface clock.
> 
> All the platforms that declare an interface clock for the SCI set it to
> the clock used as the SCI functional clock. The two clocks can thus be
> merged on the driver side, which is what this patch series does. The
> resulting clock is called "fck", and all H8/300, SH and ARM users (both
> DT and non-DT) are fixed to name their SCI clocks appropriately.
> 
> Support for the "sci_ick" name is kept in the sh-sci driver to ensure DT
> backward compatibility, and support for the "peripheral_clk" clock to
> not break SH platforms that don't declare device-specific SCI clocks.
> The latter can be removed when all SH platforms will declare their SCI
> clocks properly.
> 
> This series serves as a preparatory clock cleanup for the SCI baud rate
> generator clock support series. I decided to keep it separate as this
> series has more stringent internal dependencies:

I have tentatively queued up patch 1 as a driver change for v4.5
with Greg's Ack. I plan to send a pull request to the ARM SoC maintainers
some time this week.

>   - The SH patches 2-3 depend on patch 1,

I have tentatively queued these up on top of patch 1 as sh changes for v4.5.
I intend to send a pull request to Linus once patch 1 hits his tree
via the ARM SoC tree. If all goes well that will likely be in v4.5-rc1 or rc2.

>   - The DT patches 4-15 depend on patch 1,

I have tentatively queued up the ARM patches up as (ARM) cleanup
patches for v4.5 and the ARM64 patch as ARM64 cleanup patches for v4.5.
They are based on patch 1. I plan to send a pull request for them
to the ARM SoC maintainers later this week.

I have queued these up in cleanup rather than the dt arm64-dt branches as
they have dependencies not already present there (patch 1) and at this
stage of the merge-cycle I would like to keep the dt branches as simple as
possible.

>   - Cleanup patch 16 depends on SH patch 2.

I have tentatively queued this up as a driver change for v4.6 with
Greg's Ack. I plan to send a pull request to the ARM SoC maintainers
after rebasing on v4.5-rc1 or rc2 assuming that patch 1 is present there.

Can you confirm that patch 16 only depends on patch 2?


I have not queued up the h8300 patch. I believe that one is for Sato-san.


> Thanks for your comments!
> 
> Changes compared to v1:
>   - Take over the patches from Laurent,
>   - Add Acked-by,
>   - Handle EPROBE_DEFER,
>   - Add missing patches to convert r8a7795 and h8300.
> 
> Geert Uytterhoeven (2):
>   arm64: renesas: r8a7795 dtsi: Rename the serial port clock to fck
>   h8300: dts: Rename the serial port clock to fck
> 
> Laurent Pinchart (14):
>   serial: sh-sci: Drop the interface clock
>   sh: Rename sci_ick and sci_fck clock to fck
>   sh: Remove sci_ick clock alias
>   ARM: shmobile: sh73a0 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r7s72100 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a73a4 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a7740 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a7778 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a7779 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a7790 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a7791 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a7793 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a7794 dtsi: Rename the serial port clock to fck
>   serial: sh-sci: Drop the sci_fck clock fallback
> 
>  .../bindings/serial/renesas,sci-serial.txt         |  4 +-
>  arch/arm/boot/dts/r7s72100.dtsi                    | 16 +++---
>  arch/arm/boot/dts/r8a73a4.dtsi                     | 12 ++---
>  arch/arm/boot/dts/r8a7740.dtsi                     | 18 +++----
>  arch/arm/boot/dts/r8a7778.dtsi                     | 12 ++---
>  arch/arm/boot/dts/r8a7779.dtsi                     | 12 ++---
>  arch/arm/boot/dts/r8a7790.dtsi                     | 20 ++++----
>  arch/arm/boot/dts/r8a7791.dtsi                     | 36 ++++++-------
>  arch/arm/boot/dts/r8a7793.dtsi                     |  4 +-
>  arch/arm/boot/dts/r8a7794.dtsi                     | 36 ++++++-------
>  arch/arm/boot/dts/sh73a0.dtsi                      | 18 +++----
>  arch/arm64/boot/dts/renesas/r8a7795.dtsi           | 22 ++++----
>  arch/h8300/boot/dts/edosk2674.dts                  |  6 +--
>  arch/h8300/boot/dts/h8300h_sim.dts                 |  4 +-
>  arch/h8300/boot/dts/h8s_sim.dts                    |  4 +-
>  arch/sh/kernel/cpu/clock-cpg.c                     |  1 -
>  arch/sh/kernel/cpu/sh2a/clock-sh7264.c             |  9 +++-
>  arch/sh/kernel/cpu/sh2a/clock-sh7269.c             | 16 +++---
>  arch/sh/kernel/cpu/sh4a/clock-sh7343.c             |  8 +--
>  arch/sh/kernel/cpu/sh4a/clock-sh7366.c             |  6 +--
>  arch/sh/kernel/cpu/sh4a/clock-sh7723.c             | 12 ++---
>  arch/sh/kernel/cpu/sh4a/clock-sh7734.c             | 12 ++---
>  arch/sh/kernel/cpu/sh4a/clock-sh7757.c             |  6 +--
>  arch/sh/kernel/cpu/sh4a/clock-sh7785.c             | 12 ++---
>  arch/sh/kernel/cpu/sh4a/clock-sh7786.c             | 12 ++---
>  arch/sh/kernel/cpu/sh4a/clock-shx3.c               |  8 +--
>  drivers/tty/serial/sh-sci.c                        | 59 +++++++++++++---------
>  27 files changed, 202 insertions(+), 183 deletions(-)
> 
> -- 
> 1.9.1
> 
> Gr{oetje,eeting}s,
> 
> 						Geert
> 
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
> 
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
> 							    -- Linus Torvalds
> 

^ permalink raw reply	[flat|nested] 58+ messages in thread
* Re: [PATCH v2 00/16] serial: sh-sci: Clock Cleanups
@ 2015-12-14  8:15   ` Simon Horman
  0 siblings, 0 replies; 58+ messages in thread
From: Simon Horman @ 2015-12-14  8:15 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Greg Kroah-Hartman, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart, linux-serial, linux-sh

On Thu, Nov 19, 2015 at 07:35:57PM +0100, Geert Uytterhoeven wrote:
> 	Hi,
> 
> The SCI driver currently handles two clocks, an interface clock named
> sci_ick and a functional clock named sci_fck. Studying the datasheets of
> the SH and ARM SoCs that incorportate (H)SCI(F)([AB]) instances showed
> (un)surprisingly that the hardware doesn't have a separate controllable
> interface clock.
> 
> All the platforms that declare an interface clock for the SCI set it to
> the clock used as the SCI functional clock. The two clocks can thus be
> merged on the driver side, which is what this patch series does. The
> resulting clock is called "fck", and all H8/300, SH and ARM users (both
> DT and non-DT) are fixed to name their SCI clocks appropriately.
> 
> Support for the "sci_ick" name is kept in the sh-sci driver to ensure DT
> backward compatibility, and support for the "peripheral_clk" clock to
> not break SH platforms that don't declare device-specific SCI clocks.
> The latter can be removed when all SH platforms will declare their SCI
> clocks properly.
> 
> This series serves as a preparatory clock cleanup for the SCI baud rate
> generator clock support series. I decided to keep it separate as this
> series has more stringent internal dependencies:

I have tentatively queued up patch 1 as a driver change for v4.5
with Greg's Ack. I plan to send a pull request to the ARM SoC maintainers
some time this week.

>   - The SH patches 2-3 depend on patch 1,

I have tentatively queued these up on top of patch 1 as sh changes for v4.5.
I intend to send a pull request to Linus once patch 1 hits his tree
via the ARM SoC tree. If all goes well that will likely be in v4.5-rc1 or rc2.

>   - The DT patches 4-15 depend on patch 1,

I have tentatively queued up the ARM patches up as (ARM) cleanup
patches for v4.5 and the ARM64 patch as ARM64 cleanup patches for v4.5.
They are based on patch 1. I plan to send a pull request for them
to the ARM SoC maintainers later this week.

I have queued these up in cleanup rather than the dt arm64-dt branches as
they have dependencies not already present there (patch 1) and at this
stage of the merge-cycle I would like to keep the dt branches as simple as
possible.

>   - Cleanup patch 16 depends on SH patch 2.

I have tentatively queued this up as a driver change for v4.6 with
Greg's Ack. I plan to send a pull request to the ARM SoC maintainers
after rebasing on v4.5-rc1 or rc2 assuming that patch 1 is present there.

Can you confirm that patch 16 only depends on patch 2?


I have not queued up the h8300 patch. I believe that one is for Sato-san.


> Thanks for your comments!
> 
> Changes compared to v1:
>   - Take over the patches from Laurent,
>   - Add Acked-by,
>   - Handle EPROBE_DEFER,
>   - Add missing patches to convert r8a7795 and h8300.
> 
> Geert Uytterhoeven (2):
>   arm64: renesas: r8a7795 dtsi: Rename the serial port clock to fck
>   h8300: dts: Rename the serial port clock to fck
> 
> Laurent Pinchart (14):
>   serial: sh-sci: Drop the interface clock
>   sh: Rename sci_ick and sci_fck clock to fck
>   sh: Remove sci_ick clock alias
>   ARM: shmobile: sh73a0 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r7s72100 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a73a4 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a7740 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a7778 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a7779 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a7790 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a7791 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a7793 dtsi: Rename the serial port clock to fck
>   ARM: shmobile: r8a7794 dtsi: Rename the serial port clock to fck
>   serial: sh-sci: Drop the sci_fck clock fallback
> 
>  .../bindings/serial/renesas,sci-serial.txt         |  4 +-
>  arch/arm/boot/dts/r7s72100.dtsi                    | 16 +++---
>  arch/arm/boot/dts/r8a73a4.dtsi                     | 12 ++---
>  arch/arm/boot/dts/r8a7740.dtsi                     | 18 +++----
>  arch/arm/boot/dts/r8a7778.dtsi                     | 12 ++---
>  arch/arm/boot/dts/r8a7779.dtsi                     | 12 ++---
>  arch/arm/boot/dts/r8a7790.dtsi                     | 20 ++++----
>  arch/arm/boot/dts/r8a7791.dtsi                     | 36 ++++++-------
>  arch/arm/boot/dts/r8a7793.dtsi                     |  4 +-
>  arch/arm/boot/dts/r8a7794.dtsi                     | 36 ++++++-------
>  arch/arm/boot/dts/sh73a0.dtsi                      | 18 +++----
>  arch/arm64/boot/dts/renesas/r8a7795.dtsi           | 22 ++++----
>  arch/h8300/boot/dts/edosk2674.dts                  |  6 +--
>  arch/h8300/boot/dts/h8300h_sim.dts                 |  4 +-
>  arch/h8300/boot/dts/h8s_sim.dts                    |  4 +-
>  arch/sh/kernel/cpu/clock-cpg.c                     |  1 -
>  arch/sh/kernel/cpu/sh2a/clock-sh7264.c             |  9 +++-
>  arch/sh/kernel/cpu/sh2a/clock-sh7269.c             | 16 +++---
>  arch/sh/kernel/cpu/sh4a/clock-sh7343.c             |  8 +--
>  arch/sh/kernel/cpu/sh4a/clock-sh7366.c             |  6 +--
>  arch/sh/kernel/cpu/sh4a/clock-sh7723.c             | 12 ++---
>  arch/sh/kernel/cpu/sh4a/clock-sh7734.c             | 12 ++---
>  arch/sh/kernel/cpu/sh4a/clock-sh7757.c             |  6 +--
>  arch/sh/kernel/cpu/sh4a/clock-sh7785.c             | 12 ++---
>  arch/sh/kernel/cpu/sh4a/clock-sh7786.c             | 12 ++---
>  arch/sh/kernel/cpu/sh4a/clock-shx3.c               |  8 +--
>  drivers/tty/serial/sh-sci.c                        | 59 +++++++++++++---------
>  27 files changed, 202 insertions(+), 183 deletions(-)
> 
> -- 
> 1.9.1
> 
> Gr{oetje,eeting}s,
> 
> 						Geert
> 
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
> 
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
> 							    -- Linus Torvalds
> 

^ permalink raw reply	[flat|nested] 58+ messages in thread
* Re: [PATCH v2 01/16] serial: sh-sci: Drop the interface clock
       [not found]         ` <20151214081540.GD9929-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org>
@ 2015-12-14  8:16             ` Simon Horman
  0 siblings, 0 replies; 58+ messages in thread
From: Simon Horman @ 2015-12-14  8:16 UTC (permalink / raw)
  To: Greg Kroah-Hartman
  Cc: Geert Uytterhoeven, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart, linux-serial-u79uwXL29TY76Z2rM5mHXA,
	linux-sh-u79uwXL29TY76Z2rM5mHXA,
	devicetree-u79uwXL29TY76Z2rM5mHXA

On Mon, Dec 14, 2015 at 05:15:40PM +0900, Simon Horman wrote:
> Hi Greg,
> 
> On Sat, Dec 12, 2015 at 10:42:37PM -0800, Greg Kroah-Hartman wrote:
> > On Thu, Nov 19, 2015 at 07:35:58PM +0100, Geert Uytterhoeven wrote:
> > > From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> > > 
> > > As no platform defines an interface clock the SCI driver always falls
> > > back to a clock named "peripheral_clk".
> > >   - On SH platforms that clock is the base clock for the SCI functional
> > >     clock and has the same frequency,
> > >   - On ARM platforms that clock doesn't exist, and clk_get() will return
> > >     the default clock for the device.
> > > We can thus make the functional clock mandatory and drop the interface
> > > clock.
> > > 
> > > EPROBE_DEFER is handled for clocks that may be referenced from DT (i.e.
> > > "fck" and deprecated "sci_ick").
> > > 
> > > Cc: devicetree@vger.kernel.org
> > > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> > > Acked-by: Simon Horman <horms+renesas@verge.net.au>
> > > [geert: Handle EPROBE_DEFER, reformat description, break long comment line]
> > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> > 
> > Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> 
> If its not too much trouble I would prefer if you took this into the serial
> tree.

Sorry, I meant to can this email rather than sent it.
Please ignore the above!!!

^ permalink raw reply	[flat|nested] 58+ messages in thread
* Re: [PATCH v2 01/16] serial: sh-sci: Drop the interface clock
@ 2015-12-14  8:16             ` Simon Horman
  0 siblings, 0 replies; 58+ messages in thread
From: Simon Horman @ 2015-12-14  8:16 UTC (permalink / raw)
  To: Greg Kroah-Hartman
  Cc: Geert Uytterhoeven, Magnus Damm, Yoshinori Sato,
	Laurent Pinchart, linux-serial-u79uwXL29TY76Z2rM5mHXA,
	linux-sh-u79uwXL29TY76Z2rM5mHXA,
	devicetree-u79uwXL29TY76Z2rM5mHXA

On Mon, Dec 14, 2015 at 05:15:40PM +0900, Simon Horman wrote:
> Hi Greg,
> 
> On Sat, Dec 12, 2015 at 10:42:37PM -0800, Greg Kroah-Hartman wrote:
> > On Thu, Nov 19, 2015 at 07:35:58PM +0100, Geert Uytterhoeven wrote:
> > > From: Laurent Pinchart <laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
> > > 
> > > As no platform defines an interface clock the SCI driver always falls
> > > back to a clock named "peripheral_clk".
> > >   - On SH platforms that clock is the base clock for the SCI functional
> > >     clock and has the same frequency,
> > >   - On ARM platforms that clock doesn't exist, and clk_get() will return
> > >     the default clock for the device.
> > > We can thus make the functional clock mandatory and drop the interface
> > > clock.
> > > 
> > > EPROBE_DEFER is handled for clocks that may be referenced from DT (i.e.
> > > "fck" and deprecated "sci_ick").
> > > 
> > > Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> > > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
> > > Acked-by: Simon Horman <horms+renesas-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org>
> > > [geert: Handle EPROBE_DEFER, reformat description, break long comment line]
> > > Signed-off-by: Geert Uytterhoeven <geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
> > 
> > Acked-by: Greg Kroah-Hartman <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org>
> 
> If its not too much trouble I would prefer if you took this into the serial
> tree.

Sorry, I meant to can this email rather than sent it.
Please ignore the above!!!
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 58+ messages in thread
* Re: [PATCH v2 00/16] serial: sh-sci: Clock Cleanups
  2015-12-14  8:15   ` Simon Horman
@ 2015-12-14  8:31     ` Geert Uytterhoeven
  -1 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-12-14  8:31 UTC (permalink / raw)
  To: Simon Horman
  Cc: Geert Uytterhoeven, Greg Kroah-Hartman, Magnus Damm,
	Yoshinori Sato, Laurent Pinchart, linux-serial, Linux-sh list

Hi Simon,

On Mon, Dec 14, 2015 at 9:15 AM, Simon Horman <horms@verge.net.au> wrote:
> On Thu, Nov 19, 2015 at 07:35:57PM +0100, Geert Uytterhoeven wrote:
>> The SCI driver currently handles two clocks, an interface clock named
>> sci_ick and a functional clock named sci_fck. Studying the datasheets of
>> the SH and ARM SoCs that incorportate (H)SCI(F)([AB]) instances showed
>> (un)surprisingly that the hardware doesn't have a separate controllable
>> interface clock.
>>
>> All the platforms that declare an interface clock for the SCI set it to
>> the clock used as the SCI functional clock. The two clocks can thus be
>> merged on the driver side, which is what this patch series does. The
>> resulting clock is called "fck", and all H8/300, SH and ARM users (both
>> DT and non-DT) are fixed to name their SCI clocks appropriately.
>>
>> Support for the "sci_ick" name is kept in the sh-sci driver to ensure DT
>> backward compatibility, and support for the "peripheral_clk" clock to
>> not break SH platforms that don't declare device-specific SCI clocks.
>> The latter can be removed when all SH platforms will declare their SCI
>> clocks properly.
>>
>> This series serves as a preparatory clock cleanup for the SCI baud rate
>> generator clock support series. I decided to keep it separate as this
>> series has more stringent internal dependencies:
>
> I have tentatively queued up patch 1 as a driver change for v4.5
> with Greg's Ack. I plan to send a pull request to the ARM SoC maintainers
> some time this week.
>
>>   - The SH patches 2-3 depend on patch 1,
>
> I have tentatively queued these up on top of patch 1 as sh changes for v4.5.
> I intend to send a pull request to Linus once patch 1 hits his tree
> via the ARM SoC tree. If all goes well that will likely be in v4.5-rc1 or rc2.
>
>>   - The DT patches 4-15 depend on patch 1,
>
> I have tentatively queued up the ARM patches up as (ARM) cleanup
> patches for v4.5 and the ARM64 patch as ARM64 cleanup patches for v4.5.
> They are based on patch 1. I plan to send a pull request for them
> to the ARM SoC maintainers later this week.
>
> I have queued these up in cleanup rather than the dt arm64-dt branches as
> they have dependencies not already present there (patch 1) and at this
> stage of the merge-cycle I would like to keep the dt branches as simple as
> possible.
>
>>   - Cleanup patch 16 depends on SH patch 2.
>
> I have tentatively queued this up as a driver change for v4.6 with
> Greg's Ack. I plan to send a pull request to the ARM SoC maintainers
> after rebasing on v4.5-rc1 or rc2 assuming that patch 1 is present there.
>
> Can you confirm that patch 16 only depends on patch 2?

Yes it does.

(seems I got confused myself, due to Laurent having it at the end of the
 series ;-)

> I have not queued up the h8300 patch. I believe that one is for Sato-san.

Note that it depends on patch 1. Hence if Sato-san doesn't provide his
Acked-by, it cannot go in before v4.6.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

^ permalink raw reply	[flat|nested] 58+ messages in thread
* Re: [PATCH v2 00/16] serial: sh-sci: Clock Cleanups
@ 2015-12-14  8:31     ` Geert Uytterhoeven
  0 siblings, 0 replies; 58+ messages in thread
From: Geert Uytterhoeven @ 2015-12-14  8:31 UTC (permalink / raw)
  To: Simon Horman
  Cc: Geert Uytterhoeven, Greg Kroah-Hartman, Magnus Damm,
	Yoshinori Sato, Laurent Pinchart, linux-serial, Linux-sh list

Hi Simon,

On Mon, Dec 14, 2015 at 9:15 AM, Simon Horman <horms@verge.net.au> wrote:
> On Thu, Nov 19, 2015 at 07:35:57PM +0100, Geert Uytterhoeven wrote:
>> The SCI driver currently handles two clocks, an interface clock named
>> sci_ick and a functional clock named sci_fck. Studying the datasheets of
>> the SH and ARM SoCs that incorportate (H)SCI(F)([AB]) instances showed
>> (un)surprisingly that the hardware doesn't have a separate controllable
>> interface clock.
>>
>> All the platforms that declare an interface clock for the SCI set it to
>> the clock used as the SCI functional clock. The two clocks can thus be
>> merged on the driver side, which is what this patch series does. The
>> resulting clock is called "fck", and all H8/300, SH and ARM users (both
>> DT and non-DT) are fixed to name their SCI clocks appropriately.
>>
>> Support for the "sci_ick" name is kept in the sh-sci driver to ensure DT
>> backward compatibility, and support for the "peripheral_clk" clock to
>> not break SH platforms that don't declare device-specific SCI clocks.
>> The latter can be removed when all SH platforms will declare their SCI
>> clocks properly.
>>
>> This series serves as a preparatory clock cleanup for the SCI baud rate
>> generator clock support series. I decided to keep it separate as this
>> series has more stringent internal dependencies:
>
> I have tentatively queued up patch 1 as a driver change for v4.5
> with Greg's Ack. I plan to send a pull request to the ARM SoC maintainers
> some time this week.
>
>>   - The SH patches 2-3 depend on patch 1,
>
> I have tentatively queued these up on top of patch 1 as sh changes for v4.5.
> I intend to send a pull request to Linus once patch 1 hits his tree
> via the ARM SoC tree. If all goes well that will likely be in v4.5-rc1 or rc2.
>
>>   - The DT patches 4-15 depend on patch 1,
>
> I have tentatively queued up the ARM patches up as (ARM) cleanup
> patches for v4.5 and the ARM64 patch as ARM64 cleanup patches for v4.5.
> They are based on patch 1. I plan to send a pull request for them
> to the ARM SoC maintainers later this week.
>
> I have queued these up in cleanup rather than the dt arm64-dt branches as
> they have dependencies not already present there (patch 1) and at this
> stage of the merge-cycle I would like to keep the dt branches as simple as
> possible.
>
>>   - Cleanup patch 16 depends on SH patch 2.
>
> I have tentatively queued this up as a driver change for v4.6 with
> Greg's Ack. I plan to send a pull request to the ARM SoC maintainers
> after rebasing on v4.5-rc1 or rc2 assuming that patch 1 is present there.
>
> Can you confirm that patch 16 only depends on patch 2?

Yes it does.

(seems I got confused myself, due to Laurent having it at the end of the
 series ;-)

> I have not queued up the h8300 patch. I believe that one is for Sato-san.

Note that it depends on patch 1. Hence if Sato-san doesn't provide his
Acked-by, it cannot go in before v4.6.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

^ permalink raw reply	[flat|nested] 58+ messages in thread
* Re: [PATCH v2 00/16] serial: sh-sci: Clock Cleanups
  2015-12-14  8:31     ` Geert Uytterhoeven
@ 2015-12-14  9:11       ` Simon Horman
  -1 siblings, 0 replies; 58+ messages in thread
From: Simon Horman @ 2015-12-14  9:11 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Geert Uytterhoeven, Greg Kroah-Hartman, Magnus Damm,
	Yoshinori Sato, Laurent Pinchart, linux-serial, Linux-sh list

On Mon, Dec 14, 2015 at 09:31:30AM +0100, Geert Uytterhoeven wrote:
> Hi Simon,
> 
> On Mon, Dec 14, 2015 at 9:15 AM, Simon Horman <horms@verge.net.au> wrote:
> > On Thu, Nov 19, 2015 at 07:35:57PM +0100, Geert Uytterhoeven wrote:
> >> The SCI driver currently handles two clocks, an interface clock named
> >> sci_ick and a functional clock named sci_fck. Studying the datasheets of
> >> the SH and ARM SoCs that incorportate (H)SCI(F)([AB]) instances showed
> >> (un)surprisingly that the hardware doesn't have a separate controllable
> >> interface clock.
> >>
> >> All the platforms that declare an interface clock for the SCI set it to
> >> the clock used as the SCI functional clock. The two clocks can thus be
> >> merged on the driver side, which is what this patch series does. The
> >> resulting clock is called "fck", and all H8/300, SH and ARM users (both
> >> DT and non-DT) are fixed to name their SCI clocks appropriately.
> >>
> >> Support for the "sci_ick" name is kept in the sh-sci driver to ensure DT
> >> backward compatibility, and support for the "peripheral_clk" clock to
> >> not break SH platforms that don't declare device-specific SCI clocks.
> >> The latter can be removed when all SH platforms will declare their SCI
> >> clocks properly.
> >>
> >> This series serves as a preparatory clock cleanup for the SCI baud rate
> >> generator clock support series. I decided to keep it separate as this
> >> series has more stringent internal dependencies:
> >
> > I have tentatively queued up patch 1 as a driver change for v4.5
> > with Greg's Ack. I plan to send a pull request to the ARM SoC maintainers
> > some time this week.
> >
> >>   - The SH patches 2-3 depend on patch 1,
> >
> > I have tentatively queued these up on top of patch 1 as sh changes for v4.5.
> > I intend to send a pull request to Linus once patch 1 hits his tree
> > via the ARM SoC tree. If all goes well that will likely be in v4.5-rc1 or rc2.
> >
> >>   - The DT patches 4-15 depend on patch 1,
> >
> > I have tentatively queued up the ARM patches up as (ARM) cleanup
> > patches for v4.5 and the ARM64 patch as ARM64 cleanup patches for v4.5.
> > They are based on patch 1. I plan to send a pull request for them
> > to the ARM SoC maintainers later this week.
> >
> > I have queued these up in cleanup rather than the dt arm64-dt branches as
> > they have dependencies not already present there (patch 1) and at this
> > stage of the merge-cycle I would like to keep the dt branches as simple as
> > possible.
> >
> >>   - Cleanup patch 16 depends on SH patch 2.
> >
> > I have tentatively queued this up as a driver change for v4.6 with
> > Greg's Ack. I plan to send a pull request to the ARM SoC maintainers
> > after rebasing on v4.5-rc1 or rc2 assuming that patch 1 is present there.
> >
> > Can you confirm that patch 16 only depends on patch 2?
> 
> Yes it does.
> 
> (seems I got confused myself, due to Laurent having it at the end of the
>  series ;-)
> 
> > I have not queued up the h8300 patch. I believe that one is for Sato-san.
> 
> Note that it depends on patch 1. Hence if Sato-san doesn't provide his
> Acked-by, it cannot go in before v4.6.

Right, but it doesn't block anything, right?


As discussed on IRC a little earlier, I have _not_ queued up the patches
in the manner describe above. Instead I'm waiting for you to repost.

^ permalink raw reply	[flat|nested] 58+ messages in thread
* Re: [PATCH v2 00/16] serial: sh-sci: Clock Cleanups
@ 2015-12-14  9:11       ` Simon Horman
  0 siblings, 0 replies; 58+ messages in thread
From: Simon Horman @ 2015-12-14  9:11 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Geert Uytterhoeven, Greg Kroah-Hartman, Magnus Damm,
	Yoshinori Sato, Laurent Pinchart, linux-serial, Linux-sh list

On Mon, Dec 14, 2015 at 09:31:30AM +0100, Geert Uytterhoeven wrote:
> Hi Simon,
> 
> On Mon, Dec 14, 2015 at 9:15 AM, Simon Horman <horms@verge.net.au> wrote:
> > On Thu, Nov 19, 2015 at 07:35:57PM +0100, Geert Uytterhoeven wrote:
> >> The SCI driver currently handles two clocks, an interface clock named
> >> sci_ick and a functional clock named sci_fck. Studying the datasheets of
> >> the SH and ARM SoCs that incorportate (H)SCI(F)([AB]) instances showed
> >> (un)surprisingly that the hardware doesn't have a separate controllable
> >> interface clock.
> >>
> >> All the platforms that declare an interface clock for the SCI set it to
> >> the clock used as the SCI functional clock. The two clocks can thus be
> >> merged on the driver side, which is what this patch series does. The
> >> resulting clock is called "fck", and all H8/300, SH and ARM users (both
> >> DT and non-DT) are fixed to name their SCI clocks appropriately.
> >>
> >> Support for the "sci_ick" name is kept in the sh-sci driver to ensure DT
> >> backward compatibility, and support for the "peripheral_clk" clock to
> >> not break SH platforms that don't declare device-specific SCI clocks.
> >> The latter can be removed when all SH platforms will declare their SCI
> >> clocks properly.
> >>
> >> This series serves as a preparatory clock cleanup for the SCI baud rate
> >> generator clock support series. I decided to keep it separate as this
> >> series has more stringent internal dependencies:
> >
> > I have tentatively queued up patch 1 as a driver change for v4.5
> > with Greg's Ack. I plan to send a pull request to the ARM SoC maintainers
> > some time this week.
> >
> >>   - The SH patches 2-3 depend on patch 1,
> >
> > I have tentatively queued these up on top of patch 1 as sh changes for v4.5.
> > I intend to send a pull request to Linus once patch 1 hits his tree
> > via the ARM SoC tree. If all goes well that will likely be in v4.5-rc1 or rc2.
> >
> >>   - The DT patches 4-15 depend on patch 1,
> >
> > I have tentatively queued up the ARM patches up as (ARM) cleanup
> > patches for v4.5 and the ARM64 patch as ARM64 cleanup patches for v4.5.
> > They are based on patch 1. I plan to send a pull request for them
> > to the ARM SoC maintainers later this week.
> >
> > I have queued these up in cleanup rather than the dt arm64-dt branches as
> > they have dependencies not already present there (patch 1) and at this
> > stage of the merge-cycle I would like to keep the dt branches as simple as
> > possible.
> >
> >>   - Cleanup patch 16 depends on SH patch 2.
> >
> > I have tentatively queued this up as a driver change for v4.6 with
> > Greg's Ack. I plan to send a pull request to the ARM SoC maintainers
> > after rebasing on v4.5-rc1 or rc2 assuming that patch 1 is present there.
> >
> > Can you confirm that patch 16 only depends on patch 2?
> 
> Yes it does.
> 
> (seems I got confused myself, due to Laurent having it at the end of the
>  series ;-)
> 
> > I have not queued up the h8300 patch. I believe that one is for Sato-san.
> 
> Note that it depends on patch 1. Hence if Sato-san doesn't provide his
> Acked-by, it cannot go in before v4.6.

Right, but it doesn't block anything, right?


As discussed on IRC a little earlier, I have _not_ queued up the patches
in the manner describe above. Instead I'm waiting for you to repost.

^ permalink raw reply	[flat|nested] 58+ messages in thread
end of thread, other threads:[~2015-12-14  9:11 UTC | newest]

Thread overview: 58+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-19 18:35 [PATCH v2 00/16] serial: sh-sci: Clock Cleanups Geert Uytterhoeven
2015-11-19 18:35 ` Geert Uytterhoeven
     [not found] ` <1447958173-543-1-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
2015-11-19 18:35   ` [PATCH v2 01/16] serial: sh-sci: Drop the interface clock Geert Uytterhoeven
2015-11-19 18:35     ` Geert Uytterhoeven
2015-11-20 16:27     ` Rob Herring
2015-11-20 16:27       ` Rob Herring
2015-12-13  6:42     ` Greg Kroah-Hartman
2015-12-13  6:42       ` Greg Kroah-Hartman
2015-12-14  8:15       ` Simon Horman
2015-12-14  8:15         ` Simon Horman
     [not found]         ` <20151214081540.GD9929-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org>
2015-12-14  8:16           ` Simon Horman
2015-12-14  8:16             ` Simon Horman
2015-11-19 18:35 ` [PATCH v2 02/16] sh: Rename sci_ick and sci_fck clock to fck Geert Uytterhoeven
2015-11-19 18:35   ` Geert Uytterhoeven
2015-11-19 18:36 ` [PATCH v2 03/16] sh: Remove sci_ick clock alias Geert Uytterhoeven
2015-11-19 18:36   ` Geert Uytterhoeven
2015-11-19 18:36 ` [PATCH v2 04/16] ARM: shmobile: sh73a0 dtsi: Rename the serial port clock to fck Geert Uytterhoeven
2015-11-19 18:36   ` Geert Uytterhoeven
2015-11-19 18:36 ` [PATCH v2 05/16] ARM: shmobile: r7s72100 " Geert Uytterhoeven
2015-11-19 18:36   ` Geert Uytterhoeven
2015-11-19 18:36 ` [PATCH v2 06/16] ARM: shmobile: r8a73a4 " Geert Uytterhoeven
2015-11-19 18:36   ` Geert Uytterhoeven
2015-11-19 18:36 ` [PATCH v2 07/16] ARM: shmobile: r8a7740 " Geert Uytterhoeven
2015-11-19 18:36   ` Geert Uytterhoeven
2015-11-19 18:36 ` [PATCH v2 08/16] ARM: shmobile: r8a7778 " Geert Uytterhoeven
2015-11-19 18:36   ` Geert Uytterhoeven
2015-11-19 18:36 ` [PATCH v2 09/16] ARM: shmobile: r8a7779 " Geert Uytterhoeven
2015-11-19 18:36   ` Geert Uytterhoeven
2015-11-19 18:36 ` [PATCH v2 10/16] ARM: shmobile: r8a7790 " Geert Uytterhoeven
2015-11-19 18:36   ` Geert Uytterhoeven
2015-11-19 18:36 ` [PATCH v2 11/16] ARM: shmobile: r8a7791 " Geert Uytterhoeven
2015-11-19 18:36   ` Geert Uytterhoeven
2015-11-19 18:36 ` [PATCH v2 12/16] ARM: shmobile: r8a7793 " Geert Uytterhoeven
2015-11-19 18:36   ` Geert Uytterhoeven
2015-12-14  8:15   ` Simon Horman
2015-12-14  8:15     ` Simon Horman
2015-11-19 18:36 ` [PATCH v2 13/16] ARM: shmobile: r8a7794 " Geert Uytterhoeven
2015-11-19 18:36   ` Geert Uytterhoeven
2015-11-19 18:36 ` [PATCH v2 14/16] arm64: renesas: r8a7795 " Geert Uytterhoeven
2015-11-19 18:36   ` Geert Uytterhoeven
2015-11-19 18:43   ` Laurent Pinchart
2015-11-19 18:43     ` Laurent Pinchart
2015-11-19 18:36 ` [PATCH v2 15/16] h8300: dts: " Geert Uytterhoeven
2015-11-19 18:36   ` Geert Uytterhoeven
2015-11-19 18:43   ` Laurent Pinchart
2015-11-19 18:43     ` Laurent Pinchart
2015-11-19 18:36 ` [PATCH v2 16/16] serial: sh-sci: Drop the sci_fck clock fallback Geert Uytterhoeven
2015-11-19 18:36   ` Geert Uytterhoeven
2015-12-13  6:42   ` Greg Kroah-Hartman
2015-12-13  6:42     ` Greg Kroah-Hartman
2015-11-24  2:44 ` [PATCH v2 00/16] serial: sh-sci: Clock Cleanups Simon Horman
2015-11-24  2:44   ` Simon Horman
2015-12-14  8:15 ` Simon Horman
2015-12-14  8:15   ` Simon Horman
2015-12-14  8:31   ` Geert Uytterhoeven
2015-12-14  8:31     ` Geert Uytterhoeven
2015-12-14  9:11     ` Simon Horman
2015-12-14  9:11       ` Simon Horman

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.