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

Commit 628479a8 authored by Benoit Cousson's avatar Benoit Cousson Committed by Paul Walmsley
Browse files

OMAP4: clock data: Fix max mult and div for USB DPLL 



The DPLL USB can generate higher speed (x2) than the regular ones.
The max multiplication value is then twice the previous value.

Fix both max_mult and max_div with that correct values.

Change the max_div variable type to u16 to allow storing up to 256.

Replace as well the define with the value to avoid
unneeded indirection and provide a better readability.

Remove the defines that become useless.

Signed-off-by: default avatarBenoit Cousson <b-cousson@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 7ecd4228

arch/arm/mach-omap2/clock44xx.h

+0 −7
Original line number Diff line number Diff line
@@ -8,13 +8,6 @@ 
#ifndef __ARCH_ARM_MACH_OMAP2_CLOCK44XX_H

#define __ARCH_ARM_MACH_OMAP2_CLOCK44XX_H



/*

 * XXX Missing values for the OMAP4 DPLL_USB

 * XXX Missing min_multiplier values for all OMAP4 DPLLs

 */

#define OMAP4430_MAX_DPLL_MULT	2047

#define OMAP4430_MAX_DPLL_DIV	128



int omap4xxx_clk_init(void);



#endif

arch/arm/mach-omap2/clock44xx_data.c

+14 −15
Original line number Diff line number Diff line
@@ -258,8 +258,8 @@ static struct dpll_data dpll_abe_dd = { 
	.enable_mask	= OMAP4430_DPLL_EN_MASK,

	.autoidle_mask	= OMAP4430_AUTO_DPLL_MODE_MASK,

	.idlest_mask	= OMAP4430_ST_DPLL_CLK_MASK,

	.max_multiplier	= OMAP4430_MAX_DPLL_MULT,

	.max_divider	= OMAP4430_MAX_DPLL_DIV,

	.max_multiplier	= 2047,

	.max_divider	= 128,

	.min_divider	= 1,

};
@@ -434,8 +434,8 @@ static struct dpll_data dpll_core_dd = { 
	.enable_mask	= OMAP4430_DPLL_EN_MASK,

	.autoidle_mask	= OMAP4430_AUTO_DPLL_MODE_MASK,

	.idlest_mask	= OMAP4430_ST_DPLL_CLK_MASK,

	.max_multiplier	= OMAP4430_MAX_DPLL_MULT,

	.max_divider	= OMAP4430_MAX_DPLL_DIV,

	.max_multiplier	= 2047,

	.max_divider	= 128,

	.min_divider	= 1,

};
@@ -672,8 +672,8 @@ static struct dpll_data dpll_iva_dd = { 
	.enable_mask	= OMAP4430_DPLL_EN_MASK,

	.autoidle_mask	= OMAP4430_AUTO_DPLL_MODE_MASK,

	.idlest_mask	= OMAP4430_ST_DPLL_CLK_MASK,

	.max_multiplier	= OMAP4430_MAX_DPLL_MULT,

	.max_divider	= OMAP4430_MAX_DPLL_DIV,

	.max_multiplier	= 2047,

	.max_divider	= 128,

	.min_divider	= 1,

};
@@ -740,8 +740,8 @@ static struct dpll_data dpll_mpu_dd = { 
	.enable_mask	= OMAP4430_DPLL_EN_MASK,

	.autoidle_mask	= OMAP4430_AUTO_DPLL_MODE_MASK,

	.idlest_mask	= OMAP4430_ST_DPLL_CLK_MASK,

	.max_multiplier	= OMAP4430_MAX_DPLL_MULT,

	.max_divider	= OMAP4430_MAX_DPLL_DIV,

	.max_multiplier	= 2047,

	.max_divider	= 128,

	.min_divider	= 1,

};
@@ -813,8 +813,8 @@ static struct dpll_data dpll_per_dd = { 
	.enable_mask	= OMAP4430_DPLL_EN_MASK,

	.autoidle_mask	= OMAP4430_AUTO_DPLL_MODE_MASK,

	.idlest_mask	= OMAP4430_ST_DPLL_CLK_MASK,

	.max_multiplier	= OMAP4430_MAX_DPLL_MULT,

	.max_divider	= OMAP4430_MAX_DPLL_DIV,

	.max_multiplier	= 2047,

	.max_divider	= 128,

	.min_divider	= 1,

};
@@ -949,9 +949,8 @@ static struct dpll_data dpll_unipro_dd = { 
	.enable_mask	= OMAP4430_DPLL_EN_MASK,

	.autoidle_mask	= OMAP4430_AUTO_DPLL_MODE_MASK,

	.idlest_mask	= OMAP4430_ST_DPLL_CLK_MASK,

	.sddiv_mask	= OMAP4430_DPLL_SD_DIV_MASK,

	.max_multiplier	= OMAP4430_MAX_DPLL_MULT,

	.max_divider	= OMAP4430_MAX_DPLL_DIV,

	.max_multiplier	= 2047,

	.max_divider	= 128,

	.min_divider	= 1,

};
@@ -1017,8 +1016,8 @@ static struct dpll_data dpll_usb_dd = { 
	.autoidle_mask	= OMAP4430_AUTO_DPLL_MODE_MASK,

	.idlest_mask	= OMAP4430_ST_DPLL_CLK_MASK,

	.sddiv_mask	= OMAP4430_DPLL_SD_DIV_MASK,

	.max_multiplier	= OMAP4430_MAX_DPLL_MULT,

	.max_divider	= OMAP4430_MAX_DPLL_DIV,

	.max_multiplier	= 4095,

	.max_divider	= 256,

	.min_divider	= 1,

};

arch/arm/plat-omap/include/plat/clock.h

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ struct dpll_data { 
	u16			max_multiplier;

	u8			last_rounded_n;

	u8			min_divider;

	u8			max_divider;

	u16			max_divider;

	u8			modes;

#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)

	void __iomem		*autoidle_reg;