Module Name: src Committed By: jmcneill Date: Fri Oct 10 17:49:55 UTC 2014
Modified Files: src/sys/arch/arm/allwinner: awin_mmc.c Log Message: correct a typo in sd clk reg offsets for mmc>0 and dont bother with pll6_enable To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/allwinner/awin_mmc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/arm/allwinner/awin_mmc.c diff -u src/sys/arch/arm/allwinner/awin_mmc.c:1.12 src/sys/arch/arm/allwinner/awin_mmc.c:1.13 --- src/sys/arch/arm/allwinner/awin_mmc.c:1.12 Fri Oct 10 07:36:11 2014 +++ src/sys/arch/arm/allwinner/awin_mmc.c Fri Oct 10 17:49:55 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: awin_mmc.c,v 1.12 2014/10/10 07:36:11 jmcneill Exp $ */ +/* $NetBSD: awin_mmc.c,v 1.13 2014/10/10 17:49:55 jmcneill Exp $ */ /*- * Copyright (c) 2014 Jared D. McNeill <jmcne...@invisible.ca> @@ -29,7 +29,7 @@ #include "locators.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: awin_mmc.c,v 1.12 2014/10/10 07:36:11 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: awin_mmc.c,v 1.13 2014/10/10 17:49:55 jmcneill Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -184,7 +184,7 @@ awin_mmc_probe_clocks(struct awin_mmc_so sc->sc_mod_clk = sc->sc_pll_freq / (div + 1); bus_space_write_4(aio->aio_core_bst, aio->aio_ccm_bsh, - AWIN_SD0_CLK_REG + (sc->sc_mmc_number * 8), + AWIN_SD0_CLK_REG + (sc->sc_mmc_number * 4), AWIN_PLL_CFG_ENABLE | AWIN_PLL_CFG_PLL6 | div); #ifdef AWIN_MMC_DEBUG @@ -254,7 +254,7 @@ awin_mmc_attach(device_t parent, device_ bus_space_subregion(sc->sc_bst, aio->aio_core_bsh, loc->loc_offset, loc->loc_size, &sc->sc_bsh); bus_space_subregion(sc->sc_bst, aio->aio_ccm_bsh, - AWIN_SD0_CLK_REG + (loc->loc_port * 8), 0, &sc->sc_clk_bsh); + AWIN_SD0_CLK_REG + (loc->loc_port * 4), 0, &sc->sc_clk_bsh); sc->sc_use_dma = true; prop_dictionary_get_bool(cfg, "dma", &sc->sc_use_dma); @@ -262,7 +262,6 @@ awin_mmc_attach(device_t parent, device_ aprint_naive("\n"); aprint_normal(": SD3.0 (%s)\n", sc->sc_use_dma ? "DMA" : "PIO"); - awin_pll6_enable(); awin_mmc_probe_clocks(sc, aio); if (prop_dictionary_get_cstring_nocopy(cfg, "detect-gpio", &pin_name)) {