diff options
| author | Arnd Bergmann | 2013-03-15 22:51:54 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2013-03-15 22:51:54 +0100 |
| commit | b7442b6c8b081f1a7433ad34697ce6f8e77f4904 (patch) | |
| tree | 46537e2b25ef848ba8162e30a9ecc40540229d18 /arch/arm/mach-exynos | |
| parent | Merge branch 'next/irq-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | ARM: EXYNOS: skip wakeup interrupt registration for exynos5250 if pinctrl is ... (diff) | |
| download | kernel-qcow2-linux-b7442b6c8b081f1a7433ad34697ce6f8e77f4904.tar.gz kernel-qcow2-linux-b7442b6c8b081f1a7433ad34697ce6f8e77f4904.tar.xz kernel-qcow2-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 'arch/arm/mach-exynos')
| -rw-r--r-- | arch/arm/mach-exynos/common.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index d63d399c7bae..bdd957978d9b 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -822,6 +822,7 @@ static int __init exynos_init_irq_eint(void) static const struct of_device_id exynos_pinctrl_ids[] = { { .compatible = "samsung,exynos4210-pinctrl", }, { .compatible = "samsung,exynos4x12-pinctrl", }, + { .compatible = "samsung,exynos5250-pinctrl", }, }; struct device_node *pctrl_np, *wkup_np; const char *wkup_compat = "samsung,exynos4210-wakeup-eint"; |