> 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@xxxxxxxxxxx>
> ---
> 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 6021c54f74cf..0efa69e123ee 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;
An odd predicament, but it doesn't look as though the semantics have
changed.
I guess this set will need to go in as one so for now:
Acked-by: Lee Jones <lee.jones@xxxxxxxxxx>
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
