3 files changed, 8 insertions, 3 deletions

diff --git a/drivers/pinctrl/pinmux-sirf.c b/drivers/pinctrl/pinmux-sirf.c
index d848d9764378..99e688e07ea0 100644
--- a/drivers/pinctrl/pinmux-sirf.c
+++ b/drivers/pinctrl/pinmux-sirf.c
@@ -1067,7 +1067,7 @@ static int sirfsoc_pinmux_request_gpio(struct pinctrl_dev *pmxdev,
         spmx = pinctrl_dev_get_drvdata(pmxdev);
 
         muxval = readl(spmx->gpio_virtbase + SIRFSOC_GPIO_PAD_EN(group));
-        muxval = muxval | (1 << offset);
+        muxval = muxval | (1 << (offset - range->pin_base));
         writel(muxval, spmx->gpio_virtbase + SIRFSOC_GPIO_PAD_EN(group));
 
         return 0;
@@ -1100,21 +1100,25 @@ static struct pinctrl_gpio_range sirfsoc_gpio_ranges[] = {
                 .name = "sirfsoc-gpio*",
                 .id = 0,
                 .base = 0,
+                .pin_base = 0,
                 .npins = 32,
         }, {
                 .name = "sirfsoc-gpio*",
                 .id = 1,
                 .base = 32,
+                .pin_base = 32,
                 .npins = 32,
         }, {
                 .name = "sirfsoc-gpio*",
                 .id = 2,
                 .base = 64,
+                .pin_base = 64,
                 .npins = 32,
         }, {
                 .name = "sirfsoc-gpio*",
                 .id = 3,
                 .base = 96,
+                .pin_base = 96,
                 .npins = 19,
         },
 };
diff --git a/drivers/pinctrl/pinmux-u300.c b/drivers/pinctrl/pinmux-u300.c
index 145a84dc16e6..bcf61bee7763 100644
--- a/drivers/pinctrl/pinmux-u300.c
+++ b/drivers/pinctrl/pinmux-u300.c
@@ -1026,6 +1026,7 @@ static struct pinctrl_gpio_range u300_gpio_range = {
         .name = "COH901*",
         .id = 0,
         .base = 0,
+        .pin_base = 0,
         .npins = 64,
 };
 
diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c
index ee3aba78c3dd..92aa13ee2208 100644
--- a/drivers/pinctrl/pinmux.c
+++ b/drivers/pinctrl/pinmux.c
@@ -229,7 +229,7 @@ int pinmux_request_gpio(unsigned gpio)
                 return -EINVAL;
 
         /* Convert to the pin controllers number space */
-        pin = gpio - range->base;
+        pin = gpio - range->base + range->pin_base;
 
         /* Conjure some name stating what chip and pin this is taken by */
         snprintf(gpiostr, 15, "%s:%d", range->name, gpio);
@@ -263,7 +263,7 @@ void pinmux_free_gpio(unsigned gpio)
                 return;
 
         /* Convert to the pin controllers number space */
-        pin = gpio - range->base;
+        pin = gpio - range->base + range->pin_base;
 
         func = pin_free(pctldev, pin, range);
         kfree(func);