mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 12:42:02 +00:00
ARM: sunxi: Remove the .map_io function declaration
debug_ll_io_init should be enough to map the needed addresses at boot, so remove the trivial map_io code, and let the core call debug_ll_io_init. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
parent
6aaab172c9
commit
442f15083e
@ -26,8 +26,6 @@
|
||||
#include <asm/mach/map.h>
|
||||
#include <asm/system_misc.h>
|
||||
|
||||
#include "sunxi.h"
|
||||
|
||||
#define SUN4I_WATCHDOG_CTRL_REG 0x00
|
||||
#define SUN4I_WATCHDOG_CTRL_RESTART (1 << 0)
|
||||
#define SUN4I_WATCHDOG_MODE_REG 0x04
|
||||
@ -81,20 +79,6 @@ static void sunxi_setup_restart(void)
|
||||
arm_pm_restart = of_id->data;
|
||||
}
|
||||
|
||||
static struct map_desc sunxi_io_desc[] __initdata = {
|
||||
{
|
||||
.virtual = (unsigned long) SUNXI_REGS_VIRT_BASE,
|
||||
.pfn = __phys_to_pfn(SUNXI_REGS_PHYS_BASE),
|
||||
.length = SUNXI_REGS_SIZE,
|
||||
.type = MT_DEVICE,
|
||||
},
|
||||
};
|
||||
|
||||
void __init sunxi_map_io(void)
|
||||
{
|
||||
iotable_init(sunxi_io_desc, ARRAY_SIZE(sunxi_io_desc));
|
||||
}
|
||||
|
||||
static void __init sunxi_timer_init(void)
|
||||
{
|
||||
sunxi_init_clocks();
|
||||
@ -116,7 +100,6 @@ static const char * const sunxi_board_dt_compat[] = {
|
||||
|
||||
DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)")
|
||||
.init_machine = sunxi_dt_init,
|
||||
.map_io = sunxi_map_io,
|
||||
.init_irq = irqchip_init,
|
||||
.init_time = sunxi_timer_init,
|
||||
.dt_compat = sunxi_board_dt_compat,
|
||||
|
@ -1,20 +0,0 @@
|
||||
/*
|
||||
* Generic definitions for Allwinner SunXi SoCs
|
||||
*
|
||||
* Copyright (C) 2012 Maxime Ripard
|
||||
*
|
||||
* Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
*
|
||||
* This file is licensed under the terms of the GNU General Public
|
||||
* License version 2. This program is licensed "as is" without any
|
||||
* warranty of any kind, whether express or implied.
|
||||
*/
|
||||
|
||||
#ifndef __MACH_SUNXI_H
|
||||
#define __MACH_SUNXI_H
|
||||
|
||||
#define SUNXI_REGS_PHYS_BASE 0x01c00000
|
||||
#define SUNXI_REGS_VIRT_BASE IOMEM(0xf1c00000)
|
||||
#define SUNXI_REGS_SIZE (SZ_2M + SZ_1M)
|
||||
|
||||
#endif /* __MACH_SUNXI_H */
|
Loading…
Reference in New Issue
Block a user