mirror of https://gitee.com/openkylin/linux.git
[ARM] 4524/1: S3C: Move register out of include/asm-arm/arch-s3c2410
Move register and other definitions out of the include/asm-arm/arch-s3c2410 into the the arch directories of include/asm-arm/plat-s3c24xx and include/asm-arm/plat-s3c. This move is in preperation of the merging of s3c2400 and s3c6400. The following git mv commands are needed before this patch can be applied: git mv include/asm-arm/arch-s3c2410/regs-ac97.h include/asm-arm/plat-s3c/regs-ac97.h git mv include/asm-arm/arch-s3c2410/regs-adc.h include/asm-arm/plat-s3c/regs-adc.h git mv include/asm-arm/arch-s3c2410/regs-iis.h include/asm-arm/plat-s3c24xx/regs-iis.h git mv include/asm-arm/arch-s3c2410/regs-spi.h include/asm-arm/plat-s3c24xx/regs-spi.h git mv include/asm-arm/arch-s3c2410/regs-udc.h include/asm-arm/plat-s3c24xx/regs-udc.h git mv include/asm-arm/arch-s3c2410/udc.h include/asm-arm/plat-s3c24xx/udc.h Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Ben Dooks
Russell King
parent
dd1313a167
commit
06cfa55694
|
|
@ -25,12 +25,12 @@
|
|||
|
||||
#include <asm/plat-s3c/regs-serial.h>
|
||||
#include <asm/arch/regs-gpio.h>
|
||||
#include <asm/arch/regs-ac97.h>
|
||||
#include <asm/plat-s3c/regs-ac97.h>
|
||||
#include <asm/arch/regs-mem.h>
|
||||
#include <asm/arch/regs-lcd.h>
|
||||
#include <asm/arch/regs-sdi.h>
|
||||
#include <asm/arch/regs-iis.h>
|
||||
#include <asm/arch/regs-spi.h>
|
||||
#include <asm/plat-s3c24xx/regs-iis.h>
|
||||
#include <asm/plat-s3c24xx/regs-spi.h>
|
||||
|
||||
static struct s3c24xx_dma_map __initdata s3c2410_dma_mappings[] = {
|
||||
[DMACH_XD0] = {
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
#include <asm/arch/h1940.h>
|
||||
#include <asm/arch/h1940-latch.h>
|
||||
#include <asm/arch/fb.h>
|
||||
#include <asm/arch/udc.h>
|
||||
#include <asm/plat-s3c24xx/udc.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/clock.h>
|
||||
#include <asm/plat-s3c24xx/devs.h>
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
#include <asm/plat-s3c/regs-serial.h>
|
||||
#include <asm/arch/fb.h>
|
||||
#include <asm/plat-s3c/nand.h>
|
||||
#include <asm/arch/udc.h>
|
||||
#include <asm/plat-s3c24xx/udc.h>
|
||||
#include <asm/arch/spi.h>
|
||||
#include <asm/arch/spi-gpio.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -26,12 +26,12 @@
|
|||
|
||||
#include <asm/plat-s3c/regs-serial.h>
|
||||
#include <asm/arch/regs-gpio.h>
|
||||
#include <asm/arch/regs-ac97.h>
|
||||
#include <asm/plat-s3c/regs-ac97.h>
|
||||
#include <asm/arch/regs-mem.h>
|
||||
#include <asm/arch/regs-lcd.h>
|
||||
#include <asm/arch/regs-sdi.h>
|
||||
#include <asm/arch/regs-iis.h>
|
||||
#include <asm/arch/regs-spi.h>
|
||||
#include <asm/plat-s3c24xx/regs-iis.h>
|
||||
#include <asm/plat-s3c24xx/regs-spi.h>
|
||||
|
||||
#define MAP(x) { (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID }
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
#include <asm/arch/regs-lcd.h>
|
||||
|
||||
#include <asm/arch/idle.h>
|
||||
#include <asm/arch/udc.h>
|
||||
#include <asm/plat-s3c24xx/udc.h>
|
||||
#include <asm/arch/fb.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/s3c2410.h>
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
#include <asm/arch/regs-gpio.h>
|
||||
#include <asm/arch/regs-gpioj.h>
|
||||
#include <asm/arch/regs-dsc.h>
|
||||
#include <asm/arch/regs-spi.h>
|
||||
#include <asm/plat-s3c24xx/regs-spi.h>
|
||||
#include <asm/arch/regs-s3c2412.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/s3c2412.h>
|
||||
|
|
|
|||
|
|
@ -25,12 +25,12 @@
|
|||
|
||||
#include <asm/plat-s3c/regs-serial.h>
|
||||
#include <asm/arch/regs-gpio.h>
|
||||
#include <asm/arch/regs-ac97.h>
|
||||
#include <asm/plat-s3c/regs-ac97.h>
|
||||
#include <asm/arch/regs-mem.h>
|
||||
#include <asm/arch/regs-lcd.h>
|
||||
#include <asm/arch/regs-sdi.h>
|
||||
#include <asm/arch/regs-iis.h>
|
||||
#include <asm/arch/regs-spi.h>
|
||||
#include <asm/plat-s3c24xx/regs-iis.h>
|
||||
#include <asm/plat-s3c24xx/regs-spi.h>
|
||||
|
||||
static struct s3c24xx_dma_map __initdata s3c2440_dma_mappings[] = {
|
||||
[DMACH_XD0] = {
|
||||
|
|
|
|||
|
|
@ -26,12 +26,12 @@
|
|||
|
||||
#include <asm/plat-s3c/regs-serial.h>
|
||||
#include <asm/arch/regs-gpio.h>
|
||||
#include <asm/arch/regs-ac97.h>
|
||||
#include <asm/plat-s3c/regs-ac97.h>
|
||||
#include <asm/arch/regs-mem.h>
|
||||
#include <asm/arch/regs-lcd.h>
|
||||
#include <asm/arch/regs-sdi.h>
|
||||
#include <asm/arch/regs-iis.h>
|
||||
#include <asm/arch/regs-spi.h>
|
||||
#include <asm/plat-s3c24xx/regs-iis.h>
|
||||
#include <asm/plat-s3c24xx/regs-spi.h>
|
||||
|
||||
#define MAP(x) { \
|
||||
[0] = (x) | DMA_CH_VALID, \
|
||||
|
|
|
|||
|
|
@ -29,11 +29,11 @@
|
|||
#include <asm/irq.h>
|
||||
|
||||
#include <asm/plat-s3c/regs-serial.h>
|
||||
#include <asm/arch/udc.h>
|
||||
#include <asm/plat-s3c24xx/udc.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/devs.h>
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <asm/arch/regs-spi.h>
|
||||
#include <asm/plat-s3c24xx/regs-spi.h>
|
||||
|
||||
/* Serial port registrations */
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue