diff options
| author | Sakethram Bommisetti <sakethram.bommisetti@stericsson.com> | 2011-09-13 14:03:27 +0530 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 16:07:34 +0200 |
| commit | 6b665c905f6d44f9af397fdf67d5f4e4344a8e79 (patch) | |
| tree | 4593711abe7fa598379a73f50104c8a67f80af73 /arch | |
| parent | e17d2c827f03a40d6b9db636f34e3e33a7a2920a (diff) | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-ux500-usb.h (renamed from arch/arm/mach-ux500/board-mop500-usb.h) | 6 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/usb.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/usb.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 7bcb9d15bcb..92677f5aa7f 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -71,7 +71,7 @@ #include "regulator-u8500.h" #include "board-mop500-bm.h" #include "board-mop500-wlan.h" -#include "board-mop500-usb.h" +#include "board-ux500-usb.h" #ifdef CONFIG_AB8500_DENC static struct ab8500_denc_platform_data ab8500_denc_pdata = { @@ -301,7 +301,7 @@ static struct ab8500_platform_data ab8500_platdata = { .fg = &ab8500_fg_plat_data, .chargalg = &ab8500_chargalg_plat_data, .gpio = &ab8500_gpio_pdata, - .usb = &ab8500_usbgpio_plat_data, + .usb = &abx500_usbgpio_plat_data, #ifdef CONFIG_INPUT_AB8500_ACCDET .accdet = &ab8500_accdet_pdata, #endif 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 5c27a72c10d..6277958c8a5 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(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 dc6a6970c35..df822bdc65c 100644 --- a/arch/arm/mach-ux500/usb.c +++ b/arch/arm/mach-ux500/usb.c @@ -11,7 +11,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, \ @@ -157,7 +157,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, |