diff options
Diffstat (limited to 'arch/arm/mach-bcm2708')
| -rw-r--r-- | arch/arm/mach-bcm2708/bcm2708.c | 17 | ||||
| -rw-r--r-- | arch/arm/mach-bcm2708/include/mach/platform.h | 1 |
2 files changed, 11 insertions, 7 deletions
diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c index 486e090a8f30..51f8efa1363a 100644 --- a/arch/arm/mach-bcm2708/bcm2708.c +++ b/arch/arm/mach-bcm2708/bcm2708.c @@ -55,7 +55,6 @@ #include <asm/mach/map.h> #include <mach/timex.h> -#include <mach/vcio.h> #include <mach/system.h> #include <linux/delay.h> @@ -414,17 +413,21 @@ static struct platform_device bcm2708_usb_device = { }; static struct resource bcm2708_vcio_resources[] = { - [0] = { /* mailbox/semaphore/doorbell access */ - .start = MCORE_BASE, - .end = MCORE_BASE + SZ_4K - 1, - .flags = IORESOURCE_MEM, - }, + { + .start = ARMCTRL_0_MAIL0_BASE, + .end = ARMCTRL_0_MAIL0_BASE + SZ_64 - 1, + .flags = IORESOURCE_MEM, + }, { + .start = IRQ_ARM_MAILBOX, + .end = IRQ_ARM_MAILBOX, + .flags = IORESOURCE_IRQ, + }, }; static u64 vcio_dmamask = DMA_BIT_MASK(DMA_MASK_BITS_COMMON); static struct platform_device bcm2708_vcio_device = { - .name = BCM_VCIO_DRIVER_NAME, + .name = "bcm2708_vcio", .id = -1, /* only one VideoCore I/O area */ .resource = bcm2708_vcio_resources, .num_resources = ARRAY_SIZE(bcm2708_vcio_resources), diff --git a/arch/arm/mach-bcm2708/include/mach/platform.h b/arch/arm/mach-bcm2708/include/mach/platform.h index 2e7e1bb481ca..bef3e5a62f11 100644 --- a/arch/arm/mach-bcm2708/include/mach/platform.h +++ b/arch/arm/mach-bcm2708/include/mach/platform.h @@ -81,6 +81,7 @@ #define ARMCTRL_IC_BASE (ARM_BASE + 0x200) /* ARM interrupt controller */ #define ARMCTRL_TIMER0_1_BASE (ARM_BASE + 0x400) /* Timer 0 and 1 */ #define ARMCTRL_0_SBM_BASE (ARM_BASE + 0x800) /* User 0 (ARM)'s Semaphores Doorbells and Mailboxes */ +#define ARMCTRL_0_MAIL0_BASE (ARMCTRL_0_SBM_BASE + 0x80) /* User 0 (ARM)'s Mailbox 0 */ /* |