kernel: bump 5.10 to 5.10.103

[openwrt/staging/mkresin.git] / target / linux / at91 / patches-5.10 / 147-pinctrl-at91-pio4-fix-Prefer-unsigned-int-to-bare-us.patch

diff --git a/target/linux/at91/patches-5.10/147-pinctrl-at91-pio4-fix-Prefer-unsigned-int-to-bare-us.patch b/target/linux/at91/patches-5.10/147-pinctrl-at91-pio4-fix-Prefer-unsigned-int-to-bare-us.patch
index e3931bce64a6df79129393b7c0594ed16b12949d..0be811cc97aabfc4ba80dee2fc49653d111bfe11 100644 (file)
--- a/target/linux/at91/patches-5.10/147-pinctrl-at91-pio4-fix-Prefer-unsigned-int-to-bare-us.patch
+++ b/target/linux/at91/patches-5.10/147-pinctrl-at91-pio4-fix-Prefer-unsigned-int-to-bare-us.patch
@@ -15,8 +15,6 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  drivers/pinctrl/pinctrl-at91-pio4.c | 110 ++++++++++++++--------------
  1 file changed, 57 insertions(+), 53 deletions(-)
 
-diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c
-index f202cdb6dc3c..a5d328808e4c 100644
 --- a/drivers/pinctrl/pinctrl-at91-pio4.c
 +++ b/drivers/pinctrl/pinctrl-at91-pio4.c
 @@ -80,8 +80,8 @@
