diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2019-08-21 13:35:16 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2019-08-21 13:35:16 +0200 |
| commit | 880e4f93f94677dff02f795352ed4f069ee046b7 (patch) | |
| tree | 339be7ef0256eb6586180f014a8bd8f2f3e7fa72 /drivers/pinctrl/aspeed/pinmux-aspeed.h | |
| parent | 19d17d935b29f30510874fd34e93357eea0daba2 (diff) | |
| parent | d1abaeb3be7b5fa6d7a1fbbd2e14e3310005c4c1 (diff) | |
Merge tag 'v5.3-rc5' into devel
Linux 5.3-rc5
Diffstat (limited to 'drivers/pinctrl/aspeed/pinmux-aspeed.h')
| -rw-r--r-- | drivers/pinctrl/aspeed/pinmux-aspeed.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pinctrl/aspeed/pinmux-aspeed.h b/drivers/pinctrl/aspeed/pinmux-aspeed.h index c59e936a7dde..dfcc97ca1a8b 100644 --- a/drivers/pinctrl/aspeed/pinmux-aspeed.h +++ b/drivers/pinctrl/aspeed/pinmux-aspeed.h @@ -775,11 +775,12 @@ struct aspeed_pin_function { struct aspeed_pinmux_data; struct aspeed_pinmux_ops { - int (*set)(const struct aspeed_pinmux_data *ctx, + int (*set)(struct aspeed_pinmux_data *ctx, const struct aspeed_sig_expr *expr, bool enabled); }; struct aspeed_pinmux_data { + struct device *dev; struct regmap *maps[ASPEED_NR_PINMUX_IPS]; const struct aspeed_pinmux_ops *ops; @@ -798,7 +799,7 @@ int aspeed_sig_expr_eval(const struct aspeed_pinmux_data *ctx, const struct aspeed_sig_expr *expr, bool enabled); -static inline int aspeed_sig_expr_set(const struct aspeed_pinmux_data *ctx, +static inline int aspeed_sig_expr_set(struct aspeed_pinmux_data *ctx, const struct aspeed_sig_expr *expr, bool enabled) { |