summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2013-01-16 15:09:36 +0000
committerLinus Walleij <linus.walleij@linaro.org>2013-02-08 14:25:34 +0100
commite64d905e28031031c52db403826cd3bfe060b181 (patch)
tree6e54897e4f03d904ea5c5fed6c5d911afe0453bf /drivers/mfd
parent7d56a46e876aa89dcac921d3afab5cccace15e63 (diff)
downloadlinux-stable-e64d905e28031031c52db403826cd3bfe060b181.tar.gz
linux-stable-e64d905e28031031c52db403826cd3bfe060b181.tar.bz2
linux-stable-e64d905e28031031c52db403826cd3bfe060b181.zip
mfd: ab8500: allow AB9540 based devices to use ABX500 pinctrl
The old AB8500 GPIO driver has been un-BROKEN and converted into a multi-platform pinctrl driver. If any AB9540 based devices wish to request any GPIO pins that it offers, they can after this patch. Cc: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/ab8500-core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c
index 4cb716a00178..e2a45abf726d 100644
--- a/drivers/mfd/ab8500-core.c
+++ b/drivers/mfd/ab8500-core.c
@@ -1114,7 +1114,8 @@ static struct mfd_cell ab8500_devs[] = {
static struct mfd_cell ab9540_devs[] = {
{
- .name = "ab8500-gpio",
+ .name = "pinctrl-ab9540",
+ .of_compatible = "stericsson,ab9540-gpio",
},
{
.name = "ab9540-usb",