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

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
...@@ -629,12 +629,12 @@ static void tegra_pinctrl_clear_parked_bits(struct tegra_pmx *pmx) ...@@ -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; struct device_node *np;
bool has_prop = false; bool has_prop = false;
np = of_find_compatible_node(NULL, NULL, "nvidia,tegra30-gpio"); np = of_find_compatible_node(NULL, NULL, compatible);
if (!np) if (!np)
return has_prop; return has_prop;
...@@ -728,7 +728,7 @@ int tegra_pinctrl_probe(struct platform_device *pdev, ...@@ -728,7 +728,7 @@ int tegra_pinctrl_probe(struct platform_device *pdev,
tegra_pinctrl_clear_parked_bits(pmx); 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); pinctrl_add_gpio_range(pmx->pctl, &tegra_pinctrl_gpio_range);
platform_set_drvdata(pdev, pmx); platform_set_drvdata(pdev, pmx);
......
...@@ -189,6 +189,7 @@ struct tegra_pingroup { ...@@ -189,6 +189,7 @@ struct tegra_pingroup {
*/ */
struct tegra_pinctrl_soc_data { struct tegra_pinctrl_soc_data {
unsigned ngpios; unsigned ngpios;
const char *gpio_compatible;
const struct pinctrl_pin_desc *pins; const struct pinctrl_pin_desc *pins;
unsigned npins; unsigned npins;
struct tegra_function *functions; struct tegra_function *functions;
......
...@@ -1839,6 +1839,7 @@ static const struct tegra_pingroup tegra114_groups[] = { ...@@ -1839,6 +1839,7 @@ static const struct tegra_pingroup tegra114_groups[] = {
static const struct tegra_pinctrl_soc_data tegra114_pinctrl = { static const struct tegra_pinctrl_soc_data tegra114_pinctrl = {
.ngpios = NUM_GPIOS, .ngpios = NUM_GPIOS,
.gpio_compatible = "nvidia,tegra30-gpio",
.pins = tegra114_pins, .pins = tegra114_pins,
.npins = ARRAY_SIZE(tegra114_pins), .npins = ARRAY_SIZE(tegra114_pins),
.functions = tegra114_functions, .functions = tegra114_functions,
......
...@@ -2051,6 +2051,7 @@ static const struct tegra_pingroup tegra124_groups[] = { ...@@ -2051,6 +2051,7 @@ static const struct tegra_pingroup tegra124_groups[] = {
static const struct tegra_pinctrl_soc_data tegra124_pinctrl = { static const struct tegra_pinctrl_soc_data tegra124_pinctrl = {
.ngpios = NUM_GPIOS, .ngpios = NUM_GPIOS,
.gpio_compatible = "nvidia,tegra30-gpio",
.pins = tegra124_pins, .pins = tegra124_pins,
.npins = ARRAY_SIZE(tegra124_pins), .npins = ARRAY_SIZE(tegra124_pins),
.functions = tegra124_functions, .functions = tegra124_functions,
......
...@@ -2221,6 +2221,7 @@ static const struct tegra_pingroup tegra20_groups[] = { ...@@ -2221,6 +2221,7 @@ static const struct tegra_pingroup tegra20_groups[] = {
static const struct tegra_pinctrl_soc_data tegra20_pinctrl = { static const struct tegra_pinctrl_soc_data tegra20_pinctrl = {
.ngpios = NUM_GPIOS, .ngpios = NUM_GPIOS,
.gpio_compatible = "nvidia,tegra20-gpio",
.pins = tegra20_pins, .pins = tegra20_pins,
.npins = ARRAY_SIZE(tegra20_pins), .npins = ARRAY_SIZE(tegra20_pins),
.functions = tegra20_functions, .functions = tegra20_functions,
......
...@@ -1553,6 +1553,7 @@ static const struct tegra_pingroup tegra210_groups[] = { ...@@ -1553,6 +1553,7 @@ static const struct tegra_pingroup tegra210_groups[] = {
static const struct tegra_pinctrl_soc_data tegra210_pinctrl = { static const struct tegra_pinctrl_soc_data tegra210_pinctrl = {
.ngpios = NUM_GPIOS, .ngpios = NUM_GPIOS,
.gpio_compatible = "nvidia,tegra30-gpio",
.pins = tegra210_pins, .pins = tegra210_pins,
.npins = ARRAY_SIZE(tegra210_pins), .npins = ARRAY_SIZE(tegra210_pins),
.functions = tegra210_functions, .functions = tegra210_functions,
......
...@@ -2474,6 +2474,7 @@ static const struct tegra_pingroup tegra30_groups[] = { ...@@ -2474,6 +2474,7 @@ static const struct tegra_pingroup tegra30_groups[] = {
static const struct tegra_pinctrl_soc_data tegra30_pinctrl = { static const struct tegra_pinctrl_soc_data tegra30_pinctrl = {
.ngpios = NUM_GPIOS, .ngpios = NUM_GPIOS,
.gpio_compatible = "nvidia,tegra30-gpio",
.pins = tegra30_pins, .pins = tegra30_pins,
.npins = ARRAY_SIZE(tegra30_pins), .npins = ARRAY_SIZE(tegra30_pins),
.functions = tegra30_functions, .functions = tegra30_functions,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment