diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2015-01-12 02:45:55 +0300 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2015-01-14 16:21:38 +0300 |
| commit | f684e4ac9f4bae4e6ecff92eef9645a44764fc04 (patch) | |
| tree | 77455f29e17d3aa03e65aecdb505a850b4f10ce4 /drivers/pinctrl/pinctrl-zynq.c | |
| parent | 7382b6231591a76d061d04a420937bbc5e1c1106 (diff) | |
| download | linux-f684e4ac9f4bae4e6ecff92eef9645a44764fc04.tar.xz | |
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/pinctrl-zynq.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-zynq.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pinctrl/pinctrl-zynq.c b/drivers/pinctrl/pinctrl-zynq.c index 62534234da78..8aa05e2eb705 100644 --- a/drivers/pinctrl/pinctrl-zynq.c +++ b/drivers/pinctrl/pinctrl-zynq.c @@ -920,7 +920,7 @@ enum zynq_pin_config_param { PIN_CONFIG_IOSTANDARD = PIN_CONFIG_END + 1, }; -static const struct pinconf_generic_dt_params zynq_dt_params[] = { +static const struct pinconf_generic_params zynq_dt_params[] = { {"io-standard", PIN_CONFIG_IOSTANDARD, zynq_iostd_lvcmos18}, }; @@ -1099,9 +1099,9 @@ static struct pinctrl_desc zynq_desc = { .pctlops = &zynq_pctrl_ops, .pmxops = &zynq_pinmux_ops, .confops = &zynq_pinconf_ops, - .num_dt_params = ARRAY_SIZE(zynq_dt_params), - .params = zynq_dt_params, - .conf_items = zynq_conf_items, + .num_custom_params = ARRAY_SIZE(zynq_dt_params), + .custom_params = zynq_dt_params, + .custom_conf_items = zynq_conf_items, .owner = THIS_MODULE, }; |