Author: zbb Date: Wed Jan 20 11:57:11 2016 New Revision: 294413 URL: https://svnweb.freebsd.org/changeset/base/294413
Log: 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 <b...@semihalf.com> Differential revision: https://reviews.freebsd.org/D4372 Modified: head/sys/arm/conf/DB-78XXX head/sys/arm/conf/DB-88F5XXX head/sys/arm/conf/DB-88F6XXX head/sys/arm/conf/DOCKSTAR head/sys/arm/conf/DREAMPLUG-1001 head/sys/arm/conf/SHEEVAPLUG head/sys/arm/conf/TS7800 head/sys/arm/mv/armadaxp/armadaxp.c head/sys/arm/mv/files.mv Modified: head/sys/arm/conf/DB-78XXX ============================================================================== --- head/sys/arm/conf/DB-78XXX Wed Jan 20 11:34:22 2016 (r294412) +++ head/sys/arm/conf/DB-78XXX Wed Jan 20 11:57:11 2016 (r294413) @@ -90,6 +90,9 @@ device mvs # NAND device nand +# GPIO +device gpio + # Flattened Device Tree options FDT options FDT_DTB_STATIC Modified: head/sys/arm/conf/DB-88F5XXX ============================================================================== --- head/sys/arm/conf/DB-88F5XXX Wed Jan 20 11:34:22 2016 (r294412) +++ head/sys/arm/conf/DB-88F5XXX Wed Jan 20 11:57:11 2016 (r294413) @@ -88,6 +88,9 @@ device da # SATA device mvs +# GPIO +device gpio + # Flattened Device Tree options FDT makeoptions FDT_DTS_FILE=db88f5281.dts Modified: head/sys/arm/conf/DB-88F6XXX ============================================================================== --- head/sys/arm/conf/DB-88F6XXX Wed Jan 20 11:34:22 2016 (r294412) +++ head/sys/arm/conf/DB-88F6XXX Wed Jan 20 11:57:11 2016 (r294413) @@ -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 Modified: head/sys/arm/conf/DOCKSTAR ============================================================================== --- head/sys/arm/conf/DOCKSTAR Wed Jan 20 11:34:22 2016 (r294412) +++ head/sys/arm/conf/DOCKSTAR Wed Jan 20 11:57:11 2016 (r294413) @@ -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 Modified: head/sys/arm/conf/DREAMPLUG-1001 ============================================================================== --- head/sys/arm/conf/DREAMPLUG-1001 Wed Jan 20 11:34:22 2016 (r294412) +++ head/sys/arm/conf/DREAMPLUG-1001 Wed Jan 20 11:57:11 2016 (r294413) @@ -122,6 +122,9 @@ device u3g # USB-based 3G modems (O device iic device iicbus +# GPIO +device gpio + # SATA device mvs device ahci Modified: head/sys/arm/conf/SHEEVAPLUG ============================================================================== --- head/sys/arm/conf/SHEEVAPLUG Wed Jan 20 11:34:22 2016 (r294412) +++ head/sys/arm/conf/SHEEVAPLUG Wed Jan 20 11:57:11 2016 (r294413) @@ -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 Modified: head/sys/arm/conf/TS7800 ============================================================================== --- head/sys/arm/conf/TS7800 Wed Jan 20 11:34:22 2016 (r294412) +++ head/sys/arm/conf/TS7800 Wed Jan 20 11:57:11 2016 (r294413) @@ -76,6 +76,9 @@ device da # SATA device ata +# GPIO +device gpio + # Flattened Device Tree options FDT options FDT_DTB_STATIC Modified: head/sys/arm/mv/armadaxp/armadaxp.c ============================================================================== --- head/sys/arm/mv/armadaxp/armadaxp.c Wed Jan 20 11:34:22 2016 (r294412) +++ head/sys/arm/mv/armadaxp/armadaxp.c Wed Jan 20 11:57:11 2016 (r294413) @@ -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 */ Modified: head/sys/arm/mv/files.mv ============================================================================== --- head/sys/arm/mv/files.mv Wed Jan 20 11:34:22 2016 (r294412) +++ head/sys/arm/mv/files.mv Wed Jan 20 11:57:11 2016 (r294413) @@ -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 _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
