Removed configuration that uses cpufreq and power management, minor cosmetic changes to the board file, fuel gauge code.

Change-Id: I9810991c51ae2aa640cda0bd1ec35815c5148e6b

2 files changed, 34 insertions, 59 deletions

diff --git a/arch/arm/configs/omap3_h1_defconfig b/arch/arm/configs/omap3_h1_defconfig
index 3ff7277be7f..0c4a8c2cf6a 100644
--- a/arch/arm/configs/omap3_h1_defconfig
+++ b/arch/arm/configs/omap3_h1_defconfig
@@ -464,34 +464,7 @@ CONFIG_AUTO_ZRELADDR=y
 #
 # CPU Frequency scaling
 #
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=y
-CONFIG_CPU_FREQ_GOV_COMMON=y
-CONFIG_CPU_FREQ_STAT=y
-# CONFIG_CPU_FREQ_STAT_DETAILS is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE is not set
-# CONFIG_CPU_FREQ_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_INTERACTIVE=y
-# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
-# CONFIG_GENERIC_CPUFREQ_CPU0 is not set
-
-#
-# ARM CPU frequency scaling drivers
-#
-# CONFIG_ARM_EXYNOS4210_CPUFREQ is not set
-# CONFIG_ARM_EXYNOS4X12_CPUFREQ is not set
-# CONFIG_ARM_EXYNOS5250_CPUFREQ is not set
-# CONFIG_ARM_EXYNOS5440_CPUFREQ is not set
-# CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
-CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
+# CONFIG_CPU_FREQ is not set
 # CONFIG_CPU_IDLE is not set
 # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 
@@ -2131,14 +2104,6 @@ CONFIG_STAGING=y
 # CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set
 # CONFIG_IIO_GPIO_TRIGGER is not set
 # CONFIG_IIO_SYSFS_TRIGGER is not set
-
-#
-# Inertial measurement units
-#
-CONFIG_INV_MPU_IIO=m
-# CONFIG_INV_IIO_MPU3050_ACCEL_SLAVE_BMA250 is not set
-# CONFIG_DTS_INV_MPU_IIO is not set
-CONFIG_INV_TESTING=y
 # CONFIG_IIO_SIMPLE_DUMMY is not set
 # CONFIG_ZSMALLOC is not set
 # CONFIG_FT1000 is not set
@@ -2282,6 +2247,10 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_ADIS16400 is not set
 # CONFIG_ADIS16480 is not set
 # CONFIG_INV_MPU6050_IIO is not set
+CONFIG_INV_MPU_IIO=y
+# CONFIG_INV_IIO_MPU3050_ACCEL_SLAVE_BMA250 is not set
+# CONFIG_DTS_INV_MPU_IIO is not set
+CONFIG_INV_KERNEL_3_10=y
 
 #
 # Light sensors
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c
index 9364dc4e709..df83b4dae6b 100644
--- a/arch/arm/mach-omap2/board-omap3h1.c
+++ b/arch/arm/mach-omap2/board-omap3h1.c
@@ -275,37 +275,42 @@ static struct tps65910_board omap3h1_tps65910_pdata = {
 };
 
 static struct i2c_board_info __initdata omap3h1_i2c1_board_info[] = {
-		{
-			I2C_BOARD_INFO("tps65910", 0x2d),
-			.platform_data = &omap3h1_tps65910_pdata,
-		},
-		{
-			I2C_BOARD_INFO("mpu6515", 0x68),
-			// This is needed for the interrupt wake. IH_GPIO_BASE changed in 3.10 kernel
-			//.irq = (IH_GPIO_BASE + MPUIRQ_GPIO),
-			.platform_data = &mpu_data,
-        },
-    	{
-    		/* Backlight */
-    		I2C_BOARD_INFO("lm3530-led", 0x38),
-    		.platform_data = &omap3h1_backlight_platform_data,
-    	},
-    	{
-			I2C_BOARD_INFO("mXT224", 0x4a),
-			.platform_data = &mxt_data,
-    	},
-		{
-			I2C_BOARD_INFO("bq274xx", 0x55),
-		},
+         {
+            I2C_BOARD_INFO("tps65910", 0x2d),
+            .platform_data = &omap3h1_tps65910_pdata,
+         },
+         {
+            I2C_BOARD_INFO("mpu6515", 0x68),
+            // This is needed for the interrupt wake. IH_GPIO_BASE changed in 3.10 kernel
+            //.irq = (IH_GPIO_BASE + MPUIRQ_GPIO),
+            .platform_data = &mpu_data,
+         },
+         { 
+     	      /* Backlight */
+    	   	I2C_BOARD_INFO("lm3530-led", 0x38),
+             .platform_data = &omap3h1_backlight_platform_data,
+    	 },
+         {
+            I2C_BOARD_INFO("mXT224", 0x4a),
+            .platform_data = &mxt_data,
+         },
+         {
+            I2C_BOARD_INFO("bq274xx", 0x55),
+         },
 };
 
+static struct i2c_board_info __initdata omap3h1_i2c3_board_info[] = {
+
+};
+
+
 static int __init omap3_h1_i2c_init(void)
 {
 	gpio_request_one(ATMEL_MXT_GPIO, GPIOF_IN, "atmel_mxt_ts CHG");
 	omap3h1_i2c1_board_info[3].irq = gpio_to_irq(ATMEL_MXT_GPIO);
 
 	omap_register_i2c_bus(1, 400, omap3h1_i2c1_board_info, ARRAY_SIZE(omap3h1_i2c1_board_info));
-	//omap_register_i2c_bus(3, 400, omap3h1_i2c3_board_info, ARRAY_SIZE(omap3h1_i2c3_board_info));
+	omap_register_i2c_bus(3, 400, omap3h1_i2c3_board_info, ARRAY_SIZE(omap3h1_i2c3_board_info));
 	return 0;
 }
 
@@ -357,6 +362,7 @@ static void __init omap3_h1_init(void)
 	omap3_mux_init(board_mux, OMAP_PACKAGE_CBP);
 
 	omap3_h1_i2c_init();
+
 	omap_display_init(&omap3h1_dss_data);
 	omap_serial_init();
 	omap_sdrc_init(NULL, NULL);