FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-11 14:26:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "HACK: OMAP: DSS2: clk hack for OMAP2/3"

Browse Source 
This reverts commit 9ede365aa6f74428a1f69c21ca1cf21213167576.

The hack is no longer needed, as the HWMOD data has been fixed.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Tomi Valkeinen 2011-08-04 11:22:54 +03:00
parent e13a138bc6
commit bfe4f8d32d
5 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/video/omap2/dss/dsi.c
View File

@ -4441,9 +4441,6 @@ static int dsi_get_clocks(struct platform_device *dsidev)
dsi->dss_clk = clk; dsi->dss_clk = clk;
if (cpu_is_omap34xx() || cpu_is_omap3630())
clk = clk_get(&dsidev->dev, "dss2_alwon_fck");
else
clk = clk_get(&dsidev->dev, "sys_clk"); clk = clk_get(&dsidev->dev, "sys_clk");
if (IS_ERR(clk)) { if (IS_ERR(clk)) {
DSSERR("can't get sys_clk\n"); DSSERR("can't get sys_clk\n");

5
drivers/video/omap2/dss/dss.c
View File

@ -691,11 +691,6 @@ static void dss_put_clocks(void)
clk_put(dss.dss_clk); clk_put(dss.dss_clk);
} }
struct clk *dss_get_ick(void)
{
return clk_get(&dss.pdev->dev, "ick");
}
int dss_runtime_get(void) int dss_runtime_get(void)
{ {
int r; int r;

2
drivers/video/omap2/dss/dss.h
View File

@ -209,8 +209,6 @@ void dss_uninit_platform_driver(void);
int dss_runtime_get(void); int dss_runtime_get(void);
void dss_runtime_put(void); void dss_runtime_put(void);
struct clk *dss_get_ick(void);
void dss_select_hdmi_venc_clk_source(enum dss_hdmi_venc_clk_source_select); void dss_select_hdmi_venc_clk_source(enum dss_hdmi_venc_clk_source_select);
const char *dss_get_generic_clk_source_name(enum omap_dss_clk_source clk_src); const char *dss_get_generic_clk_source_name(enum omap_dss_clk_source clk_src);
void dss_dump_clocks(struct seq_file *s); void dss_dump_clocks(struct seq_file *s);

3
drivers/video/omap2/dss/rfbi.c
View File

@ -957,9 +957,6 @@ static int omap_rfbihw_probe(struct platform_device *pdev)
msleep(10); msleep(10);
if (cpu_is_omap24xx() || cpu_is_omap34xx() || cpu_is_omap3630())
clk = dss_get_ick();
else
clk = clk_get(&pdev->dev, "ick"); clk = clk_get(&pdev->dev, "ick");
if (IS_ERR(clk)) { if (IS_ERR(clk)) {
DSSERR("can't get ick\n"); DSSERR("can't get ick\n");

3
drivers/video/omap2/dss/venc.c
View File

@ -741,9 +741,6 @@ static int venc_get_clocks(struct platform_device *pdev)
venc.tv_clk = clk; venc.tv_clk = clk;
if (dss_has_feature(FEAT_VENC_REQUIRES_TV_DAC_CLK)) { if (dss_has_feature(FEAT_VENC_REQUIRES_TV_DAC_CLK)) {
if (cpu_is_omap34xx() || cpu_is_omap3630())
clk = clk_get(&pdev->dev, "dss_96m_fck");
else
clk = clk_get(&pdev->dev, "tv_dac_clk"); clk = clk_get(&pdev->dev, "tv_dac_clk");
if (IS_ERR(clk)) { if (IS_ERR(clk)) {
DSSERR("can't get tv_dac_clk\n"); DSSERR("can't get tv_dac_clk\n");