ux500:USB:Generic USB GPIO frame work

Making the existing U8500 usb gpio framework to generic.
This allows other platforms to use the same structure.

ST-Ericsson ID: NA
ST-Ericsson Linux next: NA
ST-Ericsson FOSS-OUT ID: NA

Change-Id: I3d5edc139e247b2373d1dd77243421e74783a0ea
Signed-off-by: Sakethram Bommisetti <sakethram.bommisetti@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30790

6 files changed, 10 insertions, 8 deletions

diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 77d03c1fbd0..5c1da28427b 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -53,6 +53,7 @@
 #include "devices-db8500.h"
 #include "board-mop500.h"
 #include "board-mop500-regulators.h"
+#include "board-ux500-usb.h"
 
 static struct gpio_led snowball_led_array[] = {
 	{
@@ -194,6 +195,7 @@ static struct ab8500_platform_data ab8500_platdata = {
 	.regulator	= ab8500_regulators,
 	.num_regulator	= ARRAY_SIZE(ab8500_regulators),
 	.gpio		= &ab8500_gpio_pdata,
+	.usb		= &abx500_usbgpio_plat_data,
 };
 
 static struct resource ab8500_resources[] = {
diff --git a/arch/arm/mach-ux500/board-mop500-usb.h b/arch/arm/mach-ux500/board-ux500-usb.h
index 85288463a73..6b35a181c0a 100644
--- a/arch/arm/mach-ux500/board-mop500-usb.h
+++ b/arch/arm/mach-ux500/board-ux500-usb.h
@@ -5,9 +5,9 @@
  * License terms: GNU General Public License (GPL) version 2
  */
 
-#ifndef __BOARD_MOP500_USB_H
-#define __BOARD_MOP500_USB_H
+#ifndef __BOARD_UX500_USB_H
+#define __BOARD_UX500_USB_H
 
-extern struct ab8500_usbgpio_platform_data ab8500_usbgpio_plat_data;
+extern struct abx500_usbgpio_platform_data abx500_usbgpio_plat_data;
 
 #endif
diff --git a/arch/arm/mach-ux500/include/mach/usb.h b/arch/arm/mach-ux500/include/mach/usb.h
index 40e4b621864..145823a4d37 100644
--- a/arch/arm/mach-ux500/include/mach/usb.h
+++ b/arch/arm/mach-ux500/include/mach/usb.h
@@ -23,7 +23,7 @@ struct ux500_musb_board_data {
 void ux500_add_usb(struct device *parent, resource_size_t base,
 		   int irq, int *dma_rx_cfg, int *dma_tx_cfg);
 
-struct ab8500_usbgpio_platform_data {
+struct abx500_usbgpio_platform_data {
 	int (*get)(struct device *device);
 	void (*enable)(void);
 	void (*disable)(void);
diff --git a/arch/arm/mach-ux500/usb.c b/arch/arm/mach-ux500/usb.c
index 3851a34f0ca..170b8934200 100644
--- a/arch/arm/mach-ux500/usb.c
+++ b/arch/arm/mach-ux500/usb.c
@@ -13,7 +13,7 @@
 #include <mach/usb.h>
 #include <plat/pincfg.h>
 #include "pins.h"
-#include "board-mop500-usb.h"
+#include "board-ux500-usb.h"
 
 #define MUSB_DMA40_RX_CH { \
 		.mode = STEDMA40_MODE_LOGICAL, \
@@ -153,7 +153,7 @@ static void put_gpio(void)
 {
 	ux500_pins_put(usb_gpio_pins);
 }
-struct ab8500_usbgpio_platform_data ab8500_usbgpio_plat_data = {
+struct abx500_usbgpio_platform_data abx500_usbgpio_plat_data = {
 	.get		= &get_gpio,
 	.enable		= &enable_gpio,
 	.disable	= &disable_gpio,
diff --git a/drivers/usb/otg/ab8500-usb.c b/drivers/usb/otg/ab8500-usb.c
index bc0123101c2..13fbabacbc8 100644
--- a/drivers/usb/otg/ab8500-usb.c
+++ b/drivers/usb/otg/ab8500-usb.c
@@ -120,7 +120,7 @@ struct ab8500_usb {
 	struct regulator *v_ape;
 	struct regulator *v_musb;
 	struct regulator *v_ulpi;
-	struct ab8500_usbgpio_platform_data *usb_gpio;
+	struct abx500_usbgpio_platform_data *usb_gpio;
 	struct delayed_work work_usb_workaround;
 	struct kobject *serial_number_kobj;
 };
diff --git a/include/linux/mfd/abx500/ab8500.h b/include/linux/mfd/abx500/ab8500.h
index 8cc2185b0a3..94a3329ccf9 100644
--- a/include/linux/mfd/abx500/ab8500.h
+++ b/include/linux/mfd/abx500/ab8500.h
@@ -274,7 +274,7 @@ struct ab8500_platform_data {
 	int num_regulator;
 	struct regulator_init_data *regulator;
 	struct ab8500_gpio_platform_data *gpio;
-	struct ab8500_usbgpio_platform_data *usb;
+	struct abx500_usbgpio_platform_data *usb;
 };
 
 extern int __devinit ab8500_init(struct ab8500 *ab8500,