Module Name: src Committed By: jmcneill Date: Sun Oct 27 17:21:23 UTC 2019
Modified Files: src/sys/arch/arm/ti: ti_sdhc.c ti_sdhcreg.h Log Message: Disable autoidle To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/ti/ti_sdhc.c \ src/sys/arch/arm/ti/ti_sdhcreg.h 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/ti/ti_sdhc.c diff -u src/sys/arch/arm/ti/ti_sdhc.c:1.1 src/sys/arch/arm/ti/ti_sdhc.c:1.2 --- src/sys/arch/arm/ti/ti_sdhc.c:1.1 Sun Oct 27 15:43:46 2019 +++ src/sys/arch/arm/ti/ti_sdhc.c Sun Oct 27 17:21:23 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ti_sdhc.c,v 1.1 2019/10/27 15:43:46 jmcneill Exp $ */ +/* $NetBSD: ti_sdhc.c,v 1.2 2019/10/27 17:21:23 jmcneill Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ti_sdhc.c,v 1.1 2019/10/27 15:43:46 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ti_sdhc.c,v 1.2 2019/10/27 17:21:23 jmcneill Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -297,8 +297,12 @@ no_dma: aprint_error_dev(dev, "Soft reset timeout\n"); bus_space_write_4(sc->sc_bst, sc->sc_bsh, MMCHS_SYSCONFIG, SYSCONFIG_ENAWAKEUP | +#if notyet SYSCONFIG_AUTOIDLE | SYSCONFIG_SIDLEMODE_AUTO | +#else + SYSCONFIG_SIDLEMODE_IGNORE | +#endif SYSCONFIG_CLOCKACTIVITY_FCLK | SYSCONFIG_CLOCKACTIVITY_ICLK); Index: src/sys/arch/arm/ti/ti_sdhcreg.h diff -u src/sys/arch/arm/ti/ti_sdhcreg.h:1.1 src/sys/arch/arm/ti/ti_sdhcreg.h:1.2 --- src/sys/arch/arm/ti/ti_sdhcreg.h:1.1 Sun Oct 27 15:43:46 2019 +++ src/sys/arch/arm/ti/ti_sdhcreg.h Sun Oct 27 17:21:23 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ti_sdhcreg.h,v 1.1 2019/10/27 15:43:46 jmcneill Exp $ */ +/* $NetBSD: ti_sdhcreg.h,v 1.2 2019/10/27 17:21:23 jmcneill Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. * All rights reserved. @@ -61,6 +61,7 @@ # define SYSCONFIG_CLOCKACTIVITY_ICLK (1 << 8) # define SYSCONFIG_SIDLEMODE_MASK (3 << 3) # define SYSCONFIG_SIDLEMODE_AUTO (2 << 3) +# define SYSCONFIG_SIDLEMODE_IGNORE (1 << 3) # define SYSCONFIG_ENAWAKEUP (1 << 2) # define SYSCONFIG_SOFTRESET (1 << 1) # define SYSCONFIG_AUTOIDLE (1 << 0)