|
@@ -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;
|
|
|
}
|
|
|
|
|
@@ -256,8 +266,7 @@ static int sec_pmic_probe(struct i2c_client *i2c,
|
|
|
sec_pmic->rtc = i2c_new_dummy(i2c->adapter, RTC_I2C_ADDR);
|
|
|
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",
|