Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba51bdd3 authored by Tomasz Figa's avatar Tomasz Figa Committed by Kukjin Kim
Browse files

gpio: samsung: Skip registration if pinctrl driver is present on EXYNOS4X12 



This patch modifies the Samsung GPIO driver to check for pinctrl driver
presence earlier and use generic matching instead of a single compatible
value.

This allows us to fix warning about unrecognized SoC in case of
EXYNOS4X12, which is not supported by this driver.

Signed-off-by: default avatarTomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Acked-by: default avatarThomas Abraham <thomas.abraham@linaro.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent ab7b51ff

drivers/gpio/gpio-samsung.c

+22 −21
Original line number Diff line number Diff line
@@ -2797,27 +2797,6 @@ static __init void exynos4_gpiolib_init(void) 
	int group = 0;

	void __iomem *gpx_base;



#ifdef CONFIG_PINCTRL_SAMSUNG

		/*

		 * This gpio driver includes support for device tree support and

		 * there are platforms using it. In order to maintain

		 * compatibility with those platforms, and to allow non-dt

		 * Exynos4210 platforms to use this gpiolib support, a check

		 * is added to find out if there is a active pin-controller

		 * driver support available. If it is available, this gpiolib

		 * support is ignored and the gpiolib support available in

		 * pin-controller driver is used. This is a temporary check and

		 * will go away when all of the Exynos4210 platforms have

		 * switched to using device tree and the pin-ctrl driver.

		 */

		struct device_node *pctrl_np;

		const char *pctrl_compat = "samsung,pinctrl-exynos4210";

		pctrl_np = of_find_compatible_node(NULL, NULL, pctrl_compat);

		if (pctrl_np)

			if (of_device_is_available(pctrl_np))

				return;

#endif



	/* gpio part1 */

	gpio_base1 = ioremap(EXYNOS4_PA_GPIO1, SZ_4K);

	if (gpio_base1 == NULL) {
@@ -3032,6 +3011,28 @@ static __init int samsung_gpiolib_init(void) 
	int i, nr_chips;

	int group = 0;



#ifdef CONFIG_PINCTRL_SAMSUNG

	/*

	* This gpio driver includes support for device tree support and there

	* are platforms using it. In order to maintain compatibility with those

	* platforms, and to allow non-dt Exynos4210 platforms to use this

	* gpiolib support, a check is added to find out if there is a active

	* pin-controller driver support available. If it is available, this

	* gpiolib support is ignored and the gpiolib support available in

	* pin-controller driver is used. This is a temporary check and will go

	* away when all of the Exynos4210 platforms have switched to using

	* device tree and the pin-ctrl driver.

	*/

	struct device_node *pctrl_np;

	static const struct of_device_id exynos_pinctrl_ids[] = {

		{ .compatible = "samsung,pinctrl-exynos4210", },

		{ .compatible = "samsung,pinctrl-exynos4x12", },

	};

	for_each_matching_node(pctrl_np, exynos_pinctrl_ids)

		if (pctrl_np && of_device_is_available(pctrl_np))

			return -ENODEV;

#endif



	samsung_gpiolib_set_cfg(samsung_gpio_cfgs, ARRAY_SIZE(samsung_gpio_cfgs));



	if (soc_is_s3c24xx()) {