Commit a05baf33 authored by Ryan Mallon's avatar Ryan Mallon
Browse files

ep93xx: Move peripheral defines to local SoC header 



Move the AHB/APB peripheral defines to local SoC header since they are
only needed by the core SoC code. The UART defines are not moved
because they are used by the mach/uncompress.h header.

Signed-off-by: default avatarRyan Mallon <rmallon@gmail.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@iki.fi>
Acked-by: default avatarHartley Sweeten <hsweeten@visionengravers.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 73303d12

arch/arm/mach-ep93xx/core.c

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 


#include <asm/hardware/vic.h>



#include "soc.h"



/*************************************************************************

 * Static I/O mappings that are needed for all EP93xx platforms

arch/arm/mach-ep93xx/dma.c

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

#include <mach/hardware.h>



#include "soc.h"



#define DMA_CHANNEL(_name, _base, _irq) \

	{ .name = (_name), .base = (_base), .irq = (_irq) }

arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h

+1 −60
Original line number Diff line number Diff line
@@ -28,50 +28,7 @@ 
#define EP93XX_APB_PHYS(x)		(EP93XX_APB_PHYS_BASE + (x))

#define EP93XX_APB_IOMEM(x)		IOMEM(EP93XX_APB_VIRT_BASE + (x))





/* AHB peripherals */

#define EP93XX_DMA_BASE			EP93XX_AHB_IOMEM(0x00000000)



#define EP93XX_ETHERNET_PHYS_BASE	EP93XX_AHB_PHYS(0x00010000)

#define EP93XX_ETHERNET_BASE		EP93XX_AHB_IOMEM(0x00010000)



#define EP93XX_USB_PHYS_BASE		EP93XX_AHB_PHYS(0x00020000)

#define EP93XX_USB_BASE			EP93XX_AHB_IOMEM(0x00020000)



#define EP93XX_RASTER_PHYS_BASE		EP93XX_AHB_PHYS(0x00030000)

#define EP93XX_RASTER_BASE		EP93XX_AHB_IOMEM(0x00030000)



#define EP93XX_GRAPHICS_ACCEL_BASE	EP93XX_AHB_IOMEM(0x00040000)



#define EP93XX_SDRAM_CONTROLLER_BASE	EP93XX_AHB_IOMEM(0x00060000)



#define EP93XX_PCMCIA_CONTROLLER_BASE	EP93XX_AHB_IOMEM(0x00080000)



#define EP93XX_BOOT_ROM_BASE		EP93XX_AHB_IOMEM(0x00090000)



#define EP93XX_IDE_BASE			EP93XX_AHB_IOMEM(0x000a0000)



#define EP93XX_VIC1_BASE		EP93XX_AHB_IOMEM(0x000b0000)



#define EP93XX_VIC2_BASE		EP93XX_AHB_IOMEM(0x000c0000)





/* APB peripherals */

#define EP93XX_TIMER_BASE		EP93XX_APB_IOMEM(0x00010000)



#define EP93XX_I2S_PHYS_BASE		EP93XX_APB_PHYS(0x00020000)

#define EP93XX_I2S_BASE			EP93XX_APB_IOMEM(0x00020000)



#define EP93XX_SECURITY_BASE		EP93XX_APB_IOMEM(0x00030000)



#define EP93XX_AAC_PHYS_BASE		EP93XX_APB_PHYS(0x00080000)

#define EP93XX_AAC_BASE			EP93XX_APB_IOMEM(0x00080000)



#define EP93XX_SPI_PHYS_BASE		EP93XX_APB_PHYS(0x000a0000)

#define EP93XX_SPI_BASE			EP93XX_APB_IOMEM(0x000a0000)



#define EP93XX_IRDA_BASE		EP93XX_APB_IOMEM(0x000b0000)



/* APB UARTs */

#define EP93XX_UART1_PHYS_BASE		EP93XX_APB_PHYS(0x000c0000)

#define EP93XX_UART1_BASE		EP93XX_APB_IOMEM(0x000c0000)
@@ -81,18 +38,6 @@ 
#define EP93XX_UART3_PHYS_BASE		EP93XX_APB_PHYS(0x000e0000)

#define EP93XX_UART3_BASE		EP93XX_APB_IOMEM(0x000e0000)



#define EP93XX_KEY_MATRIX_PHYS_BASE	EP93XX_APB_PHYS(0x000f0000)

#define EP93XX_KEY_MATRIX_BASE		EP93XX_APB_IOMEM(0x000f0000)



#define EP93XX_ADC_BASE			EP93XX_APB_IOMEM(0x00100000)

#define EP93XX_TOUCHSCREEN_BASE		EP93XX_APB_IOMEM(0x00100000)



#define EP93XX_PWM_PHYS_BASE		EP93XX_APB_PHYS(0x00110000)

#define EP93XX_PWM_BASE			EP93XX_APB_IOMEM(0x00110000)