@@ -67,7 +65,7 @@ index f202cdb6dc3c..a5d328808e4c 100644
        struct {
                u32             imr;
                u32             odsr;
-@@ -177,11 +177,11 @@ static void atmel_gpio_irq_ack(struct irq_data *d)
+@@ -177,11 +177,11 @@ static void atmel_gpio_irq_ack(struct ir
         */
  }
  
@@ -81,7 +79,7 @@ index f202cdb6dc3c..a5d328808e4c 100644
  
        atmel_gpio_write(atmel_pioctrl, pin->bank, ATMEL_PIO_MSKR,
                         BIT(pin->line));
-@@ -268,7 +268,7 @@ static struct irq_chip atmel_gpio_irq_chip = {
+@@ -268,7 +268,7 @@ static struct irq_chip atmel_gpio_irq_ch
        .irq_set_wake   = atmel_gpio_irq_set_wake,
  };
  
@@ -90,7 +88,7 @@ index f202cdb6dc3c..a5d328808e4c 100644
  {
        struct atmel_pioctrl *atmel_pioctrl = gpiochip_get_data(chip);
  
-@@ -316,11 +316,12 @@ static void atmel_gpio_irq_handler(struct irq_desc *desc)
+@@ -316,11 +316,12 @@ static void atmel_gpio_irq_handler(struc
        chained_irq_exit(chip, desc);
  }
  
@@ -105,7 +103,7 @@ index f202cdb6dc3c..a5d328808e4c 100644
  
        atmel_gpio_write(atmel_pioctrl, pin->bank, ATMEL_PIO_MSKR,
                         BIT(pin->line));
-@@ -331,11 +332,11 @@ static int atmel_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
+@@ -331,11 +332,11 @@ static int atmel_gpio_direction_input(st
        return 0;
  }
  
@@ -119,7 +117,7 @@ index f202cdb6dc3c..a5d328808e4c 100644
  
        reg = atmel_gpio_read(atmel_pioctrl, pin->bank, ATMEL_PIO_PDSR);
  
-@@ -369,12 +370,13 @@ static int atmel_gpio_get_multiple(struct gpio_chip *chip, unsigned long *mask,
+@@ -369,12 +370,13 @@ static int atmel_gpio_get_multiple(struc
        return 0;
  }
  
@@ -135,7 +133,7 @@ index f202cdb6dc3c..a5d328808e4c 100644
  
        atmel_gpio_write(atmel_pioctrl, pin->bank,
                         value ? ATMEL_PIO_SODR : ATMEL_PIO_CODR,
-@@ -389,7 +391,7 @@ static int atmel_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
+@@ -389,7 +391,7 @@ static int atmel_gpio_direction_output(s
        return 0;
  }
  
@@ -144,7 +142,7 @@ index f202cdb6dc3c..a5d328808e4c 100644
  {
        struct atmel_pioctrl *atmel_pioctrl = gpiochip_get_data(chip);
        struct atmel_pin *pin = atmel_pioctrl->pins[offset];
-@@ -445,11 +447,11 @@ static struct gpio_chip atmel_gpio_chip = {
+@@ -445,11 +447,11 @@ static struct gpio_chip atmel_gpio_chip
  
  /* --- PINCTRL --- */
  static unsigned int atmel_pin_config_read(struct pinctrl_dev *pctldev,
@@ -159,7 +157,7 @@ index f202cdb6dc3c..a5d328808e4c 100644
        void __iomem *addr = atmel_pioctrl->reg_base
                             + bank * ATMEL_PIO_BANK_OFFSET;
  
-@@ -461,11 +463,11 @@ static unsigned int atmel_pin_config_read(struct pinctrl_dev *pctldev,
+@@ -461,11 +463,11 @@ static unsigned int atmel_pin_config_rea
  }
  
  static void atmel_pin_config_write(struct pinctrl_dev *pctldev,
@@ -174,7 +172,7 @@ index f202cdb6dc3c..a5d328808e4c 100644
        void __iomem *addr = atmel_pioctrl->reg_base
                             + bank * ATMEL_PIO_BANK_OFFSET;
  
-@@ -483,7 +485,7 @@ static int atmel_pctl_get_groups_count(struct pinctrl_dev *pctldev)
+@@ -483,7 +485,7 @@ static int atmel_pctl_get_groups_count(s
  }
  
  static const char *atmel_pctl_get_group_name(struct pinctrl_dev *pctldev,
@@ -183,7 +181,7 @@ index f202cdb6dc3c..a5d328808e4c 100644
  {
        struct atmel_pioctrl *atmel_pioctrl = pinctrl_dev_get_drvdata(pctldev);
  
-@@ -491,19 +493,20 @@ static const char *atmel_pctl_get_group_name(struct pinctrl_dev *pctldev,
+@@ -491,19 +493,20 @@ static const char *atmel_pctl_get_group_
  }
  
  static int atmel_pctl_get_group_pins(struct pinctrl_dev *pctldev,
@@ -208,7 +206,7 @@ index f202cdb6dc3c..a5d328808e4c 100644
  {
        struct atmel_pioctrl *atmel_pioctrl = pinctrl_dev_get_drvdata(pctldev);
        int i;
-@@ -524,7 +527,7 @@ static int atmel_pctl_xlate_pinfunc(struct pinctrl_dev *pctldev,
+@@ -524,7 +527,7 @@ static int atmel_pctl_xlate_pinfunc(stru
                                    const char **func_name)
  {
        struct atmel_pioctrl *atmel_pioctrl = pinctrl_dev_get_drvdata(pctldev);
@@ -217,7 +215,7 @@ index f202cdb6dc3c..a5d328808e4c 100644
        struct atmel_group *grp;
  
        pin_id = ATMEL_GET_PIN_NO(pinfunc);
-@@ -554,10 +557,10 @@ static int atmel_pctl_xlate_pinfunc(struct pinctrl_dev *pctldev,
+@@ -554,10 +557,10 @@ static int atmel_pctl_xlate_pinfunc(stru
  static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
                                        struct device_node *np,
                                        struct pinctrl_map **map,
@@ -231,7 +229,7 @@ index f202cdb6dc3c..a5d328808e4c 100644
        unsigned long *configs;
        struct property *pins;
        u32 pinfunc;
-@@ -628,10 +631,10 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
+@@ -628,10 +631,10 @@ exit:
  static int atmel_pctl_dt_node_to_map(struct pinctrl_dev *pctldev,
                                     struct device_node *np_config,
                                     struct pinctrl_map **map,
@@ -244,7 +242,7 @@ index f202cdb6dc3c..a5d328808e4c 100644
        int ret;
  
        *map = NULL;
-@@ -679,13 +682,13 @@ static int atmel_pmx_get_functions_count(struct pinctrl_dev *pctldev)
+@@ -679,13 +682,13 @@ static int atmel_pmx_get_functions_count
  }
  
  static const char *atmel_pmx_get_function_name(struct pinctrl_dev *pctldev,
@@ -260,7 +258,7 @@ index f202cdb6dc3c..a5d328808e4c 100644
                                         const char * const **groups,
                                         unsigned * const num_groups)
  {
-@@ -698,11 +701,11 @@ static int atmel_pmx_get_function_groups(struct pinctrl_dev *pctldev,
+@@ -698,11 +701,11 @@ static int atmel_pmx_get_function_groups
  }
  
  static int atmel_pmx_set_mux(struct pinctrl_dev *pctldev,
@@ -275,7 +273,7 @@ index f202cdb6dc3c..a5d328808e4c 100644
        u32 conf;
  
        dev_dbg(pctldev->dev, "enable function %s group %s\n",
-@@ -726,13 +729,13 @@ static const struct pinmux_ops atmel_pmxops = {
+@@ -726,13 +729,13 @@ static const struct pinmux_ops atmel_pmx
  };
  
  static int atmel_conf_pin_config_group_get(struct pinctrl_dev *pctldev,
@@ -292,7 +290,7 @@ index f202cdb6dc3c..a5d328808e4c 100644
        u32 res;
  
        res = atmel_pin_config_read(pctldev, pin_id);
-@@ -786,21 +789,21 @@ static int atmel_conf_pin_config_group_get(struct pinctrl_dev *pctldev,
+@@ -786,21 +789,21 @@ static int atmel_conf_pin_config_group_g
  }
  
  static int atmel_conf_pin_config_group_set(struct pinctrl_dev *pctldev,
@@ -319,7 +317,7 @@ index f202cdb6dc3c..a5d328808e4c 100644
  
                dev_dbg(pctldev->dev, "%s: pin=%u, config=0x%lx\n",
                        __func__, pin_id, configs[i]);
-@@ -900,7 +903,8 @@ static int atmel_conf_pin_config_group_set(struct pinctrl_dev *pctldev,
+@@ -900,7 +903,8 @@ static int atmel_conf_pin_config_group_s
  }
  
  static void atmel_conf_pin_config_dbg_show(struct pinctrl_dev *pctldev,
@@ -329,7 +327,7 @@ index f202cdb6dc3c..a5d328808e4c 100644
  {
        struct atmel_pioctrl *atmel_pioctrl = pinctrl_dev_get_drvdata(pctldev);
        u32 conf;
-@@ -1108,8 +1112,8 @@ static int atmel_pinctrl_probe(struct platform_device *pdev)
+@@ -1108,8 +1112,8 @@ static int atmel_pinctrl_probe(struct pl
                return -ENOMEM;
        for (i = 0 ; i < atmel_pioctrl->npins; i++) {
                struct atmel_group *group = atmel_pioctrl->groups + i;
@@ -340,6 +338,3 @@ index f202cdb6dc3c..a5d328808e4c 100644
  
                atmel_pioctrl->pins[i] = devm_kzalloc(dev,
                                sizeof(**atmel_pioctrl->pins), GFP_KERNEL);
--- 
-2.32.0
-