sh: Tidy up L-BOX area5 addresses.

L-BOX can use the normal PA_AREA5_IO, there's no reason for it to
reproduce it.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/boards/lboxre2/setup.c b/arch/sh/boards/lboxre2/setup.c
index fc3cba3f0606bdabc45fe24db0ed4261c6240d99..4e20f7c63bf3dfc1477411cb0da9d994f40a2ee8 100644 (file)
--- a/arch/sh/boards/lboxre2/setup.c
+++ b/arch/sh/boards/lboxre2/setup.c
@@ -15,6 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/pata_platform.h>
 #include <asm/machvec.h>
+#include <asm/addrspace.h>
 #include <asm/lboxre2.h>
 #include <asm/io.h>
 
@@ -53,7 +54,7 @@ static int __init lboxre2_devices_setup(void)
        unsigned long paddrbase, psize;
 
        /* open I/O area window */
-       paddrbase = virt_to_phys((void*)CONFIG_CF0_BASE_ADDR);
+       paddrbase = virt_to_phys((void*)PA_AREA5_IO);
        psize = PAGE_SIZE;
        prot = PAGE_KERNEL_PCC( 1 , _PAGE_PCC_IO16);
        cf0_io_base = (u32)p3_ioremap(paddrbase, psize, prot.pgprot);

diff --git a/include/asm-sh/lboxre2.h b/include/asm-sh/lboxre2.h
index 65775668df932df1ada11f78a967fa59a2dd02c1..e6d160504923c2620d1c87f1288ce20895dff265 100644 (file)
--- a/include/asm-sh/lboxre2.h
+++ b/include/asm-sh/lboxre2.h
@@ -2,8 +2,6 @@
 #define __ASM_SH_LBOXRE2_H
 
 /*
- * linux/include/asm-sh/lbox.h
- *
  * Copyright (C) 2007 Nobuhiro Iwamatsu
  *
  * NTT COMWARE L-BOX RE2 support
@@ -14,11 +12,8 @@
  *
  */
 
-#define CONFIG_CF0_BASE_ADDR   0xb4000000 /* Boot only */
-#define CONFIG_CF1_BASE_ADDR   0xb8000000
-
-#define IRQ_CF1        9       /* CF1 */
-#define IRQ_CF0        10      /* CF0 */
+#define IRQ_CF1                9       /* CF1 */
+#define IRQ_CF0                10      /* CF0 */
 #define IRQ_INTD       11      /* INTD */
 #define IRQ_ETH1       12      /* Ether1 */
 #define IRQ_ETH0       13      /* Ether0 */