shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 12:57:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

newton:update config and board

Browse Source
This commit is contained in:
蔡枫
2011-07-13 22:54:29 +08:00
parent acbf5493a6
commit 8ce03217ca
4 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
arch/arm/configs/rk29_newton_defconfig
View File

@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.32.27
# Wed Jul 6 21:49:42 2011
# Wed Jul 13 22:33:03 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -20,6 +20,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
CONFIG_ARCH_HAS_CPUFREQ=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_ZONE_DMA=y
CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
CONFIG_VECTORS_BASE=0xffff0000
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -228,8 +229,6 @@ CONFIG_MACH_RK29_newton=y
# CONFIG_DDR_TYPE_DDR3_2133M is not set
# CONFIG_DDR_TYPE_DDR3_2133N is not set
CONFIG_DDR_TYPE_DDR3_DEFAULT=y
CONFIG_RK29_MEM_SIZE_512M=y
# CONFIG_RK29_MEM_SIZE_1G is not set
CONFIG_RK29_MEM_SIZE_M=512
CONFIG_DDR_SDRAM_FREQ=400
@@ -237,6 +236,7 @@ CONFIG_DDR_SDRAM_FREQ=400
# RK29 VPU (Video Processing Unit) support
#
CONFIG_RK29_VPU=y
CONFIG_RK29_VPU_SERVICE=y
# CONFIG_RK29_VPU_DEBUG is not set
CONFIG_RK29_JTAG=y
CONFIG_RK29_LAST_LOG=y
@@ -310,7 +310,8 @@ CONFIG_AEABI=y
# CONFIG_OABI_COMPAT is not set
# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
# CONFIG_HIGHMEM is not set
CONFIG_HIGHMEM=y
# CONFIG_HIGHPTE is not set
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_FLATMEM_MANUAL=y
# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -320,7 +321,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_PHYS_ADDR_T_64BIT is not set
CONFIG_ZONE_DMA_FLAG=0
CONFIG_ZONE_DMA_FLAG=1
CONFIG_BOUNCE=y
CONFIG_VIRT_TO_BUS=y
CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_MLOCKED_PAGE_BIT=y
@@ -712,6 +714,7 @@ CONFIG_RK29_NEWTON=y
# CONFIG_EEPROM_MAX6875 is not set
# CONFIG_EEPROM_93CX6 is not set
# CONFIG_RK29_SUPPORT_MODEM is not set
# CONFIG_MODEM_ROCKCHIP_DEMO is not set
# CONFIG_RK29_GPS is not set
#
@@ -994,6 +997,8 @@ CONFIG_RK29_I2C1_CONTROLLER=y
CONFIG_I2C2_RK29=y
CONFIG_RK29_I2C2_CONTROLLER=y
# CONFIG_RK29_I2C2_GPIO is not set
# CONFIG_RK29_I2C3_CONTROLLER is not set
# CONFIG_RK29_I2C3_GPIO is not set
CONFIG_I2C_DEV_RK29=y
#
@@ -1174,6 +1179,8 @@ CONFIG_SOC_CAMERA_OV2655=y
# CONFIG_SOC_CAMERA_OV2640 is not set
# CONFIG_SOC_CAMERA_OV3640 is not set
# CONFIG_SOC_CAMERA_OV5642 is not set
# CONFIG_OV5642_AUTOFOCUS is not set
# CONFIG_OV5642_FIXEDFOCUS is not set
# CONFIG_SOC_CAMERA_OV5640 is not set
# CONFIG_SOC_CAMERA_S5K6AA is not set
# CONFIG_SOC_CAMERA_GT2005 is not set
@@ -1338,6 +1345,8 @@ CONFIG_LCD_AT070TN93=y
# HDMI
#
# CONFIG_HDMI is not set
# CONFIG_ANX7150 is not set
# CONFIG_ANX9030 is not set
#
# Console display driver support
@@ -1843,7 +1852,8 @@ CONFIG_RK29_SMC=y
#
# CIR support
#
# CONFIG_RK_CIR is not set
CONFIG_RK_CIR=y
CONFIG_BU92747GUW_CIR=y
#
# File systems
@@ -1851,12 +1861,12 @@ CONFIG_RK29_SMC=y
# CONFIG_EXT2_FS is not set
CONFIG_EXT3_FS=y
CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
CONFIG_EXT3_FS_XATTR=y
# CONFIG_EXT3_FS_POSIX_ACL is not set
# CONFIG_EXT3_FS_SECURITY is not set
# CONFIG_EXT4_FS is not set
# CONFIG_EXT3_FS_XATTR is not set
CONFIG_EXT4_FS=y
# CONFIG_EXT4_FS_XATTR is not set
# CONFIG_EXT4_DEBUG is not set
CONFIG_JBD=y
CONFIG_FS_MBCACHE=y
CONFIG_JBD2=y
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
# CONFIG_FS_POSIX_ACL is not set
@@ -1872,7 +1882,8 @@ CONFIG_INOTIFY_USER=y
# CONFIG_QUOTA is not set
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUTOFS4_FS is not set
# CONFIG_FUSE_FS is not set
CONFIG_FUSE_FS=y
# CONFIG_CUSE is not set
#
# Caches
@@ -1914,17 +1925,7 @@ CONFIG_MISC_FILESYSTEMS=y
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
CONFIG_YAFFS_FS=y
CONFIG_YAFFS_YAFFS1=y
# CONFIG_YAFFS_9BYTE_TAGS is not set
# CONFIG_YAFFS_DOES_ECC is not set
CONFIG_YAFFS_YAFFS2=y
CONFIG_YAFFS_AUTO_YAFFS2=y
# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
# CONFIG_YAFFS_EMPTY_LOST_AND_FOUND is not set
# CONFIG_YAFFS_FS is not set
# CONFIG_JFFS2_FS is not set
CONFIG_CRAMFS=y
# CONFIG_SQUASHFS is not set
@@ -2022,6 +2023,7 @@ CONFIG_TIMER_STATS=y
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_HIGHMEM is not set
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_INFO is not set
# CONFIG_DEBUG_VM is not set

