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

Commit 098a4cb7 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge S3Cxxxx branch

parents ea75ee9a ec57b709

arch/arm/configs/s3c2410_defconfig

+39 −37
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.16

# Mon Mar 20 20:36:02 2006

# Linux kernel version: 2.6.17

# Tue Jun 20 18:57:01 2006

#

CONFIG_ARM=y

CONFIG_MMU=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_VECTORS_BASE=0xffff0000



#

# Code maturity level options
@@ -27,6 +29,7 @@ CONFIG_SYSVIPC=y 
CONFIG_SYSCTL=y

# CONFIG_AUDIT is not set

# CONFIG_IKCONFIG is not set

# CONFIG_RELAY is not set

CONFIG_INITRAMFS_SOURCE=""

CONFIG_UID16=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -42,10 +45,6 @@ CONFIG_BASE_FULL=y 
CONFIG_FUTEX=y

CONFIG_EPOLL=y

CONFIG_SHMEM=y

CONFIG_CC_ALIGN_FUNCTIONS=0

CONFIG_CC_ALIGN_LABELS=0

CONFIG_CC_ALIGN_LOOPS=0

CONFIG_CC_ALIGN_JUMPS=0

CONFIG_SLAB=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0
@@ -57,7 +56,6 @@ CONFIG_OBSOLETE_INTERMODULE=y 
#

CONFIG_MODULES=y

# CONFIG_MODULE_UNLOAD is not set

CONFIG_OBSOLETE_MODPARM=y

# CONFIG_MODVERSIONS is not set

# CONFIG_MODULE_SRCVERSION_ALL is not set

CONFIG_KMOD=y
@@ -65,6 +63,7 @@ CONFIG_KMOD=y 
#

# Block layer

#

# CONFIG_BLK_DEV_IO_TRACE is not set



#

# IO Schedulers
@@ -92,6 +91,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
# CONFIG_ARCH_IOP3XX is not set

# CONFIG_ARCH_IXP4XX is not set

# CONFIG_ARCH_IXP2000 is not set

# CONFIG_ARCH_IXP23XX is not set

# CONFIG_ARCH_L7200 is not set

# CONFIG_ARCH_PXA is not set

# CONFIG_ARCH_RPC is not set
@@ -106,6 +106,8 @@ CONFIG_ARCH_S3C2410=y 
# CONFIG_ARCH_H720X is not set

# CONFIG_ARCH_AAEC2000 is not set

# CONFIG_ARCH_AT91RM9200 is not set

# CONFIG_ARCH_PNX4008 is not set

# CONFIG_ARCH_NETX is not set



#

# S3C24XX Implementations
@@ -116,14 +118,19 @@ CONFIG_ARCH_BAST=y 
CONFIG_BAST_PC104_IRQ=y

CONFIG_ARCH_H1940=y

CONFIG_MACH_N30=y

CONFIG_MACH_SMDK=y

CONFIG_ARCH_SMDK2410=y

CONFIG_ARCH_S3C2440=y

CONFIG_SMDK2440_CPU2440=y

CONFIG_SMDK2440_CPU2442=y

CONFIG_MACH_VR1000=y

CONFIG_MACH_RX3715=y

CONFIG_MACH_OTOM=y

CONFIG_MACH_NEXCODER_2440=y

CONFIG_CPU_S3C2410=y

CONFIG_CPU_S3C244X=y

CONFIG_CPU_S3C2440=y

CONFIG_CPU_S3C2442=y



#

# S3C2410 Boot
@@ -251,12 +258,15 @@ CONFIG_IP_PNP_BOOTP=y 
# CONFIG_INET_AH is not set

# CONFIG_INET_ESP is not set

# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_XFRM_TUNNEL is not set

# CONFIG_INET_TUNNEL is not set

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_BIC=y

# CONFIG_IPV6 is not set

# CONFIG_INET6_XFRM_TUNNEL is not set

# CONFIG_INET6_TUNNEL is not set

# CONFIG_NETFILTER is not set



#
@@ -360,7 +370,6 @@ CONFIG_MTD_CFI_I2=y 
# CONFIG_MTD_CFI_I8 is not set

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_CFI_AMDSTD_RETRY=0

# CONFIG_MTD_CFI_STAA is not set

CONFIG_MTD_CFI_UTIL=y

# CONFIG_MTD_RAM is not set
@@ -385,7 +394,6 @@ CONFIG_MTD_BAST_MAXSIZE=4 
# CONFIG_MTD_SLRAM is not set

# CONFIG_MTD_PHRAM is not set

# CONFIG_MTD_MTDRAM is not set

# CONFIG_MTD_BLKMTD is not set

# CONFIG_MTD_BLOCK2MTD is not set



#
@@ -694,7 +702,6 @@ CONFIG_S3C2410_WATCHDOG=y 
#

# CONFIG_USBPCWATCHDOG is not set

# CONFIG_NVRAM is not set

# CONFIG_RTC is not set

CONFIG_S3C2410_RTC=y

# CONFIG_DTLK is not set

# CONFIG_R3964 is not set
@@ -743,9 +750,7 @@ CONFIG_SENSORS_EEPROM=m 
# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_SENSORS_RTC8564 is not set

# CONFIG_SENSORS_MAX6875 is not set

# CONFIG_RTC_X1205_I2C is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_BUS is not set
@@ -807,18 +812,29 @@ CONFIG_SENSORS_LM85=m 
#



#

# Multimedia Capabilities Port drivers

# LED devices

#

# CONFIG_NEW_LEDS is not set



#

# LED drivers

#



#

# LED Triggers

#



#

# Multimedia devices

#

# CONFIG_VIDEO_DEV is not set

