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

Commit 56c035c9 authored by Ben Dooks's avatar Ben Dooks
Browse files

Merge branch 'next-s3c64xx-device' into next-merged 

Conflicts:

	arch/arm/mach-s3c2440/mach-at2440evb.c
parents 7f275437 438a5d42

arch/arm/configs/s3c6400_defconfig

+121 −9
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.27

# Fri Oct 17 09:20:54 2008

# Linux kernel version: 2.6.28-rc3

# Mon Nov  3 10:10:30 2008

#

CONFIG_ARM=y

CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -116,6 +116,7 @@ CONFIG_DEFAULT_CFQ=y 
# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="cfq"

CONFIG_CLASSIC_RCU=y

# CONFIG_FREEZER is not set



#

# System Type
@@ -152,16 +153,17 @@ CONFIG_CLASSIC_RCU=y 
# CONFIG_ARCH_RPC is not set

# CONFIG_ARCH_SA1100 is not set

# CONFIG_ARCH_S3C2410 is not set

# CONFIG_ARCH_S3C24A0 is not set

CONFIG_ARCH_S3C64XX=y

# CONFIG_ARCH_SHARK is not set

# CONFIG_ARCH_LH7A40X is not set

# CONFIG_ARCH_DAVINCI is not set

# CONFIG_ARCH_OMAP is not set

# CONFIG_ARCH_MSM7X00A is not set

# CONFIG_ARCH_MSM is not set

CONFIG_PLAT_S3C64XX=y

CONFIG_CPU_S3C6400_INIT=y

CONFIG_CPU_S3C6400_CLOCK=y

CONFIG_S3C64XX_SETUP_I2C0=y

CONFIG_S3C64XX_SETUP_I2C1=y

CONFIG_PLAT_S3C=y



#
@@ -173,8 +175,19 @@ CONFIG_S3C_BOOT_ERROR_RESET=y 
# Power management

#

CONFIG_S3C_LOWLEVEL_UART_PORT=0

CONFIG_S3C_GPIO_SPACE=0

CONFIG_S3C_GPIO_TRACK=y

CONFIG_S3C_GPIO_PULL_UPDOWN=y

CONFIG_S3C_GPIO_CFG_S3C24XX=y

CONFIG_S3C_GPIO_CFG_S3C64XX=y

CONFIG_S3C_DEV_HSMMC=y

CONFIG_S3C_DEV_HSMMC1=y

CONFIG_S3C_DEV_I2C1=y

CONFIG_CPU_S3C6410=y

CONFIG_S3C6410_SETUP_SDHCI=y

CONFIG_MACH_SMDK6410=y

CONFIG_SMDK6410_SD_CH0=y

# CONFIG_SMDK6410_SD_CH1 is not set



#

# Processor Type
@@ -233,8 +246,10 @@ CONFIG_FLAT_NODE_MEM_MAP=y 
CONFIG_PAGEFLAGS_EXTENDED=y

CONFIG_SPLIT_PTLOCK_CPUS=4

# CONFIG_RESOURCES_64BIT is not set

# CONFIG_PHYS_ADDR_T_64BIT is not set

CONFIG_ZONE_DMA_FLAG=0

CONFIG_VIRT_TO_BUS=y

CONFIG_UNEVICTABLE_LRU=y

CONFIG_ALIGNMENT_TRAP=y



#
@@ -266,6 +281,7 @@ CONFIG_VFP=y 
# Userspace binary formats

#

CONFIG_BINFMT_ELF=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_HAVE_AOUT=y

# CONFIG_BINFMT_AOUT is not set

# CONFIG_BINFMT_MISC is not set
@@ -356,6 +372,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y 
CONFIG_MOUSE_PS2_SYNAPTICS=y

CONFIG_MOUSE_PS2_LIFEBOOK=y

CONFIG_MOUSE_PS2_TRACKPOINT=y

# CONFIG_MOUSE_PS2_ELANTECH is not set

# CONFIG_MOUSE_PS2_TOUCHKIT is not set

# CONFIG_MOUSE_SERIAL is not set

# CONFIG_MOUSE_APPLETOUCH is not set
@@ -400,6 +417,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 
# Non-8250 serial port support

#

CONFIG_SERIAL_SAMSUNG=y

CONFIG_SERIAL_SAMSUNG_UARTS=4

# CONFIG_SERIAL_SAMSUNG_DEBUG is not set

CONFIG_SERIAL_SAMSUNG_CONSOLE=y

CONFIG_SERIAL_S3C6400=y
@@ -414,7 +432,52 @@ CONFIG_HW_RANDOM=y 
# CONFIG_R3964 is not set

# CONFIG_RAW_DRIVER is not set

# CONFIG_TCG_TPM is not set

# CONFIG_I2C is not set

CONFIG_I2C=y

