10 files changed, 119 insertions, 28 deletions

diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig
index d4cfa2145386..dfc9b0bc6eb2 100644
--- a/arch/arm/mach-realview/Kconfig
+++ b/arch/arm/mach-realview/Kconfig
@@ -75,7 +75,7 @@ config MACH_REALVIEW_PBX
 
 config REALVIEW_HIGH_PHYS_OFFSET
         bool "High physical base address for the RealView platform"
-        depends on !MACH_REALVIEW_PB1176
+        depends on MMU && !MACH_REALVIEW_PB1176
         default y
         help
           RealView boards other than PB1176 have the RAM available at
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c
index facbd49eec67..dc3519c50ab2 100644
--- a/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
@@ -221,6 +221,9 @@ arch_initcall(realview_i2c_init);
 
 #define REALVIEW_SYSMCI (__io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_MCI_OFFSET)
 
+/*
+ * This is only used if GPIOLIB support is disabled
+ */
 static unsigned int realview_mmc_status(struct device *dev)
 {
         struct amba_device *adev = container_of(dev, struct amba_device, dev);
@@ -237,11 +240,15 @@ static unsigned int realview_mmc_status(struct device *dev)
 struct mmc_platform_data realview_mmc0_plat_data = {
         .ocr_mask       = MMC_VDD_32_33|MMC_VDD_33_34,
         .status         = realview_mmc_status,
+        .gpio_wp        = 17,
+        .gpio_cd        = 16,
 };
 
 struct mmc_platform_data realview_mmc1_plat_data = {
         .ocr_mask       = MMC_VDD_32_33|MMC_VDD_33_34,
         .status         = realview_mmc_status,
+        .gpio_wp        = 19,
+        .gpio_cd        = 18,
 };
 
 /*
diff --git a/arch/arm/mach-realview/include/mach/gpio.h b/arch/arm/mach-realview/include/mach/gpio.h
new file mode 100644
index 000000000000..94ff27678a46
--- /dev/null
+++ b/arch/arm/mach-realview/include/mach/gpio.h
@@ -0,0 +1,6 @@
+#include <asm-generic/gpio.h>
+
+#define gpio_get_value  __gpio_get_value
+#define gpio_set_value  __gpio_set_value
+#define gpio_cansleep   __gpio_cansleep
+#define gpio_to_irq     __gpio_to_irq
diff --git a/arch/arm/mach-realview/include/mach/hardware.h b/arch/arm/mach-realview/include/mach/hardware.h
index b42c14f89acb..8a638d15797f 100644
--- a/arch/arm/mach-realview/include/mach/hardware.h
+++ b/arch/arm/mach-realview/include/mach/hardware.h
@@ -25,6 +25,7 @@
 #include <asm/sizes.h>
 
 /* macro to get at IO space when running virtually */
+#ifdef CONFIG_MMU
 /*
  * Statically mapped addresses:
  *
@@ -33,6 +34,9 @@
  * 1fxx xxxx -> fexx xxxx
  */
 #define IO_ADDRESS(x)           (((x) & 0x03ffffff) + 0xfb000000)
+#else
+#define IO_ADDRESS(x)           (x)
+#endif
 #define __io_address(n)         __io(IO_ADDRESS(n))
 
 #endif
diff --git a/arch/arm/mach-realview/platsmp.c b/arch/arm/mach-realview/platsmp.c
index ac0e83f1cc3a..a88458b4799d 100644
--- a/arch/arm/mach-realview/platsmp.c
+++ b/arch/arm/mach-realview/platsmp.c
@@ -20,6 +20,7 @@
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/localtimer.h>
+#include <asm/unified.h>
 
 #include <mach/board-eb.h>
 #include <mach/board-pb11mp.h>
@@ -137,26 +138,19 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
 
 static void __init poke_milo(void)
 {
-        extern void secondary_startup(void);
-
         /* nobody is to be released from the pen yet */
         pen_release = -1;
 
         /*
-         * write the address of secondary startup into the system-wide
-         * flags register, then clear the bottom two bits, which is what
-         * BootMonitor is waiting for
+         * Write the address of secondary startup into the system-wide flags
+         * register. The BootMonitor waits for this register to become
+         * non-zero.
          */
-#if 1
 #define REALVIEW_SYS_FLAGSS_OFFSET 0x30
-        __raw_writel(virt_to_phys(realview_secondary_startup),
-                     __io_address(REALVIEW_SYS_BASE) +
-                     REALVIEW_SYS_FLAGSS_OFFSET);
 #define REALVIEW_SYS_FLAGSC_OFFSET 0x34
-        __raw_writel(3,
+        __raw_writel(BSYM(virt_to_phys(realview_secondary_startup)),
                      __io_address(REALVIEW_SYS_BASE) +
-                     REALVIEW_SYS_FLAGSC_OFFSET);
-#endif
+                     REALVIEW_SYS_FLAGSS_OFFSET);
 
         mb();
 }
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c
index 8dfa44e08a94..abd13b448671 100644
--- a/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@ -23,6 +23,7 @@
 #include <linux/platform_device.h>
 #include <linux/sysdev.h>
 #include <linux/amba/bus.h>
+#include <linux/amba/pl061.h>
 #include <linux/io.h>
 
 #include <mach/hardware.h>
@@ -113,6 +114,21 @@ static void __init realview_eb_map_io(void)
                 iotable_init(realview_eb11mp_io_desc, ARRAY_SIZE(realview_eb11mp_io_desc));
 }
 
