d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mark gpio as "optional" in files.mv and edit Marvell's kernconfs

Browse Source 
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
This commit is contained in:
Zbigniew Bodek 2016-01-20 11:57:11 +00:00
parent 16aec470eb
commit fa85e32f0c
9 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/arm/conf/DB-78XXX
View File

@ -90,6 +90,9 @@ device mvs
# NAND
device nand
# GPIO
device gpio
# Flattened Device Tree
options FDT
options FDT_DTB_STATIC

3
sys/arm/conf/DB-88F5XXX
View File

@ -88,6 +88,9 @@ device da
# SATA
device mvs
# GPIO
device gpio
# Flattened Device Tree
options FDT
makeoptions FDT_DTS_FILE=db88f5281.dts

3
sys/arm/conf/DB-88F6XXX
View File

@ -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

3
sys/arm/conf/DOCKSTAR
View File

@ -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

3
sys/arm/conf/DREAMPLUG-1001
View File

@ -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

3
sys/arm/conf/SHEEVAPLUG
View File

@ -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

3
sys/arm/conf/TS7800
View File

@ -76,6 +76,9 @@ device da
# SATA
device ata
# GPIO
device gpio
# Flattened Device Tree
options FDT
options FDT_DTB_STATIC

7
sys/arm/mv/armadaxp/armadaxp.c
View File

@ -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 */

2
sys/arm/mv/files.mv
View File

@ -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