Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4018bfeb authored by Felipe Balbi's avatar Felipe Balbi Committed by Kevin Hilman
Browse files

ARM: OMAP3+: SmartReflex: misc cleanups 



There are no functional changes here, only misc cleanups in general:
- re-organize variable declarations,
- converting if {} else if {} else {} into switch statements,
- correct comments typos,
- add/remove white lines to improve readability,
- etc.

Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarJean Pihet <j-pihet@ti.com>
Reviewed-by: default avatarKevin Hilman <khilman@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent 1a21a680

arch/arm/mach-omap2/smartreflex.c

+67 −33
Original line number Diff line number Diff line
@@ -36,6 +36,12 @@ 
#define SR_DISABLE_TIMEOUT	200



struct omap_sr {

	struct list_head		node;

	struct platform_device		*pdev;

	struct omap_sr_nvalue_table	*nvalue_table;

	struct voltagedomain		*voltdm;

	struct dentry			*dbg_dir;

	unsigned int			irq;

	int				srid;

	int				ip_type;

	int				nvalue_count;
@@ -49,13 +55,7 @@ struct omap_sr { 
	u32				senp_avgweight;

	u32				senp_mod;

	u32				senn_mod;

	unsigned int			irq;

	void __iomem			*base;

	struct platform_device		*pdev;

	struct list_head		node;

	struct omap_sr_nvalue_table	*nvalue_table;

	struct voltagedomain		*voltdm;

	struct dentry			*dbg_dir;

};



/* sr_list contains all the instances of smartreflex module */
@@ -123,21 +123,28 @@ static struct omap_sr *_sr_lookup(struct voltagedomain *voltdm) 


static irqreturn_t sr_interrupt(int irq, void *data)

{

	struct omap_sr *sr_info = (struct omap_sr *)data;

	struct omap_sr *sr_info = data;

	u32 status = 0;



	if (sr_info->ip_type == SR_TYPE_V1) {

	switch (sr_info->ip_type) {

	case SR_TYPE_V1:

		/* Read the status bits */

		status = sr_read_reg(sr_info, ERRCONFIG_V1);



		/* Clear them by writing back */

		sr_write_reg(sr_info, ERRCONFIG_V1, status);

	} else if (sr_info->ip_type == SR_TYPE_V2) {

		break;

	case SR_TYPE_V2:

		/* Read the status bits */

		status = sr_read_reg(sr_info, IRQSTATUS);



		/* Clear them by writing back */

		sr_write_reg(sr_info, IRQSTATUS, status);

		break;

	default:

		dev_err(&sr_info->pdev->dev, "UNKNOWN IP type %d\n",

			sr_info->ip_type);

		return IRQ_NONE;

	}



	if (sr_class->notify)
@@ -161,6 +168,7 @@ static void sr_set_clk_length(struct omap_sr *sr) 
			__func__);

		return;

	}



	sys_clk_speed = clk_get_rate(sys_ck);

	clk_put(sys_ck);
@@ -262,7 +270,7 @@ static int sr_late_init(struct omap_sr *sr_info) 
			goto error;

		}

		ret = request_irq(sr_info->irq, sr_interrupt,

				0, name, (void *)sr_info);

				0, name, sr_info);

		if (ret)

			goto error;

		disable_irq(sr_info->irq);
@@ -283,6 +291,7 @@ static int sr_late_init(struct omap_sr *sr_info) 
		"not function as desired\n", __func__);

	kfree(name);

	kfree(sr_info);



	return ret;

}
@@ -403,8 +412,9 @@ static u32 sr_retrieve_nvalue(struct omap_sr *sr, u32 efuse_offs) 
 */

int sr_configure_errgen(struct voltagedomain *voltdm)

