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/pinctrl/pinctrl-samsung.c | |
| parent | 20e375329473327d385ee54c7d62f74a6784beed (diff) | |
| parent | af99a7507469d4fa6dd4d8d633e093b1ff7aff6e (diff) | |
| download | linux-stable-0e81a3529e2495c31b717eaba3d2644461cbc5b4.tar.gz linux-stable-0e81a3529e2495c31b717eaba3d2644461cbc5b4.tar.bz2 linux-stable-0e81a3529e2495c31b717eaba3d2644461cbc5b4.zip | |
Merge branch 'v3.11-next/driver-pinctrl' into v3.11-next/s3c24xx-driver
Diffstat (limited to 'drivers/pinctrl/pinctrl-samsung.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-samsung.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/pinctrl/pinctrl-samsung.c b/drivers/pinctrl/pinctrl-samsung.c index 63ac22e89678..e67ff1b8042c 100644 --- a/drivers/pinctrl/pinctrl-samsung.c +++ b/drivers/pinctrl/pinctrl-samsung.c @@ -1118,6 +1118,16 @@ static const struct of_device_id samsung_pinctrl_dt_match[] = { { .compatible = "samsung,s3c64xx-pinctrl", .data = s3c64xx_pin_ctrl }, #endif +#ifdef CONFIG_PINCTRL_S3C24XX + { .compatible = "samsung,s3c2412-pinctrl", + .data = s3c2412_pin_ctrl }, + { .compatible = "samsung,s3c2416-pinctrl", + .data = s3c2416_pin_ctrl }, + { .compatible = "samsung,s3c2440-pinctrl", + .data = s3c2440_pin_ctrl }, + { .compatible = "samsung,s3c2450-pinctrl", + .data = s3c2450_pin_ctrl }, +#endif {}, }; MODULE_DEVICE_TABLE(of, samsung_pinctrl_dt_match); |