svn commit: r238358 - head/sys/arm/at91

[Warner Losh]

Author: imp
Date: Tue Jul 10 23:11:52 2012
New Revision: 238358
URL: http://svn.freebsd.org/changeset/base/238358

Log:
  Remove some more unused code.

Modified:
  head/sys/arm/at91/at91rm9200.c
  head/sys/arm/at91/at91sam9x25.c

Modified: head/sys/arm/at91/at91rm9200.c
==============================================================================
--- head/sys/arm/at91/at91rm9200.c	Tue Jul 10 22:10:21 2012	(r238357)
+++ head/sys/arm/at91/at91rm9200.c	Tue Jul 10 23:11:52 2012	(r238358)
@@ -50,7 +50,6 @@ struct at91rm92_softc {
 	bus_space_handle_t sc_sh;
 	bus_space_handle_t sc_sys_sh;
 	bus_space_handle_t sc_aic_sh;
-	bus_space_handle_t sc_matrix_sh;
 };
 /*
  * Standard priority levels for the system.  0 is lowest and 7 is highest.

Modified: head/sys/arm/at91/at91sam9x25.c
==============================================================================
--- head/sys/arm/at91/at91sam9x25.c	Tue Jul 10 22:10:21 2012	(r238357)
+++ head/sys/arm/at91/at91sam9x25.c	Tue Jul 10 23:11:52 2012	(r238358)
@@ -50,7 +50,6 @@ struct at91sam9x25_softc {
 	bus_space_handle_t sc_sh;
 	bus_space_handle_t sc_sys_sh;
 	bus_space_handle_t sc_aic_sh;
-	bus_space_handle_t sc_matrix_sh;
 };
 
 /*
@@ -232,20 +231,6 @@ at91_attach(device_t dev)
 	bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_IDCR, 0xffffffff);
 	bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_ICCR, 0xffffffff);
 
-	if (bus_space_subregion(sc->sc_st, sc->sc_sh,
-	    AT91SAM9X25_MATRIX_BASE, AT91SAM9X25_MATRIX_SIZE,
-	    &sc->sc_matrix_sh) != 0)
-		panic("Enable to map matrix registers");
-
-#if 0 /* wrong, placeholder */
-	/* activate NAND*/
-	i = bus_space_read_4(sc->sc_st, sc->sc_matrix_sh,
-	    AT91SAM9X25_EBICSA);
-	bus_space_write_4(sc->sc_st, sc->sc_matrix_sh,
-	    AT91SAM9X25_EBICSA, 
-	    i | AT91_MATRIX_EBI_CS3A_SMC_SMARTMEDIA);
-#endif
-
 	/* Update USB device port clock info */
 	clk = at91_pmc_clock_ref("udpck");
 	clk->pmc_mask  = PMC_SCER_UDP_SAM9;