GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-22 22:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ARM: PNX4008: move i2c clock start/stop into driver

Browse source 
Acked-by: Vitaly Wool <vitalywool@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2009-11-20 11:12:26 +00:00
parent a0dcf19f59
commit 0321cb83e1
3 changed files with 32 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

36
arch/arm/mach-pnx4008/i2c.c
View file

@ -18,36 +18,6 @@
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/i2c.h> #include <mach/i2c.h>
static int set_clock_run(struct platform_device *pdev)
{
struct clk *clk;
int retval = 0;
clk = clk_get(&pdev->dev, NULL);
if (!IS_ERR(clk)) {
clk_set_rate(clk, 1);
clk_put(clk);
} else
retval = -ENOENT;
return retval;
}
static int set_clock_stop(struct platform_device *pdev)
{
struct clk *clk;
int retval = 0;
clk = clk_get(&pdev->dev, NULL);
if (!IS_ERR(clk)) {
clk_set_rate(clk, 0);
clk_put(clk);
} else
retval = -ENOENT;
return retval;
}
static u32 calculate_input_freq(struct platform_device *pdev) static u32 calculate_input_freq(struct platform_device *pdev)
{ {
return HCLK_MHZ; return HCLK_MHZ;
@ -85,22 +55,16 @@ static struct i2c_adapter pnx_adapter2 = {
static struct i2c_pnx_data i2c0_data = { static struct i2c_pnx_data i2c0_data = {
.calculate_input_freq = calculate_input_freq, .calculate_input_freq = calculate_input_freq,
.set_clock_run = set_clock_run,
.set_clock_stop = set_clock_stop,
.adapter = &pnx_adapter0, .adapter = &pnx_adapter0,
}; };
static struct i2c_pnx_data i2c1_data = { static struct i2c_pnx_data i2c1_data = {
.calculate_input_freq = calculate_input_freq, .calculate_input_freq = calculate_input_freq,
.set_clock_run = set_clock_run,
.set_clock_stop = set_clock_stop,
.adapter = &pnx_adapter1, .adapter = &pnx_adapter1,
}; };
static struct i2c_pnx_data i2c2_data = { static struct i2c_pnx_data i2c2_data = {
.calculate_input_freq = calculate_input_freq, .calculate_input_freq = calculate_input_freq,
.set_clock_run = set_clock_run,
.set_clock_stop = set_clock_stop,
.adapter = &pnx_adapter2, .adapter = &pnx_adapter2,
}; };

39
drivers/i2c/busses/i2c-pnx.c
View file

@ -20,6 +20,9 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/i2c-pnx.h> #include <linux/i2c-pnx.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/err.h>
#include <linux/clk.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/i2c.h> #include <mach/i2c.h>
#include <asm/irq.h> #include <asm/irq.h>
@ -550,13 +553,22 @@ static int i2c_pnx_controller_suspend(struct platform_device *pdev,
pm_message_t state) pm_message_t state)
{ {
struct i2c_pnx_data *i2c_pnx = platform_get_drvdata(pdev); struct i2c_pnx_data *i2c_pnx = platform_get_drvdata(pdev);
return i2c_pnx->set_clock_run(pdev); struct i2c_pnx_algo_data *alg_data = i2c_pnx->adapter->algo_data;
/* FIXME: disable clock? */
clk_set_rate(alg_data->clk, 1);
return 0;
} }
static int i2c_pnx_controller_resume(struct platform_device *pdev) static int i2c_pnx_controller_resume(struct platform_device *pdev)
{ {
struct i2c_pnx_data *i2c_pnx = platform_get_drvdata(pdev); struct i2c_pnx_data *i2c_pnx = platform_get_drvdata(pdev);
return i2c_pnx->set_clock_run(pdev); struct i2c_pnx_algo_data *alg_data = i2c_pnx->adapter->algo_data;
clk_set_rate(alg_data->clk, 1);
return 0;
} }
#else #else
#define i2c_pnx_controller_suspend NULL #define i2c_pnx_controller_suspend NULL
@ -580,6 +592,15 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, i2c_pnx); platform_set_drvdata(pdev, i2c_pnx);
i2c_pnx->adapter->algo = &pnx_algorithm;
alg_data = i2c_pnx->adapter->algo_data;
alg_data->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(alg_data->clk)) {
ret = PTR_ERR(alg_data->clk);
goto out_drvdata;
}
if (i2c_pnx->calculate_input_freq) if (i2c_pnx->calculate_input_freq)
freq_mhz = i2c_pnx->calculate_input_freq(pdev); freq_mhz = i2c_pnx->calculate_input_freq(pdev);
else { else {
@ -588,9 +609,6 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev)
"%d MHz\n", freq_mhz); "%d MHz\n", freq_mhz);
} }
i2c_pnx->adapter->algo = &pnx_algorithm;
alg_data = i2c_pnx->adapter->algo_data;
init_timer(&alg_data->mif.timer); init_timer(&alg_data->mif.timer);
alg_data->mif.timer.function = i2c_pnx_timeout; alg_data->mif.timer.function = i2c_pnx_timeout;
alg_data->mif.timer.data = (unsigned long)i2c_pnx->adapter; alg_data->mif.timer.data = (unsigned long)i2c_pnx->adapter;
@ -602,7 +620,7 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev)
"I/O region 0x%08x for I2C already in use.\n", "I/O region 0x%08x for I2C already in use.\n",
alg_data->base); alg_data->base);
ret = -ENODEV; ret = -ENODEV;
goto out_drvdata; goto out_clkget;
} }
if (!(alg_data->ioaddr = if (!(alg_data->ioaddr =
@ -612,7 +630,7 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev)
goto out_release; goto out_release;
} }
i2c_pnx->set_clock_run(pdev); clk_set_rate(alg_data->clk, 1);
/* /*
* Clock Divisor High This value is the number of system clocks * Clock Divisor High This value is the number of system clocks
@ -658,11 +676,13 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev)
out_irq: out_irq:
free_irq(alg_data->irq, i2c_pnx->adapter); free_irq(alg_data->irq, i2c_pnx->adapter);
out_clock: out_clock:
i2c_pnx->set_clock_stop(pdev); clk_set_rate(alg_data->clk, 0);
out_unmap: out_unmap:
iounmap((void *)alg_data->ioaddr); iounmap((void *)alg_data->ioaddr);
out_release: out_release:
release_mem_region(alg_data->base, I2C_PNX_REGION_SIZE); release_mem_region(alg_data->base, I2C_PNX_REGION_SIZE);
out_clkget:
clk_put(alg_data->clk);
out_drvdata: out_drvdata:
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
out: out:
@ -677,9 +697,10 @@ static int __devexit i2c_pnx_remove(struct platform_device *pdev)
free_irq(alg_data->irq, i2c_pnx->adapter); free_irq(alg_data->irq, i2c_pnx->adapter);
i2c_del_adapter(adap); i2c_del_adapter(adap);
i2c_pnx->set_clock_stop(pdev); clk_set_rate(alg_data->clk, 0);
iounmap((void *)alg_data->ioaddr); iounmap((void *)alg_data->ioaddr);
release_mem_region(alg_data->base, I2C_PNX_REGION_SIZE); release_mem_region(alg_data->base, I2C_PNX_REGION_SIZE);
clk_put(alg_data->clk);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
return 0; return 0;

4
include/linux/i2c-pnx.h
View file

@ -13,6 +13,7 @@
#define __I2C_PNX_H__ #define __I2C_PNX_H__
struct platform_device; struct platform_device;
struct clk;
struct i2c_pnx_mif { struct i2c_pnx_mif {
int ret; /* Return value */ int ret; /* Return value */
@ -29,12 +30,11 @@ struct i2c_pnx_algo_data {
int irq; int irq;
struct i2c_pnx_mif mif; struct i2c_pnx_mif mif;
int last; int last;
struct clk *clk;
}; };
struct i2c_pnx_data { struct i2c_pnx_data {
u32 (*calculate_input_freq) (struct platform_device *pdev); u32 (*calculate_input_freq) (struct platform_device *pdev);
int (*set_clock_run) (struct platform_device *pdev);
int (*set_clock_stop) (struct platform_device *pdev);
struct i2c_adapter *adapter; struct i2c_adapter *adapter;
}; };