Commit 23b84082 authored by Alexandre Belloni's avatar Alexandre Belloni Committed by Nicolas Ferre
Browse files

ARM: at91: remove hardware.h 



hardware.h is now mostyl unused, move the remaining declarations to pm.c and
remove it.

Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 4c805654

arch/arm/mach-at91/include/mach/hardware.h

deleted100644 → 0
+0 −123
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-at91/include/mach/hardware.h

 *

 *  Copyright (C) 2003 SAN People

 *  Copyright (C) 2003 ATMEL

 *

 * 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.

 *

 */



#ifndef __ASM_ARCH_HARDWARE_H

#define __ASM_ARCH_HARDWARE_H



#include <asm/sizes.h>



/* DBGU base */

/* rm9200, 9260/9g20, 9261/9g10, 9rl */

#define AT91_BASE_DBGU0	0xfffff200

/* 9263, 9g45, sama5d3 */

#define AT91_BASE_DBGU1	0xffffee00

/* sama5d4 */

#define AT91_BASE_DBGU2	0xfc069000



/*

 * On all at91 except rm9200 and x40 have the System Controller starts

 * at address 0xffffc000 and has a size of 16KiB.

 *

 * On rm9200 it's start at 0xfffe4000 of 111KiB with non reserved data starting

 * at 0xfffff000

 *

 * Removes the individual definitions of AT91_BASE_SYS and

 * replaces them with a common version at base 0xfffffc000 and size 16KiB

 * and map the same memory space

 */

#define AT91_BASE_SYS	0xffffc000



/*

 * On sama5d4 there is no system controller, we map some needed peripherals

 */

#define AT91_ALT_BASE_SYS	0xfc069000



/*

 * On all at91 have the Advanced Interrupt Controller starts at address

 * 0xfffff000 and the Power Management Controller starts at 0xfffffc00

 */

#define AT91_AIC	0xfffff000

#define AT91_PMC	0xfffffc00



/*

 * Peripheral identifiers/interrupts.

 */

#define AT91_ID_FIQ		0	/* Advanced Interrupt Controller (FIQ) */

#define AT91_ID_SYS		1	/* System Peripherals */



#ifdef CONFIG_MMU

/*

 * Remap the peripherals from address 0xFFF78000 .. 0xFFFFFFFF

 * to 0xFEF78000 .. 0xFF000000.  (544Kb)

 */

#define AT91_IO_PHYS_BASE	0xFFF78000

#define AT91_IO_VIRT_BASE	IOMEM(0xFF000000 - AT91_IO_SIZE)



/*

 * On sama5d4, remap the peripherals from address 0xFC069000 .. 0xFC06F000

 * to 0xFB069000 .. 0xFB06F000.  (24Kb)

 */

#define AT91_ALT_IO_PHYS_BASE	AT91_ALT_BASE_SYS

#define AT91_ALT_IO_VIRT_BASE	IOMEM(0xFB069000)

#else

/*

 * Identity mapping for the non MMU case.

 */

#define AT91_IO_PHYS_BASE	AT91_BASE_SYS

#define AT91_IO_VIRT_BASE	IOMEM(AT91_IO_PHYS_BASE)



#define AT91_ALT_IO_PHYS_BASE	AT91_ALT_BASE_SYS

#define AT91_ALT_IO_VIRT_BASE	IOMEM(AT91_ALT_BASE_SYS)

#endif



#define AT91_IO_SIZE		(0xFFFFFFFF - AT91_IO_PHYS_BASE + 1)



 /* Convert a physical IO address to virtual IO address */

#define AT91_IO_P2V(x)		((x) - AT91_IO_PHYS_BASE + AT91_IO_VIRT_BASE)

#define AT91_ALT_IO_P2V(x)	((x) - AT91_ALT_IO_PHYS_BASE + AT91_ALT_IO_VIRT_BASE)



/*

 * Virtual to Physical Address mapping for IO devices.

 */

#define AT91_VA_BASE_SYS	AT91_IO_P2V(AT91_BASE_SYS)

#define AT91_ALT_VA_BASE_SYS	AT91_ALT_IO_P2V(AT91_ALT_BASE_SYS)



 /* Internal SRAM is mapped below the IO devices */

#define AT91_SRAM_MAX		SZ_1M

#define AT91_VIRT_BASE		(AT91_IO_VIRT_BASE - AT91_SRAM_MAX)



/* External Memory Map */

#define AT91_CHIPSELECT_0	0x10000000

#define AT91_CHIPSELECT_1	0x20000000

#define AT91_CHIPSELECT_2	0x30000000

#define AT91_CHIPSELECT_3	0x40000000

#define AT91_CHIPSELECT_4	0x50000000

#define AT91_CHIPSELECT_5	0x60000000

#define AT91_CHIPSELECT_6	0x70000000

#define AT91_CHIPSELECT_7	0x80000000



/* Clocks */

#define AT91_SLOW_CLOCK		32768		/* slow clock */



/*

 * FIXME: this is needed to communicate between the pinctrl driver and

 * the PM implementation in the machine. Possibly part of the PM

 * implementation should be moved down into the pinctrl driver and get

 * called as part of the generic suspend/resume path.

 */

#ifndef __ASSEMBLY__

extern void at91_pinctrl_gpio_suspend(void);

extern void at91_pinctrl_gpio_resume(void);

#endif



#endif

arch/arm/mach-at91/pm.c

+9 −2
Original line number Diff line number Diff line
@@ -32,11 +32,18 @@ 
#include <asm/fncpy.h>

#include <asm/cacheflush.h>



#include <mach/hardware.h>



#include "generic.h"

#include "pm.h"



/*

 * FIXME: this is needed to communicate between the pinctrl driver and

 * the PM implementation in the machine. Possibly part of the PM

 * implementation should be moved down into the pinctrl driver and get

 * called as part of the generic suspend/resume path.

 */

extern void at91_pinctrl_gpio_suspend(void);

extern void at91_pinctrl_gpio_resume(void);



static struct {

	unsigned long uhp_udp_mask;

	int memctrl;

arch/arm/mach-at91/pm_suspend.S

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
 */

#include <linux/linkage.h>

#include <linux/clk/at91_pmc.h>

#include <mach/hardware.h>

#include <mach/at91_ramc.h>

#include "pm.h"

arch/arm/mach-at91/sama5.c

+0 −2
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 
#include <asm/mach/map.h>

#include <asm/system_misc.h>



#include <mach/hardware.h>



#include "generic.h"

#include "soc.h"