From owner-svn-src-all@FreeBSD.ORG Tue Jul 10 23:11:53 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 067DF1065673; Tue, 10 Jul 2012 23:11:53 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E64568FC08; Tue, 10 Jul 2012 23:11:52 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6ANBqxU008959; Tue, 10 Jul 2012 23:11:52 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6ANBqN8008956; Tue, 10 Jul 2012 23:11:52 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201207102311.q6ANBqN8008956@svn.freebsd.org> From: Warner Losh Date: Tue, 10 Jul 2012 23:11:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r238358 - head/sys/arm/at91 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Tue, 10 Jul 2012 23:11:53 -0000 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;