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

Commit a639718b authored by Kukjin Kim's avatar Kukjin Kim
Browse files

Merge branch 'next-s5pv210' into for-next

parents 0321c51f b42faa12

arch/arm/configs/s5pc110_defconfig

deleted100644 → 0
+0 −66
Original line number Original line Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_KALLSYMS_ALL=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_S5PV210=y

CONFIG_S3C_LOWLEVEL_UART_PORT=1

CONFIG_MACH_SMDKC110=y

CONFIG_VMSPLIT_2G=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x20800000,8M console=ttySAC1,115200 init=/linuxrc"

CONFIG_VFP=y

CONFIG_NEON=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

# CONFIG_MISC_DEVICES is not set

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y

CONFIG_INPUT_EVDEV=y

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_SAMSUNG=y

CONFIG_SERIAL_SAMSUNG_CONSOLE=y

CONFIG_HW_RANDOM=y

# CONFIG_HWMON is not set

# CONFIG_VGA_CONSOLE is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_EXT2_FS=y

CONFIG_INOTIFY=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_CRAMFS=y

CONFIG_ROMFS_FS=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_BSD_DISKLABEL=y

CONFIG_SOLARIS_X86_PARTITION=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ASCII=y

CONFIG_NLS_ISO8859_1=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y

# CONFIG_DEBUG_PREEMPT is not set

CONFIG_DEBUG_RT_MUTEXES=y

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_DEBUG_SPINLOCK_SLEEP=y

CONFIG_DEBUG_INFO=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_ERRORS=y

CONFIG_DEBUG_LL=y

CONFIG_EARLY_PRINTK=y

CONFIG_DEBUG_S3C_UART=1

CONFIG_CRC_CCITT=y

arch/arm/configs/s5pv210_defconfig

+5 −0
Original line number Original line Diff line number Diff line
@@ -7,6 +7,11 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_S5PV210=y

CONFIG_ARCH_S5PV210=y

CONFIG_S3C_LOWLEVEL_UART_PORT=1

CONFIG_S3C_LOWLEVEL_UART_PORT=1

CONFIG_S3C_DEV_FB=y

CONFIG_S5PV210_SETUP_FB_24BPP=y

CONFIG_MACH_AQUILA=y

CONFIG_MACH_GONI=y

CONFIG_MACH_SMDKC110=y

CONFIG_MACH_SMDKV210=y

CONFIG_MACH_SMDKV210=y

CONFIG_VMSPLIT_2G=y

CONFIG_VMSPLIT_2G=y

CONFIG_PREEMPT=y

CONFIG_PREEMPT=y

arch/arm/mach-s5pv210/Kconfig

+62 −11
Original line number Original line Diff line number Diff line
@@ -27,11 +27,21 @@ config S5PV210_SETUP_I2C2 
	help

	help

	  Common setup code for i2c bus 2.

	  Common setup code for i2c bus 2.





config S5PV210_SETUP_IDE

	bool

	help

	  Common setup code for S5PV210 IDE GPIO configurations



config S5PV210_SETUP_FB_24BPP

config S5PV210_SETUP_FB_24BPP

	bool

	bool

	help

	help

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

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





config S5PV210_SETUP_KEYPAD

	bool

	help

	  Common setup code for keypad.



config S5PV210_SETUP_SDHCI

config S5PV210_SETUP_SDHCI

        bool

        bool

        select S5PV210_SETUP_SDHCI_GPIO

        select S5PV210_SETUP_SDHCI_GPIO
@@ -43,14 +53,19 @@ config S5PV210_SETUP_SDHCI_GPIO 
	help

	help

	  Common setup code for SDHCI gpio.

	  Common setup code for SDHCI gpio.





# machine support

menu "S5PC110 Machines"





config MACH_AQUILA

config MACH_AQUILA

	bool "Samsung Aquila"

	bool "Aquila"

	select CPU_S5PV210

	select CPU_S5PV210

	select ARCH_SPARSEMEM_ENABLE

	select ARCH_SPARSEMEM_ENABLE

	select S5PV210_SETUP_FB_24BPP

	select S5PV210_SETUP_FB_24BPP

	select S5PV210_SETUP_SDHCI

	select S3C_DEV_FB

	select S3C_DEV_FB

	select S5PC110_DEV_ONENAND

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC1

	select S3C_DEV_HSMMC2

	help

	help

	  Machine support for the Samsung Aquila target based on S5PC110 SoC

	  Machine support for the Samsung Aquila target based on S5PC110 SoC
@@ -58,34 +73,70 @@ config MACH_GONI 
	bool "GONI"

	bool "GONI"

	select CPU_S5PV210

	select CPU_S5PV210

	select ARCH_SPARSEMEM_ENABLE

	select ARCH_SPARSEMEM_ENABLE

	select S5PV210_SETUP_FB_24BPP

	select S5PV210_SETUP_SDHCI

	select S3C_DEV_FB

	select S5PC110_DEV_ONENAND

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC1

	select S3C_DEV_HSMMC2

	help

	help

	  Machine support for Samsung GONI board

	  Machine support for Samsung GONI board

	  S5PC110(MCP) is one of package option of S5PV210

	  S5PC110(MCP) is one of package option of S5PV210





config MACH_SMDKC110

	bool "SMDKC110"

	select CPU_S5PV210

	select ARCH_SPARSEMEM_ENABLE

	select S3C_DEV_I2C1

	select S3C_DEV_I2C2

	select SAMSUNG_DEV_IDE

	select S3C_DEV_RTC

	select S3C_DEV_WDT

	select HAVE_S3C_RTC

	select HAVE_S3C2410_WATCHDOG

	select S5PV210_SETUP_I2C1

	select S5PV210_SETUP_I2C2

	select S5PV210_SETUP_IDE

	help

	  Machine support for Samsung SMDKC110

	  S5PC110(MCP) is one of package option of S5PV210



