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

Commit 84c9b727 authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: S3C244X: Merge plat-s3c24xx s3c2440.h and s3c2442.h into s3c244x.h 



Merge these two headers into one, these two SoCs are so similar.

Note, correct fault in mach-smdk2443.h including the wrong header.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 58bac7b8

arch/arm/mach-s3c2440/dsc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <mach/regs-dsc.h>

#include <mach/regs-dsc.h>





#include <plat/cpu.h>

#include <plat/cpu.h>

#include <plat/s3c2440.h>

#include <plat/s3c244x.h>





int s3c2440_set_dsc(unsigned int pin, unsigned int value)

int s3c2440_set_dsc(unsigned int pin, unsigned int value)

{

{

arch/arm/mach-s3c2440/mach-nexcoder.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -41,7 +41,7 @@ 
#include <plat/iic.h>

#include <plat/iic.h>





#include <plat/s3c2410.h>

#include <plat/s3c2410.h>

#include <plat/s3c2440.h>

#include <plat/s3c244x.h>

#include <plat/clock.h>

#include <plat/clock.h>

#include <plat/devs.h>

#include <plat/devs.h>

#include <plat/cpu.h>

#include <plat/cpu.h>

arch/arm/mach-s3c2440/mach-smdk2440.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -40,7 +40,7 @@ 
#include <plat/iic.h>

#include <plat/iic.h>





#include <plat/s3c2410.h>

#include <plat/s3c2410.h>

#include <plat/s3c2440.h>

#include <plat/s3c244x.h>

#include <plat/clock.h>

#include <plat/clock.h>

#include <plat/devs.h>

#include <plat/devs.h>

#include <plat/cpu.h>

#include <plat/cpu.h>

arch/arm/mach-s3c2440/s3c2440.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -29,9 +29,9 @@ 
#include <mach/hardware.h>

#include <mach/hardware.h>

#include <asm/irq.h>

#include <asm/irq.h>





#include <plat/s3c2440.h>

#include <plat/devs.h>

#include <plat/devs.h>

#include <plat/cpu.h>

#include <plat/cpu.h>

#include <plat/s3c244x.h>





static struct sys_device s3c2440_sysdev = {

static struct sys_device s3c2440_sysdev = {

	.cls		= &s3c2440_sysclass,

	.cls		= &s3c2440_sysclass,

arch/arm/mach-s3c2440/s3c244x.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -38,7 +38,6 @@ 
#include <mach/regs-dsc.h>

#include <mach/regs-dsc.h>





#include <plat/s3c2410.h>

#include <plat/s3c2410.h>

#include <plat/s3c2440.h>

#include <plat/s3c244x.h>

#include <plat/s3c244x.h>

#include <plat/clock.h>

#include <plat/clock.h>

#include <plat/devs.h>

#include <plat/devs.h>