svn commit: r248926 - head/sys/mips/atheros

[Adrian Chadd]

Author: adrian
Date: Sat Mar 30 04:13:47 2013
New Revision: 248926
URL: http://svnweb.freebsd.org/changeset/base/248926

Log:
  AR933x UART updates:
  
  * Default clock is 25MHz;
  * Remove the UART register macro here - it's not needed as we don't need
    to "adjust" the register offset / spacing at all;
  * Remove unused fields in the softc.
  
  Tested:
  
  * AP121

Modified:
  head/sys/mips/atheros/uart_dev_ar933x.c

Modified: head/sys/mips/atheros/uart_dev_ar933x.c
==============================================================================
--- head/sys/mips/atheros/uart_dev_ar933x.c	Sat Mar 30 02:26:20 2013	(r248925)
+++ head/sys/mips/atheros/uart_dev_ar933x.c	Sat Mar 30 04:13:47 2013	(r248926)
@@ -41,12 +41,16 @@ __FBSDID("$FreeBSD$");
 
 #include "uart_if.h"
 
-#define	DEFAULT_RCLK	1843200
+/*
+ * Default system clock is 25MHz; see ar933x_chip.c for how
+ * the startup process determines whether it's 25MHz or 40MHz.
+ */
+#define	DEFAULT_RCLK	(25 * 1000 * 1000)
 
 #define	ar933x_getreg(bas, reg)           \
-	bus_space_read_4((bas)->bst, (bas)->bsh, uart_regofs(bas, reg))
+	bus_space_read_4((bas)->bst, (bas)->bsh, reg)
 #define	ar933x_setreg(bas, reg, value)    \
-	bus_space_write_4((bas)->bst, (bas)->bsh, uart_regofs(bas, reg), value)
+	bus_space_write_4((bas)->bst, (bas)->bsh, reg, value)
 
 
 #if 0
@@ -325,14 +329,7 @@ ar933x_getc(struct uart_bas *bas, struct
  */
 struct ar933x_softc {
 	struct uart_softc base;
-#if 0
-	uint8_t		fcr;
-	uint8_t		ier;
-	uint8_t		mcr;
-	
-	uint8_t		ier_mask;
-	uint8_t		ier_rxbits;
-#endif
+
 	uint32_t	u_ier;
 };