summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500/include/mach/hardware.h
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2011-12-15 11:41:09 +0100
committerLinus Walleij <linus.walleij@linaro.org>2011-12-19 00:35:06 +0100
commitd5608bbf81987375ced3802374b145e148140b33 (patch)
tree6e30225c268a6907dbd4cd6b5ba1847a0bef841b /arch/arm/mach-ux500/include/mach/hardware.h
parent41c34ae49ec3e48b22591a83386dfd2bfdb45ff6 (diff)
downloadblackbird-op-linux-d5608bbf81987375ced3802374b145e148140b33.tar.gz
blackbird-op-linux-d5608bbf81987375ced3802374b145e148140b33.zip
ARM: ux500: update ASIC detection for U5500
This adds a few CPU identification functions for the U5500 variants. Contains portions of code written by Rabin Vincent. Cc: Rabin Vincent <rabin.vincent@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500/include/mach/hardware.h')
-rw-r--r--arch/arm/mach-ux500/include/mach/hardware.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-ux500/include/mach/hardware.h b/arch/arm/mach-ux500/include/mach/hardware.h
index 470ac52663d6..b6ba26a1367d 100644
--- a/arch/arm/mach-ux500/include/mach/hardware.h
+++ b/arch/arm/mach-ux500/include/mach/hardware.h
@@ -10,20 +10,21 @@
#ifndef __MACH_HARDWARE_H
#define __MACH_HARDWARE_H
-/* macros to get at IO space when running virtually
+/*
+ * Macros to get at IO space when running virtually
* We dont map all the peripherals, let ioremap do
* this for us. We map only very basic peripherals here.
*/
#define U8500_IO_VIRTUAL 0xf0000000
#define U8500_IO_PHYSICAL 0xa0000000
-/* this macro is used in assembly, so no cast */
+/* This macro is used in assembly, so no cast */
#define IO_ADDRESS(x) \
(((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + U8500_IO_VIRTUAL)
/* typesafe io address */
#define __io_address(n) __io(IO_ADDRESS(n))
-/* used by some plat-nomadik code */
+/* Used by some plat-nomadik code */
#define io_p2v(n) __io_address(n)
#include <mach/db8500-regs.h>
@@ -36,6 +37,5 @@ extern void __iomem *_PRCMU_BASE;
#define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x)
-#endif
-
+#endif /* __ASSEMBLY__ */
#endif /* __MACH_HARDWARE_H */
OpenPOWER on IntegriCloud