Index: head/sys/arm/conf/SOCFPGA
===================================================================
--- head/sys/arm/conf/SOCFPGA	(revision 332886)
+++ head/sys/arm/conf/SOCFPGA	(revision 332887)
@@ -1,98 +1,104 @@
 #
 # Kernel configuration for Altera SOCFPGA development kits.
 #
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
 #    https://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 (https://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		SOCFPGA
 include 	"std.armv7"
 include 	"../altera/socfpga/std.socfpga"
 
 makeoptions	MODULES_OVERRIDE=""
 
 makeoptions	WERROR="-Werror"
 
 options 	SCHED_ULE		# ULE scheduler
 options 	PLATFORM		# Platform based SoC
 options 	SMP			# Enable multiple cores
 
 options 	SOC_ALTERA_ARRIA10
 options 	SOC_ALTERA_CYCLONE5
 
 # NFS root from boopt/dhcp
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
 #options 	BOOTP_COMPAT
 #options 	BOOTP_NFSV3
 #options 	BOOTP_WIRED_TO=ue0
 
 # Interrupt controller
 device		gic
 options 	INTRNG
 
 # ARM MPCore timer
 device		mpcore_timer
 
+# DMA support
+device		xdma
+device		pl330
+
 # MMC/SD/SDIO Card slot support
 device		mmc			# mmc/sd bus
 device		mmcsd			# mmc/sd flash cards
 device		dwmmc
 
 # Pseudo devices
 
 device		loop
 device		random
 device		pty
 device		md
 device		gpio
 
 # USB support
 options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
 device		usb
 device		dwcotg
 
 device		umass
 device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		pass
 
 # Serial ports
 device		uart
 device		uart_snps
 
 # I2C (TWSI)
 device		iic
 device		iicbus
 
 # SPI
 device		spibus
+device		cqspi
+device		n25q
 
 # Ethernet
 device		ether
 device		mii
 device		smsc
 device		smscphy
 device		dwc
 device		micphy
 
 # USB ethernet support, requires miibus
 device		miibus
 device		axe			# ASIX Electronics USB Ethernet
 device		bpf			# Berkeley packet filter
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
Index: head/sys/dts/arm/socfpga_arria10_socdk_sdmmc.dts
===================================================================
--- head/sys/dts/arm/socfpga_arria10_socdk_sdmmc.dts	(revision 332886)
+++ head/sys/dts/arm/socfpga_arria10_socdk_sdmmc.dts	(revision 332887)
@@ -1,86 +1,120 @@
 /*-
  * Copyright (c) 2017 Ruslan Bukin <br@bsdpad.com>
  * All rights reserved.
  *
  * This software was developed by SRI International and the University of
  * Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-10-C-0237
  * ("CTSRD"), as part of the DARPA CRASH research programme.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * $FreeBSD$
  */
 
 /dts-v1/;
 #include "socfpga_arria10_socdk.dtsi"
 
 / {
 	model = "Altera SOCFPGA Arria 10";
 	compatible = "altr,socfpga-arria10", "altr,socfpga";
 
 	/* Reserve first page for secondary CPU trampoline code */
 	memreserve = < 0x00000000 0x1000 >;
 
 	soc {
 		/* Local timer */
 		timer@ffffc600 {
 			clock-frequency = <200000000>;
 		};
 
 		/* Global timer */
 		global_timer: timer@ffffc200 {
 			compatible = "arm,cortex-a9-global-timer";
 			reg = <0xffffc200 0x20>;
 			interrupts = <1 11 0x301>;
 			clock-frequency = <200000000>;
 		};
 	};
 
 	chosen {
 		stdin = "serial1";
 		stdout = "serial1";
 	};
 };
 
 &uart1 {
 	clock-frequency = < 50000000 >;
 };
 
 &mmc {
 	status = "okay";
 	num-slots = <1>;
 	cap-sd-highspeed;
 	broken-cd;
 	bus-width = <4>;
 	bus-frequency = <200000000>;
 };
 
 &i2c1 {
 	lcd@28 {
 		compatible = "newhaven,nhd-0216k3z-nsw-bbw";
 		reg = <0x28>;
 	};
 };
 
 &usb0 {
 	dr_mode = "host";
 };
+
+&qspi {
+	status = "okay";
+
+	dmas = <&pdma 24>, <&pdma 25>;
+	dma-names = "tx", "rx";
+
+	flash0: n25q00@0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "n25q00aa";
+		reg = <0>;
+		spi-max-frequency = <100000000>;
+
+		m25p,fast-read;
+		cdns,page-size = <256>;
+		cdns,block-size = <16>;
+		cdns,read-delay = <4>;
+		cdns,tshsl-ns = <50>;
+		cdns,tsd2d-ns = <50>;
+		cdns,tchsh-ns = <4>;
+		cdns,tslch-ns = <4>;
+
+		partition@qspi-boot {
+			label = "boot";
+			reg = <0x0 0x2720000>;
+		};
+
+		partition@qspi-rootfs {
+			label = "rootfs";
+			reg = <0x2720000 0x58E0000>;
+		};
+	};
+};