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

Commit 4029813c authored by Eric Miao's avatar Eric Miao
Browse files

ARM: pxa: separate the clock support into clock-{pxa2xx,pxa3xx}.c 



Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent 2e8581e7

arch/arm/mach-pxa/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ endif 
# Generic drivers that other drivers may depend upon



# SoC-specific code

obj-$(CONFIG_PXA25x)		+= mfp-pxa2xx.o pxa2xx.o pxa25x.o

obj-$(CONFIG_PXA27x)		+= mfp-pxa2xx.o pxa2xx.o pxa27x.o

obj-$(CONFIG_PXA3xx)		+= mfp-pxa3xx.o pxa3xx.o smemc.o pxa3xx-ulpi.o

obj-$(CONFIG_PXA25x)		+= mfp-pxa2xx.o clock-pxa2xx.o pxa2xx.o pxa25x.o

obj-$(CONFIG_PXA27x)		+= mfp-pxa2xx.o clock-pxa2xx.o pxa2xx.o pxa27x.o

obj-$(CONFIG_PXA3xx)		+= mfp-pxa3xx.o clock-pxa3xx.o pxa3xx.o smemc.o pxa3xx-ulpi.o

obj-$(CONFIG_CPU_PXA300)	+= pxa300.o

obj-$(CONFIG_CPU_PXA320)	+= pxa320.o

obj-$(CONFIG_CPU_PXA930)	+= pxa930.o

arch/arm/mach-pxa/clock-pxa2xx.c

0 → 100644
+30 −0
Original line number Diff line number Diff line 
/*

 * linux/arch/arm/mach-pxa/clock-pxa2xx.c

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/init.h>



#include <mach/pxa2xx-regs.h>



#include "clock.h"



void clk_pxa2xx_cken_enable(struct clk *clk)

{

	CKEN |= 1 << clk->cken;

}



void clk_pxa2xx_cken_disable(struct clk *clk)

{

	CKEN &= ~(1 << clk->cken);

}



const struct clkops clk_pxa2xx_cken_ops = {

	.enable		= clk_pxa2xx_cken_enable,

	.disable	= clk_pxa2xx_cken_disable,

};

arch/arm/mach-pxa/clock-pxa3xx.c

0 → 100644
+161 −0
Original line number Diff line number Diff line 
/*

 * linux/arch/arm/mach-pxa/clock-pxa3xx.c

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/init.h>



#include <mach/pxa3xx-regs.h>



#include "clock.h"



/* Crystal clock: 13MHz */

#define BASE_CLK	13000000



/* Ring Oscillator Clock: 60MHz */

#define RO_CLK		60000000



#define ACCR_D0CS	(1 << 26)

#define ACCR_PCCE	(1 << 11)



/* crystal frequency to static memory controller multiplier (SMCFS) */

static unsigned char smcfs_mult[8] = { 6, 0, 8, 0, 0, 16, };



/* crystal frequency to HSIO bus frequency multiplier (HSS) */

static unsigned char hss_mult[4] = { 8, 12, 16, 24 };



/*

 * Get the clock frequency as reflected by CCSR and the turbo flag.

 * We assume these values have been applied via a fcs.

 * If info is not 0 we also display the current settings.

 */

unsigned int pxa3xx_get_clk_frequency_khz(int info)

{

	unsigned long acsr, xclkcfg;

	unsigned int t, xl, xn, hss, ro, XL, XN, CLK, HSS;



	/* Read XCLKCFG register turbo bit */

	__asm__ __volatile__("mrc\tp14, 0, %0, c6, c0, 0" : "=r"(xclkcfg));

	t = xclkcfg & 0x1;



	acsr = ACSR;



	xl  = acsr & 0x1f;

	xn  = (acsr >> 8) & 0x7;

	hss = (acsr >> 14) & 0x3;



	XL = xl * BASE_CLK;

	XN = xn * XL;



	ro = acsr & ACCR_D0CS;



	CLK = (ro) ? RO_CLK : ((t) ? XN : XL);

	HSS = (ro) ? RO_CLK : hss_mult[hss] * BASE_CLK;



	if (info) {

		pr_info("RO Mode clock: %d.%02dMHz (%sactive)\n",

			RO_CLK / 1000000, (RO_CLK % 1000000) / 10000,

			(ro) ? "" : "in");

		pr_info("Run Mode clock: %d.%02dMHz (*%d)\n",

			XL / 1000000, (XL % 1000000) / 10000, xl);

		pr_info("Turbo Mode clock: %d.%02dMHz (*%d, %sactive)\n",

			XN / 1000000, (XN % 1000000) / 10000, xn,

			(t) ? "" : "in");

		pr_info("HSIO bus clock: %d.%02dMHz\n",

			HSS / 1000000, (HSS % 1000000) / 10000);

	}



	return CLK / 1000;

}



/*

 * Return the current AC97 clock frequency.

 */

static unsigned long clk_pxa3xx_ac97_getrate(struct clk *clk)

{

	unsigned long rate = 312000000;

	unsigned long ac97_div;



	ac97_div = AC97_DIV;



	/* This may loose precision for some rates but won't for the

	 * standard 24.576MHz.

	 */

	rate /= (ac97_div >> 12) & 0x7fff;

	rate *= (ac97_div & 0xfff);



	return rate;

}



/*

 * Return the current HSIO bus clock frequency

 */

