From: Asutosh Pathak Date: Fri, 16 Mar 2012 01:17:36 +0000 (-0700) Subject: Max17050 : Add Max17050 support in board file X-Git-Tag: 2.1b_release~1212 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7f6e210f66b6734249e887d480899d8710ebc06f;p=kernel%2Fkernel-mfld-blackbay.git Max17050 : Add Max17050 support in board file BZ: 27610 In GI SFI table new entry for Max17050 have been added - hence this patch is needed while parsing the SFI table Change-Id: I557cbf13aad7d76d0e9bca506f3c7822cdc96ba5 Signed-off-by: Asutosh Pathak Signed-off-by: Eric Seibel Reviewed-on: http://android.intel.com:8080/39268 Reviewed-by: Ponnusamy, Siva Prasath Reviewed-by: Tc, Jenny Reviewed-by: Pallala, Ramakrishna Tested-by: Gugwad, SantoshX Reviewed-by: buildbot Tested-by: buildbot --- diff --git a/arch/x86/platform/intel-mid/board-blackbay.c b/arch/x86/platform/intel-mid/board-blackbay.c index 3789f87..773ea3d 100644 --- a/arch/x86/platform/intel-mid/board-blackbay.c +++ b/arch/x86/platform/intel-mid/board-blackbay.c @@ -692,11 +692,15 @@ static bool msic_battery_check(void) } -static void *max17042_platform_data(void *info) +static void *max170XX_platform_data(void *info) { static struct max17042_platform_data platform_data; struct i2c_board_info *i2c_info = (struct i2c_board_info *)info; +#ifdef CONFIG_BATTERY_MAX17050 + int intr = get_gpio_by_name("max17050"); +#else int intr = get_gpio_by_name("max17042"); +#endif i2c_info->irq = intr + MRST_IRQ_OFFSET; @@ -1656,7 +1660,8 @@ struct devs_id __initconst device_ids[] = { NULL}, {"msic_adc", SFI_DEV_TYPE_IPC, 1, &msic_adc_platform_data, &blackbay_ipc_device_handler}, - {"max17042", SFI_DEV_TYPE_I2C, 1, &max17042_platform_data, NULL}, + {"max17050", SFI_DEV_TYPE_I2C, 1, &max170XX_platform_data, NULL}, + {"max17042", SFI_DEV_TYPE_I2C, 1, &max170XX_platform_data, NULL}, {"hsi_ifx_modem", SFI_DEV_TYPE_HSI, 0, &hsi_modem_platform_data, NULL}, {"wl12xx_clk_vmmc", SFI_DEV_TYPE_SD, 0, &wl12xx_platform_data_init, NULL},