From b1c4c311f0040e398e1c27d77b442b8c19d30e86 Mon Sep 17 00:00:00 2001 From: Philippe Langlais Date: Wed, 29 Feb 2012 14:56:10 +0100 Subject: mfd/ab8500: gpio: remaining mainline differences This collects the AB9540 changes that could not be included in the mainline patch set due to differences in the internal code (esp re GPIO driver). Signed-off-by: Linus Walleij --- include/linux/mfd/abx500/ab8500-gpio.h | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/include/linux/mfd/abx500/ab8500-gpio.h b/include/linux/mfd/abx500/ab8500-gpio.h index c362b805104..67ac32c1dcb 100644 --- a/include/linux/mfd/abx500/ab8500-gpio.h +++ b/include/linux/mfd/abx500/ab8500-gpio.h @@ -20,8 +20,8 @@ struct ab8500_gpio_platform_data { int gpio_base; u32 irq_base; u8 config_reg[8]; - u8 config_direction[6]; - u8 config_pullups[6]; + u8 config_direction[7]; + u8 config_pullups[7]; }; enum ab8500_pin { @@ -67,6 +67,26 @@ enum ab8500_pin { AB8500_PIN_GPIO40, AB8500_PIN_GPIO41, AB8500_PIN_GPIO42, + /* AB9540 GPIO extends support provided by AB8500 */ + AB9540_PIN_GPIO43, + AB9540_PIN_GPIO44, + AB9540_PIN_GPIO45, + AB9540_PIN_GPIO46, + AB9540_PIN_GPIO47, + AB9540_PIN_GPIO48, + AB9540_PIN_GPIO49, + AB9540_PIN_GPIO50, + AB9540_PIN_GPIO51, + AB9540_PIN_GPIO52, + AB9540_PIN_GPIO53, + /* + * AB9540_PIN_GPIO60 is configured, in the AB9540 GPIO registers, where + * AB9540_PIN_GPIO54 would be expected. AB9540_PIN_GPIO54 to + * AB9540_PIN_GPIO59 do not exist and no reserved space has been left + * for them in the registers. Therefore the enum goes directly from + * AB9540_PIN_GPIO53 to AB9540_PIN_GPIO60. + */ + AB9540_PIN_GPIO60, }; int ab8500_config_pulldown(struct device *dev, -- cgit v1.2.3