diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-01-22 16:04:02 -0800 | 
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-01-22 16:04:02 -0800 | 
| commit | c3cee153d8df64679bf0de3fc38d8f361437a492 (patch) | |
| tree | ee045c56dc30a1f3aa04c26ed5591fe23b524f25 /arch/arm/mach-omap2/board-omap3h1.c | |
| parent | c4a8cecab6597381b0e82f7369e432d6a14530b7 (diff) | |
| download | olio-linux-3.10-c3cee153d8df64679bf0de3fc38d8f361437a492.tar.xz olio-linux-3.10-c3cee153d8df64679bf0de3fc38d8f361437a492.zip | |
Removed configuration that uses cpufreq and power management, minor cosmetic changes to the board file, fuel gauge code.
Change-Id: I9810991c51ae2aa640cda0bd1ec35815c5148e6b
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3h1.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 52 | 
1 files changed, 29 insertions, 23 deletions
| 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); |