From: Thomas Abraham Date: Fri, 28 Dec 2012 18:37:27 +0000 (-0800) Subject: gpio: samsung: skip gpiolib registration if pinctrl support is enabled for exynos5250 X-Git-Tag: upstream/snapshot3+hdmi~5200^2~28^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=70850ad85370b2100ffe0e6a892c1d60569b476a;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git gpio: samsung: skip gpiolib registration if pinctrl support is enabled for exynos5250 Skip exynos5250 gpiolib registration if pinctrl support for exynos5250 is enabled. Signed-off-by: Thomas Abraham Reviewed-by: Tomasz Figa Signed-off-by: Kukjin Kim --- diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c index b3643ff..49b4292 100644 --- a/drivers/gpio/gpio-samsung.c +++ b/drivers/gpio/gpio-samsung.c @@ -3024,6 +3024,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)