summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2016-11-02 22:53:26 +0300
committerGeert Uytterhoeven <geert+renesas@glider.be>2016-11-02 22:53:26 +0300
commita05de66ea69f300158186c86eceb602fca088c16 (patch)
tree1e7d5b1f759f96f08592a9ba391d7e32cd9a5c2c /include/linux
parentdbdcc4f996df280eb2758095b4774ea62da8a2a7 (diff)
parent3e91d07bb592895982400002020d510fd7b6e85f (diff)
downloadlinux-a05de66ea69f300158186c86eceb602fca088c16.tar.xz
Merge branch 'rcar-rst' into clk-renesas-for-v4.10
soc: renesas: Add R-Car RST driver for obtaining mode pin state
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/clk/renesas.h4
-rw-r--r--include/linux/soc/renesas/rcar-rst.h6
2 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/clk/renesas.h b/include/linux/clk/renesas.h
index ba6fa4148515..9ebf1f8243bb 100644
--- a/include/linux/clk/renesas.h
+++ b/include/linux/clk/renesas.h
@@ -20,10 +20,6 @@ struct device;
struct device_node;
struct generic_pm_domain;
-void r8a7778_clocks_init(u32 mode);
-void r8a7779_clocks_init(u32 mode);
-void rcar_gen2_clocks_init(u32 mode);
-
void cpg_mstp_add_clk_domain(struct device_node *np);
#ifdef CONFIG_CLK_RENESAS_CPG_MSTP
int cpg_mstp_attach_dev(struct generic_pm_domain *unused, struct device *dev);
diff --git a/include/linux/soc/renesas/rcar-rst.h b/include/linux/soc/renesas/rcar-rst.h
new file mode 100644
index 000000000000..a18e0783946b
--- /dev/null
+++ b/include/linux/soc/renesas/rcar-rst.h
@@ -0,0 +1,6 @@
+#ifndef __LINUX_SOC_RENESAS_RCAR_RST_H__
+#define __LINUX_SOC_RENESAS_RCAR_RST_H__
+
+int rcar_rst_read_mode_pins(u32 *mode);
+
+#endif /* __LINUX_SOC_RENESAS_RCAR_RST_H__ */