1 files changed, 10 insertions, 0 deletions

diff --git a/drivers/pinctrl/pinctrl-samsung.c b/drivers/pinctrl/pinctrl-samsung.c
index b917ed36fb65..8b15c6622b33 100644
--- a/drivers/pinctrl/pinctrl-samsung.c
+++ b/drivers/pinctrl/pinctrl-samsung.c
@@ -303,6 +303,11 @@ static void samsung_pinmux_setup(struct pinctrl_dev *pctldev, unsigned selector,
                 type = bank->type;
                 mask = (1 << type->fld_width[PINCFG_TYPE_FUNC]) - 1;
                 shift = pin_offset * type->fld_width[PINCFG_TYPE_FUNC];
+                if (shift >= 32) {
+                        /* Some banks have two config registers */
+                        shift -= 32;
+                        reg += 4;
+                }
 
                 spin_lock_irqsave(&bank->slock, flags);
 
@@ -356,6 +361,11 @@ static int samsung_pinmux_gpio_set_direction(struct pinctrl_dev *pctldev,
 
         mask = (1 << type->fld_width[PINCFG_TYPE_FUNC]) - 1;
         shift = pin_offset * type->fld_width[PINCFG_TYPE_FUNC];
+        if (shift >= 32) {
+                /* Some banks have two config registers */
+                shift -= 32;
+                reg += 4;
+        }
 
         spin_lock_irqsave(&bank->slock, flags);