diff options
Diffstat (limited to 'sys/arm/ti/ti_sdhci.c')
| -rw-r--r-- | sys/arm/ti/ti_sdhci.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/sys/arm/ti/ti_sdhci.c b/sys/arm/ti/ti_sdhci.c index 7b44b0958717..3b560d7c64cd 100644 --- a/sys/arm/ti/ti_sdhci.c +++ b/sys/arm/ti/ti_sdhci.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 Ian Lepore <ian@freebsd.org> * Copyright (c) 2011 Ben Gray <ben.r.gray@gmail.com>. @@ -27,8 +27,6 @@ * SUCH DAMAGE. * */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> @@ -48,7 +46,7 @@ __FBSDID("$FreeBSD$"); #include <arm/ti/ti_sysc.h> #include "gpio_if.h" -#include <dev/extres/clk/clk.h> +#include <dev/clk/clk.h> #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> @@ -107,8 +105,6 @@ static struct ofw_compat_data compat_data[] = { * access, and the various per-SoC offsets. The SDHCI_REG_OFFSET is how far * beyond the MMCHS block the SDHCI block is found; it's the same on all SoCs. */ -#define OMAP3_MMCHS_REG_OFFSET 0x000 -#define OMAP4_MMCHS_REG_OFFSET 0x100 #define AM335X_MMCHS_REG_OFFSET 0x100 #define SDHCI_REG_OFFSET 0x100 @@ -544,12 +540,6 @@ ti_sdhci_attach(device_t dev) * Also for OMAP4 disable high speed mode due to erratum ID i626. */ switch (ti_chip()) { -#ifdef SOC_OMAP4 - case CHIP_OMAP_4: - sc->mmchs_reg_off = OMAP4_MMCHS_REG_OFFSET; - sc->disable_highspeed = true; - break; -#endif #ifdef SOC_TI_AM335X case CHIP_AM335X: sc->mmchs_reg_off = AM335X_MMCHS_REG_OFFSET; @@ -689,8 +679,8 @@ ti_sdhci_attach(device_t dev) if (OF_hasprop(node, "non-removable")) sc->force_card_present = true; - bus_generic_probe(dev); - bus_generic_attach(dev); + bus_identify_children(dev); + bus_attach_children(dev); sdhci_start_slot(&sc->slot); return (0); |