3 files changed, 15 insertions, 13 deletions

diff --git a/arch/arm/mach-footbridge/common.c b/arch/arm/mach-footbridge/common.c
index e0091685fd48..9e8220e38398 100644
--- a/arch/arm/mach-footbridge/common.c
+++ b/arch/arm/mach-footbridge/common.c
@@ -143,11 +143,6 @@ static struct map_desc fb_common_io_desc[] __initdata = {
                 .pfn            = __phys_to_pfn(DC21285_ARMCSR_BASE),
                 .length         = ARMCSR_SIZE,
                 .type           = MT_DEVICE,
-        }, {
-                .virtual        = XBUS_BASE,
-                .pfn            = __phys_to_pfn(0x40000000),
-                .length         = XBUS_SIZE,
-                .type           = MT_DEVICE,
         }
 };
 
diff --git a/arch/arm/mach-footbridge/ebsa285.c b/arch/arm/mach-footbridge/ebsa285.c
index 3ff7a0c30a0f..aee8300f3490 100644
--- a/arch/arm/mach-footbridge/ebsa285.c
+++ b/arch/arm/mach-footbridge/ebsa285.c
@@ -4,6 +4,7 @@
  * EBSA285 machine fixup
  */
 #include <linux/init.h>
+#include <linux/io.h>
 #include <linux/spinlock.h>
 #include <linux/slab.h>
 #include <linux/leds.h>
@@ -17,6 +18,11 @@
 
 /* LEDs */
 #if defined(CONFIG_NEW_LEDS) && defined(CONFIG_LEDS_CLASS)
+#define XBUS_AMBER_L    BIT(0)
+#define XBUS_GREEN_L    BIT(1)
+#define XBUS_RED_L      BIT(2)
+#define XBUS_TOGGLE     BIT(7)
+
 struct ebsa285_led {
         struct led_classdev     cdev;
         u8                      mask;
@@ -36,6 +42,7 @@ static const struct {
 };
 
 static unsigned char hw_led_state;
+static void __iomem *xbus;
 
 static void ebsa285_led_set(struct led_classdev *cdev,
                 enum led_brightness b)
@@ -47,7 +54,7 @@ static void ebsa285_led_set(struct led_classdev *cdev,
                 hw_led_state |= led->mask;
         else
                 hw_led_state &= ~led->mask;
-        *XBUS_LEDS = hw_led_state;
+        writeb(hw_led_state, xbus);
 }
 
 static enum led_brightness ebsa285_led_get(struct led_classdev *cdev)
@@ -65,9 +72,13 @@ static int __init ebsa285_leds_init(void)
         if (!machine_is_ebsa285())
                 return -ENODEV;
 
+        xbus = ioremap(XBUS_CS2, SZ_4K);
+        if (!xbus)
+                return -ENOMEM;
+
         /* 3 LEDS all off */
-        hw_led_state = XBUS_LED_AMBER | XBUS_LED_GREEN | XBUS_LED_RED;
-        *XBUS_LEDS = hw_led_state;
+        hw_led_state = XBUS_AMBER_L | XBUS_GREEN_L | XBUS_RED_L;
+        writeb(hw_led_state, xbus);
 
         for (i = 0; i < ARRAY_SIZE(ebsa285_leds); i++) {
                 struct ebsa285_led *led;
diff --git a/arch/arm/mach-footbridge/include/mach/hardware.h b/arch/arm/mach-footbridge/include/mach/hardware.h
index e3d6ccac2162..02f6d7a706b1 100644
--- a/arch/arm/mach-footbridge/include/mach/hardware.h
+++ b/arch/arm/mach-footbridge/include/mach/hardware.h
@@ -51,11 +51,7 @@
 #define PCIMEM_SIZE             0x01000000
 #define PCIMEM_BASE             MMU_IO(0xf0000000, 0x80000000)
 
-#define XBUS_LEDS               ((volatile unsigned char *)(XBUS_BASE + 0x12000))
-#define XBUS_LED_AMBER          (1 << 0)
-#define XBUS_LED_GREEN          (1 << 1)
-#define XBUS_LED_RED            (1 << 2)
-#define XBUS_LED_TOGGLE         (1 << 8)
+#define XBUS_CS2                0x40012000
 
 #define XBUS_SWITCH             ((volatile unsigned char *)(XBUS_BASE + 0x12000))
 #define XBUS_SWITCH_SWITCH      ((*XBUS_SWITCH) & 15)