CONFIG_VIDEO_V4L2=y



#

# Digital Video Broadcasting Devices

#

# CONFIG_DVB is not set

# CONFIG_USB_DABUSB is not set



#

# Graphics support
@@ -828,6 +844,7 @@ CONFIG_FB_CFB_FILLRECT=y 
CONFIG_FB_CFB_COPYAREA=y

CONFIG_FB_CFB_IMAGEBLIT=y

# CONFIG_FB_MACMODES is not set

CONFIG_FB_FIRMWARE_EDID=y

CONFIG_FB_MODE_HELPERS=y

# CONFIG_FB_TILEBLITTING is not set

# CONFIG_FB_S1D13XXX is not set
@@ -863,6 +880,7 @@ CONFIG_FONT_8x16=y 
#

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_OHCI=y

# CONFIG_USB_ARCH_HAS_EHCI is not set

CONFIG_USB=y

# CONFIG_USB_DEBUG is not set
@@ -915,9 +933,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y 
# CONFIG_USB_ACECAD is not set

# CONFIG_USB_KBTAB is not set

# CONFIG_USB_POWERMATE is not set

# CONFIG_USB_MTOUCH is not set

# CONFIG_USB_ITMTOUCH is not set

# CONFIG_USB_EGALAX is not set

# CONFIG_USB_TOUCHSCREEN is not set

# CONFIG_USB_YEALINK is not set

# CONFIG_USB_XPAD is not set

# CONFIG_USB_ATI_REMOTE is not set
@@ -930,15 +946,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y 
#

# CONFIG_USB_MDC800 is not set



#

# USB Multimedia devices

#

# CONFIG_USB_DABUSB is not set



#

# Video4Linux support is needed for USB Multimedia device support

#



#

# USB Network Adapters

#
@@ -984,23 +991,18 @@ CONFIG_USB_MON=y 
# USB Gadget Support

#

# CONFIG_USB_GADGET is not set

# CONFIG_USB_GADGET_NET2280 is not set

# CONFIG_USB_GADGET_PXA2XX is not set

# CONFIG_USB_GADGET_GOKU is not set

# CONFIG_USB_GADGET_LH7A40X is not set

# CONFIG_USB_GADGET_OMAP is not set

# CONFIG_USB_GADGET_DUMMY_HCD is not set

# CONFIG_USB_ZERO is not set

# CONFIG_USB_ETH is not set

# CONFIG_USB_GADGETFS is not set

# CONFIG_USB_FILE_STORAGE is not set

# CONFIG_USB_G_SERIAL is not set



#

# MMC/SD Card support

#

# CONFIG_MMC is not set



#

# Real Time Clock

#

CONFIG_RTC_LIB=y

# CONFIG_RTC_CLASS is not set



#

# File systems

#
@@ -1052,7 +1054,6 @@ CONFIG_SYSFS=y 
# CONFIG_TMPFS is not set

# CONFIG_HUGETLB_PAGE is not set

CONFIG_RAMFS=y

# CONFIG_RELAYFS_FS is not set

# CONFIG_CONFIGFS_FS is not set



#
@@ -1193,6 +1194,7 @@ CONFIG_DEBUG_INFO=y 
# CONFIG_DEBUG_FS is not set

# CONFIG_DEBUG_VM is not set

CONFIG_FRAME_POINTER=y

# CONFIG_UNWIND_INFO is not set

CONFIG_FORCED_INLINING=y

# CONFIG_RCU_TORTURE_TEST is not set

CONFIG_DEBUG_USER=y

arch/arm/mach-s3c2410/mach-anubis.c

+50 −0
Original line number Diff line number Diff line
@@ -239,6 +239,54 @@ static struct s3c2410_platform_nand anubis_nand_info = { 
	.select_chip	= anubis_nand_select,

};



/* IDE channels */



static struct resource anubis_ide0_resource[] = {

	{

		.start	= S3C2410_CS3,

		.end	= S3C2410_CS3 + (8*32) - 1,

		.flags	= IORESOURCE_MEM,

	}, {

		.start	= S3C2410_CS3 + (1<<26),

		.end	= S3C2410_CS3 + (1<<26) + (8*32) - 1,

		.flags	= IORESOURCE_MEM,

	}, {

		.start	= IRQ_IDE0,

		.end	= IRQ_IDE0,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device anubis_device_ide0 = {

	.name		= "simtec-ide",

	.id		= 0,

	.num_resources	= ARRAY_SIZE(anubis_ide0_resource),

	.resource	= anubis_ide0_resource,

};



static struct resource anubis_ide1_resource[] = {

	{

		.start	= S3C2410_CS4,

		.end	= S3C2410_CS4 + (8*32) - 1,

		.flags	= IORESOURCE_MEM,

	}, {

		.start	= S3C2410_CS4 + (1<<26),

		.end	= S3C2410_CS4 + (1<<26) + (8*32) - 1,

		.flags	= IORESOURCE_MEM,

	}, {

		.start	= IRQ_IDE0,

		.end	= IRQ_IDE0,

		.flags	= IORESOURCE_IRQ,

	},

};





static struct platform_device anubis_device_ide1 = {

	.name		= "simtec-ide",

	.id		= 1,

	.num_resources	= ARRAY_SIZE(anubis_ide1_resource),

	.resource	= anubis_ide1_resource,

};



/* Standard Anubis devices */
@@ -249,6 +297,8 @@ static struct platform_device *anubis_devices[] __initdata = { 
	&s3c_device_i2c,

 	&s3c_device_rtc,

	&s3c_device_nand,

	&anubis_device_ide0,

	&anubis_device_ide1,

};



static struct clk *anubis_clocks[] = {