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

Commit 5b323c7b authored by Ben Dooks's avatar Ben Dooks
Browse files

[ARM] S3C: Move HSMMC device definition to plat-s3ec 



Move the definition for the hsmmc device to plat-s3c
to be shared between the s3c24xx and s3c64xx platforms.

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

arch/arm/mach-s3c2410/include/mach/irqs.h

+2 −0
Original line number Diff line number Diff line
@@ -134,6 +134,8 @@ 
#define IRQ_S3C2443_HSMMC	S3C2410_IRQ(20)		/* IRQ_SDI */

#define IRQ_S3C2443_NAND	S3C2410_IRQ(24)		/* reserved */



#define IRQ_HSMMC0		IRQ_S3C2443_HSMMC



#define IRQ_S3C2443_LCD1	S3C2410_IRQSUB(14)

#define IRQ_S3C2443_LCD2	S3C2410_IRQSUB(15)

#define IRQ_S3C2443_LCD3	S3C2410_IRQSUB(16)

arch/arm/mach-s3c2410/include/mach/map.h

+1 −0
Original line number Diff line number Diff line
@@ -102,5 +102,6 @@ 
#define S3C24XX_PA_NAND	    S3C2410_PA_NAND



#define S3C_PA_UART	    S3C24XX_PA_UART

#define S3C_PA_HSMMC0	    S3C2443_PA_HSMMC



#endif /* __ASM_ARCH_MAP_H */

arch/arm/mach-s3c2443/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ config MACH_SMDK2443 
	bool "SMDK2443"

	select CPU_S3C2443

	select MACH_SMDK

	select S3C_DEV_HSMMC

	help

	  Say Y here if you are using an SMDK2443

arch/arm/mach-s3c2443/mach-smdk2443.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static struct s3c2410_uartcfg smdk2443_uartcfgs[] __initdata = { 
static struct platform_device *smdk2443_devices[] __initdata = {

	&s3c_device_wdt,

	&s3c_device_i2c,

	&s3c_device_hsmmc,

	&s3c_device_hsmmc0,

};



static void __init smdk2443_map_io(void)

arch/arm/mach-s3c6400/include/mach/map.h

+9 −0
Original line number Diff line number Diff line
@@ -17,6 +17,12 @@ 


#include <plat/map-base.h>



/* HSMMC units */

#define S3C64XX_PA_HSMMC(x)	(0x7C200000 + ((x) * 0x100000))

#define S3C64XX_PA_HSMMC0	S3C64XX_PA_HSMMC(0)

#define S3C64XX_PA_HSMMC1	S3C64XX_PA_HSMMC(1)

#define S3C64XX_PA_HSMMC2	S3C64XX_PA_HSMMC(2)



#define S3C_PA_UART		(0x7F005000)

#define S3C_PA_UART0		(S3C_PA_UART + 0x00)

#define S3C_PA_UART1		(S3C_PA_UART + 0x400)
@@ -49,5 +55,8 @@ 


/* compatibiltiy defines. */

#define S3C_PA_TIMER		S3C64XX_PA_TIMER

#define S3C_PA_HSMMC0		S3C64XX_PA_HSMMC0

#define S3C_PA_HSMMC1		S3C64XX_PA_HSMMC1

#define S3C_PA_HSMMC2		S3C64XX_PA_HSMMC2



#endif /* __ASM_ARCH_6400_MAP_H */