Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06cfa556 authored by Ben Dooks's avatar Ben Dooks Committed by Russell King
Browse files

[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: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent dd1313a1

arch/arm/mach-s3c2410/dma.c

+3 −3
Original line number Diff line number Diff line
@@ -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] = {

arch/arm/mach-s3c2410/mach-h1940.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

arch/arm/mach-s3c2410/mach-qt2410.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

arch/arm/mach-s3c2412/dma.c

+3 −3
Original line number Diff line number Diff line
@@ -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 }

arch/arm/mach-s3c2412/mach-smdk2413.c

+1 −1
Original line number Diff line number Diff line
@@ -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>