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

Commit a0895162 authored by Martin Fuzzey's avatar Martin Fuzzey Committed by Sascha Hauer
Browse files

MXC : update i.MX21 clock support for USB host. 



* Use correct clkdev style usb clock name
* Implement rate setting for USB clock
* Introduce _clk_generic_round_rate to factorize the (now 3) uses of rounding code.

Signed-off-by: default avatarMartin Fuzzey <mfuzzey@gmail.com>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent add85a41

arch/arm/mach-mx2/clock_imx21.c

+51 −26
Original line number Original line Diff line number Diff line
@@ -48,6 +48,25 @@ static void _clk_disable(struct clk *clk) 
	__raw_writel(reg, clk->enable_reg);

	__raw_writel(reg, clk->enable_reg);

}

}





static unsigned long _clk_generic_round_rate(struct clk *clk,

			unsigned long rate,

			u32 max_divisor)

{

	u32 div;

	unsigned long parent_rate;



	parent_rate = clk_get_rate(clk->parent);



	div = parent_rate / rate;

	if (parent_rate % rate)

		div++;



	if (div > max_divisor)

		div = max_divisor;



	return parent_rate / div;

}



static int _clk_spll_enable(struct clk *clk)

static int _clk_spll_enable(struct clk *clk)

{

{

	u32 reg;

	u32 reg;
@@ -78,19 +97,7 @@ static void _clk_spll_disable(struct clk *clk) 
static unsigned long _clk_perclkx_round_rate(struct clk *clk,

static unsigned long _clk_perclkx_round_rate(struct clk *clk,

					     unsigned long rate)

					     unsigned long rate)

{

{

	u32 div;

	return _clk_generic_round_rate(clk, rate, 64);

	unsigned long parent_rate;



	parent_rate = clk_get_rate(clk->parent);



	div = parent_rate / rate;

	if (parent_rate % rate)

		div++;



	if (div > 64)

		div = 64;



	return parent_rate / div;

}

}





static int _clk_perclkx_set_rate(struct clk *clk, unsigned long rate)

static int _clk_perclkx_set_rate(struct clk *clk, unsigned long rate)
@@ -130,6 +137,32 @@ static unsigned long _clk_usb_recalc(struct clk *clk) 
	return parent_rate / (usb_pdf + 1U);

	return parent_rate / (usb_pdf + 1U);

}

}





static unsigned long _clk_usb_round_rate(struct clk *clk,

					     unsigned long rate)

{

	return _clk_generic_round_rate(clk, rate, 8);

}



static int _clk_usb_set_rate(struct clk *clk, unsigned long rate)

{

	u32 reg;

	u32 div;

	unsigned long parent_rate;



	parent_rate = clk_get_rate(clk->parent);



	div = parent_rate / rate;

	if (div > 8 || div < 1 || ((parent_rate / div) != rate))

		return -EINVAL;

	div--;



	reg = CSCR() & ~CCM_CSCR_USB_MASK;

	reg |= div << CCM_CSCR_USB_OFFSET;

	__raw_writel(reg, CCM_CSCR);



	return 0;

}



static unsigned long _clk_ssix_recalc(struct clk *clk, unsigned long pdf)

static unsigned long _clk_ssix_recalc(struct clk *clk, unsigned long pdf)

{

{

	unsigned long parent_rate;

	unsigned long parent_rate;
@@ -595,11 +628,14 @@ static struct clk csi_clk[] = { 
static struct clk usb_clk[] = {

static struct clk usb_clk[] = {

	{

	{

		.parent = &spll_clk,

		.parent = &spll_clk,

		.secondary = &usb_clk[1],

		.get_rate = _clk_usb_recalc,

		.get_rate = _clk_usb_recalc,

		.enable = _clk_enable,

		.enable = _clk_enable,

		.enable_reg = CCM_PCCR_USBOTG_REG,

		.enable_reg = CCM_PCCR_USBOTG_REG,

		.enable_shift = CCM_PCCR_USBOTG_OFFSET,

		.enable_shift = CCM_PCCR_USBOTG_OFFSET,

		.disable = _clk_disable,

		.disable = _clk_disable,

		.round_rate = _clk_usb_round_rate,

		.set_rate = _clk_usb_set_rate,

	}, {

	}, {

		.parent = &hclk_clk,

		.parent = &hclk_clk,

		.enable = _clk_enable,

		.enable = _clk_enable,
@@ -768,18 +804,7 @@ static struct clk rtc_clk = { 




static unsigned long _clk_clko_round_rate(struct clk *clk, unsigned long rate)

static unsigned long _clk_clko_round_rate(struct clk *clk, unsigned long rate)

{

{

	u32 div;

	return _clk_generic_round_rate(clk, rate, 8);

	unsigned long parent_rate;



	parent_rate = clk_get_rate(clk->parent);

	div = parent_rate / rate;

	if (parent_rate % rate)

		div++;



	if (div > 8)

		div = 8;



	return parent_rate / div;

}

}





static int _clk_clko_set_rate(struct clk *clk, unsigned long rate)

static int _clk_clko_set_rate(struct clk *clk, unsigned long rate)
@@ -921,7 +946,7 @@ static struct clk_lookup lookups[] __initdata = { 
	_REGISTER_CLOCK(NULL, "cspi3", cspi_clk[2])

	_REGISTER_CLOCK(NULL, "cspi3", cspi_clk[2])

	_REGISTER_CLOCK("imx-fb.0", NULL, lcdc_clk[0])

	_REGISTER_CLOCK("imx-fb.0", NULL, lcdc_clk[0])

	_REGISTER_CLOCK(NULL, "csi", csi_clk[0])

	_REGISTER_CLOCK(NULL, "csi", csi_clk[0])

	_REGISTER_CLOCK(NULL, "usb", usb_clk[0])

	_REGISTER_CLOCK("imx21-hcd.0", NULL, usb_clk[0])

	_REGISTER_CLOCK(NULL, "ssi1", ssi_clk[0])

	_REGISTER_CLOCK(NULL, "ssi1", ssi_clk[0])

	_REGISTER_CLOCK(NULL, "ssi2", ssi_clk[1])

	_REGISTER_CLOCK(NULL, "ssi2", ssi_clk[1])

	_REGISTER_CLOCK("mxc_nand.0", NULL, nfc_clk)

	_REGISTER_CLOCK("mxc_nand.0", NULL, nfc_clk)