+static struct pl061_platform_data gpio0_plat_data = {
+        .gpio_base      = 0,
+        .irq_base       = -1,
+};
+
+static struct pl061_platform_data gpio1_plat_data = {
+        .gpio_base      = 8,
+        .irq_base       = -1,
+};
+
+static struct pl061_platform_data gpio2_plat_data = {
+        .gpio_base      = 16,
+        .irq_base       = -1,
+};
+
 /*
  * RealView EB AMBA devices
  */
@@ -189,9 +205,9 @@ AMBA_DEVICE(clcd,  "dev:20",  EB_CLCD,  &clcd_plat_data);
 AMBA_DEVICE(dmac,  "dev:30",  DMAC,     NULL);
 AMBA_DEVICE(sctl,  "dev:e0",  SCTL,     NULL);
 AMBA_DEVICE(wdog,  "dev:e1",  EB_WATCHDOG, NULL);
-AMBA_DEVICE(gpio0, "dev:e4",  EB_GPIO0, NULL);
-AMBA_DEVICE(gpio1, "dev:e5",  GPIO1,    NULL);
-AMBA_DEVICE(gpio2, "dev:e6",  GPIO2,    NULL);
+AMBA_DEVICE(gpio0, "dev:e4",  EB_GPIO0, &gpio0_plat_data);
+AMBA_DEVICE(gpio1, "dev:e5",  GPIO1,    &gpio1_plat_data);
+AMBA_DEVICE(gpio2, "dev:e6",  GPIO2,    &gpio2_plat_data);
 AMBA_DEVICE(rtc,   "dev:e8",  EB_RTC,   NULL);
 AMBA_DEVICE(sci0,  "dev:f0",  SCI,      NULL);
 AMBA_DEVICE(uart0, "dev:f1",  EB_UART0, NULL);
diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c
index 25efe71a67c7..17fbb0e889b6 100644
--- a/arch/arm/mach-realview/realview_pb1176.c
+++ b/arch/arm/mach-realview/realview_pb1176.c
@@ -23,6 +23,7 @@
 #include <linux/platform_device.h>
 #include <linux/sysdev.h>
 #include <linux/amba/bus.h>
+#include <linux/amba/pl061.h>
 #include <linux/io.h>
 
 #include <mach/hardware.h>
@@ -107,6 +108,21 @@ static void __init realview_pb1176_map_io(void)
         iotable_init(realview_pb1176_io_desc, ARRAY_SIZE(realview_pb1176_io_desc));
 }
 
+static struct pl061_platform_data gpio0_plat_data = {
+        .gpio_base      = 0,
+        .irq_base       = -1,
+};
+
+static struct pl061_platform_data gpio1_plat_data = {
+        .gpio_base      = 8,
+        .irq_base       = -1,
+};
+
+static struct pl061_platform_data gpio2_plat_data = {
+        .gpio_base      = 16,
+        .irq_base       = -1,
+};
+
 /*
  * RealView PB1176 AMBA devices
  */
@@ -164,9 +180,9 @@ AMBA_DEVICE(uart3,	"fpga:09",	PB1176_UART3,	NULL);
 AMBA_DEVICE(smc,        "dev:00",       PB1176_SMC,     NULL);
 AMBA_DEVICE(sctl,       "dev:e0",       SCTL,           NULL);
 AMBA_DEVICE(wdog,       "dev:e1",       PB1176_WATCHDOG,        NULL);
