Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1505948

[PATCH v4 20/23] ARM: shmobile: rcar-gen2: Stop passing mode pins state to clock driver

Show all headers | View raw

Now the R-Car Gen2 CPG clock driver obtains the state of the mode pins
from the R-Car RST driver, there's no longer a need to pass this state
explicitly. Hence we can just call of_clk_init() instead.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Dirk Behme <dirk.behme@de.bosch.com>
---
v4:
  - Add Acked-by,
  - Rebase on top of "ARM: shmobile: rcar-gen2: Obtain extal frequency
    from DT",
  - Remove the call to rcar_gen2_read_mode_pins(),

v3:
  - Drop "select MFD_SYSCON", as the clock driver no longer uses syscon,

v2:
  - Kill compiler warning if CONFIG_ARM_ARCH_TIMER is not enabled.
---
 arch/arm/mach-shmobile/setup-rcar-gen2.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c
index afb9fdcd3d9084e2..b527258e0a62e806 100644
--- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/clk/renesas.h>
+#include <linux/clk-provider.h>
 #include <linux/clocksource.h>
 #include <linux/device.h>
 #include <linux/dma-contiguous.h>
@@ -71,7 +71,6 @@ static unsigned int __init get_extal_freq(void)
 
 void __init rcar_gen2_timer_init(void)
 {
-	u32 mode = rcar_gen2_read_mode_pins();
 #ifdef CONFIG_ARM_ARCH_TIMER
 	void __iomem *base;
 	u32 freq;
@@ -130,7 +129,7 @@ void __init rcar_gen2_timer_init(void)
 	iounmap(base);
 #endif /* CONFIG_ARM_ARCH_TIMER */
 
-	rcar_gen2_clocks_init(mode);
+	of_clk_init(NULL);
 	clocksource_probe();
 }
 
-- 
1.9.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v4 00/23] soc: renesas: Add R-Car RST driver for obtaining mode pin state Geert Uytterhoeven <geert+renesas@glider.be> - 2016-10-21 15:30 +0200
  [PATCH v4 05/23] ARM: dts: r8a7790: Add device node for RST module Geert Uytterhoeven <geert+renesas@glider.be> - 2016-10-21 15:30 +0200
  [PATCH v4 01/23] reset: Add renesas,rst DT bindings Geert Uytterhoeven <geert+renesas@glider.be> - 2016-10-21 15:30 +0200
    Re: [PATCH v4 01/23] reset: Add renesas,rst DT bindings Philipp Zabel <p.zabel@pengutronix.de> - 2016-10-21 17:50 +0200
  [PATCH v4 09/23] ARM: dts: r8a7794: Add device node for RST module Geert Uytterhoeven <geert+renesas@glider.be> - 2016-10-21 15:30 +0200
  [PATCH v4 17/23] clk: renesas: rcar-gen3-cpg: Remove obsolete rcar_gen3_read_mode_pins() Geert Uytterhoeven <geert+renesas@glider.be> - 2016-10-21 15:30 +0200
  [PATCH v4 03/23] ARM: dts: r8a7778: Add device node for RESET/WDT module Geert Uytterhoeven <geert+renesas@glider.be> - 2016-10-21 15:30 +0200
  [PATCH v4 13/23] clk: renesas: r8a7779: Obtain mode pin values from R-Car RST driver Geert Uytterhoeven <geert+renesas@glider.be> - 2016-10-21 15:30 +0200
  [PATCH v4 19/23] ARM: shmobile: r8a7779: Stop passing mode pins state to clock driver Geert Uytterhoeven <geert+renesas@glider.be> - 2016-10-21 15:30 +0200
  [PATCH v4 15/23] clk: renesas: r8a7795: Obtain mode pin values from R-Car RST driver Geert Uytterhoeven <geert+renesas@glider.be> - 2016-10-21 15:30 +0200
  [PATCH v4 23/23] clk: renesas: rcar-gen2: Remove obsolete rcar_gen2_clocks_init() Geert Uytterhoeven <geert+renesas@glider.be> - 2016-10-21 15:30 +0200
  [PATCH v4 18/23] ARM: shmobile: r8a7778: Stop passing mode pins state to clock driver Geert Uytterhoeven <geert+renesas@glider.be> - 2016-10-21 15:30 +0200
  [PATCH v4 20/23] ARM: shmobile: rcar-gen2: Stop passing mode pins state to clock driver Geert Uytterhoeven <geert+renesas@glider.be> - 2016-10-21 15:30 +0200
  [PATCH v4 07/23] ARM: dts: r8a7792: Add device node for RST module Geert Uytterhoeven <geert+renesas@glider.be> - 2016-10-21 15:30 +0200
  [PATCH v4 22/23] clk: renesas: r8a7779: Remove obsolete r8a7779_clocks_init() Geert Uytterhoeven <geert+renesas@glider.be> - 2016-10-21 15:30 +0200
  Re: [PATCH v4 00/23] soc: renesas: Add R-Car RST driver for  obtaining mode pin state Philipp Zabel <p.zabel@pengutronix.de> - 2016-10-21 17:50 +0200
    Re: [PATCH v4 00/23] soc: renesas: Add R-Car RST driver for  obtaining mode pin state Philipp Zabel <p.zabel@pengutronix.de> - 2016-10-21 17:50 +0200
    Re: [PATCH v4 00/23] soc: renesas: Add R-Car RST driver for obtaining  mode pin state Geert Uytterhoeven <geert@linux-m68k.org> - 2016-10-26 14:00 +0200
  Re: [PATCH v4 00/23] soc: renesas: Add R-Car RST driver for obtaining  mode pin state Geert Uytterhoeven <geert@linux-m68k.org> - 2016-10-26 14:10 +0200

csiph-web