From: 黄涛 <huangtao@rock-chips.com>
Date: Mon, 12 Jul 2010 02:24:56 +0000 (+0800)
Subject: rm arch/arm/mach-rk2818/io.c
X-Git-Tag: firefly_0821_release~11367
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fb2398cdb89ba1fbed48173c57c1aed613634ebc;p=firefly-linux-kernel-4.4.55.git

rm arch/arm/mach-rk2818/io.c
---

diff --git a/arch/arm/mach-rk2818/Makefile b/arch/arm/mach-rk2818/Makefile
index 95ed623411b6..aa2a1d82b230 100644
--- a/arch/arm/mach-rk2818/Makefile
+++ b/arch/arm/mach-rk2818/Makefile
@@ -1,4 +1,4 @@
-obj-y += io.o irq.o timer.o iomux.o gpio.o
+obj-y += irq.o timer.o iomux.o gpio.o
 obj-y += devices.o
 obj-y += clock.o
 obj-$(CONFIG_CPU_FREQ) += cpufreq.o
diff --git a/arch/arm/mach-rk2818/include/mach/io.h b/arch/arm/mach-rk2818/include/mach/io.h
index 87ea8857d541..e85ebb2278c7 100644
--- a/arch/arm/mach-rk2818/include/mach/io.h
+++ b/arch/arm/mach-rk2818/include/mach/io.h
@@ -18,15 +18,6 @@
 
 #define IO_SPACE_LIMIT 0xffffffff
 
-#define __arch_ioremap __rk2818_ioremap
-#define __arch_iounmap __iounmap
-
-void __iomem *__rk2818_ioremap(unsigned long phys_addr, size_t size, unsigned int mtype);
-
-static inline void __iomem *__io(unsigned long addr)
-{
-	return (void __iomem *)addr;
-}
 #define __io(a)		__typesafe_io(a)
 #define __mem_pci(a)    (a)
 
diff --git a/arch/arm/mach-rk2818/io.c b/arch/arm/mach-rk2818/io.c
deleted file mode 100644
index 70bc7e6898a0..000000000000
--- a/arch/arm/mach-rk2818/io.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/* arch/arm/mach-rk2818/io.c
- *
- * Copyright (C) 2010 ROCKCHIP, Inc.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/io.h>
-
-#include <mach/hardware.h>
-#include <asm/page.h>
-#include <mach/rk2818_iomap.h>
-#include <asm/mach/map.h>
-
-#include <mach/board.h>
-
-#define RK2818_DEVICE(name) { \
-		.virtual = (unsigned long) RK2818_##name##_BASE, \
-		.pfn = __phys_to_pfn(RK2818_##name##_PHYS), \
-		.length = RK2818_##name##_SIZE, \
-		.type = MT_DEVICE_NONSHARED, \
-	 }
-
-static struct map_desc rk2818_io_desc[] __initdata = {
-	/*RK2818_DEVICE(VIC),
-	RK2818_DEVICE(CSR),
-	RK2818_DEVICE(GPT),
-	RK2818_DEVICE(DMOV),
-	RK2818_DEVICE(GPIO1),
-	RK2818_DEVICE(GPIO2),
-	RK2818_DEVICE(CLK_CTL),
-	{
-		.virtual =  (unsigned long) RK2818_SHARED_RAM_BASE,
-		.pfn =      __phys_to_pfn(RK2818_SHARED_RAM_PHYS),
-		.length =   RK2818_SHARED_RAM_SIZE,
-		.type =     MT_DEVICE,
-	},*/
-};
-
-void __init rk2818_map_common_io(void)
-{
-	/* Make sure the peripheral register window is closed, since
-	 * we will use PTE flags (TEX[1]=1,B=0,C=1) to determine which
-	 * pages are peripheral interface or not.
-	 */
-	asm("mcr p15, 0, %0, c15, c2, 4" : : "r" (0));
-
-	iotable_init(rk2818_io_desc, ARRAY_SIZE(rk2818_io_desc));
-}
-
-void __iomem *
-__rk2818_ioremap(unsigned long phys_addr, size_t size, unsigned int mtype)
-{
-	if (mtype == MT_DEVICE) {
-		/* The peripherals in the 88000000 - D0000000 range
-		 * are only accessable by type MT_DEVICE_NONSHARED.
-		 * Adjust mtype as necessary to make this "just work."
-		 */
-		if ((phys_addr >= 0x88000000) && (phys_addr < 0xD0000000))
-			mtype = MT_DEVICE_NONSHARED;
-	}
-
-	return __arm_ioremap(phys_addr, size, mtype);
-}