Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d60a044 authored by Russell King's avatar Russell King
Browse files

ARM: Integrator: allow IO_ADDRESS() to be used for register addresses

parent da7ba956
Loading
Loading
Loading
Loading
+7 −7
Original line number Original line Diff line number Diff line
@@ -35,18 +35,18 @@
#define PCIO_BASE		PCI_IO_VADDR
#define PCIO_BASE		PCI_IO_VADDR
#define PCIMEM_BASE		PCI_MEMORY_VADDR
#define PCIMEM_BASE		PCI_MEMORY_VADDR


#ifdef CONFIG_MMU
/* macro to get at IO space when running virtually */
#define IO_ADDRESS(x) (((x) >> 4) + IO_BASE) 
#else
#define IO_ADDRESS(x) (x)
#endif

#define pcibios_assign_all_busses()	1
#define pcibios_assign_all_busses()	1


#define PCIBIOS_MIN_IO		0x6000
#define PCIBIOS_MIN_IO		0x6000
#define PCIBIOS_MIN_MEM 	0x00100000
#define PCIBIOS_MIN_MEM 	0x00100000


/* macro to get at IO space when running virtually */
#ifdef CONFIG_MMU
#define IO_ADDRESS(x)	(((x) & 0x000fffff) | (((x) >> 4) & 0x0ff00000) | IO_BASE)
#else
#define IO_ADDRESS(x)	(x)
#endif

#define __io_address(n)		((void __iomem *)IO_ADDRESS(n))
#define __io_address(n)		((void __iomem *)IO_ADDRESS(n))


#endif
#endif