From 906315803fe6a38f5ed2806599cbd7c0fcf9de86 Mon Sep 17 00:00:00 2001 From: Tomasz Figa Date: Mon, 18 Mar 2013 22:31:54 +0100 Subject: [PATCH] --- yaml --- r: 363009 b: refs/heads/master c: c16150d846585d27e90795447ecc7c055d90f6d5 h: refs/heads/master i: 363007: 3ef5e269911337fd58c0a31ed6a26df938149ec2 v: v3 --- [refs] | 2 +- trunk/drivers/pinctrl/pinctrl-samsung.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d3137f859192..453ed4d5e7b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43fc9e7fab903ea3c525c693c5e9bf566d521380 +refs/heads/master: c16150d846585d27e90795447ecc7c055d90f6d5 diff --git a/trunk/drivers/pinctrl/pinctrl-samsung.c b/trunk/drivers/pinctrl/pinctrl-samsung.c index b917ed36fb65..8b15c6622b33 100644 --- a/trunk/drivers/pinctrl/pinctrl-samsung.c +++ b/trunk/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);