From owner-svn-src-all@freebsd.org Fri Jul 3 03:34:22 2015 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 ADA5C99476A; Fri, 3 Jul 2015 03:34:22 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 9F62B2027; Fri, 3 Jul 2015 03:34:22 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t633YM5S000155; Fri, 3 Jul 2015 03:34:22 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t633YMCa000153; Fri, 3 Jul 2015 03:34:22 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201507030334.t633YMCa000153@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Fri, 3 Jul 2015 03:34:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r285073 - head/sys/mips/atheros 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.20 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: Fri, 03 Jul 2015 03:34:22 -0000 Author: adrian Date: Fri Jul 3 03:34:21 2015 New Revision: 285073 URL: https://svnweb.freebsd.org/changeset/base/285073 Log: Enable setting the QCA955x GPIO output mux configuration. It's not used by any boards yet, but it's going to creep up soon as more boards show up. Modified: head/sys/mips/atheros/qca955x_chip.c Modified: head/sys/mips/atheros/qca955x_chip.c ============================================================================== --- head/sys/mips/atheros/qca955x_chip.c Fri Jul 3 03:32:54 2015 (r285072) +++ head/sys/mips/atheros/qca955x_chip.c Fri Jul 3 03:34:21 2015 (r285073) @@ -351,7 +351,7 @@ qca955x_chip_reset_nfc(int active) /* * Configure the GPIO output mux setup. * - * The AR934x introduced an output mux which allowed + * The QCA955x has an output mux which allowed * certain functions to be configured on any pin. * Specifically, the switch PHY link LEDs and * WMAC external RX LNA switches are not limited to @@ -360,14 +360,13 @@ qca955x_chip_reset_nfc(int active) static void qca955x_chip_gpio_output_configure(int gpio, uint8_t func) { -#if 0 uint32_t reg, s; uint32_t t; if (gpio > QCA955X_GPIO_COUNT) return; - reg = AR934X_GPIO_REG_OUT_FUNC0 + 4 * (gpio / 4); + reg = QCA955X_GPIO_REG_OUT_FUNC0 + 4 * (gpio / 4); s = 8 * (gpio % 4); /* read-modify-write */ @@ -378,7 +377,6 @@ qca955x_chip_gpio_output_configure(int g /* flush write */ ATH_READ_REG(AR71XX_GPIO_BASE + reg); -#endif } struct ar71xx_cpu_def qca955x_chip_def = {