endmenu



config S5PC110_DEV_ONENAND

config S5PC110_DEV_ONENAND

	bool

	bool

	help

	help

	  Compile in platform device definition for OneNAND1 controller

	  Compile in platform device definition for OneNAND1 controller





menu "S5PV210 Machines"



config MACH_SMDKV210

config MACH_SMDKV210

	bool "SMDKV210"

	bool "SMDKV210"

	select CPU_S5PV210

	select CPU_S5PV210

	select ARCH_SPARSEMEM_ENABLE

	select ARCH_SPARSEMEM_ENABLE

	select SAMSUNG_DEV_ADC

	select SAMSUNG_DEV_ADC

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC1

	select S3C_DEV_HSMMC2

	select S3C_DEV_HSMMC3

	select S3C_DEV_I2C1

	select S3C_DEV_I2C2

	select SAMSUNG_DEV_IDE

	select SAMSUNG_DEV_KEYPAD

	select SAMSUNG_DEV_TS

	select SAMSUNG_DEV_TS

	select S3C_DEV_RTC

	select S3C_DEV_WDT

	select S3C_DEV_WDT

	select HAVE_S3C_RTC

	select HAVE_S3C2410_WATCHDOG

	select HAVE_S3C2410_WATCHDOG

	select S5PV210_SETUP_I2C1

	select S5PV210_SETUP_I2C2

	select S5PV210_SETUP_IDE

	select S5PV210_SETUP_KEYPAD

	select S5PV210_SETUP_SDHCI

	help

	help

	  Machine support for Samsung SMDKV210

	  Machine support for Samsung SMDKV210





config MACH_SMDKC110

endmenu

	bool "SMDKC110"

	select CPU_S5PV210

	select ARCH_SPARSEMEM_ENABLE

	select S3C_DEV_WDT

	select HAVE_S3C2410_WATCHDOG

	help

	  Machine support for Samsung SMDKC110

	  S5PC110(MCP) is one of package option of S5PV210





endif
 
endif

arch/arm/mach-s5pv210/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -31,5 +31,7 @@ obj-$(CONFIG_S5PC110_DEV_ONENAND) += dev-onenand.o 
obj-$(CONFIG_S5PV210_SETUP_FB_24BPP)	+= setup-fb-24bpp.o

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

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

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

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

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

obj-$(CONFIG_S5PV210_SETUP_IDE)		+= setup-ide.o

obj-$(CONFIG_S5PV210_SETUP_KEYPAD)	+= setup-keypad.o

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

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

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

arch/arm/mach-s5pv210/cpu.c

+17 −1
Original line number Original line Diff line number Diff line
@@ -32,8 +32,11 @@ 
#include <plat/devs.h>

#include <plat/devs.h>

#include <plat/clock.h>

#include <plat/clock.h>

#include <plat/s5pv210.h>

#include <plat/s5pv210.h>

#include <plat/ata-core.h>

#include <plat/iic-core.h>

#include <plat/iic-core.h>

#include <plat/keypad-core.h>

#include <plat/sdhci.h>

#include <plat/sdhci.h>

#include <plat/reset.h>





/* Initial IO mappings */

/* Initial IO mappings */
@@ -69,6 +72,11 @@ static void s5pv210_idle(void) 
	local_irq_enable();

	local_irq_enable();

}

}





static void s5pv210_sw_reset(void)

{

	__raw_writel(0x1, S5P_SWRESET);

}



/* s5pv210_map_io

/* s5pv210_map_io

 *

 *

 * register the standard cpu IO areas

 * register the standard cpu IO areas
@@ -79,18 +87,23 @@ void __init s5pv210_map_io(void) 
#ifdef CONFIG_S3C_DEV_ADC

#ifdef CONFIG_S3C_DEV_ADC

	s3c_device_adc.name	= "s3c64xx-adc";

	s3c_device_adc.name	= "s3c64xx-adc";

#endif

#endif



	iotable_init(s5pv210_iodesc, ARRAY_SIZE(s5pv210_iodesc));

	iotable_init(s5pv210_iodesc, ARRAY_SIZE(s5pv210_iodesc));





	/* initialise device information early */

	/* initialise device information early */

	s5pv210_default_sdhci0();

	s5pv210_default_sdhci0();

	s5pv210_default_sdhci1();

	s5pv210_default_sdhci1();

	s5pv210_default_sdhci2();

	s5pv210_default_sdhci2();

	s5pv210_default_sdhci3();



	s3c_cfcon_setname("s5pv210-pata");





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

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

	s3c_i2c0_setname("s3c2440-i2c");

	s3c_i2c0_setname("s3c2440-i2c");

	s3c_i2c1_setname("s3c2440-i2c");

	s3c_i2c1_setname("s3c2440-i2c");

	s3c_i2c2_setname("s3c2440-i2c");

	s3c_i2c2_setname("s3c2440-i2c");



	/* Use s5pv210-keypad instead of samsung-keypad */

	samsung_keypad_setname("s5pv210-keypad");

}

}





void __init s5pv210_init_clocks(int xtal)

void __init s5pv210_init_clocks(int xtal)
@@ -138,5 +151,8 @@ int __init s5pv210_init(void) 
	/* set idle function */

	/* set idle function */

	pm_idle = s5pv210_idle;

	pm_idle = s5pv210_idle;





	/* set sw_reset function */

	s5p_reset_hook = s5pv210_sw_reset;



	return sysdev_register(&s5pv210_sysdev);

	return sysdev_register(&s5pv210_sysdev);

}
 
}