Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 3 Jul 2015 03:34:22 +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: r285073 - head/sys/mips/atheros
Message-ID:  <201507030334.t633YMCa000153@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 = {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507030334.t633YMCa000153>