Commit 6c0afb50 authored by Tero Kristo's avatar Tero Kristo
Browse files

clk: ti: convert to use proper register definition for all accesses 



Currently, TI clock driver uses an encapsulated struct that is cast into
a void pointer to store all register addresses. This can be considered
as rather nasty hackery, and prevents from expanding the register
address field also. Instead, replace all the code to use proper struct
in place for this, which contains all the previously used data.

This patch is rather large as it is touching multiple files, but this
can't be split up as we need to avoid any boot breakage.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
parent 473adbf4

arch/arm/mach-omap2/clkt2xxx_dpllcore.c

+2 −1
Original line number Diff line number Diff line
@@ -138,7 +138,8 @@ int omap2_reprogram_dpllcore(struct clk_hw *hw, unsigned long rate, 
		if (!dd)

			return -EINVAL;



		tmpset.cm_clksel1_pll = readl_relaxed(dd->mult_div1_reg);

		tmpset.cm_clksel1_pll =

			omap_clk_ll_ops.clk_readl(&dd->mult_div1_reg);

		tmpset.cm_clksel1_pll &= ~(dd->mult_mask |

					   dd->div1_mask);

		div = ((curr_prcm_set->xtal_speed / 1000000) - 1);

arch/arm/mach-omap2/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ u16 cpu_mask; 
#define OMAP3PLUS_DPLL_FINT_MIN		32000

#define OMAP3PLUS_DPLL_FINT_MAX		52000000



static struct ti_clk_ll_ops omap_clk_ll_ops = {

struct ti_clk_ll_ops omap_clk_ll_ops = {

	.clkdm_clk_enable = clkdm_clk_enable,

	.clkdm_clk_disable = clkdm_clk_disable,

	.clkdm_lookup = clkdm_lookup,

arch/arm/mach-omap2/clock.h

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ 
#define OMAP4XXX_EN_DPLL_FRBYPASS		0x6

#define OMAP4XXX_EN_DPLL_LOCKED			0x7



extern struct ti_clk_ll_ops omap_clk_ll_ops;



extern u16 cpu_mask;



extern const struct clkops clkops_omap2_dflt_wait;

arch/arm/mach-omap2/cm.h

+3 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#define MAX_MODULE_READY_TIME		2000



# ifndef __ASSEMBLER__

#include <linux/clk/ti.h>

extern void __iomem *cm_base;

extern void __iomem *cm2_base;

extern void omap2_set_globals_cm(void __iomem *cm, void __iomem *cm2);
@@ -50,7 +51,7 @@ extern void omap2_set_globals_cm(void __iomem *cm, void __iomem *cm2); 
 * @module_disable: ptr to the SoC CM-specific module_disable impl

 */

struct cm_ll_data {

	int (*split_idlest_reg)(void __iomem *idlest_reg, s16 *prcm_inst,

	int (*split_idlest_reg)(struct clk_omap_reg *idlest_reg, s16 *prcm_inst,

				u8 *idlest_reg_id);

	int (*wait_module_ready)(u8 part, s16 prcm_mod, u16 idlest_reg,

				 u8 idlest_shift);
@@ -60,7 +61,7 @@ struct cm_ll_data { 
	void (*module_disable)(u8 part, u16 inst, u16 clkctrl_offs);

};



extern int cm_split_idlest_reg(void __iomem *idlest_reg, s16 *prcm_inst,

extern int cm_split_idlest_reg(struct clk_omap_reg *idlest_reg, s16 *prcm_inst,

			       u8 *idlest_reg_id);

int omap_cm_wait_module_ready(u8 part, s16 prcm_mod, u16 idlest_reg,

			      u8 idlest_shift);

arch/arm/mach-omap2/cm2xxx.c

+3 −6
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ void omap2xxx_cm_apll96_disable(void) 
 * XXX This function is only needed until absolute register addresses are

 * removed from the OMAP struct clk records.

 */

static int omap2xxx_cm_split_idlest_reg(void __iomem *idlest_reg,

static int omap2xxx_cm_split_idlest_reg(struct clk_omap_reg *idlest_reg,

					s16 *prcm_inst,

					u8 *idlest_reg_id)

{
@@ -212,10 +212,7 @@ static int omap2xxx_cm_split_idlest_reg(void __iomem *idlest_reg, 
	u8 idlest_offs;

	int i;



	if (idlest_reg < cm_base || idlest_reg > (cm_base + 0x0fff))

		return -EINVAL;



	idlest_offs = (unsigned long)idlest_reg & 0xff;

	idlest_offs = idlest_reg->offset & 0xff;

	for (i = 0; i < ARRAY_SIZE(omap2xxx_cm_idlest_offs); i++) {

		if (idlest_offs == omap2xxx_cm_idlest_offs[i]) {

			*idlest_reg_id = i + 1;
@@ -226,7 +223,7 @@ static int omap2xxx_cm_split_idlest_reg(void __iomem *idlest_reg, 
	if (i == ARRAY_SIZE(omap2xxx_cm_idlest_offs))

		return -EINVAL;



	offs = idlest_reg - cm_base;

	offs = idlest_reg->offset;

	offs &= 0xff00;

	*prcm_inst = offs;

CRA Git | Maintained and supported by SUSTech CRA and CCSE