d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the new sdhci_fdt_gpio helper functions to add full support for FDT

Browse Source 
gpio pins for detecting card insert/remove and write protect.
This commit is contained in:
Ian Lepore 2017-01-09 01:57:51 +00:00
parent 78906a722f
commit e62eb51d5a
1 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
sys/arm/ti/ti_sdhci.c
View File

@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$");
#include <dev/mmc/mmcbrvar.h>
#include <dev/sdhci/sdhci.h>
#include <dev/sdhci/sdhci_fdt_gpio.h>
#include "sdhci_if.h"
#include <arm/ti/ti_cpuid.h>
@ -61,7 +62,7 @@ __FBSDID("$FreeBSD$");
struct ti_sdhci_softc {
device_t dev;
device_t gpio_dev;
struct sdhci_fdt_gpio * gpio;
struct resource * mem_res;
struct resource * irq_res;
void * intr_cookie;
@ -362,20 +363,24 @@ static int
ti_sdhci_get_ro(device_t brdev, device_t reqdev)
{
struct ti_sdhci_softc *sc = device_get_softc(brdev);
unsigned int readonly = 0;
/* If a gpio pin is configured, read it. */
if (sc->gpio_dev != NULL) {
GPIO_PIN_GET(sc->gpio_dev, sc->wp_gpio_pin, &readonly);
}
return (sdhci_fdt_gpio_get_readonly(sc->gpio));
}
return (readonly);
static bool
ti_sdhci_get_card_present(device_t dev, struct sdhci_slot *slot)
{
struct ti_sdhci_softc *sc = device_get_softc(dev);
return (sdhci_fdt_gpio_get_present(sc->gpio));
}
static int
ti_sdhci_detach(device_t dev)
{
/* sdhci_fdt_gpio_teardown(sc->gpio); */
return (EBUSY);
}
@ -501,25 +506,6 @@ ti_sdhci_attach(device_t dev)
sc->slot.host.caps |= MMC_OCR_290_300 | MMC_OCR_300_310;
}
/*
* See if we've got a GPIO-based write detect pin. This is not the
* standard documented property for this, we added it in freebsd.
*/
if ((OF_getencprop(node, "mmchs-wp-gpio-pin", &prop, sizeof(prop))) <= 0)
sc->wp_gpio_pin = 0xffffffff;
else
sc->wp_gpio_pin = prop;
if (sc->wp_gpio_pin != 0xffffffff) {
sc->gpio_dev = devclass_get_device(devclass_find("gpio"), 0);
if (sc->gpio_dev == NULL)
device_printf(dev, "Error: No GPIO device, "
"Write Protect pin will not function\n");
else
GPIO_PIN_SETFLAGS(sc->gpio_dev, sc->wp_gpio_pin,
GPIO_PIN_INPUT);
}
/*
* Set the offset from the device's memory start to the MMCHS registers.
* Also for OMAP4 disable high speed mode due to erratum ID i626.
@ -572,6 +558,8 @@ ti_sdhci_attach(device_t dev)
goto fail;
}
sc->gpio = sdhci_fdt_gpio_setup(sc->dev, &sc->slot);
/* Initialise the MMCHS hardware. */
ti_sdhci_hw_init(dev);
@ -706,6 +694,7 @@ static device_method_t ti_sdhci_methods[] = {
DEVMETHOD(sdhci_write_2, ti_sdhci_write_2),
DEVMETHOD(sdhci_write_4, ti_sdhci_write_4),
DEVMETHOD(sdhci_write_multi_4, ti_sdhci_write_multi_4),
DEVMETHOD(sdhci_get_card_present, ti_sdhci_get_card_present),
DEVMETHOD_END
};