Date: Tue, 6 Jan 2015 07:43:08 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r276741 - in head/sys/mips: atheros conf Message-ID: <201501060743.t067h8oT044415@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adrian Date: Tue Jan 6 07:43:07 2015 New Revision: 276741 URL: https://svnweb.freebsd.org/changeset/base/276741 Log: Make the apb.c code optional behind ar71xx_apb rather than standard. The QCA955x has more mux interrupts going on - and the AR934x actually does, but I cheated and assigned wlan and pcie to the same interrupt line. They are, there's just a status register mux that I should've been using. Luckily this isn't too bad a change in itself - almost all of the Atheros MIPS configurations use a _BASE file to inherit from. Except PB92, which I should really fix up at some point. The AR934x will use the legacy apb for now until I write its replacement. The QCA955x SoC I'm doing bring-up on will have a separate qca955x_apb.c implementation that includes hooking into IP2/IP3 and doing further interrupt demuxing as appropriate. Modified: head/sys/mips/atheros/files.ar71xx head/sys/mips/conf/AR71XX_BASE head/sys/mips/conf/AR724X_BASE head/sys/mips/conf/AR91XX_BASE head/sys/mips/conf/AR933X_BASE head/sys/mips/conf/AR934X_BASE head/sys/mips/conf/PB92 Modified: head/sys/mips/atheros/files.ar71xx ============================================================================== --- head/sys/mips/atheros/files.ar71xx Tue Jan 6 07:41:30 2015 (r276740) +++ head/sys/mips/atheros/files.ar71xx Tue Jan 6 07:43:07 2015 (r276741) @@ -1,6 +1,6 @@ # $FreeBSD$ -mips/atheros/apb.c standard +mips/atheros/apb.c optional ar71xx_apb mips/atheros/ar71xx_gpio.c optional gpio mips/atheros/ar71xx_machdep.c standard mips/atheros/ar71xx_ehci.c optional ehci Modified: head/sys/mips/conf/AR71XX_BASE ============================================================================== --- head/sys/mips/conf/AR71XX_BASE Tue Jan 6 07:41:30 2015 (r276740) +++ head/sys/mips/conf/AR71XX_BASE Tue Jan 6 07:43:07 2015 (r276741) @@ -110,6 +110,8 @@ device ar71xx_wdog device uart device uart_ar71xx +device ar71xx_apb + device loop device ether device md Modified: head/sys/mips/conf/AR724X_BASE ============================================================================== --- head/sys/mips/conf/AR724X_BASE Tue Jan 6 07:41:30 2015 (r276740) +++ head/sys/mips/conf/AR724X_BASE Tue Jan 6 07:43:07 2015 (r276741) @@ -119,6 +119,8 @@ device ar71xx_wdog device uart device uart_ar71xx +device ar71xx_apb + device loop device ether device md Modified: head/sys/mips/conf/AR91XX_BASE ============================================================================== --- head/sys/mips/conf/AR91XX_BASE Tue Jan 6 07:41:30 2015 (r276740) +++ head/sys/mips/conf/AR91XX_BASE Tue Jan 6 07:43:07 2015 (r276741) @@ -108,6 +108,8 @@ device ar71xx_wdog device uart device uart_ar71xx +device ar71xx_apb + device loop device ether device md Modified: head/sys/mips/conf/AR933X_BASE ============================================================================== --- head/sys/mips/conf/AR933X_BASE Tue Jan 6 07:41:30 2015 (r276740) +++ head/sys/mips/conf/AR933X_BASE Tue Jan 6 07:43:07 2015 (r276741) @@ -113,6 +113,8 @@ device ar71xx_wdog device uart device uart_ar933x +device ar71xx_apb + device loop device ether device md Modified: head/sys/mips/conf/AR934X_BASE ============================================================================== --- head/sys/mips/conf/AR934X_BASE Tue Jan 6 07:41:30 2015 (r276740) +++ head/sys/mips/conf/AR934X_BASE Tue Jan 6 07:43:07 2015 (r276741) @@ -117,6 +117,9 @@ device ar71xx_wdog device uart device uart_ar71xx +# XXX for now; later a separate APB mux is needed to demux PCI/WLAN interrupts. +device ar71xx_apb + device loop device ether device md Modified: head/sys/mips/conf/PB92 ============================================================================== --- head/sys/mips/conf/PB92 Tue Jan 6 07:41:30 2015 (r276740) +++ head/sys/mips/conf/PB92 Tue Jan 6 07:43:07 2015 (r276741) @@ -126,6 +126,8 @@ device ar71xx_wdog device uart device uart_ar71xx +device ar71xx_apb + # Network twiddling device loop device ether
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501060743.t067h8oT044415>