-AMBA_DEVICE(gpio0,      "dev:e4",       PB1176_GPIO0,   NULL);
-AMBA_DEVICE(gpio1,      "dev:e5",       GPIO1,          NULL);
-AMBA_DEVICE(gpio2,      "dev:e6",       GPIO2,          NULL);
+AMBA_DEVICE(gpio0,      "dev:e4",       PB1176_GPIO0,   &gpio0_plat_data);
+AMBA_DEVICE(gpio1,      "dev:e5",       GPIO1,          &gpio1_plat_data);
+AMBA_DEVICE(gpio2,      "dev:e6",       GPIO2,          &gpio2_plat_data);
 AMBA_DEVICE(rtc,        "dev:e8",       PB1176_RTC,     NULL);
 AMBA_DEVICE(sci0,       "dev:f0",       SCI,            NULL);
 AMBA_DEVICE(uart0,      "dev:f1",       PB1176_UART0,   NULL);
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c
index dc4b16943907..fdd042b85f40 100644
--- a/arch/arm/mach-realview/realview_pb11mp.c
+++ b/arch/arm/mach-realview/realview_pb11mp.c
@@ -23,6 +23,7 @@
 #include <linux/platform_device.h>
 #include <linux/sysdev.h>
 #include <linux/amba/bus.h>
+#include <linux/amba/pl061.h>
 #include <linux/io.h>
 
 #include <mach/hardware.h>
@@ -108,6 +109,21 @@ static void __init realview_pb11mp_map_io(void)
         iotable_init(realview_pb11mp_io_desc, ARRAY_SIZE(realview_pb11mp_io_desc));
 }
 
+static struct pl061_platform_data gpio0_plat_data = {
+        .gpio_base      = 0,
+        .irq_base       = -1,
+};
+
+static struct pl061_platform_data gpio1_plat_data = {
+        .gpio_base      = 8,
+        .irq_base       = -1,
+};
+
+static struct pl061_platform_data gpio2_plat_data = {
+        .gpio_base      = 16,
+        .irq_base       = -1,
+};
+
 /*
  * RealView PB11MPCore AMBA devices
  */
@@ -166,9 +182,9 @@ AMBA_DEVICE(uart3,	"fpga:09",	PB11MP_UART3,	NULL);
 AMBA_DEVICE(smc,        "dev:00",       PB11MP_SMC,     NULL);
 AMBA_DEVICE(sctl,       "dev:e0",       SCTL,           NULL);
 AMBA_DEVICE(wdog,       "dev:e1",       PB11MP_WATCHDOG, NULL);
-AMBA_DEVICE(gpio0,      "dev:e4",       PB11MP_GPIO0,   NULL);
-AMBA_DEVICE(gpio1,      "dev:e5",       GPIO1,          NULL);
-AMBA_DEVICE(gpio2,      "dev:e6",       GPIO2,          NULL);
+AMBA_DEVICE(gpio0,      "dev:e4",       PB11MP_GPIO0,   &gpio0_plat_data);
+AMBA_DEVICE(gpio1,      "dev:e5",       GPIO1,          &gpio1_plat_data);
+AMBA_DEVICE(gpio2,      "dev:e6",       GPIO2,          &gpio2_plat_data);
 AMBA_DEVICE(rtc,        "dev:e8",       PB11MP_RTC,     NULL);
 AMBA_DEVICE(sci0,       "dev:f0",       SCI,            NULL);
 AMBA_DEVICE(uart0,      "dev:f1",       PB11MP_UART0,   NULL);
diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c
index d6ac1eb86576..70bba9900d97 100644
--- a/arch/arm/mach-realview/realview_pba8.c
+++ b/arch/arm/mach-realview/realview_pba8.c
@@ -23,6 +23,7 @@
 #include <linux/platform_device.h>
 #include <linux/sysdev.h>
 #include <linux/amba/bus.h>
+#include <linux/amba/pl061.h>
 #include <linux/io.h>
 
 #include <asm/irq.h>
@@ -98,6 +99,21 @@ static void __init realview_pba8_map_io(void)
         iotable_init(realview_pba8_io_desc, ARRAY_SIZE(realview_pba8_io_desc));
 }
 
