diff options
Diffstat (limited to 'arch/arm/mach-realview')
-rw-r--r-- | arch/arm/mach-realview/core.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-realview/include/mach/smp.h | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c index 2fa38df2841..07c08151dfe 100644 --- a/arch/arm/mach-realview/core.c +++ b/arch/arm/mach-realview/core.c | |||
@@ -259,6 +259,7 @@ struct mmci_platform_data realview_mmc0_plat_data = { | |||
259 | .status = realview_mmc_status, | 259 | .status = realview_mmc_status, |
260 | .gpio_wp = 17, | 260 | .gpio_wp = 17, |
261 | .gpio_cd = 16, | 261 | .gpio_cd = 16, |
262 | .cd_invert = true, | ||
262 | }; | 263 | }; |
263 | 264 | ||
264 | struct mmci_platform_data realview_mmc1_plat_data = { | 265 | struct mmci_platform_data realview_mmc1_plat_data = { |
@@ -266,6 +267,7 @@ struct mmci_platform_data realview_mmc1_plat_data = { | |||
266 | .status = realview_mmc_status, | 267 | .status = realview_mmc_status, |
267 | .gpio_wp = 19, | 268 | .gpio_wp = 19, |
268 | .gpio_cd = 18, | 269 | .gpio_cd = 18, |
270 | .cd_invert = true, | ||
269 | }; | 271 | }; |
270 | 272 | ||
271 | /* | 273 | /* |
diff --git a/arch/arm/mach-realview/include/mach/smp.h b/arch/arm/mach-realview/include/mach/smp.h index dd53892d44a..d3cd265cb05 100644 --- a/arch/arm/mach-realview/include/mach/smp.h +++ b/arch/arm/mach-realview/include/mach/smp.h | |||
@@ -1,16 +1,8 @@ | |||
1 | #ifndef ASMARM_ARCH_SMP_H | 1 | #ifndef ASMARM_ARCH_SMP_H |
2 | #define ASMARM_ARCH_SMP_H | 2 | #define ASMARM_ARCH_SMP_H |
3 | 3 | ||
4 | |||
5 | #include <asm/hardware/gic.h> | 4 | #include <asm/hardware/gic.h> |
6 | 5 | #include <asm/smp_mpidr.h> | |
7 | #define hard_smp_processor_id() \ | ||
8 | ({ \ | ||
9 | unsigned int cpunum; \ | ||
10 | __asm__("mrc p15, 0, %0, c0, c0, 5" \ | ||
11 | : "=r" (cpunum)); \ | ||
12 | cpunum &= 0x0F; \ | ||
13 | }) | ||
14 | 6 | ||
15 | /* | 7 | /* |
16 | * We use IRQ1 as the IPI | 8 | * We use IRQ1 as the IPI |