Commit 3c94d2d0 authored by Stefan Agner's avatar Stefan Agner Committed by Linus Walleij
Browse files

pinctrl: tegra: define GPIO compatible node per SoC 



Tegra 2 uses a different GPIO controller which uses "tegra20-gpio" as
compatible string.

Make the compatible string the GPIO node is using a SoC specific
property. This prevents the kernel from registering the GPIO range
twice in case the GPIO range is specified in the device tree.

Fixes: 9462510c ("pinctrl: tegra: Only set the gpio range if needed")
Signed-off-by: default avatarStefan Agner <stefan@agner.ch>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 55aedef5

drivers/pinctrl/tegra/pinctrl-tegra.c

+3 −3
Original line number Diff line number Diff line
@@ -629,12 +629,12 @@ static void tegra_pinctrl_clear_parked_bits(struct tegra_pmx *pmx) 
	}

}



static bool gpio_node_has_range(void)

static bool gpio_node_has_range(const char *compatible)

{

	struct device_node *np;

	bool has_prop = false;



	np = of_find_compatible_node(NULL, NULL, "nvidia,tegra30-gpio");

	np = of_find_compatible_node(NULL, NULL, compatible);

	if (!np)

		return has_prop;
@@ -728,7 +728,7 @@ int tegra_pinctrl_probe(struct platform_device *pdev, 


	tegra_pinctrl_clear_parked_bits(pmx);



	if (!gpio_node_has_range())

	if (!gpio_node_has_range(pmx->soc->gpio_compatible))

		pinctrl_add_gpio_range(pmx->pctl, &tegra_pinctrl_gpio_range);



	platform_set_drvdata(pdev, pmx);

drivers/pinctrl/tegra/pinctrl-tegra.h

+1 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ struct tegra_pingroup { 
 */

struct tegra_pinctrl_soc_data {

	unsigned ngpios;

	const char *gpio_compatible;

	const struct pinctrl_pin_desc *pins;

	unsigned npins;

	struct tegra_function *functions;

drivers/pinctrl/tegra/pinctrl-tegra114.c

+1 −0
Original line number Diff line number Diff line
@@ -1839,6 +1839,7 @@ static const struct tegra_pingroup tegra114_groups[] = { 


static const struct tegra_pinctrl_soc_data tegra114_pinctrl = {

	.ngpios = NUM_GPIOS,

	.gpio_compatible = "nvidia,tegra30-gpio",

	.pins = tegra114_pins,

	.npins = ARRAY_SIZE(tegra114_pins),

	.functions = tegra114_functions,

drivers/pinctrl/tegra/pinctrl-tegra124.c

+1 −0
Original line number Diff line number Diff line
@@ -2051,6 +2051,7 @@ static const struct tegra_pingroup tegra124_groups[] = { 


static const struct tegra_pinctrl_soc_data tegra124_pinctrl = {

	.ngpios = NUM_GPIOS,

	.gpio_compatible = "nvidia,tegra30-gpio",

	.pins = tegra124_pins,

	.npins = ARRAY_SIZE(tegra124_pins),

	.functions = tegra124_functions,

drivers/pinctrl/tegra/pinctrl-tegra20.c

+1 −0
Original line number Diff line number Diff line
@@ -2221,6 +2221,7 @@ static const struct tegra_pingroup tegra20_groups[] = { 


static const struct tegra_pinctrl_soc_data tegra20_pinctrl = {

	.ngpios = NUM_GPIOS,

	.gpio_compatible = "nvidia,tegra20-gpio",

	.pins = tegra20_pins,

	.npins = ARRAY_SIZE(tegra20_pins),

	.functions = tegra20_functions,