diff options
| author | Luiz Otavio O Souza <loos@FreeBSD.org> | 2015-05-05 00:19:04 +0000 |
|---|---|---|
| committer | Luiz Otavio O Souza <loos@FreeBSD.org> | 2015-05-05 00:19:04 +0000 |
| commit | 2ae580711aca010ce4ac1ce3769ac2e36a97538c (patch) | |
| tree | b44d0865aa30f9b300ae30041ecf7bc4cd1256d4 /sys/arm/broadcom/bcm2835/bcm2835_vcbus.h | |
| parent | 53b89be19651f8c622d0ed598123fa411cd34613 (diff) | |
Fix DMA on RPi 2.
BCM2836 has a different base address for peripherals.
Obtained from: netbsd
Notes
Notes:
svn path=/head/; revision=282440
Diffstat (limited to 'sys/arm/broadcom/bcm2835/bcm2835_vcbus.h')
| -rw-r--r-- | sys/arm/broadcom/bcm2835/bcm2835_vcbus.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h b/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h index cb871f23bf9e..7b79b1ab5ea4 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h +++ b/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h @@ -37,14 +37,20 @@ #define BCM2835_VCBUS_IO_BASE 0x7E000000 #define BCM2835_VCBUS_SDRAM_UNCACHED 0xC0000000 +#ifdef SOC_BCM2836 +#define BCM2835_ARM_IO_BASE 0x3f000000 +#define BCM2835_VCBUS_SDRAM_BASE BCM2835_VCBUS_SDRAM_UNCACHED +#else #define BCM2835_ARM_IO_BASE 0x20000000 -#define BCM2835_ARM_IO_SIZE 0x02000000 +#define BCM2835_VCBUS_SDRAM_BASE BCM2835_VCBUS_SDRAM_CACHED +#endif +#define BCM2835_ARM_IO_SIZE 0x01000000 /* * Convert physical address to VC bus address. Should be used * when submitting address over mailbox interface */ -#define PHYS_TO_VCBUS(pa) ((pa) + BCM2835_VCBUS_SDRAM_CACHED) +#define PHYS_TO_VCBUS(pa) ((pa) + BCM2835_VCBUS_SDRAM_BASE) /* Check whether pa bellong top IO window */ #define BCM2835_ARM_IS_IO(pa) (((pa) >= BCM2835_ARM_IO_BASE) && \ @@ -61,6 +67,6 @@ * when address is returned by VC over mailbox interface. e.g. * framebuffer base */ -#define VCBUS_TO_PHYS(vca) ((vca) - BCM2835_VCBUS_SDRAM_CACHED) +#define VCBUS_TO_PHYS(vca) ((vca) - BCM2835_VCBUS_SDRAM_BASE) #endif /* _BCM2835_VCBUS_H_ */ |