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

Commit 45c79433 authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: S5PC100: Fixup merge problems 



Between problems with Kconfig and merging commits from several
different sources, it seems the s5pc100 build's move from plat-s5pc11
has had a few problems.

Since I do not have the trees to rebuild this quickly, the easiest
thing is to simply fix the errors found once the s5pc100_defconfig
actually builds.

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

arch/arm/mach-s5pc100/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static struct map_desc s5pc100_iodesc[] __initdata = { 
		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)VA_VIC2,

		.pfn		= __phys_to_pfn(S5PC100_PA_VIC2),

		.pfn		= __phys_to_pfn(S5P_PA_VIC2),

		.length		= SZ_16K,

		.type		= MT_DEVICE,

	}, {

arch/arm/mach-s5pc100/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ 
#include <linux/dma-mapping.h>



#include <plat/devs.h>

#include <plat/irqs.h>



#include <mach/map.h>

#include <mach/irqs.h>



#include <plat/s3c-pl330-pdata.h>

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

+15 −11
Original line number Diff line number Diff line
@@ -44,9 +44,7 @@ 
#define S5PC100_PA_OTHERS	(0xE0200000)

#define S5PC100_VA_OTHERS	(S3C_VA_SYS + 0x10000)



#define S5PC100_PA_GPIO		(0xE0300000)



#define S5PC1XX_PA_GPIO		S5PC100_PA_GPIO

#define S5P_PA_GPIO		(0xE0300000)

#define S5PC1XX_VA_GPIO		S3C_ADDR(0x00500000)



/* Interrupt */
@@ -56,6 +54,10 @@ 
#define S5PC100_VA_VIC_OFFSET	0x10000

#define S5PC1XX_PA_VIC(x)	(S5PC100_PA_VIC + ((x) * S5PC100_PA_VIC_OFFSET))

#define S5PC1XX_VA_VIC(x)	(S5PC100_VA_VIC + ((x) * S5PC100_VA_VIC_OFFSET))

#define S5P_PA_VIC0		S5PC1XX_PA_VIC(0)

#define S5P_PA_VIC1		S5PC1XX_PA_VIC(1)

#define S5P_PA_VIC2		S5PC1XX_PA_VIC(2)





#define S5PC100_PA_ONENAND	(0xE7100000)
@@ -92,6 +94,10 @@ 


#define S5PC100_PA_FB		(0xEE000000)



#define S5PC100_PA_I2S0		(0xF2000000)

#define S5PC100_PA_I2S1		(0xF2100000)

#define S5PC100_PA_I2S2		(0xF2200000)



#define S5PC100_PA_AC97		0xF2300000



/* PCM */
@@ -115,16 +121,14 @@ 
#define S3C_PA_G3D		S5PC100_PA_G3D

#define S3C_PA_JPEG		S5PC100_PA_JPEG

#define S3C_PA_ROTATOR		S5PC100_PA_ROTATOR

#define S3C_VA_VIC0		(S3C_VA_IRQ + 0x0)

#define S3C_VA_VIC1		(S3C_VA_IRQ + 0x10000)

#define S3C_VA_VIC2		(S3C_VA_IRQ + 0x20000)

#define S3C_PA_IIC		S5PC100_PA_I2C

#define S3C_PA_IIC1		S5PC100_PA_I2C1

#define S5P_VA_VIC0		S5PC1XX_VA_VIC(0)

#define S5P_VA_VIC1		S5PC1XX_VA_VIC(1)

#define S5P_VA_VIC2		S5PC1XX_VA_VIC(2)

#define S3C_PA_USB_HSOTG	S5PC100_PA_USB_HSOTG

#define S3C_PA_USB_HSPHY	S5PC100_PA_USB_HSPHY

#define S3C_PA_HSMMC0		S5PC100_PA_HSMMC0

#define S3C_PA_HSMMC1		S5PC100_PA_HSMMC1

#define S3C_PA_HSMMC2		S5PC100_PA_HSMMC2

#define S3C_PA_HSMMC0		S5PC100_PA_HSMMC(0)

#define S3C_PA_HSMMC1		S5PC100_PA_HSMMC(1)

#define S3C_PA_HSMMC2		S5PC100_PA_HSMMC(2)

#define S3C_PA_KEYPAD		S5PC100_PA_KEYPAD

#define S3C_PA_TSADC		S5PC100_PA_TSADC

#define S3C_PA_ONENAND		S5PC100_PA_ONENAND

arch/arm/mach-s5pc100/include/mach/regs-gpio.h

+5 −2
Original line number Diff line number Diff line
@@ -60,9 +60,12 @@ 
#define S5PC100EINT30PEND		(S5P_VA_GPIO + 0xF40)

#define S5P_EINT_PEND(x)		(S5PC100EINT30PEND + ((x) * 0x4))



#define EINT_REG_NR(x)			(EINT_OFFSET(x) >> 3)

#define eint_offset(irq) ((irq) < IRQ_EINT16_31 ? ((irq) - IRQ_EINT(0)) : \

			  (((irq) - S5P_EINT_BASE2)))



#define eint_irq_to_bit(irq)		(1 << (EINT_OFFSET(irq) & 0x7))

#define EINT_REG_NR(x)			(eint_offset(x) >> 3)



#define eint_irq_to_bit(irq)		(1 << (eint_offset(irq) & 0x7))



/* values for S5P_EXTINT0 */

#define S5P_EXTINT_LOWLEV		(0x00)