lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6

Browse Source 
GPIO fixes for v3.3-rc2

Straight forward bug fixes in this branch.  A couple of x86 gpio drivers
missing spinlock initialization, an API change fixup for the samsung driver
and a name typo fix.

* tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6:
  gpio: Add missing spin_lock_init in gpio-ml-ioh driver
  gpio: Add missing spin_lock_init in gpio-pch driver
  gpio: samsung: adapt to changes in gpio specifier translator function declaration
  Correct bad gpio naming
This commit is contained in:
Linus Torvalds
2012-02-06 15:29:56 -08:00
parent 105e518093 7e3a70fb7b
commit 8597559a78
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpio/gpio-lpc32xx.c
View File

@@ -96,7 +96,7 @@ static const char *gpio_p2_names[LPC32XX_GPIO_P2_MAX] = {
}; };
static const char *gpio_p3_names[LPC32XX_GPIO_P3_MAX] = { static const char *gpio_p3_names[LPC32XX_GPIO_P3_MAX] = {
"gpi000", "gpio01", "gpio02", "gpio03", "gpio00", "gpio01", "gpio02", "gpio03",
"gpio04", "gpio05" "gpio04", "gpio05"
}; };

1
drivers/gpio/gpio-ml-ioh.c
View File

@@ -448,6 +448,7 @@ static int __devinit ioh_gpio_probe(struct pci_dev *pdev,
chip->reg = chip->base; chip->reg = chip->base;
chip->ch = i; chip->ch = i;
mutex_init(&chip->lock); mutex_init(&chip->lock);
spin_lock_init(&chip->spinlock);
ioh_gpio_setup(chip, num_ports[i]); ioh_gpio_setup(chip, num_ports[i]);
ret = gpiochip_add(&chip->gpio); ret = gpiochip_add(&chip->gpio);
if (ret) { if (ret) {

1
drivers/gpio/gpio-pch.c
View File

@@ -392,6 +392,7 @@ static int __devinit pch_gpio_probe(struct pci_dev *pdev,
chip->reg = chip->base; chip->reg = chip->base;
pci_set_drvdata(pdev, chip); pci_set_drvdata(pdev, chip);
mutex_init(&chip->lock); mutex_init(&chip->lock);
spin_lock_init(&chip->spinlock);
pch_gpio_setup(chip); pch_gpio_setup(chip);
ret = gpiochip_add(&chip->gpio); ret = gpiochip_add(&chip->gpio);
if (ret) { if (ret) {

23
drivers/gpio/gpio-samsung.c
View File

@@ -2387,27 +2387,30 @@ static struct samsung_gpio_chip exynos4_gpios_3[] = {
}; };
#if defined(CONFIG_ARCH_EXYNOS4) && defined(CONFIG_OF) #if defined(CONFIG_ARCH_EXYNOS4) && defined(CONFIG_OF)
static int exynos4_gpio_xlate(struct gpio_chip *gc, struct device_node *np, static int exynos4_gpio_xlate(struct gpio_chip *gc,
const void *gpio_spec, u32 *flags) const struct of_phandle_args *gpiospec, u32 *flags)
{ {
const __be32 *gpio = gpio_spec; unsigned int pin;
const u32 n = be32_to_cpup(gpio);
unsigned int pin = gc->base + be32_to_cpu(gpio[0]);
if (WARN_ON(gc->of_gpio_n_cells < 4)) if (WARN_ON(gc->of_gpio_n_cells < 4))
return -EINVAL; return -EINVAL;
if (n > gc->ngpio) if (WARN_ON(gpiospec->args_count < gc->of_gpio_n_cells))
return -EINVAL; return -EINVAL;
if (s3c_gpio_cfgpin(pin, S3C_GPIO_SFN(be32_to_cpu(gpio[1])))) if (gpiospec->args[0] > gc->ngpio)
return -EINVAL;
pin = gc->base + gpiospec->args[0];
if (s3c_gpio_cfgpin(pin, S3C_GPIO_SFN(gpiospec->args[1])))
pr_warn("gpio_xlate: failed to set pin function\n"); pr_warn("gpio_xlate: failed to set pin function\n");
if (s3c_gpio_setpull(pin, be32_to_cpu(gpio[2]))) if (s3c_gpio_setpull(pin, gpiospec->args[2]))
pr_warn("gpio_xlate: failed to set pin pull up/down\n"); pr_warn("gpio_xlate: failed to set pin pull up/down\n");
if (s5p_gpio_set_drvstr(pin, be32_to_cpu(gpio[3]))) if (s5p_gpio_set_drvstr(pin, gpiospec->args[3]))
pr_warn("gpio_xlate: failed to set pin drive strength\n"); pr_warn("gpio_xlate: failed to set pin drive strength\n");
return n; return gpiospec->args[0];
} }
static const struct of_device_id exynos4_gpio_dt_match[] __initdata = { static const struct of_device_id exynos4_gpio_dt_match[] __initdata = {