CONFIG_I2C_BOARDINFO=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_HELPER_AUTO=y



#

# I2C Hardware Bus support

#



#

# I2C system bus drivers (mostly embedded / system-on-chip)

#

# CONFIG_I2C_GPIO is not set

# CONFIG_I2C_OCORES is not set

CONFIG_I2C_S3C2410=y

# CONFIG_I2C_SIMTEC is not set



#

# External I2C/SMBus adapter drivers

#

# CONFIG_I2C_PARPORT_LIGHT is not set

# CONFIG_I2C_TAOS_EVM is not set



#

# Other I2C/SMBus bus drivers

#

# CONFIG_I2C_PCA_PLATFORM is not set

# CONFIG_I2C_STUB is not set



#

# Miscellaneous I2C Chip support

#

# CONFIG_DS1682 is not set

CONFIG_AT24=y

# CONFIG_SENSORS_EEPROM is not set

# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_PCF8575 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_TPS65010 is not set

# CONFIG_SENSORS_MAX6875 is not set

# CONFIG_SENSORS_TSL2550 is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_BUS is not set

# CONFIG_I2C_DEBUG_CHIP is not set

# CONFIG_SPI is not set

CONFIG_ARCH_REQUIRE_GPIOLIB=y

CONFIG_GPIOLIB=y
@@ -424,6 +487,9 @@ CONFIG_GPIOLIB=y 
#

# I2C GPIO expanders:

#

# CONFIG_GPIO_MAX732X is not set

# CONFIG_GPIO_PCA953X is not set

# CONFIG_GPIO_PCF857X is not set



#

# PCI GPIO expanders:
@@ -436,14 +502,52 @@ CONFIG_GPIOLIB=y 
# CONFIG_POWER_SUPPLY is not set

CONFIG_HWMON=y

# CONFIG_HWMON_VID is not set

# CONFIG_SENSORS_AD7414 is not set

# CONFIG_SENSORS_AD7418 is not set

# CONFIG_SENSORS_ADM1021 is not set

# CONFIG_SENSORS_ADM1025 is not set

# CONFIG_SENSORS_ADM1026 is not set

# CONFIG_SENSORS_ADM1029 is not set

# CONFIG_SENSORS_ADM1031 is not set

# CONFIG_SENSORS_ADM9240 is not set

# CONFIG_SENSORS_ADT7470 is not set

# CONFIG_SENSORS_ADT7473 is not set

# CONFIG_SENSORS_ATXP1 is not set

# CONFIG_SENSORS_DS1621 is not set

# CONFIG_SENSORS_F71805F is not set

# CONFIG_SENSORS_F71882FG is not set

# CONFIG_SENSORS_F75375S is not set

# CONFIG_SENSORS_GL518SM is not set

# CONFIG_SENSORS_GL520SM is not set

# CONFIG_SENSORS_IT87 is not set

# CONFIG_SENSORS_LM63 is not set

# CONFIG_SENSORS_LM75 is not set

# CONFIG_SENSORS_LM77 is not set

# CONFIG_SENSORS_LM78 is not set

# CONFIG_SENSORS_LM80 is not set

# CONFIG_SENSORS_LM83 is not set

# CONFIG_SENSORS_LM85 is not set

# CONFIG_SENSORS_LM87 is not set

# CONFIG_SENSORS_LM90 is not set

# CONFIG_SENSORS_LM92 is not set

# CONFIG_SENSORS_LM93 is not set

# CONFIG_SENSORS_MAX1619 is not set

# CONFIG_SENSORS_MAX6650 is not set

# CONFIG_SENSORS_PC87360 is not set

# CONFIG_SENSORS_PC87427 is not set

# CONFIG_SENSORS_DME1737 is not set

# CONFIG_SENSORS_SMSC47M1 is not set

# CONFIG_SENSORS_SMSC47M192 is not set

# CONFIG_SENSORS_SMSC47B397 is not set

# CONFIG_SENSORS_ADS7828 is not set

# CONFIG_SENSORS_THMC50 is not set

# CONFIG_SENSORS_VT1211 is not set

# CONFIG_SENSORS_W83781D is not set

# CONFIG_SENSORS_W83791D is not set

# CONFIG_SENSORS_W83792D is not set

# CONFIG_SENSORS_W83793 is not set

# CONFIG_SENSORS_W83L785TS is not set

# CONFIG_SENSORS_W83L786NG is not set

# CONFIG_SENSORS_W83627HF is not set

# CONFIG_SENSORS_W83627EHF is not set

# CONFIG_HWMON_DEBUG_CHIP is not set
@@ -465,12 +569,13 @@ CONFIG_SSB_POSSIBLE=y 
# CONFIG_MFD_ASIC3 is not set

# CONFIG_HTC_EGPIO is not set

# CONFIG_HTC_PASIC3 is not set

