aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sa1100/badge4.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-03-25 18:54:16 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-03-25 18:54:16 -0400
commit374da9da22ebaad0524c77905b5e89ae4619bef3 (patch)
tree78f8ebbbc2e730b8e510e3a68b5b73755196fb68 /arch/arm/mach-sa1100/badge4.c
parentfbae0f8912dc12b284433c05417ea76311205bbf (diff)
parent81e6ca3eb74d6bdbab181dd2db378f49f76f0d97 (diff)
Merge branch 'sa1111' into sa11x0
Conflicts: arch/arm/common/sa1111.c arch/arm/mach-sa1100/neponset.c Fixed: arch/arm/mach-sa1100/assabet.c for the neponset changes
Diffstat (limited to 'arch/arm/mach-sa1100/badge4.c')
-rw-r--r--arch/arm/mach-sa1100/badge4.c21
1 files changed, 16 insertions, 5 deletions
diff --git a/arch/arm/mach-sa1100/badge4.c b/arch/arm/mach-sa1100/badge4.c
index ce2dbdf4ba1a..5839c9d8bb92 100644
--- a/arch/arm/mach-sa1100/badge4.c
+++ b/arch/arm/mach-sa1100/badge4.c
@@ -43,8 +43,24 @@ static struct resource sa1111_resources[] = {
43 [1] = DEFINE_RES_IRQ(BADGE4_IRQ_GPIO_SA1111), 43 [1] = DEFINE_RES_IRQ(BADGE4_IRQ_GPIO_SA1111),
44}; 44};
45 45
46static int badge4_sa1111_enable(void *data, unsigned devid)
47{
48 if (devid == SA1111_DEVID_USB)
49 badge4_set_5V(BADGE4_5V_USB, 1);
50 return 0;
51}
52
53static void badge4_sa1111_disable(void *data, unsigned devid)
54{
55 if (devid == SA1111_DEVID_USB)
56 badge4_set_5V(BADGE4_5V_USB, 0);
57}
58
46static struct sa1111_platform_data sa1111_info = { 59static struct sa1111_platform_data sa1111_info = {
47 .irq_base = IRQ_BOARD_END, 60 .irq_base = IRQ_BOARD_END,
61 .disable_devs = SA1111_DEVID_PS2_MSE,
62 .enable = badge4_sa1111_enable,
63 .disable = badge4_sa1111_disable,
48}; 64};
49 65
50static u64 sa1111_dmamask = 0xffffffffUL; 66static u64 sa1111_dmamask = 0xffffffffUL;
@@ -258,11 +274,6 @@ static struct map_desc badge4_io_desc[] __initdata = {
258 .pfn = __phys_to_pfn(0x10000000), 274 .pfn = __phys_to_pfn(0x10000000),
259 .length = 0x00100000, 275 .length = 0x00100000,
260 .type = MT_DEVICE 276 .type = MT_DEVICE
261 }, { /* SA-1111 */
262 .virtual = 0xf4000000,
263 .pfn = __phys_to_pfn(0x48000000),
264 .length = 0x00100000,
265 .type = MT_DEVICE
266 } 277 }
267}; 278};
268 279