diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2015-01-12 00:45:55 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2015-01-14 14:21:38 +0100 |
| commit | f684e4ac9f4bae4e6ecff92eef9645a44764fc04 (patch) | |
| tree | 77455f29e17d3aa03e65aecdb505a850b4f10ce4 /drivers/pinctrl/qcom | |
| parent | 7382b6231591a76d061d04a420937bbc5e1c1106 (diff) | |
pinctrl: pinconf-generic: loose DT dependence
New pin controllers such as ACPI-based may also have custom properties
to parse, and should be able to use generic pin config. Let's make the
code compile on !OF systems and rename members a bit to underscore it
is custom parameters and not necessarily DT parameters.
This fixes a build regression for x86_64 on the zeroday kernel builds.
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Reviewed-and-tested-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/qcom')
| -rw-r--r-- | drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c index 17f811c9c2c0..bbf99a715b63 100644 --- a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c +++ b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c @@ -131,7 +131,7 @@ struct pmic_gpio_state { struct gpio_chip chip; }; -static const struct pinconf_generic_dt_params pmic_gpio_bindings[] = { +static const struct pinconf_generic_params pmic_gpio_bindings[] = { {"qcom,pull-up-strength", PMIC_GPIO_CONF_PULL_UP, 0}, {"qcom,drive-strength", PMIC_GPIO_CONF_STRENGTH, 0}, }; @@ -742,9 +742,9 @@ static int pmic_gpio_probe(struct platform_device *pdev) pctrldesc->name = dev_name(dev); pctrldesc->pins = pindesc; pctrldesc->npins = npins; - pctrldesc->num_dt_params = ARRAY_SIZE(pmic_gpio_bindings); - pctrldesc->params = pmic_gpio_bindings; - pctrldesc->conf_items = pmic_conf_items; + pctrldesc->num_custom_params = ARRAY_SIZE(pmic_gpio_bindings); + pctrldesc->custom_params = pmic_gpio_bindings; + pctrldesc->custom_conf_items = pmic_conf_items; for (i = 0; i < npins; i++, pindesc++) { pad = &pads[i]; |