diff for duplicates of <5090D28E.6050703@ti.com> diff --git a/a/1.txt b/N1/1.txt index 621028c..4329d35 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -23,7 +23,7 @@ On Tuesday 30 October 2012 09:40 PM, Tomi Valkeinen wrote: > { > - int dsi_module; > - -> - dsi_module = clk = OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC ? 0 : 1; +> - dsi_module = clk == OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC ? 0 : 1; > - > - return dsi_get_dsidev_from_id(dsi_module); > + switch (channel) { @@ -39,13 +39,13 @@ On Tuesday 30 October 2012 09:40 PM, Tomi Valkeinen wrote: > -static bool dpi_use_dsi_pll(struct omap_dss_device *dssdev) > +static enum omap_dss_clk_source dpi_get_alt_clk_src(enum omap_channel channel) > { -> - if (dssdev->clocks.dispc.dispc_fclk_src = +> - if (dssdev->clocks.dispc.dispc_fclk_src == > - OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC || -> - dssdev->clocks.dispc.dispc_fclk_src = +> - dssdev->clocks.dispc.dispc_fclk_src == > - OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC || -> - dssdev->clocks.dispc.channel.lcd_clk_src = +> - dssdev->clocks.dispc.channel.lcd_clk_src == > - OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC || -> - dssdev->clocks.dispc.channel.lcd_clk_src = +> - dssdev->clocks.dispc.channel.lcd_clk_src == > - OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC) > - return true; > - else @@ -86,7 +86,8 @@ On Tuesday 30 October 2012 09:40 PM, Tomi Valkeinen wrote: > } > > - if (dpi_use_dsi_pll(dssdev)) { -> - enum omap_dss_clk_source dispc_fclk_src > - dssdev->clocks.dispc.dispc_fclk_src; +> - enum omap_dss_clk_source dispc_fclk_src = +> - dssdev->clocks.dispc.dispc_fclk_src; > - dpi.dsidev = dpi_get_dsidev(dispc_fclk_src); > + /* > + * XXX We shouldn't need dssdev->channel for this. The dsi pll clock diff --git a/a/content_digest b/N1/content_digest index aed3739..8e22318 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01351613409-21186-13-git-send-email-tomi.valkeinen@ti.com\0" "From\0Archit Taneja <archit@ti.com>\0" "Subject\0Re: [PATCH 12/12] OMAPDSS: DPI: always use DSI PLL if available\0" - "Date\0Wed, 31 Oct 2012 07:38:06 +0000\0" + "Date\0Wed, 31 Oct 2012 12:56:06 +0530\0" "To\0Tomi Valkeinen <tomi.valkeinen@ti.com>\0" "Cc\0linux-omap@vger.kernel.org" linux-fbdev@vger.kernel.org @@ -34,7 +34,7 @@ "> {\n" "> -\tint dsi_module;\n" "> -\n" - "> -\tdsi_module = clk = OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC ? 0 : 1;\n" + "> -\tdsi_module = clk == OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC ? 0 : 1;\n" "> -\n" "> -\treturn dsi_get_dsidev_from_id(dsi_module);\n" "> +\tswitch (channel) {\n" @@ -50,13 +50,13 @@ "> -static bool dpi_use_dsi_pll(struct omap_dss_device *dssdev)\n" "> +static enum omap_dss_clk_source dpi_get_alt_clk_src(enum omap_channel channel)\n" "> {\n" - "> -\tif (dssdev->clocks.dispc.dispc_fclk_src =\n" + "> -\tif (dssdev->clocks.dispc.dispc_fclk_src ==\n" "> -\t\t\tOMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC ||\n" - "> -\t\t\tdssdev->clocks.dispc.dispc_fclk_src =\n" + "> -\t\t\tdssdev->clocks.dispc.dispc_fclk_src ==\n" "> -\t\t\tOMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC ||\n" - "> -\t\t\tdssdev->clocks.dispc.channel.lcd_clk_src =\n" + "> -\t\t\tdssdev->clocks.dispc.channel.lcd_clk_src ==\n" "> -\t\t\tOMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC ||\n" - "> -\t\t\tdssdev->clocks.dispc.channel.lcd_clk_src =\n" + "> -\t\t\tdssdev->clocks.dispc.channel.lcd_clk_src ==\n" "> -\t\t\tOMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC)\n" "> -\t\treturn true;\n" "> -\telse\n" @@ -97,7 +97,8 @@ "> \t}\n" ">\n" "> -\tif (dpi_use_dsi_pll(dssdev)) {\n" - "> -\t\tenum omap_dss_clk_source dispc_fclk_src > -\t\t\tdssdev->clocks.dispc.dispc_fclk_src;\n" + "> -\t\tenum omap_dss_clk_source dispc_fclk_src =\n" + "> -\t\t\tdssdev->clocks.dispc.dispc_fclk_src;\n" "> -\t\tdpi.dsidev = dpi_get_dsidev(dispc_fclk_src);\n" "> +\t/*\n" "> +\t * XXX We shouldn't need dssdev->channel for this. The dsi pll clock\n" @@ -144,4 +145,4 @@ ">\n" > -8f6af29fcfb2bcfc5e8b7bdbb5d00a7fccac01a780a11e821ce01c3e4fc471af +d2e0c3bf1083fb09dc620de42452db35c83bb1f0d0053d1f0bfbbeea7bb5c5c4
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.