diff options
| author | Jason Chen <b02280@freescale.com> | 2010-03-24 16:07:56 +0800 |
|---|---|---|
| committer | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2010-05-25 11:20:16 +0200 |
| commit | fa257907abe1d8e63912df5033f3a3593c592924 (patch) | |
| tree | 17ddfe817298411b51c050a780b602dedc3d7cfe /drivers/mxc/ipu3 | |
| parent | cf436300e4b56eadfb0aa1735643e8aa44da4b88 (diff) | |
ENGR00121922 ipuv3: move ipu reset function to MSL
move ipu reset function to MSL.
Signed-off-by: Jason Chen <b02280@freescale.com>
Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'drivers/mxc/ipu3')
| -rw-r--r-- | drivers/mxc/ipu3/ipu_common.c | 18 | ||||
| -rw-r--r-- | drivers/mxc/ipu3/ipu_regs.h | 3 |
2 files changed, 2 insertions, 19 deletions
diff --git a/drivers/mxc/ipu3/ipu_common.c b/drivers/mxc/ipu3/ipu_common.c index 4b79b6a36dea..8216b10ecf07 100644 --- a/drivers/mxc/ipu3/ipu_common.c +++ b/drivers/mxc/ipu3/ipu_common.c @@ -250,21 +250,6 @@ static struct clk pixel_clk[] = { }; /*! - * This function resets IPU - */ -void ipu_reset(void) -{ - u32 *reg; - u32 value; - reg = ioremap(SRC_BASE_ADDR, PAGE_SIZE); - value = __raw_readl(reg); - value = value | SW_IPU_RST; - __raw_writel(value, reg); - iounmap(reg); -} -EXPORT_SYMBOL(ipu_reset); - -/*! * This function is called by the driver framework to initialize the IPU * hardware. * @@ -359,7 +344,8 @@ static int ipu_probe(struct platform_device *pdev) g_ipu_clk = clk_get(&pdev->dev, "ipu_clk"); dev_dbg(g_ipu_dev, "ipu_clk = %lu\n", clk_get_rate(g_ipu_clk)); - ipu_reset(); + if (plat_data->reset) + plat_data->reset(); clk_set_parent(g_pixel_clk[0], g_ipu_clk); clk_set_parent(g_pixel_clk[1], g_ipu_clk); diff --git a/drivers/mxc/ipu3/ipu_regs.h b/drivers/mxc/ipu3/ipu_regs.h index d650e8a305ff..2438df60a0ce 100644 --- a/drivers/mxc/ipu3/ipu_regs.h +++ b/drivers/mxc/ipu3/ipu_regs.h @@ -299,9 +299,6 @@ extern u32 *ipu_vdi_reg; #define DP_CSC_0(flow) (ipu_dp_reg + 0x0054/4 + flow/4) #define DP_CSC_1(flow) (ipu_dp_reg + 0x0058/4 + flow/4) -/* Software reset for ipu */ -#define SW_IPU_RST 8 - enum { IPU_CONF_CSI0_EN = 0x00000001, IPU_CONF_CSI1_EN = 0x00000002, |