Commit 3e1e4a5f authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Linus Torvalds
Browse files

mfd/rtc: s5m: fix register updating by adding regmap for RTC 



Rename old regmap field of "struct sec_pmic_dev" to "regmap_pmic" and
add new regmap for RTC.

On S5M8767A registers were not properly updated and read due to usage of
the same regmap as the PMIC.  This could be observed in various hangs,
e.g.  in infinite loop during waiting for UDR field change.

On this chip family the RTC has different I2C address than PMIC so
additional regmap is needed.

Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: default avatarMark Brown <broonie@linaro.org>
Acked-by: default avatarSangbeom Kim <sbkim73@samsung.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 222ead7f

drivers/mfd/sec-core.c

+22 −8
Original line number Diff line number Diff line
@@ -81,31 +81,31 @@ static struct of_device_id sec_dt_match[] = { 


int sec_reg_read(struct sec_pmic_dev *sec_pmic, u8 reg, void *dest)

{

	return regmap_read(sec_pmic->regmap, reg, dest);

	return regmap_read(sec_pmic->regmap_pmic, reg, dest);

}

EXPORT_SYMBOL_GPL(sec_reg_read);



int sec_bulk_read(struct sec_pmic_dev *sec_pmic, u8 reg, int count, u8 *buf)

{

	return regmap_bulk_read(sec_pmic->regmap, reg, buf, count);

	return regmap_bulk_read(sec_pmic->regmap_pmic, reg, buf, count);

}

EXPORT_SYMBOL_GPL(sec_bulk_read);



int sec_reg_write(struct sec_pmic_dev *sec_pmic, u8 reg, u8 value)

{

	return regmap_write(sec_pmic->regmap, reg, value);

	return regmap_write(sec_pmic->regmap_pmic, reg, value);

}

EXPORT_SYMBOL_GPL(sec_reg_write);



int sec_bulk_write(struct sec_pmic_dev *sec_pmic, u8 reg, int count, u8 *buf)

{

	return regmap_raw_write(sec_pmic->regmap, reg, buf, count);

	return regmap_raw_write(sec_pmic->regmap_pmic, reg, buf, count);

}

EXPORT_SYMBOL_GPL(sec_bulk_write);



int sec_reg_update(struct sec_pmic_dev *sec_pmic, u8 reg, u8 val, u8 mask)

{

	return regmap_update_bits(sec_pmic->regmap, reg, mask, val);

	return regmap_update_bits(sec_pmic->regmap_pmic, reg, mask, val);

}

EXPORT_SYMBOL_GPL(sec_reg_update);
@@ -166,6 +166,11 @@ static struct regmap_config s5m8767_regmap_config = { 
	.cache_type = REGCACHE_FLAT,

};



static const struct regmap_config sec_rtc_regmap_config = {

	.reg_bits = 8,

	.val_bits = 8,

};



#ifdef CONFIG_OF

/*

 * Only the common platform data elements for s5m8767 are parsed here from the
@@ -266,9 +271,9 @@ static int sec_pmic_probe(struct i2c_client *i2c, 
		break;

	}



	sec_pmic->regmap = devm_regmap_init_i2c(i2c, regmap);

	if (IS_ERR(sec_pmic->regmap)) {

		ret = PTR_ERR(sec_pmic->regmap);

	sec_pmic->regmap_pmic = devm_regmap_init_i2c(i2c, regmap);

	if (IS_ERR(sec_pmic->regmap_pmic)) {

		ret = PTR_ERR(sec_pmic->regmap_pmic);

		dev_err(&i2c->dev, "Failed to allocate register map: %d\n",

			ret);

		return ret;
@@ -277,6 +282,15 @@ 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);

	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",

			ret);

		return ret;

	}



	if (pdata && pdata->cfg_pmic_irq)

		pdata->cfg_pmic_irq();

drivers/mfd/sec-irq.c

+3 −3
Original line number Diff line number Diff line
@@ -280,19 +280,19 @@ int sec_irq_init(struct sec_pmic_dev *sec_pmic) 


	switch (type) {

	case S5M8763X:

		ret = regmap_add_irq_chip(sec_pmic->regmap, sec_pmic->irq,

		ret = regmap_add_irq_chip(sec_pmic->regmap_pmic, sec_pmic->irq,

				  IRQF_TRIGGER_FALLING | IRQF_ONESHOT,

				  sec_pmic->irq_base, &s5m8763_irq_chip,

				  &sec_pmic->irq_data);

		break;

	case S5M8767X:

		ret = regmap_add_irq_chip(sec_pmic->regmap, sec_pmic->irq,

		ret = regmap_add_irq_chip(sec_pmic->regmap_pmic, sec_pmic->irq,

				  IRQF_TRIGGER_FALLING | IRQF_ONESHOT,

				  sec_pmic->irq_base, &s5m8767_irq_chip,

				  &sec_pmic->irq_data);

		break;

	case S2MPS11X:

		ret = regmap_add_irq_chip(sec_pmic->regmap, sec_pmic->irq,

		ret = regmap_add_irq_chip(sec_pmic->regmap_pmic, sec_pmic->irq,

				  IRQF_TRIGGER_FALLING | IRQF_ONESHOT,

				  sec_pmic->irq_base, &s2mps11_irq_chip,

				  &sec_pmic->irq_data);

drivers/regulator/s5m8767.c

+1 −1
Original line number Diff line number Diff line
@@ -925,7 +925,7 @@ static int s5m8767_pmic_probe(struct platform_device *pdev) 
		config.dev = s5m8767->dev;

		config.init_data = pdata->regulators[i].initdata;

		config.driver_data = s5m8767;

		config.regmap = iodev->regmap;

		config.regmap = iodev->regmap_pmic;

		config.of_node = pdata->regulators[i].reg_node;



		rdev[i] = devm_regulator_register(&pdev->dev, &regulators[id],

drivers/rtc/rtc-s5m.c

+1 −1
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ static int s5m_rtc_probe(struct platform_device *pdev) 


	info->dev = &pdev->dev;

	info->s5m87xx = s5m87xx;

	info->regmap = s5m87xx->regmap;

	info->regmap = s5m87xx->regmap_rtc;

	info->device_type = s5m87xx->device_type;

	info->wtsr_smpl = s5m87xx->wtsr_smpl;

include/linux/mfd/samsung/core.h

+2 −1
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ enum sec_device_type { 
struct sec_pmic_dev {

	struct device *dev;

	struct sec_platform_data *pdata;

	struct regmap *regmap;

	struct regmap *regmap_pmic;

	struct regmap *regmap_rtc;

	struct i2c_client *i2c;

	struct i2c_client *rtc;

CRA Git | Maintained and supported by SUSTech CRA and CCSE