diff options
| -rw-r--r-- | arch/arm/configs/gta03_defconfig | 3 | ||||
| -rw-r--r-- | arch/arm/mach-s3c6410/Kconfig | 16 | ||||
| -rw-r--r-- | drivers/serial/samsung.c | 2 |
3 files changed, 16 insertions, 5 deletions
diff --git a/arch/arm/configs/gta03_defconfig b/arch/arm/configs/gta03_defconfig index 61cd9b8db97..fecc65e34ab 100644 --- a/arch/arm/configs/gta03_defconfig +++ b/arch/arm/configs/gta03_defconfig @@ -164,6 +164,7 @@ CONFIG_ARCH_S3C64XX=y # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_OMAP is not set # CONFIG_ARCH_MSM is not set +CONFIG_MACH_NEO1973=y CONFIG_PLAT_S3C64XX=y CONFIG_CPU_S3C6400_INIT=y CONFIG_CPU_S3C6400_CLOCK=y @@ -542,6 +543,7 @@ CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_GPIO is not set +CONFIG_KEYBOARD_NEO1973=y CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=y CONFIG_MOUSE_PS2_ALPS=y @@ -726,6 +728,7 @@ CONFIG_POWER_SUPPLY=y # CONFIG_BATTERY_DS2760 is not set # CONFIG_BATTERY_BQ27x00 is not set # CONFIG_BATTERY_BQ27000_HDQ is not set +CONFIG_GTA02_HDQ=y CONFIG_HWMON=y # CONFIG_HWMON_VID is not set # CONFIG_SENSORS_AD7414 is not set diff --git a/arch/arm/mach-s3c6410/Kconfig b/arch/arm/mach-s3c6410/Kconfig index 4d5bbd62a5e..ae20642a1dc 100644 --- a/arch/arm/mach-s3c6410/Kconfig +++ b/arch/arm/mach-s3c6410/Kconfig @@ -62,8 +62,16 @@ config SMDK6410_SD_CH1 endchoice config MACH_OPENMOKO_GTA03 - bool "OM_GTA03" - select CPU_S3C6410 - help - Machine support for the Openmoko GTA03 + bool "Openmoko GTA03 Phone" + select CPU_S3C6410 + select S3C_DEV_HSMMC + select S3C_DEV_I2C1 + select S3C6410_SETUP_SDHCI + select S3C64XX_SETUP_I2C1 + select SENSORS_PCF50633 + select POWER_SUPPLY +# select GTA02_HDQ + select MACH_NEO1973 + help + Machine support for the Openmoko GTA03 Phone diff --git a/drivers/serial/samsung.c b/drivers/serial/samsung.c index a1020ad9c79..c262eb1ae20 100644 --- a/drivers/serial/samsung.c +++ b/drivers/serial/samsung.c @@ -50,7 +50,7 @@ #include <mach/map.h> #include <plat/regs-serial.h> -#ifdef CONFIG_MACH_NEO1973 +#if defined(CONFIG_MACH_NEO1973) && !defined(CONFIG_CPU_S3C6410) #include <mach/regs-gpio.h> #include <mach/regs-clock.h> #endif |