# CONFIG_UCB1400_CORE is not set

# CONFIG_MFD_TMIO is not set

# CONFIG_MFD_T7L66XB is not set

# CONFIG_MFD_TC6387XB is not set

# CONFIG_MFD_TC6393XB is not set

# CONFIG_PMIC_DA903X is not set

# CONFIG_MFD_WM8400 is not set

# CONFIG_MFD_WM8350_I2C is not set



#

# Multimedia devices
@@ -546,6 +651,7 @@ CONFIG_SDIO_UART=y 
# MMC/SD/SDIO Host Controller Drivers

#

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_S3C=y

# CONFIG_MEMSTICK is not set

# CONFIG_ACCESSIBILITY is not set

# CONFIG_NEW_LEDS is not set
@@ -691,11 +797,17 @@ CONFIG_FRAME_POINTER=y 
# CONFIG_FAULT_INJECTION is not set

# CONFIG_LATENCYTOP is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_HAVE_FTRACE=y

CONFIG_HAVE_DYNAMIC_FTRACE=y

# CONFIG_FTRACE is not set

CONFIG_HAVE_FUNCTION_TRACER=y



#

# Tracers

#

# CONFIG_FUNCTION_TRACER is not set

# CONFIG_SCHED_TRACER is not set

# CONFIG_CONTEXT_SWITCH_TRACER is not set

# CONFIG_BOOT_TRACER is not set

# CONFIG_STACK_TRACER is not set

# CONFIG_DYNAMIC_PRINTK_DEBUG is not set

# CONFIG_SAMPLES is not set

CONFIG_HAVE_ARCH_KGDB=y

# CONFIG_KGDB is not set

arch/arm/mach-s3c2410/include/mach/gpio-core.h

0 → 100644
+34 −0
Original line number Diff line number Diff line 
/* arch/arm/mach-s3c24100/include/mach/gpio-core.h

 *

 * Copyright 2008 Openmoko, Inc.

 * Copyright 2008 Simtec Electronics

 *      Ben Dooks <ben@simtec.co.uk>

 *      http://armlinux.simtec.co.uk/

 *

 * S3C2410 - GPIO core support

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

*/



#ifndef __ASM_ARCH_GPIO_CORE_H

#define __ASM_ARCH_GPIO_CORE_H __FILE__



#include <plat/gpio-core.h>

#include <mach/regs-gpio.h>



extern struct s3c_gpio_chip s3c24xx_gpios[];



static inline struct s3c_gpio_chip *s3c_gpiolib_getchip(unsigned int pin)

{

	struct s3c_gpio_chip *chip;



	if (pin > S3C2410_GPG10)

		return NULL;



	chip = &s3c24xx_gpios[pin/32];

	return (S3C2410_GPIO_OFFSET(pin) > chip->chip.ngpio) ? chip : NULL;

}



#endif /* __ASM_ARCH_GPIO_CORE_H */

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

+2 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ 
#define S3C24XX_PA_TIMER    S3C2410_PA_TIMER

#define S3C24XX_PA_USBDEV   S3C2410_PA_USBDEV

#define S3C24XX_PA_WATCHDOG S3C2410_PA_WATCHDOG

#define S3C24XX_PA_IIC      S3C2410_PA_IIC

#define S3C24XX_PA_IIS      S3C2410_PA_IIS

#define S3C24XX_PA_GPIO     S3C2410_PA_GPIO

#define S3C24XX_PA_RTC      S3C2410_PA_RTC
@@ -101,6 +100,8 @@ 
#define S3C24XX_PA_SDI      S3C2410_PA_SDI

#define S3C24XX_PA_NAND	    S3C2410_PA_NAND



#define S3C_PA_IIC          S3C2410_PA_IIC

#define S3C_PA_UART	    S3C24XX_PA_UART

#define S3C_PA_HSMMC0	    S3C2443_PA_HSMMC



#endif /* __ASM_ARCH_MAP_H */

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

+3 −1
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
#include <mach/regs-lcd.h>

#include <mach/regs-gpio.h>



#include <plat/iic.h>

#include <plat/devs.h>

#include <plat/cpu.h>
@@ -150,7 +151,7 @@ static struct platform_device *amlm5900_devices[] __initdata = { 
#endif

	&s3c_device_adc,

	&s3c_device_wdt,

	&s3c_device_i2c,

	&s3c_device_i2c0,

	&s3c_device_usb,

 	&s3c_device_rtc,

	&s3c_device_usbgadget,
@@ -233,6 +234,7 @@ static void __init amlm5900_init(void) 
#ifdef CONFIG_FB_S3C2410

	s3c24xx_fb_set_platdata(&amlm5900_fb_info);

#endif

	s3c_i2c0_set_platdata(NULL);

	platform_add_devices(amlm5900_devices, ARRAY_SIZE(amlm5900_devices));

}