diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-03-15 22:51:54 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-15 22:51:54 +0100 |
| commit | b7442b6c8b081f1a7433ad34697ce6f8e77f4904 (patch) | |
| tree | 46537e2b25ef848ba8162e30a9ecc40540229d18 /drivers/gpio/gpio-samsung.c | |
| parent | cabaf3edf8b464558776c90c0c70252b40197c9d (diff) | |
| parent | 97916777d6904e24b86eac77da58ef7cb09d539d (diff) | |
| download | blackbird-obmc-linux-b7442b6c8b081f1a7433ad34697ce6f8e77f4904.tar.gz blackbird-obmc-linux-b7442b6c8b081f1a7433ad34697ce6f8e77f4904.zip | |
Merge branch 'next/pinctrl-exynos' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers
From Kukjin Kim <kgene.kim@samsung.com>:
Here is support pinctrl-exynos5250 and that already got ack from Linus Walleij.
* 'next/pinctrl-exynos' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: skip wakeup interrupt registration for exynos5250 if pinctrl is enabled
gpio: samsung: skip gpiolib registration if pinctrl support is enabled for exynos5250
pinctrl: exynos: add exynos5250 SoC specific data
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/gpio/gpio-samsung.c')
| -rw-r--r-- | drivers/gpio/gpio-samsung.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c index 58aa28fb5889..99e0fa49fcbd 100644 --- a/drivers/gpio/gpio-samsung.c +++ b/drivers/gpio/gpio-samsung.c @@ -3028,6 +3028,7 @@ static __init int samsung_gpiolib_init(void) static const struct of_device_id exynos_pinctrl_ids[] = { { .compatible = "samsung,exynos4210-pinctrl", }, { .compatible = "samsung,exynos4x12-pinctrl", }, + { .compatible = "samsung,exynos5250-pinctrl", }, { .compatible = "samsung,exynos5440-pinctrl", }, }; for_each_matching_node(pctrl_np, exynos_pinctrl_ids) |
