Index: head/sys/arm/conf/GENERIC
===================================================================
--- head/sys/arm/conf/GENERIC	(revision 307827)
+++ head/sys/arm/conf/GENERIC	(revision 307828)
@@ -1,174 +1,177 @@
 #
 # GENERICV6 -- Generic(ish) kernel config.
 #
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
 #    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
 # FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
 # latest information.
 #
 # An exhaustive list of options and more detailed explanations of the
 # device lines is also present in the ../../conf/NOTES and NOTES files.
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
 # $FreeBSD$
 
 ident		GENERIC
 
 cpu		CPU_CORTEXA_MP
 machine 	arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 makeoptions	KERNVIRTADDR=0xc0000000
 options 	KERNVIRTADDR=0xc0000000
 
 include 	"std.armv6"
 files		"../allwinner/files.allwinner"
 files		"../allwinner/a20/files.a20"
 files		"../allwinner/a31/files.a31"
 files		"../allwinner/a83t/files.a83t"
 files		"../allwinner/h3/files.h3"
 files		"../broadcom/bcm2835/files.bcm2836"
 files		"../broadcom/bcm2835/files.bcm283x"
 files		"../nvidia/tegra124/files.tegra124"
 files		"../qemu/files.qemu"
 
 options 	SOC_ALLWINNER_A20
 options 	SOC_ALLWINNER_A31
 options 	SOC_ALLWINNER_A31S
 options 	SOC_ALLWINNER_A83T
 options 	SOC_ALLWINNER_H3
 options 	SOC_BCM2836
 
 options 	SCHED_ULE		# ULE scheduler
 options 	SMP			# Enable multiple cores
 options 	PLATFORM
 options 	PLATFORM_SMP
 options 	MULTIDELAY
 options 	LINUX_BOOT_ABI
 
 # EXT_RESOURCES pseudo devices
 options 	EXT_RESOURCES
 device		clk
 device		phy
 device		hwreset
 device		regulator
 
+# CPU frequency control
+device		cpufreq
+
 # Interrupt controller
 options 	INTRNG
 device		gic
 
 # ARM Generic Timer
 device		generic_timer
 
 # MMC/SD/SDIO Card slot support
 device		sdhci			# SD controller
 device		mmc			# mmc/sd bus
 device		mmcsd			# mmc/sd flash cards
 
 # ATA controllers
 device		ahci			# AHCI-compatible SATA controllers
 #device		ata			# Legacy ATA/SATA controllers
 
 # PCI
 options 	NEW_PCIB
 device		pci
 
 # PCI NICs
 device		re			# RealTek 8139C+/8169/8169S/8110S
 
 # VirtIO
 device		virtio
 device		virtio_mmio
 device		virtio_blk
 device		vtnet
 
 # Console and misc
 device		uart
 device		uart_ns8250
 device		uart_snps
 device		pl011
 device		pty
 device		snp
 device		md			# Memory "disks"
 device		random			# Entropy device
 device		psci
 
 # I2C support
 device		iicbus
 device		iic
 device		twsi
 device		rsb
 device		p2wi			# Allwinner Push-Pull Two Wire interface
 device		axp209			# AXP209 Power Management Unit
 device		axp81x			# AXP813/818 Power Management Unit
 device		bcm2835_bsc
 device		icee
 
 # GPIO
 device		gpio
 device		gpioled
 device		gpioregulator
 
 # SPI
 device		spibus
 device		bcm2835_spi
 
 device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		cd			# CD
 device		pass			# Passthrough device (direct ATA/SCSI access)
 
 # USB support
 options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
 device		usb
 #device		uhci
 device		ohci
 device		ehci
 device		dwcotg			# DWC OTG controller
 
 device		umass			# Disks/Mass storage - Requires scbus and da
 device		uhid			# "Human Interface Devices"
 device		ukbd			# Allow keyboard like HIDs to control console
 
 # Ethernet
 device		loop
 device		ether
 device		vlan			# 802.1Q VLAN support
 device		mii
 device		bpf
 
 #device		emac			# 10/100 integrated EMAC controller
 device		dwc			# 10/100/1000 integrated GMAC controller
 device		awg			# 10/100/1000 integrated EMAC controller
 
 # USB ethernet support, requires miibus
 device		smcphy
 device		smsc
 device		miibus
 
 # Sound support
 device		sound
 
 # Framebuffer support
 device		vt
 device		kbdmux
 device		ums
 device		videomode
 device		hdmi
 device		vchiq
 
 # Pinmux
 device		fdt_pinctrl
 
 # Extensible Firmware Interface
 options 	EFI
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
 makeoptions	MODULES_EXTRA="dtb/allwinner dtb/nvidia dtb/rpi"