mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 21:21:37 +00:00
AT91: change includes from asm/arch/io.h to asm/io.h
and remove the now unused asm/arch-at91/io.h Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
This commit is contained in:
parent
60af568038
commit
86592f6059
11 changed files with 10 additions and 54 deletions
|
@ -23,10 +23,10 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
|
#include <asm/io.h>
|
||||||
#include <asm/arch/at91_common.h>
|
#include <asm/arch/at91_common.h>
|
||||||
#include <asm/arch/at91_pmc.h>
|
#include <asm/arch/at91_pmc.h>
|
||||||
#include <asm/arch/gpio.h>
|
#include <asm/arch/gpio.h>
|
||||||
#include <asm/arch/io.h>
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* if CONFIG_AT91_GPIO_PULLUP ist set, keep pullups on on all
|
* if CONFIG_AT91_GPIO_PULLUP ist set, keep pullups on on all
|
||||||
|
|
|
@ -12,8 +12,8 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
|
#include <asm/io.h>
|
||||||
#include <asm/arch/hardware.h>
|
#include <asm/arch/hardware.h>
|
||||||
#include <asm/arch/io.h>
|
|
||||||
#include <asm/arch/at91_pmc.h>
|
#include <asm/arch/at91_pmc.h>
|
||||||
#include <asm/arch/clk.h>
|
#include <asm/arch/clk.h>
|
||||||
|
|
||||||
|
|
|
@ -24,13 +24,12 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
|
#include <asm/io.h>
|
||||||
#include <asm/arch/hardware.h>
|
#include <asm/arch/hardware.h>
|
||||||
#include <asm/arch/at91_pmc.h>
|
#include <asm/arch/at91_pmc.h>
|
||||||
#include <asm/arch/at91_pit.h>
|
#include <asm/arch/at91_pit.h>
|
||||||
#include <asm/arch/at91_gpbr.h>
|
#include <asm/arch/at91_gpbr.h>
|
||||||
#include <asm/arch/clk.h>
|
#include <asm/arch/clk.h>
|
||||||
#include <asm/arch/io.h>
|
|
||||||
|
|
||||||
#ifndef CONFIG_SYS_AT91_MAIN_CLOCK
|
#ifndef CONFIG_SYS_AT91_MAIN_CLOCK
|
||||||
#define CONFIG_SYS_AT91_MAIN_CLOCK 0
|
#define CONFIG_SYS_AT91_MAIN_CLOCK 0
|
||||||
|
|
|
@ -60,8 +60,8 @@
|
||||||
* do a read-modify-write for partially programmed pages
|
* do a read-modify-write for partially programmed pages
|
||||||
*/
|
*/
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
|
#include <asm/io.h>
|
||||||
#include <asm/arch/hardware.h>
|
#include <asm/arch/hardware.h>
|
||||||
#include <asm/arch/io.h>
|
|
||||||
#include <asm/arch/at91_common.h>
|
#include <asm/arch/at91_common.h>
|
||||||
#include <asm/arch/at91_eefc.h>
|
#include <asm/arch/at91_eefc.h>
|
||||||
#include <asm/arch/at91_dbu.h>
|
#include <asm/arch/at91_dbu.h>
|
||||||
|
|
|
@ -23,10 +23,10 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
|
#include <asm/io.h>
|
||||||
#include <asm/arch/at91_pmc.h>
|
#include <asm/arch/at91_pmc.h>
|
||||||
#include <asm/arch/at91_pio.h>
|
#include <asm/arch/at91_pio.h>
|
||||||
#include <asm/arch/gpio.h>
|
#include <asm/arch/gpio.h>
|
||||||
#include <asm/arch/io.h>
|
|
||||||
|
|
||||||
#ifdef CONFIG_RED_LED
|
#ifdef CONFIG_RED_LED
|
||||||
void red_LED_on(void)
|
void red_LED_on(void)
|
||||||
|
|
|
@ -23,9 +23,9 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
|
#include <asm/io.h>
|
||||||
#include <asm/arch/hardware.h>
|
#include <asm/arch/hardware.h>
|
||||||
#include <asm/arch/at91_rstc.h>
|
#include <asm/arch/at91_rstc.h>
|
||||||
#include <asm/arch/io.h>
|
|
||||||
|
|
||||||
/* Reset the cpu by telling the reset controller to do so */
|
/* Reset the cpu by telling the reset controller to do so */
|
||||||
void reset_cpu(ulong ignored)
|
void reset_cpu(ulong ignored)
|
||||||
|
|
|
@ -23,11 +23,11 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
|
#include <asm/io.h>
|
||||||
#include <asm/arch/hardware.h>
|
#include <asm/arch/hardware.h>
|
||||||
#include <asm/arch/at91_pit.h>
|
#include <asm/arch/at91_pit.h>
|
||||||
#include <asm/arch/at91_pmc.h>
|
#include <asm/arch/at91_pmc.h>
|
||||||
#include <asm/arch/clk.h>
|
#include <asm/arch/clk.h>
|
||||||
#include <asm/arch/io.h>
|
|
||||||
#include <div64.h>
|
#include <div64.h>
|
||||||
|
|
||||||
#if !defined(CONFIG_AT91FAMILY)
|
#if !defined(CONFIG_AT91FAMILY)
|
||||||
|
|
|
@ -1,43 +0,0 @@
|
||||||
/*
|
|
||||||
* [origin: Linux kernel include/asm-arm/arch-at91/io.h]
|
|
||||||
*
|
|
||||||
* Copyright (C) 2003 SAN People
|
|
||||||
*
|
|
||||||
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __ASM_ARCH_IO_H
|
|
||||||
#define __ASM_ARCH_IO_H
|
|
||||||
|
|
||||||
#include <asm/io.h>
|
|
||||||
|
|
||||||
#ifdef CONFIG_AT91_LEGACY
|
|
||||||
|
|
||||||
static inline unsigned int at91_sys_read(unsigned int reg_offset)
|
|
||||||
{
|
|
||||||
void *addr = (void *)ATMEL_BASE_SYS;
|
|
||||||
|
|
||||||
return __raw_readl(addr + reg_offset);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void at91_sys_write(unsigned int reg_offset, unsigned long value)
|
|
||||||
{
|
|
||||||
void *addr = (void *)ATMEL_BASE_SYS;
|
|
||||||
|
|
||||||
__raw_writel(value, addr + reg_offset);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -36,9 +36,9 @@
|
||||||
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
|
#include <asm/io.h>
|
||||||
#include <asm/sizes.h>
|
#include <asm/sizes.h>
|
||||||
#include <asm/arch/hardware.h>
|
#include <asm/arch/hardware.h>
|
||||||
#include <asm/arch/io.h>
|
|
||||||
#include <asm/arch/at91_pio.h>
|
#include <asm/arch/at91_pio.h>
|
||||||
|
|
||||||
int at91_set_pio_pullup(unsigned port, unsigned pin, int use_pullup)
|
int at91_set_pio_pullup(unsigned port, unsigned pin, int use_pullup)
|
||||||
|
|
|
@ -38,9 +38,9 @@
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <command.h>
|
#include <command.h>
|
||||||
#include <rtc.h>
|
#include <rtc.h>
|
||||||
|
#include <asm/io.h>
|
||||||
#include <asm/errno.h>
|
#include <asm/errno.h>
|
||||||
#include <asm/arch/hardware.h>
|
#include <asm/arch/hardware.h>
|
||||||
#include <asm/arch/io.h>
|
|
||||||
#include <asm/arch/at91_rtt.h>
|
#include <asm/arch/at91_rtt.h>
|
||||||
#include <asm/arch/at91_gpbr.h>
|
#include <asm/arch/at91_gpbr.h>
|
||||||
|
|
||||||
|
|
|
@ -25,8 +25,8 @@
|
||||||
|
|
||||||
#if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT)
|
#if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT)
|
||||||
|
|
||||||
|
#include <asm/io.h>
|
||||||
#include <asm/arch/hardware.h>
|
#include <asm/arch/hardware.h>
|
||||||
#include <asm/arch/io.h>
|
|
||||||
#include <asm/arch/at91_pmc.h>
|
#include <asm/arch/at91_pmc.h>
|
||||||
#include <asm/arch/clk.h>
|
#include <asm/arch/clk.h>
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue