From owner-svn-src-all@freebsd.org Thu Aug 25 13:59:21 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 282FFBC5D57; Thu, 25 Aug 2016 13:59:21 +0000 (UTC) (envelope-from jmcneill@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DB2B21807; Thu, 25 Aug 2016 13:59:20 +0000 (UTC) (envelope-from jmcneill@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7PDxKQu094389; Thu, 25 Aug 2016 13:59:20 GMT (envelope-from jmcneill@FreeBSD.org) Received: (from jmcneill@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7PDxJcL094387; Thu, 25 Aug 2016 13:59:19 GMT (envelope-from jmcneill@FreeBSD.org) Message-Id: <201608251359.u7PDxJcL094387@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jmcneill set sender to jmcneill@FreeBSD.org using -f From: Jared McNeill Date: Thu, 25 Aug 2016 13:59:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r304805 - in head/sys: arm64/conf conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Aug 2016 13:59:21 -0000 Author: jmcneill Date: Thu Aug 25 13:59:19 2016 New Revision: 304805 URL: https://svnweb.freebsd.org/changeset/base/304805 Log: Add support for Allwinner A64. Reviewed by: andrew, manu Relnotes: yes Modified: head/sys/arm64/conf/GENERIC head/sys/conf/files.arm64 Modified: head/sys/arm64/conf/GENERIC ============================================================================== --- head/sys/arm64/conf/GENERIC Thu Aug 25 13:46:52 2016 (r304804) +++ head/sys/arm64/conf/GENERIC Thu Aug 25 13:59:19 2016 (r304805) @@ -86,6 +86,7 @@ options WITNESS_SKIPSPIN # Don't run wi options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones # SoC support +options SOC_ALLWINNER_A64 options SOC_CAVM_THUNDERX options SOC_HISI_HI6220 @@ -103,6 +104,7 @@ options PCI_IOV # PCI SR-IOV support # Ethernet NICs device mii device miibus # MII bus support +device awg # Allwinner EMAC Gigabit Ethernet device em # Intel PRO/1000 Gigabit Ethernet Family device igb # Intel PRO/1000 PCIE Server Gigabit Family device ix # Intel 10Gb Ethernet Family @@ -118,6 +120,7 @@ device da device pass # Passthrough device (direct ATA/SCSI access) # MMC/SD/SDIO Card slot support +device aw_mmc # Allwinner SD/MMC controller device mmc # mmc/sd bus device mmcsd # mmc/sd flash cards device dwmmc @@ -125,18 +128,45 @@ device dwmmc # Serial (COM) ports device uart # Generic UART driver device uart_ns8250 # ns8250-type UART driver +device uart_snps device pl011 # USB support options USB_DEBUG # enable debug msgs +device aw_ehci # Allwinner EHCI USB interface (USB 2.0) +device aw_usbphy # Allwinner USB PHY device dwcotg # DWC OTG controller -device ohci # OHCI PCI->USB interface -device ehci # EHCI PCI->USB interface (USB 2.0) +device ohci # OHCI USB interface +device ehci # EHCI USB interface (USB 2.0) device xhci # XHCI PCI->USB interface (USB 3.0) device usb # USB Bus (required) device ukbd # Keyboard device umass # Disks/Mass storage - Requires scbus and da +# GPIO +device aw_gpio # Allwinner GPIO controller +device gpio +device fdt_pinctrl + +# I2C +device aw_rsb # Allwinner Reduced Serial Bus +device iicbus + +# Clock and reset controllers +device aw_ccu # Allwinner clock controller + +# Interrupt controllers +device aw_nmi # Allwinner NMI support + +# Real-time clock support +device aw_rtc # Allwinner Real-time Clock + +# Watchdog controllers +device aw_wdog # Allwinner Watchdog + +# Power management controllers +device axp81x # X-Powers AXP81x PMIC + # Pseudo devices. device loop # Network loopback device random # Entropy device @@ -148,6 +178,13 @@ device gif # IPv6 and IPv4 tunneling device firmware # firmware assist module device psci # Support for ARM PSCI +# EXT_RESOURCES pseudo devices +options EXT_RESOURCES +device clk +device phy +device hwreset +device regulator + # The `bpf' device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this! # Note that 'bpf' is required for DHCP. Modified: head/sys/conf/files.arm64 ============================================================================== --- head/sys/conf/files.arm64 Thu Aug 25 13:46:52 2016 (r304804) +++ head/sys/conf/files.arm64 Thu Aug 25 13:59:19 2016 (r304805) @@ -11,6 +11,30 @@ cloudabi64_vdso_blob.o optional compat_ no-implicit-rule \ clean "cloudabi64_vdso_blob.o" # +arm/allwinner/a10_ehci.c optional ehci aw_ehci +arm/allwinner/a10_gpio.c optional gpio aw_gpio +arm/allwinner/a10_mmc.c optional mmc aw_mmc +arm/allwinner/a64/a64_padconf.c optional soc_allwinner_a64 +arm/allwinner/a64/a64_r_padconf.c optional soc_allwinner_a64 +arm/allwinner/aw_ccu.c optional aw_ccu +arm/allwinner/aw_nmi.c optional aw_nmi \ + compile-with "${NORMAL_C} -I$S/gnu/dts/include" +arm/allwinner/aw_reset.c optional aw_ccu +arm/allwinner/aw_rsb.c optional aw_rsb +arm/allwinner/aw_rtc.c optional aw_rtc +arm/allwinner/aw_usbphy.c optional ehci aw_usbphy +arm/allwinner/aw_wdog.c optional aw_wdog +arm/allwinner/axp81x.c optional axp81x +arm/allwinner/clk/aw_ahbclk.c optional aw_ccu +arm/allwinner/clk/aw_apbclk.c optional aw_ccu +arm/allwinner/clk/aw_axiclk.c optional aw_ccu +arm/allwinner/clk/aw_cpuclk.c optional aw_ccu +arm/allwinner/clk/aw_gate.c optional aw_ccu +arm/allwinner/clk/aw_modclk.c optional aw_ccu +arm/allwinner/clk/aw_pll.c optional aw_ccu \ + compile-with "${NORMAL_C} -I$S/gnu/dts/include" +arm/allwinner/clk/aw_usbclk.c optional aw_ccu +arm/allwinner/if_awg.c optional awg arm/arm/generic_timer.c standard arm/arm/gic.c standard arm/arm/gic_fdt.c optional fdt