From: Igor Mitsyanko Date: Fri, 8 Jun 2012 13:30:29 +0000 (+0400) Subject: mach-tizen: replace Atmel MXT touchscreen with MARU ts X-Git-Tag: 2.2.1_release^2~83^2~7^2~44 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fa97f19355139c08e4c86e7f9161933eb271a147;p=sdk%2Femulator%2Femulator-kernel.git mach-tizen: replace Atmel MXT touchscreen with MARU ts Remove i2c3 interface initialization also since we do not use it anymore. Signed-off-by: Igor Mitsyanko --- diff --git a/arch/arm/configs/tizen_defconfig b/arch/arm/configs/tizen_defconfig index e46bc01dd055..a93d75ebae1d 100644 --- a/arch/arm/configs/tizen_defconfig +++ b/arch/arm/configs/tizen_defconfig @@ -1,7 +1,3 @@ -# -# Automatically generated file; DO NOT EDIT. -# Linux/arm 3.4.0 Kernel Configuration -# CONFIG_ARM=y CONFIG_MIGHT_HAVE_PCI=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -315,7 +311,6 @@ CONFIG_S3C_DEV_HSMMC2=y CONFIG_S3C_DEV_HSMMC3=y CONFIG_S3C_DEV_I2C1=y CONFIG_S3C_DEV_I2C2=y -CONFIG_S3C_DEV_I2C3=y CONFIG_S3C_DEV_I2C5=y CONFIG_S3C_DEV_I2C6=y CONFIG_S3C_DEV_I2C7=y @@ -383,7 +378,6 @@ CONFIG_EXYNOS4_DEV_SYSMMU=y CONFIG_EXYNOS4_DEV_USB_OHCI=y CONFIG_EXYNOS4_SETUP_I2C1=y CONFIG_EXYNOS4_SETUP_I2C2=y -CONFIG_EXYNOS4_SETUP_I2C3=y CONFIG_EXYNOS4_SETUP_I2C5=y CONFIG_EXYNOS4_SETUP_I2C6=y CONFIG_EXYNOS4_SETUP_I2C7=y @@ -1230,7 +1224,7 @@ CONFIG_INPUT=y # Userland interfaces # CONFIG_INPUT_MOUSEDEV=y -CONFIG_INPUT_MOUSEDEV_PSAUX=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # CONFIG_INPUT_JOYDEV is not set @@ -1267,7 +1261,7 @@ CONFIG_KEYBOARD_ATKBD=y # CONFIG_INPUT_TABLET is not set CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_AD7879 is not set -CONFIG_TOUCHSCREEN_ATMEL_MXT=y +# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set # CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set # CONFIG_TOUCHSCREEN_BU21013 is not set # CONFIG_TOUCHSCREEN_CY8CTMG110 is not set @@ -1409,7 +1403,7 @@ CONFIG_I2C_ALGOBIT=y # CONFIG_I2C_DESIGNWARE_PLATFORM is not set # CONFIG_I2C_DESIGNWARE_PCI is not set # CONFIG_I2C_EG20T is not set -CONFIG_I2C_GPIO=y +# CONFIG_I2C_GPIO is not set # CONFIG_I2C_INTEL_MID is not set # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PCA_PLATFORM is not set @@ -2334,7 +2328,7 @@ CONFIG_IOMMU_SUPPORT=y CONFIG_MARU=y # CONFIG_MARU_LCD is not set CONFIG_MARU_CODEC=y -# CONFIG_MARU_TOUCHSCREEN is not set +CONFIG_MARU_TOUCHSCREEN=y # CONFIG_MARU_FB is not set CONFIG_MARU_CAMERA=y # CONFIG_MARU_OVERLAY is not set diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 28f02fbe2a4e..e7277f8b3b1b 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -317,7 +317,6 @@ config MACH_TIZEN select S3C_DEV_HSMMC3 select S3C_DEV_I2C1 select S3C_DEV_I2C2 - select S3C_DEV_I2C3 select S3C_DEV_I2C5 select S3C_DEV_I2C6 select S5P_DEV_CSIS0 @@ -335,7 +334,6 @@ config MACH_TIZEN select EXYNOS4_SETUP_FIMD0 select EXYNOS4_SETUP_I2C1 select EXYNOS4_SETUP_I2C2 - select EXYNOS4_SETUP_I2C3 select EXYNOS4_SETUP_I2C5 select EXYNOS4_SETUP_I2C6 select EXYNOS4_SETUP_SDHCI diff --git a/arch/arm/mach-exynos/mach-tizen.c b/arch/arm/mach-exynos/mach-tizen.c index aa8b7d77184d..e5d2a85b5b79 100644 --- a/arch/arm/mach-exynos/mach-tizen.c +++ b/arch/arm/mach-exynos/mach-tizen.c @@ -353,61 +353,6 @@ static struct i2c_board_info i2c2_devs[] __initdata = { }, }; -/* TSP */ -static struct mxt_platform_data mxt_platform_data = { - .x_line = 18, - .y_line = 11, - .x_size = 800, - .y_size = 480, - .blen = 0x1, - .threshold = 0x28, - .voltage = 2800000, /* 2.8V */ - .orient = MXT_DIAGONAL_COUNTER, - .irqflags = IRQF_TRIGGER_FALLING, -}; - -static struct s3c2410_platform_i2c i2c3_data __initdata = { - .flags = 0, - .bus_num = 3, - .slave_addr = 0x10, - .frequency = 400 * 1000, - .sda_delay = 100, -}; - -static struct i2c_board_info i2c3_devs[] __initdata = { - { - I2C_BOARD_INFO("atmel_mxt_ts", 0x4a), - .platform_data = &mxt_platform_data, - .irq = IRQ_EINT(4), - }, -}; - -#define MXT_XY_SWITCH (1 << 0) - -static void __init tizen_tsp_init(struct fb_videomode *win_mode) -{ - int gpio; - - if (mxt_platform_data.orient & MXT_XY_SWITCH) { - unsigned int tmp; - - mxt_platform_data.x_size = win_mode->yres; - mxt_platform_data.y_size = win_mode->xres; - tmp = mxt_platform_data.x_line; - mxt_platform_data.x_line = mxt_platform_data.y_line; - mxt_platform_data.y_line = tmp; - } else { - mxt_platform_data.x_size = win_mode->xres; - mxt_platform_data.y_size = win_mode->yres; - } - - /* TOUCH_INT: XEINT_4 */ - gpio = EXYNOS4_GPX0(4); - gpio_request(gpio, "TOUCH_INT"); - s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(0xf)); - s3c_gpio_setpull(gpio, S3C_GPIO_PULL_UP); -} - static struct regulator_consumer_supply __initdata max8997_ldo1_[] = { REGULATOR_SUPPLY("vdd", "s5p-adc"), /* Used by CPU's ADC drv */ }; @@ -1349,7 +1294,6 @@ static struct platform_device *tizen_devices[] __initdata = { &s3c_device_wdt, &s3c_device_timer[0], &s5p_device_ehci, - &s3c_device_i2c3, &s3c_device_adc, &s5p_device_g2d, &s5p_device_jpeg, @@ -1491,7 +1435,6 @@ static void __init tizen_machine_init(void) { tizen_sdhci_init(); tizen_parse_videomode(); - tizen_tsp_init(&tizen_fb_win0.win_mode); tizen_power_init(); amba_device_register(&kmi0_device, &iomem_resource); @@ -1500,8 +1443,6 @@ static void __init tizen_machine_init(void) i2c_register_board_info(1, i2c1_devs, ARRAY_SIZE(i2c1_devs)); s3c_i2c2_set_platdata(&i2c2_data); i2c_register_board_info(2, i2c2_devs, ARRAY_SIZE(i2c2_devs)); - s3c_i2c3_set_platdata(&i2c3_data); - i2c_register_board_info(3, i2c3_devs, ARRAY_SIZE(i2c3_devs)); s3c_i2c5_set_platdata(NULL); i2c5_devs[I2C5_MAX8997].irq = gpio_to_irq(EXYNOS4_GPX0(7)); i2c_register_board_info(5, i2c5_devs, ARRAY_SIZE(i2c5_devs));