diff options
Diffstat (limited to 'recipes/linux/linux-omap-2.6.31/dss2/0003-OMAP-OMAPFB-add-omapdss-device.patch')
| -rw-r--r-- | recipes/linux/linux-omap-2.6.31/dss2/0003-OMAP-OMAPFB-add-omapdss-device.patch | 136 |
1 files changed, 136 insertions, 0 deletions
diff --git a/recipes/linux/linux-omap-2.6.31/dss2/0003-OMAP-OMAPFB-add-omapdss-device.patch b/recipes/linux/linux-omap-2.6.31/dss2/0003-OMAP-OMAPFB-add-omapdss-device.patch new file mode 100644 index 0000000000..fb9928cfce --- /dev/null +++ b/recipes/linux/linux-omap-2.6.31/dss2/0003-OMAP-OMAPFB-add-omapdss-device.patch @@ -0,0 +1,136 @@ +From 40b33143283fda49f0be9113b952c1d77e1c709a Mon Sep 17 00:00:00 2001 +From: Tomi Valkeinen <tomi.valkeinen@nokia.com> +Date: Thu, 18 Jun 2009 13:02:39 +0300 +Subject: [PATCH 03/18] OMAP: OMAPFB: add omapdss device + +The upcoming new display subsystem driver is divided to two devices, +omapdss and omapfb, of which omapdss handles the actual hardware. + +This patch adds a dummy omapdss platform device for the current omapfb +driver, which is then used to get the clocks. This will make it possible +for the current and the new display drivers to co-exist. + +Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> +Acked-by: Tony Lindgren <tony@atomide.com> +--- + arch/arm/mach-omap2/clock24xx.c | 8 ++++---- + arch/arm/mach-omap2/clock34xx.c | 14 +++++++------- + drivers/video/omap/dispc.c | 19 ++++++++++++++++--- + 3 files changed, 27 insertions(+), 14 deletions(-) + +diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c +index bc5d3ac..8cb8368 100644 +--- a/arch/arm/mach-omap2/clock24xx.c ++++ b/arch/arm/mach-omap2/clock24xx.c +@@ -116,10 +116,10 @@ static struct omap_clk omap24xx_clks[] = { + CLK(NULL, "mdm_ick", &mdm_ick, CK_243X), + CLK(NULL, "mdm_osc_ck", &mdm_osc_ck, CK_243X), + /* DSS domain clocks */ +- CLK("omapfb", "ick", &dss_ick, CK_243X | CK_242X), +- CLK("omapfb", "dss1_fck", &dss1_fck, CK_243X | CK_242X), +- CLK("omapfb", "dss2_fck", &dss2_fck, CK_243X | CK_242X), +- CLK("omapfb", "tv_fck", &dss_54m_fck, CK_243X | CK_242X), ++ CLK("omapdss", "ick", &dss_ick, CK_243X | CK_242X), ++ CLK("omapdss", "dss1_fck", &dss1_fck, CK_243X | CK_242X), ++ CLK("omapdss", "dss2_fck", &dss2_fck, CK_243X | CK_242X), ++ CLK("omapdss", "tv_fck", &dss_54m_fck, CK_243X | CK_242X), + /* L3 domain clocks */ + CLK(NULL, "core_l3_ck", &core_l3_ck, CK_243X | CK_242X), + CLK(NULL, "ssi_fck", &ssi_ssr_sst_fck, CK_243X | CK_242X), +diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c +index cd7819c..aff72ea 100644 +--- a/arch/arm/mach-omap2/clock34xx.c ++++ b/arch/arm/mach-omap2/clock34xx.c +@@ -235,13 +235,13 @@ static struct omap_clk omap34xx_clks[] = { + CLK("omap_rng", "ick", &rng_ick, CK_343X), + CLK(NULL, "sha11_ick", &sha11_ick, CK_343X), + CLK(NULL, "des1_ick", &des1_ick, CK_343X), +- CLK("omapfb", "dss1_fck", &dss1_alwon_fck_3430es1, CK_3430ES1), +- CLK("omapfb", "dss1_fck", &dss1_alwon_fck_3430es2, CK_3430ES2), +- CLK("omapfb", "tv_fck", &dss_tv_fck, CK_343X), +- CLK("omapfb", "video_fck", &dss_96m_fck, CK_343X), +- CLK("omapfb", "dss2_fck", &dss2_alwon_fck, CK_343X), +- CLK("omapfb", "ick", &dss_ick_3430es1, CK_3430ES1), +- CLK("omapfb", "ick", &dss_ick_3430es2, CK_3430ES2), ++ CLK("omapdss", "dss1_fck", &dss1_alwon_fck_3430es1, CK_3430ES1), ++ CLK("omapdss", "dss1_fck", &dss1_alwon_fck_3430es2, CK_3430ES2), ++ CLK("omapdss", "tv_fck", &dss_tv_fck, CK_343X), ++ CLK("omapdss", "video_fck", &dss_96m_fck, CK_343X), ++ CLK("omapdss", "dss2_fck", &dss2_alwon_fck, CK_343X), ++ CLK("omapdss", "ick", &dss_ick_3430es1, CK_3430ES1), ++ CLK("omapdss", "ick", &dss_ick_3430es2, CK_3430ES2), + CLK(NULL, "cam_mclk", &cam_mclk, CK_343X), + CLK(NULL, "cam_ick", &cam_ick, CK_343X), + CLK(NULL, "csi2_96m_fck", &csi2_96m_fck, CK_343X), +diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c +index f021770..d383888 100644 +--- a/drivers/video/omap/dispc.c ++++ b/drivers/video/omap/dispc.c +@@ -24,6 +24,7 @@ + #include <linux/vmalloc.h> + #include <linux/clk.h> + #include <linux/io.h> ++#include <linux/platform_device.h> + + #include <mach/sram.h> + #include <mach/board.h> +@@ -184,6 +185,11 @@ static struct { + struct omapfb_color_key color_key; + } dispc; + ++static struct platform_device omapdss_device = { ++ .name = "omapdss", ++ .id = -1, ++}; ++ + static void enable_lcd_clocks(int enable); + + static void inline dispc_write_reg(int idx, u32 val) +@@ -880,20 +886,20 @@ static irqreturn_t omap_dispc_irq_handler(int irq, void *dev) + + static int get_dss_clocks(void) + { +- dispc.dss_ick = clk_get(dispc.fbdev->dev, "ick"); ++ dispc.dss_ick = clk_get(&omapdss_device.dev, "ick"); + if (IS_ERR(dispc.dss_ick)) { + dev_err(dispc.fbdev->dev, "can't get ick\n"); + return PTR_ERR(dispc.dss_ick); + } + +- dispc.dss1_fck = clk_get(dispc.fbdev->dev, "dss1_fck"); ++ dispc.dss1_fck = clk_get(&omapdss_device.dev, "dss1_fck"); + if (IS_ERR(dispc.dss1_fck)) { + dev_err(dispc.fbdev->dev, "can't get dss1_fck\n"); + clk_put(dispc.dss_ick); + return PTR_ERR(dispc.dss1_fck); + } + +- dispc.dss_54m_fck = clk_get(dispc.fbdev->dev, "tv_fck"); ++ dispc.dss_54m_fck = clk_get(&omapdss_device.dev, "tv_fck"); + if (IS_ERR(dispc.dss_54m_fck)) { + dev_err(dispc.fbdev->dev, "can't get tv_fck\n"); + clk_put(dispc.dss_ick); +@@ -1349,6 +1355,12 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode, + int skip_init = 0; + int i; + ++ r = platform_device_register(&omapdss_device); ++ if (r) { ++ dev_err(fbdev->dev, "can't register omapdss device\n"); ++ return r; ++ } ++ + memset(&dispc, 0, sizeof(dispc)); + + dispc.base = ioremap(DISPC_BASE, SZ_1K); +@@ -1490,6 +1502,7 @@ static void omap_dispc_cleanup(void) + enable_interface_clocks(0); + put_dss_clocks(); + iounmap(dispc.base); ++ platform_device_unregister(&omapdss_device); + } + + const struct lcd_ctrl omap2_int_ctrl = { +-- +1.6.2.4 + |