From: Alexandre Belloni <alexandre.belloni@bootlin.com>
Date: Wed, 20 Mar 2019 12:34:15 +0000 (+0100)
Subject: rtc: goldfish: allow building on more than MIPS
X-Git-Tag: v5.2-rc1~105^2~145
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a6ec8c15d35815af1ca83e269f48944c49aff9b;p=thirdparty%2Fkernel%2Flinux.git

rtc: goldfish: allow building on more than MIPS

Goldfish can be ARM or x86, allow building the driver for more than just
MIPS.

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index a71734c416939..805e4ace30caa 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -1857,7 +1857,8 @@ config RTC_DRV_HID_SENSOR_TIME
 
 config RTC_DRV_GOLDFISH
 	tristate "Goldfish Real Time Clock"
-	depends on MIPS && (GOLDFISH || COMPILE_TEST)
+	depends on OF && HAS_IOMEM
+	depends on GOLDFISH || COMPILE_TEST
 	help
 	  Say yes to enable RTC driver for the Goldfish based virtual platform.
 
diff --git a/drivers/rtc/rtc-goldfish.c b/drivers/rtc/rtc-goldfish.c
index 23301e15992c1..3fbd2715560ec 100644
--- a/drivers/rtc/rtc-goldfish.c
+++ b/drivers/rtc/rtc-goldfish.c
@@ -16,6 +16,7 @@
 
 #include <linux/io.h>
 #include <linux/module.h>
+#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/rtc.h>