UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net/can/mpc52xx_can: refactor clock-get routine 

Merge two functions into one. The result is smaller as they can now share some
variables.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Wolfram Sang 2009-11-16 12:57:50 +00:00 committed by David S. Miller
parent 68bd7422a2
commit 3f158c2532
1 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/net/can/mscan/mpc52xx_can.c
View File

@ -38,28 +38,37 @@
static struct of_device_id mpc52xx_cdm_ids[] __devinitdata = { static struct of_device_id mpc52xx_cdm_ids[] __devinitdata = {
{ .compatible = "fsl,mpc5200-cdm", }, { .compatible = "fsl,mpc5200-cdm", },
{ .compatible = "fsl,mpc5200b-cdm", },
{} {}
}; };
/* /*
* Get the frequency of the external oscillator clock connected * Get frequency of the MSCAN clock source
* to the SYS_XTAL_IN pin, or return 0 if it cannot be determined. *
* Either the oscillator clock (SYS_XTAL_IN) or the IP bus clock (IP_CLK)
* can be selected. According to the MPC5200 user's manual, the oscillator
* clock is the better choice as it has less jitter but due to a hardware
* bug, it can not be selected for the old MPC5200 Rev. A chips.
*/ */
static unsigned int __devinit mpc52xx_can_xtal_freq(struct of_device *of)
static unsigned int __devinit mpc52xx_can_clock_freq(struct of_device *of,
int clock_src)
{ {
unsigned int pvr;
struct mpc52xx_cdm __iomem *cdm; struct mpc52xx_cdm __iomem *cdm;
struct device_node *np_cdm; struct device_node *np_cdm;
unsigned int freq; unsigned int freq;
u32 val; u32 val;
pvr = mfspr(SPRN_PVR);
freq = mpc5xxx_get_bus_frequency(of->node); freq = mpc5xxx_get_bus_frequency(of->node);
if (!freq) if (!freq)
return 0; return 0;
/* if (clock_src == MSCAN_CLKSRC_BUS || pvr == 0x80822011)
* Determine SYS_XTAL_IN frequency from the clock domain settings return freq;
*/
/* Determine SYS_XTAL_IN frequency from the clock domain settings */
np_cdm = of_find_matching_node(NULL, mpc52xx_cdm_ids); np_cdm = of_find_matching_node(NULL, mpc52xx_cdm_ids);
if (!np_cdm) { if (!np_cdm) {
dev_err(&of->dev, "can't get clock node!\n"); dev_err(&of->dev, "can't get clock node!\n");
@ -80,28 +89,6 @@ static unsigned int __devinit mpc52xx_can_xtal_freq(struct of_device *of)
return freq; return freq;
} }
/*
* Get frequency of the MSCAN clock source
*
* Either the oscillator clock (SYS_XTAL_IN) or the IP bus clock (IP_CLK)
* can be selected. According to the MPC5200 user's manual, the oscillator
* clock is the better choice as it has less jitter but due to a hardware
* bug, it can not be selected for the old MPC5200 Rev. A chips.
*/
static unsigned int __devinit mpc52xx_can_clock_freq(struct of_device *of,
int clock_src)
{
unsigned int pvr;
pvr = mfspr(SPRN_PVR);
if (clock_src == MSCAN_CLKSRC_BUS || pvr == 0x80822011)
return mpc5xxx_get_bus_frequency(of->node);
return mpc52xx_can_xtal_freq(of);
}
static int __devinit mpc5xxx_can_probe(struct of_device *ofdev, static int __devinit mpc5xxx_can_probe(struct of_device *ofdev,
const struct of_device_id *id) const struct of_device_id *id)
{ {