{

	u32 sr_config, sr_errconfig, errconfig_offs, vpboundint_en;

	u32 vpboundint_st, senp_en = 0, senn_en = 0;

	u32 sr_config, sr_errconfig, errconfig_offs;

	u32 vpboundint_en, vpboundint_st;

	u32 senp_en = 0, senn_en = 0;

	u8 senp_shift, senn_shift;

	struct omap_sr *sr = _sr_lookup(voltdm);
@@ -423,20 +433,23 @@ int sr_configure_errgen(struct voltagedomain *voltdm) 
	sr_config = (sr->clk_length << SRCONFIG_SRCLKLENGTH_SHIFT) |

		SRCONFIG_SENENABLE | SRCONFIG_ERRGEN_EN;



	if (sr->ip_type == SR_TYPE_V1) {

	switch (sr->ip_type) {

	case SR_TYPE_V1:

		sr_config |= SRCONFIG_DELAYCTRL;

		senn_shift = SRCONFIG_SENNENABLE_V1_SHIFT;

		senp_shift = SRCONFIG_SENPENABLE_V1_SHIFT;

		errconfig_offs = ERRCONFIG_V1;

		vpboundint_en = ERRCONFIG_VPBOUNDINTEN_V1;

		vpboundint_st = ERRCONFIG_VPBOUNDINTST_V1;

	} else if (sr->ip_type == SR_TYPE_V2) {

		break;

	case SR_TYPE_V2:

		senn_shift = SRCONFIG_SENNENABLE_V2_SHIFT;

		senp_shift = SRCONFIG_SENPENABLE_V2_SHIFT;

		errconfig_offs = ERRCONFIG_V2;

		vpboundint_en = ERRCONFIG_VPBOUNDINTEN_V2;

		vpboundint_st = ERRCONFIG_VPBOUNDINTST_V2;

	} else {

		break;

	default:

		dev_err(&sr->pdev->dev, "%s: Trying to Configure smartreflex"

			"module without specifying the ip\n", __func__);

		return -EINVAL;
@@ -469,8 +482,8 @@ int sr_configure_errgen(struct voltagedomain *voltdm) 
 */

int sr_disable_errgen(struct voltagedomain *voltdm)

{

	u32 errconfig_offs, vpboundint_en;

	u32 vpboundint_st;

	u32 errconfig_offs;

	u32 vpboundint_en, vpboundint_st;

	struct omap_sr *sr = _sr_lookup(voltdm);



	if (IS_ERR(sr)) {
@@ -479,15 +492,18 @@ int sr_disable_errgen(struct voltagedomain *voltdm) 
		return -EINVAL;

	}



	if (sr->ip_type == SR_TYPE_V1) {

	switch (sr->ip_type) {

	case SR_TYPE_V1:

		errconfig_offs = ERRCONFIG_V1;

		vpboundint_en = ERRCONFIG_VPBOUNDINTEN_V1;

		vpboundint_st = ERRCONFIG_VPBOUNDINTST_V1;

	} else if (sr->ip_type == SR_TYPE_V2) {

		break;

	case SR_TYPE_V2:

		errconfig_offs = ERRCONFIG_V2;

		vpboundint_en = ERRCONFIG_VPBOUNDINTEN_V2;

		vpboundint_st = ERRCONFIG_VPBOUNDINTST_V2;

	} else {

		break;

	default:

		dev_err(&sr->pdev->dev, "%s: Trying to Configure smartreflex"

			"module without specifying the ip\n", __func__);

		return -EINVAL;
@@ -537,14 +553,17 @@ int sr_configure_minmax(struct voltagedomain *voltdm) 
		SRCONFIG_SENENABLE |

		(sr->accum_data << SRCONFIG_ACCUMDATA_SHIFT);



	if (sr->ip_type == SR_TYPE_V1) {

	switch (sr->ip_type) {

	case SR_TYPE_V1:

		sr_config |= SRCONFIG_DELAYCTRL;

		senn_shift = SRCONFIG_SENNENABLE_V1_SHIFT;

		senp_shift = SRCONFIG_SENPENABLE_V1_SHIFT;

	} else if (sr->ip_type == SR_TYPE_V2) {

		break;

	case SR_TYPE_V2:

		senn_shift = SRCONFIG_SENNENABLE_V2_SHIFT;

		senp_shift = SRCONFIG_SENPENABLE_V2_SHIFT;

	} else {

		break;

	default:

		dev_err(&sr->pdev->dev, "%s: Trying to Configure smartreflex"

			"module without specifying the ip\n", __func__);

		return -EINVAL;
@@ -560,20 +579,27 @@ int sr_configure_minmax(struct voltagedomain *voltdm) 
	 * Enabling the interrupts if MINMAXAVG module is used.

	 * TODO: check if all the interrupts are mandatory

	 */

	if (sr->ip_type == SR_TYPE_V1) {

	switch (sr->ip_type) {

	case SR_TYPE_V1:

		sr_modify_reg(sr, ERRCONFIG_V1,

			(ERRCONFIG_MCUACCUMINTEN | ERRCONFIG_MCUVALIDINTEN |

			ERRCONFIG_MCUBOUNDINTEN),

			(ERRCONFIG_MCUACCUMINTEN | ERRCONFIG_MCUACCUMINTST |

			 ERRCONFIG_MCUVALIDINTEN | ERRCONFIG_MCUVALIDINTST |

			 ERRCONFIG_MCUBOUNDINTEN | ERRCONFIG_MCUBOUNDINTST));

	} else if (sr->ip_type == SR_TYPE_V2) {

		break;

	case SR_TYPE_V2:

		sr_write_reg(sr, IRQSTATUS,

			IRQSTATUS_MCUACCUMINT | IRQSTATUS_MCVALIDINT |

			IRQSTATUS_MCBOUNDSINT | IRQSTATUS_MCUDISABLEACKINT);

		sr_write_reg(sr, IRQENABLE_SET,

			IRQENABLE_MCUACCUMINT | IRQENABLE_MCUVALIDINT |

			IRQENABLE_MCUBOUNDSINT | IRQENABLE_MCUDISABLEACKINT);

		break;

	default:

		dev_err(&sr->pdev->dev, "%s: Trying to Configure smartreflex"

			"module without specifying the ip\n", __func__);

		return -EINVAL;

	}



	return 0;
@@ -592,9 +618,9 @@ int sr_configure_minmax(struct voltagedomain *voltdm) 
 */

int sr_enable(struct voltagedomain *voltdm, unsigned long volt)

{

	u32 nvalue_reciprocal;

	struct omap_volt_data *volt_data;

	struct omap_sr *sr = _sr_lookup(voltdm);

	u32 nvalue_reciprocal;

	int ret;



	if (IS_ERR(sr)) {
@@ -666,10 +692,17 @@ void sr_disable(struct voltagedomain *voltdm) 
	 * disable the clocks.

	 */

	if (sr_read_reg(sr, SRCONFIG) & SRCONFIG_SRENABLE) {

		if (sr->ip_type == SR_TYPE_V1)

		switch (sr->ip_type) {

		case SR_TYPE_V1:

			sr_v1_disable(sr);

		else if (sr->ip_type == SR_TYPE_V2)

			break;

		case SR_TYPE_V2:

			sr_v2_disable(sr);

			break;

		default:

			dev_err(&sr->pdev->dev, "UNKNOWN IP type %d\n",

				sr->ip_type);

		}

	}



	pm_runtime_put_sync_suspend(&sr->pdev->dev);
@@ -828,10 +861,10 @@ void omap_sr_register_pmic(struct omap_sr_pmic_data *pmic_data) 
	sr_pmic_data = pmic_data;

}



/* PM Debug Fs enteries to enable disable smartreflex. */

/* PM Debug FS entries to enable and disable smartreflex. */

static int omap_sr_autocomp_show(void *data, u64 *val)

{

	struct omap_sr *sr_info = (struct omap_sr *) data;

	struct omap_sr *sr_info = data;



	if (!sr_info) {

		pr_warning("%s: omap_sr struct not found\n", __func__);
@@ -845,7 +878,7 @@ static int omap_sr_autocomp_show(void *data, u64 *val) 


static int omap_sr_autocomp_store(void *data, u64 val)

{

	struct omap_sr *sr_info = (struct omap_sr *) data;

	struct omap_sr *sr_info = data;



	if (!sr_info) {

		pr_warning("%s: omap_sr struct not found\n", __func__);
@@ -874,7 +907,7 @@ DEFINE_SIMPLE_ATTRIBUTE(pm_sr_fops, omap_sr_autocomp_show, 


static int __init omap_sr_probe(struct platform_device *pdev)

{

	struct omap_sr *sr_info = kzalloc(sizeof(struct omap_sr), GFP_KERNEL);

	struct omap_sr *sr_info;

	struct omap_sr_data *pdata = pdev->dev.platform_data;

	struct resource *mem, *irq;

	struct dentry *nvalue_dir;
@@ -882,6 +915,7 @@ static int __init omap_sr_probe(struct platform_device *pdev) 
	int i, ret = 0;

	char *name;



	sr_info = kzalloc(sizeof(struct omap_sr), GFP_KERNEL);

	if (!sr_info) {

		dev_err(&pdev->dev, "%s: unable to allocate sr_info\n",

			__func__);