diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2013-06-12 05:24:16 +0900 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-06-12 05:24:16 +0900 |
commit | 0e81a3529e2495c31b717eaba3d2644461cbc5b4 (patch) | |
tree | 05f25d95367bab3635486db8ba3287d754102f1d /drivers/gpio/gpio-samsung.c | |
parent | 20e375329473327d385ee54c7d62f74a6784beed (diff) | |
parent | af99a7507469d4fa6dd4d8d633e093b1ff7aff6e (diff) | |
download | op-kernel-dev-0e81a3529e2495c31b717eaba3d2644461cbc5b4.zip op-kernel-dev-0e81a3529e2495c31b717eaba3d2644461cbc5b4.tar.gz |
Merge branch 'v3.11-next/driver-pinctrl' into v3.11-next/s3c24xx-driver
Diffstat (limited to 'drivers/gpio/gpio-samsung.c')
-rw-r--r-- | drivers/gpio/gpio-samsung.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c index 96f6a7c..a1392f4 100644 --- a/drivers/gpio/gpio-samsung.c +++ b/drivers/gpio/gpio-samsung.c @@ -2963,6 +2963,10 @@ static __init int samsung_gpiolib_init(void) */ struct device_node *pctrl_np; static const struct of_device_id exynos_pinctrl_ids[] = { + { .compatible = "samsung,s3c2412-pinctrl", }, + { .compatible = "samsung,s3c2416-pinctrl", }, + { .compatible = "samsung,s3c2440-pinctrl", }, + { .compatible = "samsung,s3c2450-pinctrl", }, { .compatible = "samsung,exynos4210-pinctrl", }, { .compatible = "samsung,exynos4x12-pinctrl", }, { .compatible = "samsung,exynos5250-pinctrl", }, |