summaryrefslogtreecommitdiffstats
path: root/sys/dev/sdhci/sdhci_fdt.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/sdhci/sdhci_fdt.c')
-rw-r--r--sys/dev/sdhci/sdhci_fdt.c72
1 files changed, 35 insertions, 37 deletions
diff --git a/sys/dev/sdhci/sdhci_fdt.c b/sys/dev/sdhci/sdhci_fdt.c
index 27709d0..2e1b30e 100644
--- a/sys/dev/sdhci/sdhci_fdt.c
+++ b/sys/dev/sdhci/sdhci_fdt.c
@@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
-#include <sys/conf.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/module.h>
@@ -46,21 +45,19 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/resource.h>
-#include <machine/stdarg.h>
#include <dev/fdt/fdt_common.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
#include <dev/mmc/bridge.h>
-#include <dev/mmc/mmcreg.h>
-#include <dev/mmc/mmcbrvar.h>
+
#include <dev/sdhci/sdhci.h>
#include "mmcbr_if.h"
#include "sdhci_if.h"
-#define MAX_SLOTS 6
+#define MAX_SLOTS 6
struct sdhci_fdt_softc {
device_t dev; /* Controller device */
@@ -68,7 +65,7 @@ struct sdhci_fdt_softc {
u_int caps; /* If we override SDHCI_CAPABILITIES */
uint32_t max_clk; /* Max possible freq */
struct resource *irq_res; /* IRQ resource */
- void *intrhand; /* Interrupt handle */
+ void *intrhand; /* Interrupt handle */
int num_slots; /* Number of slots on this controller*/
struct sdhci_slot slots[MAX_SLOTS];
@@ -79,14 +76,16 @@ static uint8_t
sdhci_fdt_read_1(device_t dev, struct sdhci_slot *slot, bus_size_t off)
{
struct sdhci_fdt_softc *sc = device_get_softc(dev);
+
return (bus_read_1(sc->mem_res[slot->num], off));
}
static void
sdhci_fdt_write_1(device_t dev, struct sdhci_slot *slot, bus_size_t off,
- uint8_t val)
+ uint8_t val)
{
struct sdhci_fdt_softc *sc = device_get_softc(dev);
+
bus_write_1(sc->mem_res[slot->num], off, val);
}
@@ -94,14 +93,16 @@ static uint16_t
sdhci_fdt_read_2(device_t dev, struct sdhci_slot *slot, bus_size_t off)
{
struct sdhci_fdt_softc *sc = device_get_softc(dev);
+
return (bus_read_2(sc->mem_res[slot->num], off));
}
static void
sdhci_fdt_write_2(device_t dev, struct sdhci_slot *slot, bus_size_t off,
- uint16_t val)
+ uint16_t val)
{
struct sdhci_fdt_softc *sc = device_get_softc(dev);
+
bus_write_2(sc->mem_res[slot->num], off, val);
}
@@ -109,14 +110,16 @@ static uint32_t
sdhci_fdt_read_4(device_t dev, struct sdhci_slot *slot, bus_size_t off)
{
struct sdhci_fdt_softc *sc = device_get_softc(dev);
+
return (bus_read_4(sc->mem_res[slot->num], off));
}
static void
sdhci_fdt_write_4(device_t dev, struct sdhci_slot *slot, bus_size_t off,
- uint32_t val)
+ uint32_t val)
{
struct sdhci_fdt_softc *sc = device_get_softc(dev);
+
bus_write_4(sc->mem_res[slot->num], off, val);
}
@@ -125,6 +128,7 @@ sdhci_fdt_read_multi_4(device_t dev, struct sdhci_slot *slot,
bus_size_t off, uint32_t *data, bus_size_t count)
{
struct sdhci_fdt_softc *sc = device_get_softc(dev);
+
bus_read_multi_4(sc->mem_res[slot->num], off, data, count);
}
@@ -133,6 +137,7 @@ sdhci_fdt_write_multi_4(device_t dev, struct sdhci_slot *slot,
bus_size_t off, uint32_t *data, bus_size_t count)
{
struct sdhci_fdt_softc *sc = device_get_softc(dev);
+
bus_write_multi_4(sc->mem_res[slot->num], off, data, count);
}
@@ -142,10 +147,8 @@ sdhci_fdt_intr(void *arg)
struct sdhci_fdt_softc *sc = (struct sdhci_fdt_softc *)arg;
int i;
- for (i = 0; i < sc->num_slots; i++) {
- struct sdhci_slot *slot = &sc->slots[i];
- sdhci_generic_intr(slot);
- }
+ for (i = 0; i < sc->num_slots; i++)
+ sdhci_generic_intr(&sc->slots[i]);
}
static int
@@ -187,6 +190,7 @@ static int
sdhci_fdt_attach(device_t dev)
{
struct sdhci_fdt_softc *sc = device_get_softc(dev);
+ struct sdhci_slot *slot;
int err, slots, rid, i;
sc->dev = dev;
@@ -194,7 +198,7 @@ sdhci_fdt_attach(device_t dev)
/* Allocate IRQ. */
rid = 0;
sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
- RF_ACTIVE);
+ RF_ACTIVE);
if (sc->irq_res == NULL) {
device_printf(dev, "Can't allocate IRQ\n");
return (ENOMEM);
@@ -204,15 +208,15 @@ sdhci_fdt_attach(device_t dev)
slots = sc->num_slots; /* number of slots determined in probe(). */
sc->num_slots = 0;
for (i = 0; i < slots; i++) {
- struct sdhci_slot *slot = &sc->slots[sc->num_slots];
+ slot = &sc->slots[sc->num_slots];
/* Allocate memory. */
rid = 0;
sc->mem_res[i] = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
&rid, RF_ACTIVE);
if (sc->mem_res[i] == NULL) {
- device_printf(dev, "Can't allocate memory for "
- "slot %d\n", i);
+ device_printf(dev,
+ "Can't allocate memory for slot %d\n", i);
continue;
}
@@ -236,10 +240,8 @@ sdhci_fdt_attach(device_t dev)
}
/* Process cards detection. */
- for (i = 0; i < sc->num_slots; i++) {
- struct sdhci_slot *slot = &sc->slots[i];
- sdhci_start_slot(slot);
- }
+ for (i = 0; i < sc->num_slots; i++)
+ sdhci_start_slot(&sc->slots[i]);
return (0);
}
@@ -253,15 +255,12 @@ sdhci_fdt_detach(device_t dev)
bus_generic_detach(dev);
bus_teardown_intr(dev, sc->irq_res, sc->intrhand);
bus_release_resource(dev, SYS_RES_IRQ, rman_get_rid(sc->irq_res),
- sc->irq_res);
+ sc->irq_res);
for (i = 0; i < sc->num_slots; i++) {
- struct sdhci_slot *slot = &sc->slots[i];
-
- sdhci_cleanup_slot(slot);
+ sdhci_cleanup_slot(&sc->slots[i]);
bus_release_resource(dev, SYS_RES_MEMORY,
- rman_get_rid(sc->mem_res[i]),
- sc->mem_res[i]);
+ rman_get_rid(sc->mem_res[i]), sc->mem_res[i]);
}
return (0);
@@ -269,20 +268,20 @@ sdhci_fdt_detach(device_t dev)
static device_method_t sdhci_fdt_methods[] = {
/* device_if */
- DEVMETHOD(device_probe, sdhci_fdt_probe),
- DEVMETHOD(device_attach, sdhci_fdt_attach),
- DEVMETHOD(device_detach, sdhci_fdt_detach),
+ DEVMETHOD(device_probe, sdhci_fdt_probe),
+ DEVMETHOD(device_attach, sdhci_fdt_attach),
+ DEVMETHOD(device_detach, sdhci_fdt_detach),
/* Bus interface */
DEVMETHOD(bus_read_ivar, sdhci_generic_read_ivar),
DEVMETHOD(bus_write_ivar, sdhci_generic_write_ivar),
/* mmcbr_if */
- DEVMETHOD(mmcbr_update_ios, sdhci_generic_update_ios),
- DEVMETHOD(mmcbr_request, sdhci_generic_request),
- DEVMETHOD(mmcbr_get_ro, sdhci_generic_get_ro),
- DEVMETHOD(mmcbr_acquire_host, sdhci_generic_acquire_host),
- DEVMETHOD(mmcbr_release_host, sdhci_generic_release_host),
+ DEVMETHOD(mmcbr_update_ios, sdhci_generic_update_ios),
+ DEVMETHOD(mmcbr_request, sdhci_generic_request),
+ DEVMETHOD(mmcbr_get_ro, sdhci_generic_get_ro),
+ DEVMETHOD(mmcbr_acquire_host, sdhci_generic_acquire_host),
+ DEVMETHOD(mmcbr_release_host, sdhci_generic_release_host),
/* SDHCI registers accessors */
DEVMETHOD(sdhci_read_1, sdhci_fdt_read_1),
@@ -307,5 +306,4 @@ static devclass_t sdhci_fdt_devclass;
DRIVER_MODULE(sdhci_fdt, simplebus, sdhci_fdt_driver, sdhci_fdt_devclass,
NULL, NULL);
MODULE_DEPEND(sdhci_fdt, sdhci, 1, 1, 1);
-DRIVER_MODULE(mmc, sdhci_fdt, mmc_driver, mmc_devclass, NULL, NULL);
-MODULE_DEPEND(sdhci_fdt, mmc, 1, 1, 1);
+MMC_DECLARE_BRIDGE(sdhci_fdt);
OpenPOWER on IntegriCloud