lkml.org 
[lkml]   [2014]   [Feb]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/4] mfd: sec: Select different RTC regmaps for devices
    Date
    This patch prepares for adding support for S2MPS14 RTC driver by
    selecting different regmaps for S2MPS1X/S5M876X RTC devices.

    Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
    Acked-by: Lee Jones <lee.jones@linaro.org>
    ---
    drivers/mfd/sec-core.c | 15 ++++++++++++---
    1 file changed, 12 insertions(+), 3 deletions(-)

    diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
    index 074939c9bd42..e717c6dfb105 100644
    --- a/drivers/mfd/sec-core.c
    +++ b/drivers/mfd/sec-core.c
    @@ -199,7 +199,7 @@ static int sec_pmic_probe(struct i2c_client *i2c,
    const struct i2c_device_id *id)
    {
    struct sec_platform_data *pdata = dev_get_platdata(&i2c->dev);
    - const struct regmap_config *regmap;
    + const struct regmap_config *regmap, *regmap_rtc;
    struct sec_pmic_dev *sec_pmic;
    int ret;

    @@ -233,15 +233,25 @@ static int sec_pmic_probe(struct i2c_client *i2c,
    switch (sec_pmic->device_type) {
    case S2MPS11X:
    regmap = &s2mps11_regmap_config;
    + /*
    + * The rtc-s5m driver does not support S2MPS11 and there
    + * is no mfd_cell for S2MPS11 RTC device.
    + * However we must pass something to devm_regmap_init_i2c()
    + * so use S5M-like regmap config even though it wouldn't work.
    + */
    + regmap_rtc = &sec_rtc_regmap_config;
    break;
    case S5M8763X:
    regmap = &s5m8763_regmap_config;
    + regmap_rtc = &sec_rtc_regmap_config;
    break;
    case S5M8767X:
    regmap = &s5m8767_regmap_config;
    + regmap_rtc = &sec_rtc_regmap_config;
    break;
    default:
    regmap = &sec_regmap_config;
    + regmap_rtc = &sec_rtc_regmap_config;
    break;
    }

    @@ -260,8 +270,7 @@ static int sec_pmic_probe(struct i2c_client *i2c,
    }
    i2c_set_clientdata(sec_pmic->rtc, sec_pmic);

    - sec_pmic->regmap_rtc = devm_regmap_init_i2c(sec_pmic->rtc,
    - &sec_rtc_regmap_config);
    + sec_pmic->regmap_rtc = devm_regmap_init_i2c(sec_pmic->rtc, regmap_rtc);
    if (IS_ERR(sec_pmic->regmap_rtc)) {
    ret = PTR_ERR(sec_pmic->regmap_rtc);
    dev_err(&i2c->dev, "Failed to allocate RTC register map: %d\n",
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2014-02-28 12:21    [W:2.158 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site