From owner-svn-src-head@freebsd.org Thu Feb 1 22:00:05 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D1D97ECD7AF; Thu, 1 Feb 2018 22:00:05 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7694569F14; Thu, 1 Feb 2018 22:00:05 +0000 (UTC) (envelope-from adrian@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 71AD612D5B; Thu, 1 Feb 2018 22:00:05 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w11M05ac000886; Thu, 1 Feb 2018 22:00:05 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w11M05V9000884; Thu, 1 Feb 2018 22:00:05 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201802012200.w11M05V9000884@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Thu, 1 Feb 2018 22:00:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r328755 - head/sys/mips/conf X-SVN-Group: head X-SVN-Commit-Author: adrian X-SVN-Commit-Paths: head/sys/mips/conf X-SVN-Commit-Revision: 328755 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Feb 2018 22:00:06 -0000 Author: adrian Date: Thu Feb 1 22:00:05 2018 New Revision: 328755 URL: https://svnweb.freebsd.org/changeset/base/328755 Log: [atheros] Teach the QCA955x SoC code about the new hints stuff. Modified: head/sys/mips/conf/QCA955X_BASE.hints head/sys/mips/conf/std.QCA955X Modified: head/sys/mips/conf/QCA955X_BASE.hints ============================================================================== --- head/sys/mips/conf/QCA955X_BASE.hints Thu Feb 1 21:58:52 2018 (r328754) +++ head/sys/mips/conf/QCA955X_BASE.hints Thu Feb 1 22:00:05 2018 (r328755) @@ -12,6 +12,10 @@ hint.apb.0.at="nexus0" # the irq ranges appropriately. hint.apb.0.irq=4 +# ART calibration data mapping device +hint.ar71xx_caldata.0.at="nexus0" +hint.ar71xx_caldata.0.order=0 + # uart0 hint.uart.0.at="apb0" # NB: This isn't an ns8250 UART @@ -59,9 +63,13 @@ hint.ath.0.msize=0x20000 hint.ath.0.irq=0 hint.ath.0.vendor_id=0x168c hint.ath.0.device_id=0x0039 -# Set this to define where the ath calibration data -# should be fetched from in physical memory. -# hint.ath.0.eepromaddr=0x1fff1000 + +# Where the ART is - last 64k in the first 8MB of flash +#hint.ar71xx_caldata.0.map.0.ath_fixup_addr=0x1fff0000 +#hint.ar71xx_caldata.0.map.0.ath_fixup_size=16384 + +# And now tell the ath(4) driver where to look! +#hint.ath.0.eeprom_firmware="ar71xx_caldata.0.map.0.eeprom_firmware" # SPI flash hint.spi.0.at="nexus0" Modified: head/sys/mips/conf/std.QCA955X ============================================================================== --- head/sys/mips/conf/std.QCA955X Thu Feb 1 21:58:52 2018 (r328754) +++ head/sys/mips/conf/std.QCA955X Thu Feb 1 22:00:05 2018 (r328755) @@ -50,7 +50,17 @@ options NO_FFS_SNAPSHOT # We don't require snapshot include "std.AR_MIPS_BASE" makeoptions MODULES_OVERRIDE+="hwpmc_mips74k" +# EEPROM caldata for AHB connected device +options AR71XX_ATH_EEPROM +device ar71xx_caldata +device firmware + +# Support QCA955x in the HAL option AH_SUPPORT_QCA9550 # Chipset support + +# Support EEPROM caldata in AHB devices +options ATH_EEPROM_FIRMWARE + device uart_ar71xx device ar71xx_apb