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 <asutosh.pathak@intel.com>
Signed-off-by: Eric Seibel <eric.seibel@intel.com>
Reviewed-on: http://android.intel.com:8080/39268
Reviewed-by: Ponnusamy, Siva Prasath <siva.prasath.ponnusamy@intel.com>
Reviewed-by: Tc, Jenny <jenny.tc@intel.com>
Reviewed-by: Pallala, Ramakrishna <ramakrishna.pallala@intel.com>
Tested-by: Gugwad, SantoshX <santoshx.gugwad@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

diff --git a/arch/x86/platform/intel-mid/board-blackbay.c b/arch/x86/platform/intel-mid/board-blackbay.c
index 3789f87..773ea3d 100644 (file)
--- 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},