+static struct pl061_platform_data gpio0_plat_data = {
+        .gpio_base      = 0,
+        .irq_base       = -1,
+};
+
+static struct pl061_platform_data gpio1_plat_data = {
+        .gpio_base      = 8,
+        .irq_base       = -1,
+};
+
+static struct pl061_platform_data gpio2_plat_data = {
+        .gpio_base      = 16,
+        .irq_base       = -1,
+};
+
 /*
  * RealView PBA8Core AMBA devices
  */
@@ -156,9 +172,9 @@ AMBA_DEVICE(uart3,	"fpga:09",	PBA8_UART3,	NULL);
 AMBA_DEVICE(smc,        "dev:00",       PBA8_SMC,       NULL);
 AMBA_DEVICE(sctl,       "dev:e0",       SCTL,           NULL);
 AMBA_DEVICE(wdog,       "dev:e1",       PBA8_WATCHDOG, NULL);
-AMBA_DEVICE(gpio0,      "dev:e4",       PBA8_GPIO0,     NULL);
-AMBA_DEVICE(gpio1,      "dev:e5",       GPIO1,          NULL);
-AMBA_DEVICE(gpio2,      "dev:e6",       GPIO2,          NULL);
+AMBA_DEVICE(gpio0,      "dev:e4",       PBA8_GPIO0,     &gpio0_plat_data);
+AMBA_DEVICE(gpio1,      "dev:e5",       GPIO1,          &gpio1_plat_data);
+AMBA_DEVICE(gpio2,      "dev:e6",       GPIO2,          &gpio2_plat_data);
 AMBA_DEVICE(rtc,        "dev:e8",       PBA8_RTC,       NULL);
 AMBA_DEVICE(sci0,       "dev:f0",       SCI,            NULL);
 AMBA_DEVICE(uart0,      "dev:f1",       PBA8_UART0,     NULL);
diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c
index ede2a57240a3..ce6c5d25fbef 100644
--- a/arch/arm/mach-realview/realview_pbx.c
+++ b/arch/arm/mach-realview/realview_pbx.c
@@ -22,6 +22,7 @@
 #include <linux/platform_device.h>
 #include <linux/sysdev.h>
 #include <linux/amba/bus.h>
+#include <linux/amba/pl061.h>
 #include <linux/io.h>
 
 #include <asm/irq.h>
@@ -118,6 +119,21 @@ static void __init realview_pbx_map_io(void)
                 iotable_init(realview_local_io_desc, ARRAY_SIZE(realview_local_io_desc));
 }
 
+static struct pl061_platform_data gpio0_plat_data = {
+        .gpio_base      = 0,
+        .irq_base       = -1,
+};
+
+static struct pl061_platform_data gpio1_plat_data = {
+        .gpio_base      = 8,
+        .irq_base       = -1,
+};
+
+static struct pl061_platform_data gpio2_plat_data = {
+        .gpio_base      = 16,
+        .irq_base       = -1,
+};
+
 /*
  * RealView PBXCore AMBA devices
  */
@@ -176,9 +192,9 @@ AMBA_DEVICE(uart3,	"fpga:09",	PBX_UART3,	NULL);
 AMBA_DEVICE(smc,        "dev:00",       PBX_SMC,        NULL);
 AMBA_DEVICE(sctl,       "dev:e0",       SCTL,           NULL);
 AMBA_DEVICE(wdog,       "dev:e1",       PBX_WATCHDOG,   NULL);
-AMBA_DEVICE(gpio0,      "dev:e4",       PBX_GPIO0,      NULL);
-AMBA_DEVICE(gpio1,      "dev:e5",       GPIO1,          NULL);
-AMBA_DEVICE(gpio2,      "dev:e6",       GPIO2,          NULL);
+AMBA_DEVICE(gpio0,      "dev:e4",       PBX_GPIO0,      &gpio0_plat_data);
+AMBA_DEVICE(gpio1,      "dev:e5",       GPIO1,          &gpio1_plat_data);
+AMBA_DEVICE(gpio2,      "dev:e6",       GPIO2,          &gpio2_plat_data);
 AMBA_DEVICE(rtc,        "dev:e8",       PBX_RTC,        NULL);
 AMBA_DEVICE(sci0,       "dev:f0",       SCI,            NULL);
 AMBA_DEVICE(uart0,      "dev:f1",       PBX_UART0,      NULL);