diff options
| author |   Maxime Ripard <mripard@kernel.org> | 2019-10-03 09:59:29 +0200 |
|---|---|---|
| committer | Maxime Ripard <mripard@kernel.org> | 2019-10-03 09:59:29 +0200 |
| commit | 77fdaa091d79c87323a9f3912a25f73e02ea2a01 (patch) | |
| tree | 0e47e2d3c4a966277dbaec075f4685187fdae482 /drivers/pinctrl/pinctrl-rk805.c | |
| parent | drm/omap: fix max fclk divider for omap36xx (diff) | |
| parent | Linux 5.4-rc1 (diff) | |
| download | linux-dev-77fdaa091d79c87323a9f3912a25f73e02ea2a01.tar.xz linux-dev-77fdaa091d79c87323a9f3912a25f73e02ea2a01.zip | |
Merge drm/drm-fixes into drm-misc-fixes
We haven't backmerged for a while, let's start the -rc period by pulling
rc1.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'drivers/pinctrl/pinctrl-rk805.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-rk805.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/pinctrl-rk805.c b/drivers/pinctrl/pinctrl-rk805.c index a8459cafd4ea..26adbe9d6d42 100644 --- a/drivers/pinctrl/pinctrl-rk805.c +++ b/drivers/pinctrl/pinctrl-rk805.c @@ -197,7 +197,7 @@ static int rk805_gpio_get_direction(struct gpio_chip *chip, unsigned int offset) return !(val & pci->pin_cfg[offset].dir_msk); } -static struct gpio_chip rk805_gpio_chip = { +static const struct gpio_chip rk805_gpio_chip = { .label = "rk805-gpio", .request = gpiochip_generic_request, .free = gpiochip_generic_free, @@ -404,7 +404,7 @@ static const struct pinconf_ops rk805_pinconf_ops = { .pin_config_set = rk805_pinconf_set, }; -static struct pinctrl_desc rk805_pinctrl_desc = { +static const struct pinctrl_desc rk805_pinctrl_desc = { .name = "rk805-pinctrl", .pctlops = &rk805_pinctrl_ops, .pmxops = &rk805_pinmux_ops, |