Commit 4641d6a5 authored by Stephen Boyd's avatar Stephen Boyd Committed by Michael Turquette
Browse files

Merge branch 'for-4.12-ti-clk-cleanups' of https://github.com/t-kristo/linux-pm into clk-next 

* 'for-4.12-ti-clk-cleanups' of https://github.com/t-kristo/linux-pm:
  clk: ti: convert to use proper register definition for all accesses
  clk: ti: dpll44xx: fix clksel register initialization
  clk: ti: gate: export gate_clk_ops locally
  clk: ti: divider: add driver internal API for parsing divider data
  clk: ti: divider: convert TI divider clock to use its own data representation
  clk: ti: mux: convert TI mux clock to use its internal data representation
  clk: ti: drop unnecessary MEMMAP_ADDRESSING flag
  clk: ti: omap4: cleanup unnecessary clock aliases
  clk: ti: enforce const types on string arrays
  clk: ti: move omap2_init_clk_clkdm under TI clock driver
  clk: ti: add clkdm_lookup to the exported functions
  clk: ti: use automatic clock alias generation framework
  clk: ti: add API for creating aliases automatically for simple clock types
  clk: ti: add support for automatic clock alias generation
  clk: ti: remove un-used definitions from public clk_hw_omap struct
parents b0459491 6c0afb50

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

+2 −33
Original line number Diff line number Diff line
@@ -54,9 +54,10 @@ 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,

	.cm_wait_module_ready = omap_cm_wait_module_ready,

	.cm_split_idlest_reg = cm_split_idlest_reg,

};
@@ -78,38 +79,6 @@ int __init omap2_clk_setup_ll_ops(void) 
 * OMAP2+ specific clock functions

 */



/* Public functions */



/**

 * omap2_init_clk_clkdm - look up a clockdomain name, store pointer in clk

 * @clk: OMAP clock struct ptr to use

 *

 * Convert a clockdomain name stored in a struct clk 'clk' into a

 * clockdomain pointer, and save it into the struct clk.  Intended to be

 * called during clk_register().  No return value.

 */

void omap2_init_clk_clkdm(struct clk_hw *hw)

{

	struct clk_hw_omap *clk = to_clk_hw_omap(hw);

	struct clockdomain *clkdm;

	const char *clk_name;



	if (!clk->clkdm_name)

		return;



	clk_name = __clk_get_name(hw->clk);



	clkdm = clkdm_lookup(clk->clkdm_name);

	if (clkdm) {

		pr_debug("clock: associated clk %s to clkdm %s\n",

			 clk_name, clk->clkdm_name);

		clk->clkdm = clkdm;

	} else {

		pr_debug("clock: could not associate clk %s to clkdm %s\n",

			 clk_name, clk->clkdm_name);

	}

}



/**

 * ti_clk_init_features - init clock features struct for the SoC

 *

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