From: Tomasz Figa Date: Mon, 18 Mar 2013 21:31:54 +0000 (+0100) Subject: pinctrl: samsung: Handle banks with two configuration registers X-Git-Tag: next-20130422~25^2~2^2~9 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c16150d846585d27e90795447ecc7c055d90f6d5;p=karo-tx-linux.git pinctrl: samsung: Handle banks with two configuration registers This patch adds support for banks that have more than one function configuration registers, e.g. some of the banks of S3C64xx SoCs. Signed-off-by: Tomasz Figa Signed-off-by: Linus Walleij --- 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);