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

Groups > linux.kernel > #1505944

[PATCH v4 15/23] clk: renesas: r8a7795: Obtain mode pin values from R-Car RST driver

Show all headers | View raw

Obtain the values of the mode pins from the R-Car RST driver, which
relies on the presence in DT of a device node for the RST module.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Dirk Behme <dirk.behme@de.bosch.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
v4:
  - Add Acked-by, Reviewed-by,

v3:
  - New.
---
 drivers/clk/renesas/r8a7795-cpg-mssr.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/clk/renesas/r8a7795-cpg-mssr.c b/drivers/clk/renesas/r8a7795-cpg-mssr.c
index f255e451e8cafbbf..726c3d7940b491b9 100644
--- a/drivers/clk/renesas/r8a7795-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7795-cpg-mssr.c
@@ -15,6 +15,7 @@
 #include <linux/device.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
+#include <linux/soc/renesas/rcar-rst.h>
 
 #include <dt-bindings/clock/r8a7795-cpg-mssr.h>
 
@@ -311,7 +312,12 @@ enum clk_ids {
 static int __init r8a7795_cpg_mssr_init(struct device *dev)
 {
 	const struct rcar_gen3_cpg_pll_config *cpg_pll_config;
-	u32 cpg_mode = rcar_gen3_read_mode_pins();
+	u32 cpg_mode;
+	int error;
+
+	error = rcar_rst_read_mode_pins(&cpg_mode);
+	if (error)
+		return error;
 
 	cpg_pll_config = &cpg_pll_configs[CPG_PLL_CONFIG_INDEX(cpg_mode)];
 	if (!cpg_pll_config->extal_div) {
-- 
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