9
arch/arm/mach-rk29/board-rk29-newton.c
View File

@@ -629,7 +629,7 @@ struct ft5406_platform_data ft5406_info = {
};
#endif
#if defined(CONFIG_TOUCHSCREEN_GOODIX_NEWTON)
#if defined(CONFIG_TOUCHSCREEN_GT819)
#define TOUCH_RESET_PIN RK29_PIN6_PC3
#define TOUCH_INT_PIN RK29_PIN0_PA2
int gt819_init_platform_hw(void)
@@ -1018,7 +1018,7 @@ static struct i2c_board_info __initdata board_i2c2_devices[] = {
.platform_data = &eeti_egalax_info,
},
#endif
#if defined (CONFIG_TOUCHSCREEN_GOODIX_NEWTON)
#if defined (CONFIG_TOUCHSCREEN_GT819)
{
.type = "Goodix-TS",
.addr = 0x55,
@@ -1623,6 +1623,11 @@ static void __init rk29_board_iomux_init(void)
}
static struct platform_device *devices[] __initdata = {
#ifdef CONFIG_RK29_WATCHDOG
&rk29_device_wdt,
#endif
#ifdef CONFIG_UART1_RK29
&rk29_device_uart1,
#endif

4
drivers/input/touchscreen/Kconfig
View File

@@ -758,8 +758,8 @@ config TOUCHSCREEN_GT818_IIC
config D70_L3188A
tristate "D70-L3188A based touchscreens"
depends on I2C2_RK29
config TOUCHSCREEN_GOODIX_NEWTON
tristate "GOODIX based touchscreens"
config TOUCHSCREEN_GT819
tristate "GT819 based touchscreens"
depends on I2C2_RK29
config TOUCHSCREEN_FT5406
tristate "FT5406 based touchscreens: FT5406 Interface"

2
drivers/input/touchscreen/Makefile
View File

@@ -58,4 +58,4 @@ obj-$(CONFIG_TOUCHSCREEN_GT818_IIC) += gt818_ts.o
obj-$(CONFIG_TOUCHSCREEN_ILI2102_IIC) += ili2102_ts.o
obj-$(CONFIG_D70_L3188A) += goodix_touch.o
obj-$(CONFIG_TOUCHSCREEN_FT5406) += ft5406_ts.o
obj-$(CONFIG_TOUCHSCREEN_GOODIX_NEWTON) += gt819.o
obj-$(CONFIG_TOUCHSCREEN_GT819) += gt819.o