summaryrefslogtreecommitdiff
path: root/include/linux/soc
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-05-10 16:33:45 +0300
committerArnd Bergmann <arnd@arndb.de>2017-05-10 16:33:45 +0300
commit9dfe29d9d2b07ef3fe683d64f57ca06f03e17805 (patch)
tree98714f8861052dafe6da4316aab6d0b1e85a2563 /include/linux/soc
parente942661130e7221d4aeac9804ff100e7516470f3 (diff)
parent7b4ccb3c466f62bbf2f4dd5d6a143d945a6f3051 (diff)
downloadlinux-9dfe29d9d2b07ef3fe683d64f57ca06f03e17805.tar.xz
Merge tag 'renesas-fixes-for-v4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
Pull "Renesas ARM Based SoC Fixes for v4.12" from Simon Horman: * Provide dummy rcar_rst_read_mode_pins() for compile-testing * tag 'renesas-fixes-for-v4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: soc: renesas: Provide dummy rcar_rst_read_mode_pins() for compile-testing
Diffstat (limited to 'include/linux/soc')
-rw-r--r--include/linux/soc/renesas/rcar-rst.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/soc/renesas/rcar-rst.h b/include/linux/soc/renesas/rcar-rst.h
index a18e0783946b..787e7ad53d45 100644
--- a/include/linux/soc/renesas/rcar-rst.h
+++ b/include/linux/soc/renesas/rcar-rst.h
@@ -1,6 +1,11 @@
#ifndef __LINUX_SOC_RENESAS_RCAR_RST_H__
#define __LINUX_SOC_RENESAS_RCAR_RST_H__
+#if defined(CONFIG_ARCH_RCAR_GEN1) || defined(CONFIG_ARCH_RCAR_GEN2) || \
+ defined(CONFIG_ARCH_R8A7795) || defined(CONFIG_ARCH_R8A7796)
int rcar_rst_read_mode_pins(u32 *mode);
+#else
+static inline int rcar_rst_read_mode_pins(u32 *mode) { return -ENODEV; }
+#endif
#endif /* __LINUX_SOC_RENESAS_RCAR_RST_H__ */