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

Commit a2b7ba9c authored Oct 07, 2008 by Ben Dooks

[ARM] S3C24XX: Move files out of include/asm-arm/plat-s3c*



First move of items out of include/asm-arm/plat-s3c* to their
new homes under arch/arm/plat-s3c/include/plat and
arch/arm/plat-s3c24xx/include/plat directories.

Note, we have to create a dummy arch/arm/plat-s3c/Makefile to
allow us to add arch/arm/plat-s3c/include/plat to the path.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>

parent 4330ed8e

arch/arm/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -120,7 +120,7 @@ endif
		machine-$(CONFIG_ARCH_OMAP2) := omap2
		plat-$(CONFIG_ARCH_OMAP) := omap
		machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443
		plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx
		plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c
		machine-$(CONFIG_ARCH_LH7A40X) := lh7a40x
		machine-$(CONFIG_ARCH_VERSATILE) := versatile
		machine-$(CONFIG_ARCH_IMX) := imx

arch/arm/mach-s3c2410/bast-irq.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@
		#include <mach/bast-map.h>
		#include <mach/bast-irq.h>

		#include <asm/plat-s3c24xx/irq.h>
		#include <plat/irq.h>

		#if 0
		#include <asm/debug-ll.h>

arch/arm/mach-s3c2410/clock.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -37,13 +37,13 @@
		#include <mach/hardware.h>
		#include <asm/io.h>

		#include <asm/plat-s3c/regs-serial.h>
		#include <plat/regs-serial.h>
		#include <mach/regs-clock.h>
		#include <mach/regs-gpio.h>

		#include <asm/plat-s3c24xx/s3c2410.h>
		#include <plat/s3c2410.h>
		#include <asm/plat-s3c24xx/clock.h>
		#include <asm/plat-s3c24xx/cpu.h>
		#include <plat/cpu.h>

		int s3c2410_clkcon_enable(struct clk *clk, int enable)
		{

arch/arm/mach-s3c2410/dma.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,10 +20,10 @@
		#include <asm/dma.h>
		#include <mach/dma.h>

		#include <asm/plat-s3c24xx/cpu.h>
		#include <plat/cpu.h>
		#include <asm/plat-s3c24xx/dma.h>

		#include <asm/plat-s3c/regs-serial.h>
		#include <plat/regs-serial.h>
		#include <mach/regs-gpio.h>
		#include <asm/plat-s3c/regs-ac97.h>
		#include <mach/regs-mem.h>

arch/arm/mach-s3c2410/include/mach/debug-macro.S

+2 −2

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@

		#include <mach/map.h>
		#include <mach/regs-gpio.h>
		#include <asm/plat-s3c/regs-serial.h>
		#include <plat/regs-serial.h>

		#define S3C2410_UART1_OFF (0x4000)
		#define SHIFT_2440TXF (14-9)
		@@ -99,4 +99,4 @@

		/* include the reset of the code which will do the work */

		#include <asm/plat-s3c/debug-macro.S>
		#include <plat/debug-macro.S>