Commit 7a52cbcc authored by Robin Murphy's avatar Robin Murphy Committed by Lee Jones
Browse files

mfd: rk808: Reduce shutdown duplication 



Rather than having 3 almost-identical functions plus the machinery to
keep track of them, it's far simpler to just dynamically select the
appropriate register field per variant.

Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 90df3a82

drivers/mfd/rk808.c

+20 −41
Original line number Diff line number Diff line
@@ -448,21 +448,6 @@ static const struct regmap_irq_chip rk818_irq_chip = { 


static struct i2c_client *rk808_i2c_client;



static void rk805_device_shutdown(void)

{

	int ret;

	struct rk808 *rk808 = i2c_get_clientdata(rk808_i2c_client);



	if (!rk808)

		return;



	ret = regmap_update_bits(rk808->regmap,

				 RK805_DEV_CTRL_REG,

				 DEV_OFF, DEV_OFF);

	if (ret)

		dev_err(&rk808_i2c_client->dev, "Failed to shutdown device!\n");

}



static void rk805_device_shutdown_prepare(void)

{

	int ret;
@@ -478,32 +463,29 @@ static void rk805_device_shutdown_prepare(void) 
		dev_err(&rk808_i2c_client->dev, "Failed to shutdown device!\n");

}



static void rk808_device_shutdown(void)

static void rk808_pm_power_off(void)

{

	int ret;

	unsigned int reg, bit;

	struct rk808 *rk808 = i2c_get_clientdata(rk808_i2c_client);



	if (!rk808)

	switch (rk808->variant) {

	case RK805_ID:

		reg = RK805_DEV_CTRL_REG;

		bit = DEV_OFF;

		break;

	case RK808_ID:

		reg = RK808_DEVCTRL_REG,

		bit = DEV_OFF_RST;

		break;

	case RK818_ID:

		reg = RK818_DEVCTRL_REG;

		bit = DEV_OFF;

		break;

	default:

		return;



	ret = regmap_update_bits(rk808->regmap,

				 RK808_DEVCTRL_REG,

				 DEV_OFF_RST, DEV_OFF_RST);

	if (ret)

		dev_err(&rk808_i2c_client->dev, "Failed to shutdown device!\n");

	}



static void rk818_device_shutdown(void)

{

	int ret;

	struct rk808 *rk808 = i2c_get_clientdata(rk808_i2c_client);



	if (!rk808)

		return;



	ret = regmap_update_bits(rk808->regmap,

				 RK818_DEVCTRL_REG,

				 DEV_OFF, DEV_OFF);

	ret = regmap_update_bits(rk808->regmap, reg, bit, bit);

	if (ret)

		dev_err(&rk808_i2c_client->dev, "Failed to shutdown device!\n");

}
@@ -592,7 +574,6 @@ static int rk808_probe(struct i2c_client *client, 
		nr_pre_init_regs = ARRAY_SIZE(rk805_pre_init_reg);

		cells = rk805s;

		nr_cells = ARRAY_SIZE(rk805s);

		rk808->pm_pwroff_fn = rk805_device_shutdown;

		rk808->pm_pwroff_prep_fn = rk805_device_shutdown_prepare;

		break;

	case RK808_ID:
@@ -602,7 +583,6 @@ static int rk808_probe(struct i2c_client *client, 
		nr_pre_init_regs = ARRAY_SIZE(rk808_pre_init_reg);

		cells = rk808s;

		nr_cells = ARRAY_SIZE(rk808s);

		rk808->pm_pwroff_fn = rk808_device_shutdown;

		break;

	case RK818_ID:

		rk808->regmap_cfg = &rk818_regmap_config;
@@ -611,7 +591,6 @@ static int rk808_probe(struct i2c_client *client, 
		nr_pre_init_regs = ARRAY_SIZE(rk818_pre_init_reg);

		cells = rk818s;

		nr_cells = ARRAY_SIZE(rk818s);

		rk808->pm_pwroff_fn = rk818_device_shutdown;

		break;

	case RK809_ID:

	case RK817_ID:
@@ -673,7 +652,7 @@ static int rk808_probe(struct i2c_client *client, 


	if (of_property_read_bool(np, "rockchip,system-power-controller")) {

		rk808_i2c_client = client;

		pm_power_off = rk808->pm_pwroff_fn;

		pm_power_off = rk808_pm_power_off;

		pm_power_off_prepare = rk808->pm_pwroff_prep_fn;

	}
@@ -694,7 +673,7 @@ static int rk808_remove(struct i2c_client *client) 
	 * pm_power_off may points to a function from another module.

	 * Check if the pointer is set by us and only then overwrite it.

	 */

	if (rk808->pm_pwroff_fn && pm_power_off == rk808->pm_pwroff_fn)

	if (pm_power_off == rk808_pm_power_off)

		pm_power_off = NULL;



	/**

include/linux/mfd/rk808.h

+0 −1
Original line number Diff line number Diff line
@@ -620,7 +620,6 @@ struct rk808 { 
	long				variant;

	const struct regmap_config	*regmap_cfg;

	const struct regmap_irq_chip	*regmap_irq_chip;

	void				(*pm_pwroff_fn)(void);

	void				(*pm_pwroff_prep_fn)(void);

};

#endif /* __LINUX_REGULATOR_RK808_H */