Module Name: src
Committed By: snj
Date: Thu Dec 10 23:44:11 UTC 2015
Modified Files:
src/sys/arch/arm/allwinner [netbsd-7]: awin_mmc.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1043):
sys/arch/arm/allwinner/awin_mmc.c: revision 1.23 via patch
Wait 20ms for the PLL to stabilize after enabling it.
Fixes occasional bogus size report for my SD card.
To generate a diff of this commit:
cvs rdiff -u -r1.3.10.4 -r1.3.10.5 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.3.10.4 src/sys/arch/arm/allwinner/awin_mmc.c:1.3.10.5
--- src/sys/arch/arm/allwinner/awin_mmc.c:1.3.10.4 Sat Nov 7 16:15:03 2015
+++ src/sys/arch/arm/allwinner/awin_mmc.c Thu Dec 10 23:44:11 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_mmc.c,v 1.3.10.4 2015/11/07 16:15:03 riz Exp $ */
+/* $NetBSD: awin_mmc.c,v 1.3.10.5 2015/12/10 23:44:11 snj Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awin_mmc.c,v 1.3.10.4 2015/11/07 16:15:03 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_mmc.c,v 1.3.10.5 2015/12/10 23:44:11 snj Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -557,6 +557,7 @@ awin_mmc_bus_clock(sdmmc_chipset_handle_
clk |= __SHIFTIN(sdly, AWIN_SD_CLK_PHASE_CTR);
clk |= AWIN_PLL_CFG_ENABLE;
bus_space_write_4(sc->sc_bst, sc->sc_clk_bsh, 0, clk);
+ delay(20000);
clkcr |= AWIN_MMC_CLKCR_CARDCLKON;
MMC_WRITE(sc, AWIN_MMC_CLKCR, clkcr);
