mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 14:13:16 +00:00
45 lines
1.8 KiB
Diff
45 lines
1.8 KiB
Diff
|
From 1978d88cdc8eb0986d36cac0e9541220fa71d87d Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
|
||
|
|
Date: Tue, 30 Mar 2021 12:32:25 +0200
|
||
|
|
Subject: [PATCH] pinctrl: bcm: bcm6362: fix warning
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
The current implementation of bcm6362_set_gpio() produces the following
|
||
|
|
warning on x86_64:
|
||
|
|
drivers/pinctrl/bcm/pinctrl-bcm6362.c: In function 'bcm6362_set_gpio':
|
||
|
|
drivers/pinctrl/bcm/pinctrl-bcm6362.c:503:8: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
|
||
|
|
503 | (uint32_t) desc->drv_data, 0);
|
||
|
|
| ^
|
||
|
|
|
||
|
|
Modify the code to make it similar to bcm63268_set_gpio() in order to fix
|
||
|
|
the warning.
|
||
|
|
|
||
|
|
Fixes: 705791e23ecd ("pinctrl: add a pincontrol driver for BCM6362")
|
||
|
|
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
|
||
|
|
Link: https://lore.kernel.org/r/20210330103225.3949-1-noltari@gmail.com
|
||
|
|
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
|
||
|
|
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
||
|
|
---
|
||
|
|
drivers/pinctrl/bcm/pinctrl-bcm6362.c | 6 +++---
|
||
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/pinctrl/bcm/pinctrl-bcm6362.c
|
||
|
|
+++ b/drivers/pinctrl/bcm/pinctrl-bcm6362.c
|
||
|
|
@@ -496,11 +496,11 @@ static int bcm6362_pinctrl_get_groups(st
|
||
|
|
static void bcm6362_set_gpio(struct bcm63xx_pinctrl *pc, unsigned pin)
|
||
|
|
{
|
||
|
|
const struct pinctrl_pin_desc *desc = &bcm6362_pins[pin];
|
||
|
|
+ unsigned int basemode = (uintptr_t)desc->drv_data;
|
||
|
|
unsigned int mask = bcm63xx_bank_pin(pin);
|
||
|
|
|
||
|
|
- if (desc->drv_data)
|
||
|
|
- regmap_update_bits(pc->regs, BCM6362_BASEMODE_REG,
|
||
|
|
- (uint32_t) desc->drv_data, 0);
|
||
|
|
+ if (basemode)
|
||
|
|
+ regmap_update_bits(pc->regs, BCM6362_BASEMODE_REG, basemode, 0);
|
||
|
|
|
||
|
|
if (pin < BCM63XX_BANK_GPIOS) {
|
||
|
|
/* base mode 0 => gpio 1 => mux function */
|