Date: Thu, 16 Jan 2020 21:50:54 +0000 (UTC) From: Emmanuel Vadot <manu@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356813 - head/sys/dev/mmc/host Message-ID: <202001162150.00GLosHj057687@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: manu Date: Thu Jan 16 21:50:53 2020 New Revision: 356813 URL: https://svnweb.freebsd.org/changeset/base/356813 Log: dwmmc: Remove max_hz from the softc We never use it so directly set the value to the mmc host structure. Modified: head/sys/dev/mmc/host/dwmmc.c head/sys/dev/mmc/host/dwmmc_var.h Modified: head/sys/dev/mmc/host/dwmmc.c ============================================================================== --- head/sys/dev/mmc/host/dwmmc.c Thu Jan 16 21:45:21 2020 (r356812) +++ head/sys/dev/mmc/host/dwmmc.c Thu Jan 16 21:50:53 2020 (r356813) @@ -484,8 +484,8 @@ parse_fdt(struct dwmmc_softc *sc) sc->host.caps |= MMC_CAP_8_BIT_DATA; /* max-frequency */ - if (OF_getencprop(node, "max-frequency", &sc->max_hz, sizeof(uint32_t)) <= 0) - sc->max_hz = 200000000; + if (OF_getencprop(node, "max-frequency", &sc->host.f_max, sizeof(uint32_t)) <= 0) + sc->host.f_max = 200000000; /* fifo-depth */ if ((len = OF_getproplen(node, "fifo-depth")) > 0) { @@ -726,7 +726,6 @@ dwmmc_attach(device_t dev) WRITE4(sc, SDMMC_CTRL, SDMMC_CTRL_INT_ENABLE); sc->host.f_min = 400000; - sc->host.f_max = sc->max_hz; sc->host.host_ocr = MMC_OCR_320_330 | MMC_OCR_330_340; sc->host.caps |= MMC_CAP_HSPEED; sc->host.caps |= MMC_CAP_SIGNALING_330; Modified: head/sys/dev/mmc/host/dwmmc_var.h ============================================================================== --- head/sys/dev/mmc/host/dwmmc_var.h Thu Jan 16 21:45:21 2020 (r356812) +++ head/sys/dev/mmc/host/dwmmc_var.h Thu Jan 16 21:50:53 2020 (r356813) @@ -79,7 +79,6 @@ struct dwmmc_softc { uint32_t acd_rcvd; uint32_t cmd_done; uint64_t bus_hz; - uint32_t max_hz; uint32_t fifo_depth; uint32_t num_slots; uint32_t sdr_timing;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001162150.00GLosHj057687>