lkml.org 
[lkml]   [2013]   [Feb]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 73/73] ARM: ux500: Pass regulator platform data using the new format
    Date
    Regulator platform data is now passed though a single structure
    as opposed to the old way where four separate struct elements
    were required. This patch makes use of the new format.

    Signed-off-by: Lee Jones <lee.jones@linaro.org>
    ---
    arch/arm/mach-ux500/board-mop500.c | 5 +----
    include/linux/mfd/abx500/ab8500.h | 11 ++---------
    2 files changed, 3 insertions(+), 13 deletions(-)

    diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
    index d453522..b47192d 100644
    --- a/arch/arm/mach-ux500/board-mop500.c
    +++ b/arch/arm/mach-ux500/board-mop500.c
    @@ -217,10 +217,7 @@ static struct platform_device snowball_sbnet_dev = {

    static struct ab8500_platform_data ab8500_platdata = {
    .irq_base = MOP500_AB8500_IRQ_BASE,
    - .regulator_reg_init = ab8500_regulator_reg_init,
    - .num_regulator_reg_init = ARRAY_SIZE(ab8500_regulator_reg_init),
    - .regulator = ab8500_regulators,
    - .num_regulator = ARRAY_SIZE(ab8500_regulators),
    + .regulator = &ab8500_regulator_plat_data,
    .gpio = &ab8500_gpio_pdata,
    .codec = &ab8500_codec_pdata,
    };
    diff --git a/include/linux/mfd/abx500/ab8500.h b/include/linux/mfd/abx500/ab8500.h
    index 1cb5698..c7e33c8 100644
    --- a/include/linux/mfd/abx500/ab8500.h
    +++ b/include/linux/mfd/abx500/ab8500.h
    @@ -266,8 +266,7 @@ struct ab8500 {
    const int *irq_reg_offset;
    };

    -struct regulator_reg_init;
    -struct regulator_init_data;
    +struct ab8500_regulator_platform_data;
    struct ab8500_gpio_platform_data;
    struct ab8500_codec_platform_data;

    @@ -275,18 +274,12 @@ struct ab8500_codec_platform_data;
    * struct ab8500_platform_data - AB8500 platform data
    * @irq_base: start of AB8500 IRQs, AB8500_NR_IRQS will be used
    * @init: board-specific initialization after detection of ab8500
    - * @num_regulator_reg_init: number of regulator init registers
    - * @regulator_reg_init: regulator init registers
    - * @num_regulator: number of regulators
    * @regulator: machine-specific constraints for regulators
    */
    struct ab8500_platform_data {
    int irq_base;
    void (*init) (struct ab8500 *);
    - int num_regulator_reg_init;
    - struct ab8500_regulator_reg_init *regulator_reg_init;
    - int num_regulator;
    - struct regulator_init_data *regulator;
    + struct ab8500_regulator_platform_data *regulator;
    struct ab8500_gpio_platform_data *gpio;
    struct ab8500_codec_platform_data *codec;
    };
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2013-02-04 13:47    [W:2.810 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site