#define EP93XX_RTC_PHYS_BASE		EP93XX_APB_PHYS(0x00120000)

#define EP93XX_RTC_BASE			EP93XX_APB_IOMEM(0x00120000)



#define EP93XX_SYSCON_BASE		EP93XX_APB_IOMEM(0x00130000)

#define EP93XX_SYSCON_REG(x)		(EP93XX_SYSCON_BASE + (x))

#define EP93XX_SYSCON_POWER_STATE	EP93XX_SYSCON_REG(0x00)
@@ -182,8 +127,4 @@ 
#define EP93XX_SYSCON_SYSCFG_LCSN1	(1<<0)

#define EP93XX_SYSCON_SWLOCK		EP93XX_SYSCON_REG(0xc0)



#define EP93XX_WATCHDOG_PHYS_BASE	EP93XX_APB_PHYS(0x00140000)

#define EP93XX_WATCHDOG_BASE		EP93XX_APB_IOMEM(0x00140000)





#endif

arch/arm/mach-ep93xx/soc.h

+57 −0
Original line number Diff line number Diff line
@@ -47,4 +47,61 @@ 
#define EP93XX_SDCE3_PHYS_BASE_ASYNC	0xf0000000	/* ASDO Pin = 0 */

#define EP93XX_CS0_PHYS_BASE_SYNC	0xf0000000	/* ASDO Pin = 1 */



/* AHB peripherals */

#define EP93XX_DMA_BASE			EP93XX_AHB_IOMEM(0x00000000)



#define EP93XX_ETHERNET_PHYS_BASE	EP93XX_AHB_PHYS(0x00010000)

#define EP93XX_ETHERNET_BASE		EP93XX_AHB_IOMEM(0x00010000)



#define EP93XX_USB_PHYS_BASE		EP93XX_AHB_PHYS(0x00020000)

#define EP93XX_USB_BASE			EP93XX_AHB_IOMEM(0x00020000)



#define EP93XX_RASTER_PHYS_BASE		EP93XX_AHB_PHYS(0x00030000)

#define EP93XX_RASTER_BASE		EP93XX_AHB_IOMEM(0x00030000)



#define EP93XX_GRAPHICS_ACCEL_BASE	EP93XX_AHB_IOMEM(0x00040000)



#define EP93XX_SDRAM_CONTROLLER_BASE	EP93XX_AHB_IOMEM(0x00060000)



#define EP93XX_PCMCIA_CONTROLLER_BASE	EP93XX_AHB_IOMEM(0x00080000)



#define EP93XX_BOOT_ROM_BASE		EP93XX_AHB_IOMEM(0x00090000)



#define EP93XX_IDE_BASE			EP93XX_AHB_IOMEM(0x000a0000)



#define EP93XX_VIC1_BASE		EP93XX_AHB_IOMEM(0x000b0000)



#define EP93XX_VIC2_BASE		EP93XX_AHB_IOMEM(0x000c0000)



/* APB peripherals */

#define EP93XX_TIMER_BASE		EP93XX_APB_IOMEM(0x00010000)



#define EP93XX_I2S_PHYS_BASE		EP93XX_APB_PHYS(0x00020000)

#define EP93XX_I2S_BASE			EP93XX_APB_IOMEM(0x00020000)



#define EP93XX_SECURITY_BASE		EP93XX_APB_IOMEM(0x00030000)



#define EP93XX_AAC_PHYS_BASE		EP93XX_APB_PHYS(0x00080000)

#define EP93XX_AAC_BASE			EP93XX_APB_IOMEM(0x00080000)



#define EP93XX_SPI_PHYS_BASE		EP93XX_APB_PHYS(0x000a0000)

#define EP93XX_SPI_BASE			EP93XX_APB_IOMEM(0x000a0000)



#define EP93XX_IRDA_BASE		EP93XX_APB_IOMEM(0x000b0000)



#define EP93XX_KEY_MATRIX_PHYS_BASE	EP93XX_APB_PHYS(0x000f0000)

#define EP93XX_KEY_MATRIX_BASE		EP93XX_APB_IOMEM(0x000f0000)



#define EP93XX_ADC_BASE			EP93XX_APB_IOMEM(0x00100000)

#define EP93XX_TOUCHSCREEN_BASE		EP93XX_APB_IOMEM(0x00100000)



#define EP93XX_PWM_PHYS_BASE		EP93XX_APB_PHYS(0x00110000)

#define EP93XX_PWM_BASE			EP93XX_APB_IOMEM(0x00110000)



#define EP93XX_RTC_PHYS_BASE		EP93XX_APB_PHYS(0x00120000)

#define EP93XX_RTC_BASE			EP93XX_APB_IOMEM(0x00120000)



#define EP93XX_WATCHDOG_PHYS_BASE	EP93XX_APB_PHYS(0x00140000)

#define EP93XX_WATCHDOG_BASE		EP93XX_APB_IOMEM(0x00140000)



#endif /* _EP93XX_SOC_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE