openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: 6373/1: tc35892-gpio: add setup/remove callbacks 

For board-specific initialization.

Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: linux-kernel@vger.kernel.org
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Rabin Vincent 2010-09-13 13:04:02 +01:00 committed by Russell King
parent f066439cfc
commit f0a7a98d1d
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpio/tc35892-gpio.c
View File

@ -322,6 +322,9 @@ static int __devinit tc35892_gpio_probe(struct platform_device *pdev)
goto out_freeirq; goto out_freeirq;
} }
if (pdata->setup)
pdata->setup(tc35892, tc35892_gpio->chip.base);
platform_set_drvdata(pdev, tc35892_gpio); platform_set_drvdata(pdev, tc35892_gpio);
return 0; return 0;
@ -338,9 +341,14 @@ static int __devinit tc35892_gpio_probe(struct platform_device *pdev)
static int __devexit tc35892_gpio_remove(struct platform_device *pdev) static int __devexit tc35892_gpio_remove(struct platform_device *pdev)
{ {
struct tc35892_gpio *tc35892_gpio = platform_get_drvdata(pdev); struct tc35892_gpio *tc35892_gpio = platform_get_drvdata(pdev);
struct tc35892 *tc35892 = tc35892_gpio->tc35892;
struct tc35892_gpio_platform_data *pdata = tc35892->pdata->gpio;
int irq = platform_get_irq(pdev, 0); int irq = platform_get_irq(pdev, 0);
int ret; int ret;
if (pdata->remove)
pdata->remove(tc35892, tc35892_gpio->chip.base);
ret = gpiochip_remove(&tc35892_gpio->chip); ret = gpiochip_remove(&tc35892_gpio->chip);
if (ret < 0) { if (ret < 0) {
dev_err(tc35892_gpio->dev, dev_err(tc35892_gpio->dev,

4
include/linux/mfd/tc35892.h
View File

@ -111,9 +111,13 @@ extern int tc35892_set_bits(struct tc35892 *tc35892, u8 reg, u8 mask, u8 val);
* struct tc35892_gpio_platform_data - TC35892 GPIO platform data * struct tc35892_gpio_platform_data - TC35892 GPIO platform data
* @gpio_base: first gpio number assigned to TC35892. A maximum of * @gpio_base: first gpio number assigned to TC35892. A maximum of
* %TC35892_NR_GPIOS GPIOs will be allocated. * %TC35892_NR_GPIOS GPIOs will be allocated.
* @setup: callback for board-specific initialization
* @remove: callback for board-specific teardown
*/ */
struct tc35892_gpio_platform_data { struct tc35892_gpio_platform_data {
int gpio_base; int gpio_base;
void (*setup)(struct tc35892 *tc35892, unsigned gpio_base);
void (*remove)(struct tc35892 *tc35892, unsigned gpio_base);
}; };
/** /**