summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>2011-09-21 14:51:57 +0200
committerJonas ABERG <jonas.aberg@stericsson.com>2011-09-29 09:06:09 +0200
commitc6b7369fccd5626119a36185d21b11b87fd90391 (patch)
tree1afd9ba8f1cf1b9c3d9f7a705ce73f73807551c2
parent01a1c18784cbd610528296ab4d98f816d282e32c (diff)
ux500: use updated gpio driver
AB8500 gpio driver is now exporting its gpios directly. Change-Id: Iea4e25f325246a1e690fd3c4fa67ba88157957ab Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32128 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
-rw-r--r--arch/arm/mach-ux500/board-mop500.c4
-rw-r--r--arch/arm/mach-ux500/board-mop500.h26
-rw-r--r--drivers/staging/cg2900/board-mop500-cg2900.c3
3 files changed, 13 insertions, 20 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 6d6a3d4c5ac..f601be7026e 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -105,7 +105,7 @@ static struct platform_device snowball_led_dev = {
};
static struct ab8500_gpio_platform_data ab8500_gpio_pdata = {
- .gpio_base = MOP500_AB8500_GPIO(0),
+ .gpio_base = AB8500_PIN_GPIO1,
.irq_base = MOP500_AB8500_VIR_GPIO_IRQ_BASE,
/* config_reg is the initial configuration of ab8500 pins.
* The pins can be configured as GPIO or alt functions based
@@ -147,7 +147,7 @@ static struct abx500_accdet_platform_data ab8500_accdet_pdata = {
.btn_keycode = KEY_MEDIA,
.accdet1_dbth = ACCDET1_TH_1200mV | ACCDET1_DB_70ms,
.accdet2122_th = ACCDET21_TH_1000mV | ACCDET22_TH_1000mV,
- .video_ctrl_gpio = MOP500_AB8500_GPIO(34),
+ .video_ctrl_gpio = AB8500_PIN_GPIO35,
};
#endif
diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h
index 9b069a9f085..98c81924946 100644
--- a/arch/arm/mach-ux500/board-mop500.h
+++ b/arch/arm/mach-ux500/board-mop500.h
@@ -8,6 +8,7 @@
#define __BOARD_MOP500_H
/* This defines the NOMADIK_NR_GPIO */
+#include <linux/mfd/ab8500/gpio.h>
#include <mach/gpio.h>
/* Snowball GPIO for MMC card */
@@ -58,23 +59,14 @@
#define GPIO_SDMMC_1V8_3V_SEL MOP500_EGPIO(18)
#define MOP500_EGPIO_END MOP500_EGPIO(24)
-/* GPIOs on the AB8500 mixed-signals circuit */
-#define MOP500_AB8500_GPIO(x) (MOP500_EGPIO_END + (x))
-
-/* mop500 AB8500 GPIO */
-
-/*
- * Snowball AB8500 GPIO
- * Documentation starts on pin 1
- * and framework enumerates from 0
- */
-#define SNOWBALL_VSMPS2_1V8_GPIO MOP500_AB8500_GPIO(0) /* SYSCLKREQ2/GPIO1 */
-#define SNOWBALL_PM_GPIO1_GPIO MOP500_AB8500_GPIO(1) /* SYSCLKREQ3/GPIO2 */
-#define SNOWBALL_WLAN_CLK_REQ_GPIO MOP500_AB8500_GPIO(2) /* SYSCLKREQ4/GPIO3 */
-#define SNOWBALL_PM_GPIO4_GPIO MOP500_AB8500_GPIO(3) /* SYSCLKREQ6/GPIO4 */
-#define SNOWBALL_EN_3V6_GPIO MOP500_AB8500_GPIO(15) /* PWMOUT3/GPIO16 */
-#define SNOWBALL_PME_ETH_GPIO MOP500_AB8500_GPIO(23) /* SYSCLKREQ7/GPIO24 */
-#define SNOWBALL_EN_3V3_ETH_GPIO MOP500_AB8500_GPIO(25) /* GPIO26 */
+/*Snowball AB8500 GPIO */
+#define SNOWBALL_VSMPS2_1V8_GPIO AB8500_PIN_GPIO1 /* SYSCLKREQ2/GPIO1 */
+#define SNOWBALL_PM_GPIO1_GPIO AB8500_PIN_GPIO2 /* SYSCLKREQ3/GPIO2 */
+#define SNOWBALL_WLAN_CLK_REQ_GPIO AB8500_PIN_GPIO3 /* SYSCLKREQ4/GPIO3 */
+#define SNOWBALL_PM_GPIO4_GPIO AB8500_PIN_GPIO4 /* SYSCLKREQ6/GPIO4 */
+#define SNOWBALL_EN_3V6_GPIO AB8500_PIN_GPIO16 /* PWMOUT3/GPIO16 */
+#define SNOWBALL_PME_ETH_GPIO AB8500_PIN_GPIO24 /* SYSCLKREQ7/GPIO24 */
+#define SNOWBALL_EN_3V3_ETH_GPIO AB8500_PIN_GPIO26 /* GPIO26 */
struct i2c_board_info;
diff --git a/drivers/staging/cg2900/board-mop500-cg2900.c b/drivers/staging/cg2900/board-mop500-cg2900.c
index de2fc08dffa..5f40941a5f1 100644
--- a/drivers/staging/cg2900/board-mop500-cg2900.c
+++ b/drivers/staging/cg2900/board-mop500-cg2900.c
@@ -15,6 +15,7 @@
#include <linux/gpio/nomadik.h>
#include <linux/ioport.h>
#include <linux/platform_device.h>
+#include <linux/mfd/ab8500/gpio.h>
#include <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci.h>
@@ -31,7 +32,7 @@
#define CG2900_BT_ENABLE_GPIO 170
#define CG2900_GBF_ENA_RESET_GPIO 171
#define WLAN_PMU_EN_GPIO 226
-#define WLAN_PMU_EN_GPIO_U9500 MOP500_AB8500_GPIO(10)
+#define WLAN_PMU_EN_GPIO_U9500 AB8500_PIN_GPIO11
#define CG2900_BT_CTS_GPIO 0
enum cg2900_gpio_pull_sleep cg2900_sleep_gpio[21] = {