From eea14b704fe749e8d0b59d3e42485e2f4cc53553 Mon Sep 17 00:00:00 2001 From: Maksim Kozlov Date: Wed, 20 Jun 2012 13:50:11 +0400 Subject: [PATCH] mach-tizen: delete i2c2 and max17042 from tizen board --- arch/arm/configs/tizen_defconfig | 2 -- arch/arm/mach-exynos/Kconfig | 7 ----- arch/arm/mach-exynos/mach-tizen.c | 47 ------------------------------- 3 files changed, 56 deletions(-) diff --git a/arch/arm/configs/tizen_defconfig b/arch/arm/configs/tizen_defconfig index 2c8cfb3a24f8..46a27a7b7b68 100644 --- a/arch/arm/configs/tizen_defconfig +++ b/arch/arm/configs/tizen_defconfig @@ -310,7 +310,6 @@ CONFIG_S3C_DEV_HSMMC1=y CONFIG_S3C_DEV_HSMMC2=y CONFIG_S3C_DEV_HSMMC3=y CONFIG_S3C_DEV_I2C1=y -CONFIG_S3C_DEV_I2C2=y CONFIG_S3C_DEV_I2C5=y CONFIG_S3C_DEV_I2C6=y CONFIG_S3C_DEV_I2C7=y @@ -377,7 +376,6 @@ CONFIG_EXYNOS4_SETUP_FIMD0=y CONFIG_EXYNOS4_DEV_SYSMMU=y CONFIG_EXYNOS4_DEV_USB_OHCI=y CONFIG_EXYNOS4_SETUP_I2C1=y -CONFIG_EXYNOS4_SETUP_I2C2=y CONFIG_EXYNOS4_SETUP_I2C5=y CONFIG_EXYNOS4_SETUP_I2C6=y CONFIG_EXYNOS4_SETUP_I2C7=y diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index e7277f8b3b1b..5432a9bcab6d 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -105,11 +105,6 @@ config EXYNOS4_SETUP_I2C1 help Common setup code for i2c bus 1. -config EXYNOS4_SETUP_I2C2 - bool - help - Common setup code for i2c bus 2. - config EXYNOS4_SETUP_I2C3 bool help @@ -316,7 +311,6 @@ config MACH_TIZEN select S3C_DEV_HSMMC2 select S3C_DEV_HSMMC3 select S3C_DEV_I2C1 - select S3C_DEV_I2C2 select S3C_DEV_I2C5 select S3C_DEV_I2C6 select S5P_DEV_CSIS0 @@ -333,7 +327,6 @@ config MACH_TIZEN select EXYNOS4_SETUP_FIMC select EXYNOS4_SETUP_FIMD0 select EXYNOS4_SETUP_I2C1 - select EXYNOS4_SETUP_I2C2 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 73629040ef76..345ad6a0ecef 100644 --- a/arch/arm/mach-exynos/mach-tizen.c +++ b/arch/arm/mach-exynos/mach-tizen.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -309,51 +308,6 @@ static struct i2c_board_info i2c1_devs[] __initdata = { }, }; -/* I2C2 (Fuel Gauge) */ -static struct max17042_reg_data max17042_init_data[] = { - { MAX17042_CGAIN, 0x0000 }, - { MAX17042_MiscCFG, 0x0003 }, - { MAX17042_LearnCFG, 0x0007 }, - /* RCOMP: 0x0050 2011.02.29 from MAXIM */ - { MAX17042_RCOMP0, 0x0050 }, -}; - -/* Alert only when the battery is removed or inserted */ -static struct max17042_reg_data max17042_alert_init_data[] = { - /* SALRT Threshold setting (disable) unsigned MAX/MIN */ - { MAX17042_SALRT_Th, 0xFF00 }, - /* VALRT Threshold setting (disable) unsigned MAX/MIN */ - { MAX17042_VALRT_Th, 0xFF00 }, - /* TALRT Threshold setting (disable) signed MAX/MIN */ - { MAX17042_TALRT_Th, 0x7F80 }, -}; - -static struct max17042_platform_data tizen_battery_platform_data = { - .init_data = max17042_init_data, - .num_init_data = ARRAY_SIZE(max17042_init_data), - .alrt_data = max17042_alert_init_data, - .num_alrt_data = ARRAY_SIZE(max17042_alert_init_data), -// .irq_base = IRQ_FUEL_BASE, - .enable_alert = true, - .wakeup = true, - .r_sns = 10000, /* 10m Ohm */ -}; - -static struct s3c2410_platform_i2c i2c2_data __initdata = { - .flags = 0, - .bus_num = 2, - .slave_addr = 0x10, - .frequency = 400000U, - .sda_delay = 200, -}; - -static struct i2c_board_info i2c2_devs[] __initdata = { - { - I2C_BOARD_INFO("max17042", 0x36), - .platform_data = &tizen_battery_platform_data, - }, -}; - static struct regulator_consumer_supply __initdata max8997_ldo1_[] = { REGULATOR_SUPPLY("vdd", "s5p-adc"), /* Used by CPU's ADC drv */ }; @@ -1312,7 +1266,6 @@ static struct platform_device *tizen_devices[] __initdata = { &cam_8m_12v_fixed_rdev, &exynos4_bus_devfreq, &s3c_device_i2c1, - &s3c_device_i2c2, &exynos4_device_i2s0, &samsung_asoc_idma, }; -- 2.34.1