 @@ -1,14 +1,14 @@
-/* $NetBSD: mesongx_mmc.c,v 1.13 2021/01/27 03:10:18 thorpej Exp $ */
+/* $NetBSD: mesongx_mmc.c,v 1.14 2021/01/28 11:45:31 jmcneill Exp $ */
 /*-
  * Copyright (c) 2019 Jared McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mesongx_mmc.c,v 1.13 2021/01/27 03:10:18 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mesongx_mmc.c,v 1.14 2021/01/28 11:45:31 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bitops.h>
 #include <sys/gpio.h>
 #include <dev/sdmmc/sdmmcvar.h>
 #include <dev/sdmmc/sdmmcchip.h>
 #include <dev/sdmmc/sdmmc_ioreg.h>
 @@ -486,43 +486,58 @@ mesongx_mmc_set_clock(struct mesongx_mmc
 				continue;
 			const int diff = target_rate - rate;
 			if (diff < best_diff) {
 				best_diff = diff;
 				best_sel = sel;
 				best_div = div;
+			}
+		}
+	}
 	if (best_diff == INT_MAX)
 		return ERANGE;
 	val = MMC_READ(sc, SD_EMMC_CFG);
 	val |= CFG_STOP_CLK;
 	MMC_WRITE(sc, SD_EMMC_CFG, val);
 	val = MMC_READ(sc, SD_EMMC_CFG);
 	if (ddr)
 		val |= CFG_DDR;
 	else
 		val &= ~CFG_DDR;
 	MMC_WRITE(sc, SD_EMMC_CFG, val);
 	val = MMC_READ(sc, SD_EMMC_CLOCK);
 	if (sc->sc_hwtype == MESONGX_MMC_V3)
 		val |= CLOCK_CFG_V3_ALWAYS_ON;
 	else
 		val |= CLOCK_CFG_V2_ALWAYS_ON;
 	val &= ~CLOCK_CFG_RX_PHASE;
 	val |= __SHIFTIN(0, CLOCK_CFG_RX_PHASE);
 	val &= ~CLOCK_CFG_TX_PHASE;
-	val |= __SHIFTIN(2, CLOCK_CFG_TX_PHASE);
+	val |= __SHIFTIN(0, CLOCK_CFG_TX_PHASE);
 	val &= ~CLOCK_CFG_CO_PHASE;
-	val |= __SHIFTIN(3, CLOCK_CFG_CO_PHASE);
+	val |= __SHIFTIN(2, CLOCK_CFG_CO_PHASE);
 	val &= ~CLOCK_CFG_SRC;
 	val |= __SHIFTIN(best_sel, CLOCK_CFG_SRC);
 	val &= ~CLOCK_CFG_DIV;
 	val |= __SHIFTIN(best_div, CLOCK_CFG_DIV);
 	MMC_WRITE(sc, SD_EMMC_CLOCK, val);
 	val = MMC_READ(sc, SD_EMMC_CFG);
 	val &= ~CFG_STOP_CLK;
 	MMC_WRITE(sc, SD_EMMC_CFG, val);
 	return 0;
+}
 static void
 mesongx_mmc_attach_i(device_t self)
+{
 	struct mesongx_mmc_softc * const sc = device_private(self);
 	struct sdmmcbus_attach_args saa;
 	uint32_t width;
 	if (sc->sc_pwrseq)
 		fdtbus_mmc_pwrseq_pre_power_on(sc->sc_pwrseq);
 @@ -723,41 +738,28 @@ mesongx_mmc_write_protect(sdmmc_chipset_
 	return 0;
+}
 static int
 mesongx_mmc_bus_power(sdmmc_chipset_handle_t sch, uint32_t ocr)
+{
 	return 0;
+}
 static int
 mesongx_mmc_bus_clock(sdmmc_chipset_handle_t sch, int freq, bool ddr)
+{
 	struct mesongx_mmc_softc * const sc = sch;
 	uint32_t val;
 	int error;
 	error = mesongx_mmc_set_clock(sc, freq, ddr);
 	if (error != 0)
 		return error;
 	val = MMC_READ(sc, SD_EMMC_CFG);
 	if (ddr)
 		val |= CFG_DDR;
 	else
 		val &= ~CFG_DDR;
 	MMC_WRITE(sc, SD_EMMC_CFG, val);
-	return 0;
+	return mesongx_mmc_set_clock(sc, freq, ddr);
+}
 static int
 mesongx_mmc_bus_width(sdmmc_chipset_handle_t sch, int width)
+{
 	struct mesongx_mmc_softc *sc = sch;
 	uint32_t val;
 	val = MMC_READ(sc, SD_EMMC_CFG);
 	val &= ~CFG_BUS_WIDTH;
 	switch (width) {
 	case 1: