ARM: picoxcell: remove dependency on mach/* headers
Signed-off-by: Rob Herring <rob.herring@calxeda.com> [Jamie Iles: rework to fold picoxcell_soc.h in common.c] Signed-off-by: Jamie Iles <jamie@jamieiles.com>
This commit is contained in:
parent
360a0cab50
commit
06413f1e31
|
@ -20,14 +20,15 @@
|
||||||
#include <asm/hardware/vic.h>
|
#include <asm/hardware/vic.h>
|
||||||
#include <asm/mach/map.h>
|
#include <asm/mach/map.h>
|
||||||
|
|
||||||
#include <mach/map.h>
|
|
||||||
#include <mach/picoxcell_soc.h>
|
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
#define WDT_CTRL_REG_EN_MASK (1 << 0)
|
#define PHYS_TO_IO(x) (((x) & 0x00ffffff) | 0xfe000000)
|
||||||
#define WDT_CTRL_REG_OFFS (0x00)
|
#define PICOXCELL_PERIPH_BASE 0x80000000
|
||||||
#define WDT_TIMEOUT_REG_OFFS (0x04)
|
#define PICOXCELL_PERIPH_LENGTH SZ_4M
|
||||||
|
|
||||||
|
#define WDT_CTRL_REG_EN_MASK (1 << 0)
|
||||||
|
#define WDT_CTRL_REG_OFFS (0x00)
|
||||||
|
#define WDT_TIMEOUT_REG_OFFS (0x04)
|
||||||
static void __iomem *wdt_regs;
|
static void __iomem *wdt_regs;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -1,25 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2011 Picochip Ltd., Jamie Iles
|
|
||||||
*
|
|
||||||
* 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.
|
|
||||||
*/
|
|
||||||
#ifndef __PICOXCELL_MAP_H__
|
|
||||||
#define __PICOXCELL_MAP_H__
|
|
||||||
|
|
||||||
#define PHYS_TO_IO(x) (((x) & 0x00ffffff) | 0xfe000000)
|
|
||||||
|
|
||||||
#ifdef __ASSEMBLY__
|
|
||||||
#define IO_ADDRESS(x) PHYS_TO_IO((x))
|
|
||||||
#else
|
|
||||||
#define IO_ADDRESS(x) (void __iomem __force *)(PHYS_TO_IO((x)))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* __PICOXCELL_MAP_H__ */
|
|
|
@ -1,25 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2011 Picochip Ltd., Jamie Iles
|
|
||||||
*
|
|
||||||
* This file contains the hardware definitions of the picoXcell SoC devices.
|
|
||||||
*
|
|
||||||
* 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.
|
|
||||||
*/
|
|
||||||
#ifndef __PICOXCELL_SOC_H__
|
|
||||||
#define __PICOXCELL_SOC_H__
|
|
||||||
|
|
||||||
#define PICOXCELL_UART1_BASE 0x80230000
|
|
||||||
#define PICOXCELL_PERIPH_BASE 0x80000000
|
|
||||||
#define PICOXCELL_PERIPH_LENGTH SZ_4M
|
|
||||||
#define PICOXCELL_VIC0_BASE 0x80060000
|
|
||||||
#define PICOXCELL_VIC1_BASE 0x80064000
|
|
||||||
|
|
||||||
#endif /* __PICOXCELL_SOC_H__ */
|
|
Loading…
Reference in New Issue