[GIT PULL] Renesas ARM Based SoC Fixes for v4.12

[GIT PULL] Renesas ARM Based SoC Fixes for v4.12

[Simon Horman]

Hi Olof, Hi Kevin, Hi Arnd,

Please consider these Renesas ARM based SoC fixes for v4.12.

* Fix from Geert Uytterhoeven to avoid an undefined reference
  to `rcar_rst_read_mode_pins' in the case where the R-Car RST driver
  is not included.


The following changes since commit c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201:

  Linux 4.11-rc1 (2017-03-05 12:59:56 -0800)

are available in the git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-fixes-for-v4.12

for you to fetch changes up to 7b4ccb3c466f62bbf2f4dd5d6a143d945a6f3051:

  soc: renesas: Provide dummy rcar_rst_read_mode_pins() for compile-testing (2017-04-28 10:07:36 +0200)

----------------------------------------------------------------
Renesas ARM Based SoC Fixes for v4.12

* Provide dummy rcar_rst_read_mode_pins() for compile-testing

----------------------------------------------------------------
Geert Uytterhoeven (1):
      soc: renesas: Provide dummy rcar_rst_read_mode_pins() for compile-testing

 include/linux/soc/renesas/rcar-rst.h | 5 +++++
 1 file changed, 5 insertions(+)

[PATCH] soc: renesas: Provide dummy rcar_rst_read_mode_pins() for compile-testing

[Simon Horman]

From: Geert Uytterhoeven <geert+renesas@glider.be>

If the R-Car RST driver is not included, compile-testing R-Car clock
drivers fails with a link error:

    undefined reference to `rcar_rst_read_mode_pins'

To fix this, provide a dummy version.  Use the exact same test logic as
in drivers/soc/renesas/Makefile, as there is no Kconfig symbol (yet) to
control compilation of the R-Car RST driver.

Fixes: 527c02f66d263d2e ("soc: renesas: Add R-Car RST driver")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 include/linux/soc/renesas/rcar-rst.h | 5 +++++
 1 file changed, 5 insertions(+)

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__ */
-- 
2.1.4

[GIT PULL] Renesas ARM Based SoC Fixes for v4.12

[Arnd Bergmann]

On Tue, May 2, 2017 at 10:35 AM, Simon Horman
<horms+renesas@verge.net.au> wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these Renesas ARM based SoC fixes for v4.12.
>
> * Fix from Geert Uytterhoeven to avoid an undefined reference
>   to `rcar_rst_read_mode_pins' in the case where the R-Car RST driver
>   is not included.
>
>

Pulled into fixes, thanks!

     Arnd