From 563073febe686a5788b3edd0cd836dc6cc7f8ee1 Mon Sep 17 00:00:00 2001
From: zbb <zbb@FreeBSD.org>
Date: Wed, 20 Jan 2016 11:57:11 +0000
Subject: [PATCH] Mark gpio as "optional" in files.mv and edit Marvell's
 kernconfs

Including arm/mv/gpio.c now depends on 'gpio' device. 'device gpio' was
added to all kernconf files of Marvell boards, except ARMADAXP (dummy
mv_gpio_res definition was removed) and ARMADA38X (not supported yet).

This commit allows to use generic files.mv on A38X.

Reviewed by:    andrew
Obtained from:	Semihalf
Sponsored by:	Stormshield
Submitted by:	Bartosz Szczepanek <bsz@semihalf.com>
Differential revision:	https://reviews.freebsd.org/D4372
---
 sys/arm/conf/DB-78XXX          | 3 +++
 sys/arm/conf/DB-88F5XXX        | 3 +++
 sys/arm/conf/DB-88F6XXX        | 3 +++
 sys/arm/conf/DOCKSTAR          | 3 +++
 sys/arm/conf/DREAMPLUG-1001    | 3 +++
 sys/arm/conf/SHEEVAPLUG        | 3 +++
 sys/arm/conf/TS7800            | 3 +++
 sys/arm/mv/armadaxp/armadaxp.c | 7 -------
 sys/arm/mv/files.mv            | 2 +-
 9 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/sys/arm/conf/DB-78XXX b/sys/arm/conf/DB-78XXX
index 024593cd33af..d40990baf4b2 100644
--- a/sys/arm/conf/DB-78XXX
+++ b/sys/arm/conf/DB-78XXX
@@ -90,6 +90,9 @@ device		mvs
 # NAND
 device		nand
 
+# GPIO
+device		gpio
+
 # Flattened Device Tree
 options 	FDT
 options 	FDT_DTB_STATIC
diff --git a/sys/arm/conf/DB-88F5XXX b/sys/arm/conf/DB-88F5XXX
index 5fd96fc92aa9..28f448ae472a 100644
--- a/sys/arm/conf/DB-88F5XXX
+++ b/sys/arm/conf/DB-88F5XXX
@@ -88,6 +88,9 @@ device		da
 # SATA
 device		mvs
 
+# GPIO
+device		gpio
+
 # Flattened Device Tree
 options 	FDT
 makeoptions	FDT_DTS_FILE=db88f5281.dts
diff --git a/sys/arm/conf/DB-88F6XXX b/sys/arm/conf/DB-88F6XXX
index c3f238c3c945..9dafb820b3aa 100644
--- a/sys/arm/conf/DB-88F6XXX
+++ b/sys/arm/conf/DB-88F6XXX
@@ -94,6 +94,9 @@ device		mvs
 # NAND
 device		nand
 
+# GPIO
+device		gpio
+
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
 options 	FDT_DTB_STATIC
diff --git a/sys/arm/conf/DOCKSTAR b/sys/arm/conf/DOCKSTAR
index d7fa96e26cf1..c643b92eb14c 100644
--- a/sys/arm/conf/DOCKSTAR
+++ b/sys/arm/conf/DOCKSTAR
@@ -148,6 +148,9 @@ device		pf
 device		pflog
 device		pfsync
 
+# GPIO
+device		gpio
+
 # ALTQ, required for PF
 options 	ALTQ			# Basic ALTQ support
 options 	ALTQ_CBQ		# Class Based Queueing
diff --git a/sys/arm/conf/DREAMPLUG-1001 b/sys/arm/conf/DREAMPLUG-1001
index 3277b43dfdff..b5f4bd4b02e2 100644
--- a/sys/arm/conf/DREAMPLUG-1001
+++ b/sys/arm/conf/DREAMPLUG-1001
@@ -122,6 +122,9 @@ device		u3g  			# USB-based 3G modems (Option, Huawei, Sierra)
 device		iic
 device		iicbus
 
+# GPIO
+device		gpio
+
 # SATA
 device		mvs
 device		ahci
diff --git a/sys/arm/conf/SHEEVAPLUG b/sys/arm/conf/SHEEVAPLUG
index 5d89c2dd186e..367de9dbff9a 100644
--- a/sys/arm/conf/SHEEVAPLUG
+++ b/sys/arm/conf/SHEEVAPLUG
@@ -82,6 +82,9 @@ device		da
 # NAND
 device		nand
 
+# GPIO
+device		gpio
+
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
 options 	FDT_DTB_STATIC
diff --git a/sys/arm/conf/TS7800 b/sys/arm/conf/TS7800
index 1b62e59ba333..e06b0aa23da9 100644
--- a/sys/arm/conf/TS7800
+++ b/sys/arm/conf/TS7800
@@ -76,6 +76,9 @@ device		da
 # SATA
 device		ata
 
+# GPIO
+device		gpio
+
 # Flattened Device Tree
 options 	FDT
 options 	FDT_DTB_STATIC
diff --git a/sys/arm/mv/armadaxp/armadaxp.c b/sys/arm/mv/armadaxp/armadaxp.c
index 3bbeadd078d6..693ae6a93e65 100644
--- a/sys/arm/mv/armadaxp/armadaxp.c
+++ b/sys/arm/mv/armadaxp/armadaxp.c
@@ -86,13 +86,6 @@ int platform_get_ncpus(void);
 #define COHER_FABRIC_CFU		0x28
 #define COHER_FABRIC_CIB_CTRL		0x80
 
-/* XXX Make gpio driver optional and remove it */
-struct resource_spec mv_gpio_res[] = {
-	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },
-	{ SYS_RES_IRQ,		0,	RF_ACTIVE },
-	{ -1, 0 }
-};
-
 struct vco_freq_ratio {
 	uint8_t	vco_cpu;	/* VCO to CLK0(CPU) clock ratio */
 	uint8_t	vco_l2c;	/* VCO to NB(L2 cache) clock ratio */
diff --git a/sys/arm/mv/files.mv b/sys/arm/mv/files.mv
index 78b5548fb367..791ef00993ab 100644
--- a/sys/arm/mv/files.mv
+++ b/sys/arm/mv/files.mv
@@ -12,7 +12,7 @@
 # - JTAG/ICE
 # - Vector Floating Point (VFP) unit
 #
-arm/mv/gpio.c			standard
+arm/mv/gpio.c			optional	gpio
 arm/mv/mv_common.c		standard
 arm/mv/mv_localbus.c		standard
 arm/mv/mv_machdep.c		standard