lkml.org 
[lkml]   [2013]   [Oct]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v10 07/12] intel_mid: Added custom device_handler support
    Date
    From: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>

    This patch provides a means to add custom handler for
    SFI devices. If you set device_handler as NULL in
    device_id table standard SFI device handler will be used.
    If its not NULL custom handler will be called.

    Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
    Signed-off-by: David Cohen <david.a.cohen@linux.intel.com>
    ---
    arch/x86/platform/intel-mid/intel-mid.c | 74 ++++++++++++++++++---------------
    1 file changed, 40 insertions(+), 34 deletions(-)

    diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
    index d24c729..7bfd784 100644
    --- a/arch/x86/platform/intel-mid/intel-mid.c
    +++ b/arch/x86/platform/intel-mid/intel-mid.c
    @@ -396,6 +396,9 @@ struct devs_id {
    u8 type;
    u8 delay;
    void *(*get_platform_data)(void *info);
    + /* Custom handler for devices */
    + void (*device_handler)(struct sfi_device_table_entry *pentry,
    + struct devs_id *dev);
    };

    /* the offset for the mapping of global gpio pin to irq */
    @@ -690,28 +693,27 @@ static void *tc35876x_platform_data(void *data)
    }

    static const struct devs_id __initconst device_ids[] = {
    - {"bma023", SFI_DEV_TYPE_I2C, 1, &no_platform_data},
    - {"pmic_gpio", SFI_DEV_TYPE_SPI, 1, &pmic_gpio_platform_data},
    - {"pmic_gpio", SFI_DEV_TYPE_IPC, 1, &pmic_gpio_platform_data},
    - {"spi_max3111", SFI_DEV_TYPE_SPI, 0, &max3111_platform_data},
    - {"i2c_max7315", SFI_DEV_TYPE_I2C, 1, &max7315_platform_data},
    - {"i2c_max7315_2", SFI_DEV_TYPE_I2C, 1, &max7315_platform_data},
    - {"tca6416", SFI_DEV_TYPE_I2C, 1, &tca6416_platform_data},
    - {"emc1403", SFI_DEV_TYPE_I2C, 1, &emc1403_platform_data},
    - {"i2c_accel", SFI_DEV_TYPE_I2C, 0, &lis331dl_platform_data},
    - {"pmic_audio", SFI_DEV_TYPE_IPC, 1, &no_platform_data},
    - {"mpu3050", SFI_DEV_TYPE_I2C, 1, &mpu3050_platform_data},
    - {"i2c_disp_brig", SFI_DEV_TYPE_I2C, 0, &tc35876x_platform_data},
    + {"bma023", SFI_DEV_TYPE_I2C, 1, &no_platform_data, NULL},
    + {"pmic_gpio", SFI_DEV_TYPE_SPI, 1, &pmic_gpio_platform_data, NULL},
    + {"pmic_gpio", SFI_DEV_TYPE_IPC, 1, &pmic_gpio_platform_data, NULL},
    + {"spi_max3111", SFI_DEV_TYPE_SPI, 0, &max3111_platform_data, NULL},
    + {"i2c_max7315", SFI_DEV_TYPE_I2C, 1, &max7315_platform_data, NULL},
    + {"i2c_max7315_2", SFI_DEV_TYPE_I2C, 1, &max7315_platform_data, NULL},
    + {"tca6416", SFI_DEV_TYPE_I2C, 1, &tca6416_platform_data, NULL},
    + {"emc1403", SFI_DEV_TYPE_I2C, 1, &emc1403_platform_data, NULL},
    + {"i2c_accel", SFI_DEV_TYPE_I2C, 0, &lis331dl_platform_data, NULL},
    + {"pmic_audio", SFI_DEV_TYPE_IPC, 1, &no_platform_data, NULL},
    + {"mpu3050", SFI_DEV_TYPE_I2C, 1, &mpu3050_platform_data, NULL},
    + {"i2c_disp_brig", SFI_DEV_TYPE_I2C, 0, &tc35876x_platform_data, NULL},

    /* MSIC subdevices */
    - {"msic_battery", SFI_DEV_TYPE_IPC, 1, &msic_battery_platform_data},
    - {"msic_gpio", SFI_DEV_TYPE_IPC, 1, &msic_gpio_platform_data},
    - {"msic_audio", SFI_DEV_TYPE_IPC, 1, &msic_audio_platform_data},
    - {"msic_power_btn", SFI_DEV_TYPE_IPC, 1, &msic_power_btn_platform_data},
    - {"msic_ocd", SFI_DEV_TYPE_IPC, 1, &msic_ocd_platform_data},
    - {"msic_thermal", SFI_DEV_TYPE_IPC, 1, &msic_thermal_platform_data},
    -
    - {},
    + {"msic_battery", SFI_DEV_TYPE_IPC, 1, &msic_battery_platform_data, NULL},
    + {"msic_gpio", SFI_DEV_TYPE_IPC, 1, &msic_gpio_platform_data, NULL},
    + {"msic_audio", SFI_DEV_TYPE_IPC, 1, &msic_audio_platform_data, NULL},
    + {"msic_power_btn", SFI_DEV_TYPE_IPC, 1, &msic_power_btn_platform_data, NULL},
    + {"msic_ocd", SFI_DEV_TYPE_IPC, 1, &msic_ocd_platform_data, NULL},
    + {"msic_thermal", SFI_DEV_TYPE_IPC, 1, &msic_thermal_platform_data, NULL},
    + { 0 }
    };

    #define MAX_IPCDEVS 24
    @@ -965,20 +967,24 @@ static int __init sfi_parse_devs(struct sfi_table_header *table)
    if ((dev == NULL) || (dev->get_platform_data == NULL))
    continue;

    - switch (pentry->type) {
    - case SFI_DEV_TYPE_IPC:
    - sfi_handle_ipc_dev(pentry, dev);
    - break;
    - case SFI_DEV_TYPE_SPI:
    - sfi_handle_spi_dev(pentry, dev);
    - break;
    - case SFI_DEV_TYPE_I2C:
    - sfi_handle_i2c_dev(pentry, dev);
    - break;
    - case SFI_DEV_TYPE_UART:
    - case SFI_DEV_TYPE_HSI:
    - default:
    - ;
    + if (dev->device_handler) {
    + dev->device_handler(pentry, dev);
    + } else {
    + switch (pentry->type) {
    + case SFI_DEV_TYPE_IPC:
    + sfi_handle_ipc_dev(pentry, dev);
    + break;
    + case SFI_DEV_TYPE_SPI:
    + sfi_handle_spi_dev(pentry, dev);
    + break;
    + case SFI_DEV_TYPE_I2C:
    + sfi_handle_i2c_dev(pentry, dev);
    + break;
    + case SFI_DEV_TYPE_UART:
    + case SFI_DEV_TYPE_HSI:
    + default:
    + break;
    + }
    }
    }
    return 0;
    --
    1.8.4.rc3


    \
     
     \ /
      Last update: 2013-10-18 02:41    [W:4.031 / U:0.260 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site