forked from luck/tmp_suning_uos_patched
gpio/twl4030: get platform data from device tree
Adds a number of missing device tree properties for twl4030/gpio, and update bindings: - "ti,use-leds" -> .use_leds - "ti,debounce" -> .debounce - "ti,mmc-cd" -> .mmc_cd - "ti,pullups" -> .pullups - "ti,pulldowns" -> .pulldowns Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch> Acked-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Vaibhav Hiremath <hvaibhav@ti.com> [b-cousson@ti.com: Fix some checkpatch CHECK issues] Signed-off-by: Benoit Cousson <b-cousson@ti.com>
This commit is contained in:
parent
5635121edb
commit
f74ce8fb84
@ -11,6 +11,11 @@ Required properties:
|
|||||||
- interrupt-controller: Mark the device node as an interrupt controller
|
- interrupt-controller: Mark the device node as an interrupt controller
|
||||||
The first cell is the GPIO number.
|
The first cell is the GPIO number.
|
||||||
The second cell is not used.
|
The second cell is not used.
|
||||||
|
- ti,use-leds : Enables LEDA and LEDB outputs if set
|
||||||
|
- ti,debounce : if n-th bit is set, debounces GPIO-n
|
||||||
|
- ti,mmc-cd : if n-th bit is set, GPIO-n controls VMMC(n+1)
|
||||||
|
- ti,pullups : if n-th bit is set, set a pullup on GPIO-n
|
||||||
|
- ti,pulldowns : if n-th bit is set, set a pulldown on GPIO-n
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
|
|
||||||
@ -20,4 +25,5 @@ twl_gpio: gpio {
|
|||||||
gpio-controller;
|
gpio-controller;
|
||||||
#interrupt-cells = <2>;
|
#interrupt-cells = <2>;
|
||||||
interrupt-controller;
|
interrupt-controller;
|
||||||
|
ti,use-leds;
|
||||||
};
|
};
|
||||||
|
@ -395,6 +395,31 @@ static int __devinit gpio_twl4030_debounce(u32 debounce, u8 mmc_cd)
|
|||||||
|
|
||||||
static int gpio_twl4030_remove(struct platform_device *pdev);
|
static int gpio_twl4030_remove(struct platform_device *pdev);
|
||||||
|
|
||||||
|
static struct twl4030_gpio_platform_data *of_gpio_twl4030(struct device *dev)
|
||||||
|
{
|
||||||
|
struct twl4030_gpio_platform_data *omap_twl_info;
|
||||||
|
|
||||||
|
omap_twl_info = devm_kzalloc(dev, sizeof(*omap_twl_info), GFP_KERNEL);
|
||||||
|
if (!omap_twl_info)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
omap_twl_info->gpio_base = -1;
|
||||||
|
|
||||||
|
omap_twl_info->use_leds = of_property_read_bool(dev->of_node,
|
||||||
|
"ti,use-leds");
|
||||||
|
|
||||||
|
of_property_read_u32(dev->of_node, "ti,debounce",
|
||||||
|
&omap_twl_info->debounce);
|
||||||
|
of_property_read_u32(dev->of_node, "ti,mmc-cd",
|
||||||
|
(u32 *)&omap_twl_info->mmc_cd);
|
||||||
|
of_property_read_u32(dev->of_node, "ti,pullups",
|
||||||
|
&omap_twl_info->pullups);
|
||||||
|
of_property_read_u32(dev->of_node, "ti,pulldowns",
|
||||||
|
&omap_twl_info->pulldowns);
|
||||||
|
|
||||||
|
return omap_twl_info;
|
||||||
|
}
|
||||||
|
|
||||||
static int __devinit gpio_twl4030_probe(struct platform_device *pdev)
|
static int __devinit gpio_twl4030_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct twl4030_gpio_platform_data *pdata = pdev->dev.platform_data;
|
struct twl4030_gpio_platform_data *pdata = pdev->dev.platform_data;
|
||||||
@ -423,39 +448,42 @@ static int __devinit gpio_twl4030_probe(struct platform_device *pdev)
|
|||||||
twl4030_gpio_irq_base = irq_base;
|
twl4030_gpio_irq_base = irq_base;
|
||||||
|
|
||||||
no_irqs:
|
no_irqs:
|
||||||
twl_gpiochip.base = -1;
|
|
||||||
twl_gpiochip.ngpio = TWL4030_GPIO_MAX;
|
twl_gpiochip.ngpio = TWL4030_GPIO_MAX;
|
||||||
twl_gpiochip.dev = &pdev->dev;
|
twl_gpiochip.dev = &pdev->dev;
|
||||||
|
|
||||||
if (pdata) {
|
if (node)
|
||||||
twl_gpiochip.base = pdata->gpio_base;
|
pdata = of_gpio_twl4030(&pdev->dev);
|
||||||
|
|
||||||
/*
|
if (pdata == NULL) {
|
||||||
* NOTE: boards may waste power if they don't set pullups
|
dev_err(&pdev->dev, "Platform data is missing\n");
|
||||||
* and pulldowns correctly ... default for non-ULPI pins is
|
return -ENXIO;
|
||||||
* pulldown, and some other pins may have external pullups
|
|
||||||
* or pulldowns. Careful!
|
|
||||||
*/
|
|
||||||
ret = gpio_twl4030_pulls(pdata->pullups, pdata->pulldowns);
|
|
||||||
if (ret)
|
|
||||||
dev_dbg(&pdev->dev, "pullups %.05x %.05x --> %d\n",
|
|
||||||
pdata->pullups, pdata->pulldowns,
|
|
||||||
ret);
|
|
||||||
|
|
||||||
ret = gpio_twl4030_debounce(pdata->debounce, pdata->mmc_cd);
|
|
||||||
if (ret)
|
|
||||||
dev_dbg(&pdev->dev, "debounce %.03x %.01x --> %d\n",
|
|
||||||
pdata->debounce, pdata->mmc_cd,
|
|
||||||
ret);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* NOTE: we assume VIBRA_CTL.VIBRA_EN, in MODULE_AUDIO_VOICE,
|
|
||||||
* is (still) clear if use_leds is set.
|
|
||||||
*/
|
|
||||||
if (pdata->use_leds)
|
|
||||||
twl_gpiochip.ngpio += 2;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
twl_gpiochip.base = pdata->gpio_base;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* NOTE: boards may waste power if they don't set pullups
|
||||||
|
* and pulldowns correctly ... default for non-ULPI pins is
|
||||||
|
* pulldown, and some other pins may have external pullups
|
||||||
|
* or pulldowns. Careful!
|
||||||
|
*/
|
||||||
|
ret = gpio_twl4030_pulls(pdata->pullups, pdata->pulldowns);
|
||||||
|
if (ret)
|
||||||
|
dev_dbg(&pdev->dev, "pullups %.05x %.05x --> %d\n",
|
||||||
|
pdata->pullups, pdata->pulldowns, ret);
|
||||||
|
|
||||||
|
ret = gpio_twl4030_debounce(pdata->debounce, pdata->mmc_cd);
|
||||||
|
if (ret)
|
||||||
|
dev_dbg(&pdev->dev, "debounce %.03x %.01x --> %d\n",
|
||||||
|
pdata->debounce, pdata->mmc_cd, ret);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* NOTE: we assume VIBRA_CTL.VIBRA_EN, in MODULE_AUDIO_VOICE,
|
||||||
|
* is (still) clear if use_leds is set.
|
||||||
|
*/
|
||||||
|
if (pdata->use_leds)
|
||||||
|
twl_gpiochip.ngpio += 2;
|
||||||
|
|
||||||
ret = gpiochip_add(&twl_gpiochip);
|
ret = gpiochip_add(&twl_gpiochip);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
dev_err(&pdev->dev, "could not register gpiochip, %d\n", ret);
|
dev_err(&pdev->dev, "could not register gpiochip, %d\n", ret);
|
||||||
|
Loading…
Reference in New Issue
Block a user