diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-25 23:54:16 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-25 23:54:16 +0100 |
| commit | 374da9da22ebaad0524c77905b5e89ae4619bef3 (patch) | |
| tree | 78f8ebbbc2e730b8e510e3a68b5b73755196fb68 /arch/arm/mach-sa1100/badge4.c | |
| parent | fbae0f8912dc12b284433c05417ea76311205bbf (diff) | |
| parent | 81e6ca3eb74d6bdbab181dd2db378f49f76f0d97 (diff) | |
| download | linux-374da9da22ebaad0524c77905b5e89ae4619bef3.tar.gz linux-374da9da22ebaad0524c77905b5e89ae4619bef3.tar.bz2 linux-374da9da22ebaad0524c77905b5e89ae4619bef3.zip | |
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.c | 21 |
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[] = { [1] = DEFINE_RES_IRQ(BADGE4_IRQ_GPIO_SA1111), }; +static int badge4_sa1111_enable(void *data, unsigned devid) +{ + if (devid == SA1111_DEVID_USB) + badge4_set_5V(BADGE4_5V_USB, 1); + return 0; +} + +static void badge4_sa1111_disable(void *data, unsigned devid) +{ + if (devid == SA1111_DEVID_USB) + badge4_set_5V(BADGE4_5V_USB, 0); +} + static struct sa1111_platform_data sa1111_info = { .irq_base = IRQ_BOARD_END, + .disable_devs = SA1111_DEVID_PS2_MSE, + .enable = badge4_sa1111_enable, + .disable = badge4_sa1111_disable, }; static u64 sa1111_dmamask = 0xffffffffUL; @@ -258,11 +274,6 @@ static struct map_desc badge4_io_desc[] __initdata = { .pfn = __phys_to_pfn(0x10000000), .length = 0x00100000, .type = MT_DEVICE - }, { /* SA-1111 */ - .virtual = 0xf4000000, - .pfn = __phys_to_pfn(0x48000000), - .length = 0x00100000, - .type = MT_DEVICE } }; |