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

Commit ea5a4e20 authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: Merge for-2635-4/s5pv210-boards 

Merge branch 'for-2635-4/s5pv210-boards' into for-2635-4/partial1

Conflicts:
	arch/arm/mach-s5pv210/include/mach/map.h
parents fac3d355 eff4c74d

arch/arm/mach-s5pv210/Kconfig

+44 −6
Original line number Diff line number Diff line
@@ -17,10 +17,50 @@ config CPU_S5PV210 
	help

	  Enable S5PV210 CPU support



choice

	prompt "Select machine type"

	depends on ARCH_S5PV210

	default MACH_SMDKV210

config S5PV210_SETUP_I2C1

	bool

	help

	  Common setup code for i2c bus 1.



config S5PV210_SETUP_I2C2

	bool

	help

	  Common setup code for i2c bus 2.



config S5PV210_SETUP_FB_24BPP

	bool

	help

          Common setup code for S5PV210 with an 24bpp RGB display helper.



config S5PV210_SETUP_SDHCI

        bool

        select S5PV210_SETUP_SDHCI_GPIO

        help

          Internal helper functions for S5PV210 based SDHCI systems



config S5PV210_SETUP_SDHCI_GPIO

	bool

	help

	  Common setup code for SDHCI gpio.



# machine support



config MACH_AQUILA

	bool "Samsung Aquila"

	select CPU_S5PV210

	select ARCH_SPARSEMEM_ENABLE

	select S5PV210_SETUP_FB_24BPP

	select S3C_DEV_FB

	help

	  Machine support for the Samsung Aquila target based on S5PC110 SoC



config MACH_GONI

	bool "GONI"

	select CPU_S5PV210

	select ARCH_SPARSEMEM_ENABLE

	help

	  Machine support for Samsung GONI board

	  S5PC110(MCP) is one of package option of S5PV210



config MACH_SMDKV210

	bool "SMDKV210"
@@ -39,6 +79,4 @@ config MACH_SMDKC110 
	  Machine support for Samsung SMDKC110

	  S5PC110(MCP) is one of package option of S5PV210



endchoice



endif

arch/arm/mach-s5pv210/Makefile

+7 −0
Original line number Diff line number Diff line
@@ -17,9 +17,16 @@ obj-$(CONFIG_CPU_S5PV210) += setup-i2c0.o 


# machine support



obj-$(CONFIG_MACH_AQUILA)	+= mach-aquila.o

obj-$(CONFIG_MACH_SMDKV210)	+= mach-smdkv210.o

obj-$(CONFIG_MACH_SMDKC110)	+= mach-smdkc110.o

obj-$(CONFIG_MACH_GONI)		+= mach-goni.o



# device support



obj-y				+= dev-audio.o

obj-$(CONFIG_S5PV210_SETUP_FB_24BPP)	+= setup-fb-24bpp.o

obj-$(CONFIG_S5PV210_SETUP_I2C1) 	+= setup-i2c1.o

obj-$(CONFIG_S5PV210_SETUP_I2C2) 	+= setup-i2c2.o

obj-$(CONFIG_S5PV210_SETUP_SDHCI)       += setup-sdhci.o

obj-$(CONFIG_S5PV210_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o

arch/arm/mach-s5pv210/cpu.c

+12 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ 
#include <plat/devs.h>

#include <plat/clock.h>

#include <plat/s5pv210.h>

#include <plat/iic-core.h>

#include <plat/sdhci.h>



/* Initial IO mappings */
@@ -77,6 +79,16 @@ void __init s5pv210_map_io(void) 
	s3c_device_adc.name	= "s3c64xx-adc";



	iotable_init(s5pv210_iodesc, ARRAY_SIZE(s5pv210_iodesc));



	/* initialise device information early */

	s5pv210_default_sdhci0();

	s5pv210_default_sdhci1();

	s5pv210_default_sdhci2();



	/* the i2c devices are directly compatible with s3c2440 */

	s3c_i2c0_setname("s3c2440-i2c");

	s3c_i2c1_setname("s3c2440-i2c");

	s3c_i2c2_setname("s3c2440-i2c");

}



void __init s5pv210_init_clocks(int xtal)

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

+5 −0
Original line number Diff line number Diff line
@@ -134,4 +134,9 @@ 
#define EINT_GPIO_2(x)		S5PV210_GPH2(x)

#define EINT_GPIO_3(x)		S5PV210_GPH3(x)



/* Compatibility */

#define IRQ_LCD_FIFO		IRQ_LCD0

#define IRQ_LCD_VSYNC		IRQ_LCD1

#define IRQ_LCD_SYSTEM		IRQ_LCD2



#endif /* ASM_ARCH_IRQS_H */

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

+13 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#define S5P_PA_GPIO		S5PV210_PA_GPIO



#define S5PV210_PA_IIC0		(0xE1800000)

#define S5PV210_PA_IIC1		(0xFAB00000)

#define S5PV210_PA_IIC2		(0xE1A00000)



#define S5PV210_PA_TIMER	(0xE2500000)

#define S5P_PA_TIMER		S5PV210_PA_TIMER
@@ -47,6 +49,10 @@ 
#define S5PV210_PA_PDMA0	0xE0900000

#define S5PV210_PA_PDMA1	0xE0A00000



#define S5PV210_PA_FB		(0xF8000000)



#define S5PV210_PA_HSMMC(x)	(0xEB000000 + ((x) * 0x100000))



#define S5PV210_PA_VIC0		(0xF2000000)

#define S5P_PA_VIC0		S5PV210_PA_VIC0
@@ -79,7 +85,14 @@ 


/* compatibiltiy defines. */

#define S3C_PA_UART		S5PV210_PA_UART

#define S3C_PA_HSMMC0		S5PV210_PA_HSMMC(0)

#define S3C_PA_HSMMC1		S5PV210_PA_HSMMC(1)

#define S3C_PA_HSMMC2		S5PV210_PA_HSMMC(2)

#define S3C_PA_IIC		S5PV210_PA_IIC0

#define S3C_PA_IIC1		S5PV210_PA_IIC1

#define S3C_PA_IIC2		S5PV210_PA_IIC2

#define S3C_PA_FB		S5PV210_PA_FB



#define SAMSUNG_PA_ADC		S5PV210_PA_ADC



#endif /* __ASM_ARCH_MAP_H */