--- arch/mips/include/asm/lemote/pci.h | 31 +++++++++++++++++++++++++++++++ arch/mips/lemote/lm2e/setup.c | 9 ++------- 2 files changed, 33 insertions(+), 7 deletions(-) create mode 100644 arch/mips/include/asm/lemote/pci.h diff --git a/arch/mips/include/asm/lemote/pci.h b/arch/mips/include/asm/lemote/pci.h new file mode 100644 index 0000000..8e5c9c3 --- /dev/null +++ b/arch/mips/include/asm/lemote/pci.h @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2008 Zhang Le <r0bertz@xxxxxxxxxx> + * + * This program is free software; you can redistribute it + * and/or modify it under the terms of the GNU General + * Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be + * useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA + * 02139, USA. + */ + +#ifndef _LEMOTE_PCI_H_ +#define _LEMOTE_PCI_H_ + +#ifdef CONFIG_64BIT +#define LEMOTE_IO_PORT_BASE 0xffffffffbfd00000 +#else +#define LEMOTE_IO_PORT_BASE 0xbfd00000 +#endif + +#endif /* !_LEMOTE_PCI_H_ */ diff --git a/arch/mips/lemote/lm2e/setup.c b/arch/mips/lemote/lm2e/setup.c index 2cc6745..6f7076d 100644 --- a/arch/mips/lemote/lm2e/setup.c +++ b/arch/mips/lemote/lm2e/setup.c @@ -34,6 +34,7 @@ #include <asm/mc146818-time.h> #include <asm/time.h> #include <asm/wbflush.h> +#include <asm/lemote/pci.h> #ifdef CONFIG_VT #include <linux/console.h> @@ -42,12 +43,6 @@ extern void mips_reboot_setup(void); -#ifdef CONFIG_64BIT -#define PTR_PAD(p) ((0xffffffff00000000)|((unsigned long long)(p))) -#else -#define PTR_PAD(p) (p) -#endif - unsigned long cpu_clock_freq; unsigned long bus_clock; unsigned int memsize; @@ -80,7 +75,7 @@ static void wbflush_loongson2e(void) void __init plat_mem_setup(void) { - set_io_port_base(PTR_PAD(0xbfd00000)); + set_io_port_base(LEMOTE_IO_PORT_BASE); mips_reboot_setup(); -- 1.6.0.2