static unsigned long clk_pxa3xx_hsio_getrate(struct clk *clk)

{

	unsigned long acsr;

	unsigned int hss, hsio_clk;



	acsr = ACSR;



	hss = (acsr >> 14) & 0x3;

	hsio_clk = (acsr & ACCR_D0CS) ? RO_CLK : hss_mult[hss] * BASE_CLK;



	return hsio_clk;

}



void clk_pxa3xx_cken_enable(struct clk *clk)

{

	unsigned long mask = 1ul << (clk->cken & 0x1f);



	if (clk->cken < 32)

		CKENA |= mask;

	else

		CKENB |= mask;

}



void clk_pxa3xx_cken_disable(struct clk *clk)

{

	unsigned long mask = 1ul << (clk->cken & 0x1f);



	if (clk->cken < 32)

		CKENA &= ~mask;

	else

		CKENB &= ~mask;

}



const struct clkops clk_pxa3xx_cken_ops = {

	.enable		= clk_pxa3xx_cken_enable,

	.disable	= clk_pxa3xx_cken_disable,

};



const struct clkops clk_pxa3xx_hsio_ops = {

	.enable		= clk_pxa3xx_cken_enable,

	.disable	= clk_pxa3xx_cken_disable,

	.getrate	= clk_pxa3xx_hsio_getrate,

};



const struct clkops clk_pxa3xx_ac97_ops = {

	.enable		= clk_pxa3xx_cken_enable,

	.disable	= clk_pxa3xx_cken_disable,

	.getrate	= clk_pxa3xx_ac97_getrate,

};



static void clk_pout_enable(struct clk *clk)

{

	OSCC |= OSCC_PEN;

}



static void clk_pout_disable(struct clk *clk)

{

	OSCC &= ~OSCC_PEN;

}



const struct clkops clk_pxa3xx_pout_ops = {

	.enable		= clk_pout_enable,

	.disable	= clk_pout_disable,

};

arch/arm/mach-pxa/clock.c

+9 −17
Original line number Diff line number Diff line
@@ -3,21 +3,12 @@ 
 */

#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/list.h>

#include <linux/errno.h>

#include <linux/err.h>

#include <linux/string.h>

#include <linux/clk.h>

#include <linux/spinlock.h>

#include <linux/platform_device.h>

#include <linux/delay.h>



#include <asm/clkdev.h>

#include <mach/pxa2xx-regs.h>

#include <mach/hardware.h>



#include "devices.h"

#include "generic.h"

#include "clock.h"



static DEFINE_SPINLOCK(clocks_lock);
@@ -63,18 +54,19 @@ unsigned long clk_get_rate(struct clk *clk) 
}

EXPORT_SYMBOL(clk_get_rate);





void clk_cken_enable(struct clk *clk)

void clk_dummy_enable(struct clk *clk)

{

	CKEN |= 1 << clk->cken;

}



void clk_cken_disable(struct clk *clk)

void clk_dummy_disable(struct clk *clk)

{

	CKEN &= ~(1 << clk->cken);

}



const struct clkops clk_cken_ops = {

	.enable		= clk_cken_enable,

	.disable	= clk_cken_disable,

const struct clkops clk_dummy_ops = {

	.enable		= clk_dummy_enable,

	.disable	= clk_dummy_disable,

};



struct clk clk_dummy = {

	.ops		= &clk_dummy_ops,

};

arch/arm/mach-pxa/clock.h

+15 −6
Original line number Diff line number Diff line
@@ -14,6 +14,12 @@ struct clk { 
	unsigned int		enabled;

};



void clk_dummy_enable(struct clk *);

void clk_dummy_disable(struct clk *);



extern const struct clkops clk_dummy_ops;

extern struct clk clk_dummy;



#define INIT_CLKREG(_clk,_devname,_conname)		\

	{						\

		.clk		= _clk,			\
@@ -34,18 +40,18 @@ struct clk clk_##_name = { \ 
		.delay	= _delay,			\

	}



#define DEFINE_CKEN(_name, _cken, _rate, _delay)	\

#define DEFINE_PXA2_CKEN(_name, _cken, _rate, _delay)	\

struct clk clk_##_name = {				\

		.ops	= &clk_cken_ops,		\

		.ops	= &clk_pxa2xx_cken_ops,		\

		.rate	= _rate,			\

		.cken	= CKEN_##_cken,			\

		.delay	= _delay,			\

	}



extern const struct clkops clk_cken_ops;

extern const struct clkops clk_pxa2xx_cken_ops;



void clk_cken_enable(struct clk *clk);

void clk_cken_disable(struct clk *clk);

void clk_pxa2xx_cken_enable(struct clk *clk);

void clk_pxa2xx_cken_disable(struct clk *clk);



#ifdef CONFIG_PXA3xx

#define DEFINE_PXA3_CKEN(_name, _cken, _rate, _delay)	\
@@ -57,7 +63,10 @@ struct clk clk_##_name = { \ 
	}



extern const struct clkops clk_pxa3xx_cken_ops;

extern const struct clkops clk_pxa3xx_hsio_ops;

extern const struct clkops clk_pxa3xx_ac97_ops;

extern const struct clkops clk_pxa3xx_pout_ops;



extern void clk_pxa3xx_cken_enable(struct clk *);

extern void clk_pxa3xx_cken_disable(struct clk *);

#endif