diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-05-31 11:05:16 +0300 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-05-31 13:48:28 +0300 |
| commit | c2ebf4754b92f9fb1e422c8c068da7f0b12c9432 (patch) | |
| tree | 6d29b2b74ec031d197c651d8d1c94706e849b690 /drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c | |
| parent | 94bf176b9784e55f3f5fe1015cd9cbc168743563 (diff) | |
| download | linux-c2ebf4754b92f9fb1e422c8c068da7f0b12c9432.tar.xz | |
pinctrl: uniphier: introduce capability flag
The core part of the UniPhier pinctrl driver needs to support a new
capability for upcoming UniPhier ARMv8 SoCs. This sometimes happens
because pinctrl drivers include really SoC-specific stuff.
This commit intends to tidy up SoC-specific parameters of the existing
drivers before adding the new one. Having just one flag would be
better than adding a new struct member every time a new SoC-specific
capability comes up.
At this time, there is one flag, UNIPHIER_PINCTRL_CAPS_DBGMUX_SEPARATE.
This capability (I'd say rather quirk) was added for PH1-Pro4 and
PH1-Pro5 as requirement from a customer. For those SoCs, one pin-mux
setting is controlled by the combination of two separate registers; the
LSB bits at register offset (8 * N) and the MSB bits at (8 * N + 4).
Because it is impossible to update two separate registers atomically,
the LOAD_PINCTRL register should be set in order to make the pin-mux
settings really effective.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c')
| -rw-r--r-- | drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c index 4ada574cbf4a..edea90d726a0 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c @@ -852,9 +852,7 @@ static struct uniphier_pinctrl_socdata uniphier_ld4_pindata = { .groups_count = ARRAY_SIZE(uniphier_ld4_groups), .functions = uniphier_ld4_functions, .functions_count = ARRAY_SIZE(uniphier_ld4_functions), - .mux_bits = 8, - .reg_stride = 4, - .load_pinctrl = false, + .caps = 0, }; static int uniphier_ld4_pinctrl_probe(struct platform_device *pdev) |