[src/netbsd-7]: src/sys/arch/arm/allwinner Pull up following revision(s) (req...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5729595d4750
branches:  netbsd-7
changeset: 799729:5729595d4750
user:      snj <snj%NetBSD.org@localhost>
date:      Thu Dec 10 23:44:11 2015 +0000

description:
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.

diffstat:

 sys/arch/arm/allwinner/awin_mmc.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 370d81e1d48e -r 5729595d4750 sys/arch/arm/allwinner/awin_mmc.c
--- a/sys/arch/arm/allwinner/awin_mmc.c Wed Dec 02 07:30:54 2015 +0000
+++ b/sys/arch/arm/allwinner/awin_mmc.c Thu Dec 10 23:44:11 2015 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
                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);