* [PATCH 6/8] ARM: OMAP2/3: Change omapfb to use clkdev for dispc and rfbi [not found] <20090514174100.12080.9736.stgit@localhost> @ 2009-05-14 17:49 ` Tony Lindgren 2009-05-14 19:03 ` Krzysztof Helt 0 siblings, 1 reply; 7+ messages in thread From: Tony Lindgren @ 2009-05-14 17:49 UTC (permalink / raw) To: linux-arm-kernel; +Cc: Imre Deak, linux-omap, linux-fbdev-devel This makes the framebuffer work on omap3. Also fix the clk_get usage for checkpatch.pl "ERROR: do not use assignment in if condition". Cc: Imre Deak <imre.deak@nokia.com> Cc: linux-fbdev-devel@lists.sourceforge.net Signed-off-by: Tony Lindgren <tony@atomide.com> --- arch/arm/mach-omap2/clock24xx.c | 8 ++++---- arch/arm/mach-omap2/clock34xx.c | 10 +++++----- drivers/video/omap/dispc.c | 16 +++++++++------- drivers/video/omap/rfbi.c | 8 +++++--- 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c index ff9b4c0..e4cef33 100644 --- a/arch/arm/mach-omap2/clock24xx.c +++ b/arch/arm/mach-omap2/clock24xx.c @@ -103,10 +103,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(NULL, "dss_ick", &dss_ick, CK_243X | CK_242X), - CLK(NULL, "dss1_fck", &dss1_fck, CK_243X | CK_242X), - CLK(NULL, "dss2_fck", &dss2_fck, CK_243X | CK_242X), - CLK(NULL, "dss_54m_fck", &dss_54m_fck, CK_243X | CK_242X), + 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), /* 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 a057539..ba05aa4 100644 --- a/arch/arm/mach-omap2/clock34xx.c +++ b/arch/arm/mach-omap2/clock34xx.c @@ -197,11 +197,11 @@ 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(NULL, "dss1_alwon_fck", &dss1_alwon_fck, CK_343X), - CLK(NULL, "dss_tv_fck", &dss_tv_fck, CK_343X), - CLK(NULL, "dss_96m_fck", &dss_96m_fck, CK_343X), - CLK(NULL, "dss2_alwon_fck", &dss2_alwon_fck, CK_343X), - CLK(NULL, "dss_ick", &dss_ick, CK_343X), + CLK("omapfb", "dss1_fck", &dss1_alwon_fck, CK_343X), + 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, CK_343X), 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 dfb72f5..3668df2 100644 --- a/drivers/video/omap/dispc.c +++ b/drivers/video/omap/dispc.c @@ -880,23 +880,25 @@ static irqreturn_t omap_dispc_irq_handler(int irq, void *dev) static int get_dss_clocks(void) { - if (IS_ERR((dispc.dss_ick = clk_get(dispc.fbdev->dev, "dss_ick")))) { - dev_err(dispc.fbdev->dev, "can't get dss_ick\n"); + dispc.dss_ick = clk_get(dispc.fbdev->dev, "ick"); + if (IS_ERR(dispc.dss_ick)) { + dev_err(dispc.fbdev->dev, "can't get ick\n"); return PTR_ERR(dispc.dss_ick); } - if (IS_ERR((dispc.dss1_fck = clk_get(dispc.fbdev->dev, "dss1_fck")))) { + dispc.dss1_fck = clk_get(dispc.fbdev->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); } - if (IS_ERR((dispc.dss_54m_fck = - clk_get(dispc.fbdev->dev, "dss_54m_fck")))) { - dev_err(dispc.fbdev->dev, "can't get dss_54m_fck\n"); + dispc.dss_54m_fck = clk_get(dispc.fbdev->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); clk_put(dispc.dss1_fck); - return PTR_ERR(dispc.dss_54m_fck); + } return 0; diff --git a/drivers/video/omap/rfbi.c b/drivers/video/omap/rfbi.c index a13c8dc..9332d6c 100644 --- a/drivers/video/omap/rfbi.c +++ b/drivers/video/omap/rfbi.c @@ -83,12 +83,14 @@ static inline u32 rfbi_read_reg(int idx) static int rfbi_get_clocks(void) { - if (IS_ERR((rfbi.dss_ick = clk_get(rfbi.fbdev->dev, "dss_ick")))) { - dev_err(rfbi.fbdev->dev, "can't get dss_ick\n"); + rfbi.dss_ick = clk_get(rfbi.fbdev->dev, "ick"); + if (IS_ERR(rfbi.dss_ick)) { + dev_err(rfbi.fbdev->dev, "can't get ick\n"); return PTR_ERR(rfbi.dss_ick); } - if (IS_ERR((rfbi.dss1_fck = clk_get(rfbi.fbdev->dev, "dss1_fck")))) { + rfbi.dss1_fck = clk_get(rfbi.fbdev->dev, "dss1_fck"); + if (IS_ERR(rfbi.dss1_fck)) { dev_err(rfbi.fbdev->dev, "can't get dss1_fck\n"); clk_put(rfbi.dss_ick); return PTR_ERR(rfbi.dss1_fck); ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 6/8] ARM: OMAP2/3: Change omapfb to use clkdev for dispc and rfbi 2009-05-14 17:49 ` [PATCH 6/8] ARM: OMAP2/3: Change omapfb to use clkdev for dispc and rfbi Tony Lindgren @ 2009-05-14 19:03 ` Krzysztof Helt 2009-05-14 20:28 ` Tony Lindgren 0 siblings, 1 reply; 7+ messages in thread From: Krzysztof Helt @ 2009-05-14 19:03 UTC (permalink / raw) To: Tony Lindgren; +Cc: linux-arm-kernel, Imre Deak, linux-omap, linux-fbdev-devel On Thu, 14 May 2009 10:49:59 -0700 Tony Lindgren <tony@atomide.com> wrote: > This makes the framebuffer work on omap3. > > Also fix the clk_get usage for checkpatch.pl > "ERROR: do not use assignment in if condition". > > Cc: Imre Deak <imre.deak@nokia.com> > Cc: linux-fbdev-devel@lists.sourceforge.net > Signed-off-by: Tony Lindgren <tony@atomide.com> > --- Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl> > arch/arm/mach-omap2/clock24xx.c | 8 ++++---- > arch/arm/mach-omap2/clock34xx.c | 10 +++++----- > drivers/video/omap/dispc.c | 16 +++++++++------- > drivers/video/omap/rfbi.c | 8 +++++--- > 4 files changed, 23 insertions(+), 19 deletions(-) > > diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c > index ff9b4c0..e4cef33 100644 > --- a/arch/arm/mach-omap2/clock24xx.c > +++ b/arch/arm/mach-omap2/clock24xx.c > @@ -103,10 +103,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(NULL, "dss_ick", &dss_ick, CK_243X | CK_242X), > - CLK(NULL, "dss1_fck", &dss1_fck, CK_243X | CK_242X), > - CLK(NULL, "dss2_fck", &dss2_fck, CK_243X | CK_242X), > - CLK(NULL, "dss_54m_fck", &dss_54m_fck, CK_243X | CK_242X), > + 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), > /* 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 a057539..ba05aa4 100644 > --- a/arch/arm/mach-omap2/clock34xx.c > +++ b/arch/arm/mach-omap2/clock34xx.c > @@ -197,11 +197,11 @@ 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(NULL, "dss1_alwon_fck", &dss1_alwon_fck, CK_343X), > - CLK(NULL, "dss_tv_fck", &dss_tv_fck, CK_343X), > - CLK(NULL, "dss_96m_fck", &dss_96m_fck, CK_343X), > - CLK(NULL, "dss2_alwon_fck", &dss2_alwon_fck, CK_343X), > - CLK(NULL, "dss_ick", &dss_ick, CK_343X), > + CLK("omapfb", "dss1_fck", &dss1_alwon_fck, CK_343X), > + 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, CK_343X), > 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 dfb72f5..3668df2 100644 > --- a/drivers/video/omap/dispc.c > +++ b/drivers/video/omap/dispc.c > @@ -880,23 +880,25 @@ static irqreturn_t omap_dispc_irq_handler(int irq, void *dev) > > static int get_dss_clocks(void) > { > - if (IS_ERR((dispc.dss_ick = clk_get(dispc.fbdev->dev, "dss_ick")))) { > - dev_err(dispc.fbdev->dev, "can't get dss_ick\n"); > + dispc.dss_ick = clk_get(dispc.fbdev->dev, "ick"); > + if (IS_ERR(dispc.dss_ick)) { > + dev_err(dispc.fbdev->dev, "can't get ick\n"); > return PTR_ERR(dispc.dss_ick); > } > > - if (IS_ERR((dispc.dss1_fck = clk_get(dispc.fbdev->dev, "dss1_fck")))) { > + dispc.dss1_fck = clk_get(dispc.fbdev->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); > } > > - if (IS_ERR((dispc.dss_54m_fck = > - clk_get(dispc.fbdev->dev, "dss_54m_fck")))) { > - dev_err(dispc.fbdev->dev, "can't get dss_54m_fck\n"); > + dispc.dss_54m_fck = clk_get(dispc.fbdev->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); > clk_put(dispc.dss1_fck); > - return PTR_ERR(dispc.dss_54m_fck); > + > } > > return 0; > diff --git a/drivers/video/omap/rfbi.c b/drivers/video/omap/rfbi.c > index a13c8dc..9332d6c 100644 > --- a/drivers/video/omap/rfbi.c > +++ b/drivers/video/omap/rfbi.c > @@ -83,12 +83,14 @@ static inline u32 rfbi_read_reg(int idx) > > static int rfbi_get_clocks(void) > { > - if (IS_ERR((rfbi.dss_ick = clk_get(rfbi.fbdev->dev, "dss_ick")))) { > - dev_err(rfbi.fbdev->dev, "can't get dss_ick\n"); > + rfbi.dss_ick = clk_get(rfbi.fbdev->dev, "ick"); > + if (IS_ERR(rfbi.dss_ick)) { > + dev_err(rfbi.fbdev->dev, "can't get ick\n"); > return PTR_ERR(rfbi.dss_ick); > } > > - if (IS_ERR((rfbi.dss1_fck = clk_get(rfbi.fbdev->dev, "dss1_fck")))) { > + rfbi.dss1_fck = clk_get(rfbi.fbdev->dev, "dss1_fck"); > + if (IS_ERR(rfbi.dss1_fck)) { > dev_err(rfbi.fbdev->dev, "can't get dss1_fck\n"); > clk_put(rfbi.dss_ick); > return PTR_ERR(rfbi.dss1_fck); > > > ------------------------------------------------------------------- > List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel > FAQ: http://www.arm.linux.org.uk/mailinglists/faq.php > Etiquette: http://www.arm.linux.org.uk/mailinglists/etiquette.php > ---------------------------------------------------------------------- Czy bede bogaty? Zapytaj wrozke >> http://link.interia.pl/f216c ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 6/8] ARM: OMAP2/3: Change omapfb to use clkdev for dispc and rfbi 2009-05-14 19:03 ` Krzysztof Helt @ 2009-05-14 20:28 ` Tony Lindgren 2009-05-16 9:06 ` Russell King - ARM Linux 0 siblings, 1 reply; 7+ messages in thread From: Tony Lindgren @ 2009-05-14 20:28 UTC (permalink / raw) To: Krzysztof Helt; +Cc: linux-arm-kernel, Imre Deak, linux-omap, linux-fbdev-devel [-- Attachment #1: Type: text/plain, Size: 1937 bytes --] * Krzysztof Helt <krzysztof.h1@poczta.fm> [090514 11:57]: > On Thu, 14 May 2009 10:49:59 -0700 > Tony Lindgren <tony@atomide.com> wrote: > > > This makes the framebuffer work on omap3. > > > > Also fix the clk_get usage for checkpatch.pl > > "ERROR: do not use assignment in if condition". > > > > Cc: Imre Deak <imre.deak@nokia.com> > > Cc: linux-fbdev-devel@lists.sourceforge.net > > Signed-off-by: Tony Lindgren <tony@atomide.com> > > --- > > Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl> Thanks for looking. Here's v2 of the patch with one line fixed below. > > --- a/drivers/video/omap/dispc.c > > +++ b/drivers/video/omap/dispc.c > > @@ -880,23 +880,25 @@ static irqreturn_t omap_dispc_irq_handler(int irq, void *dev) > > > > static int get_dss_clocks(void) > > { > > - if (IS_ERR((dispc.dss_ick = clk_get(dispc.fbdev->dev, "dss_ick")))) { > > - dev_err(dispc.fbdev->dev, "can't get dss_ick\n"); > > + dispc.dss_ick = clk_get(dispc.fbdev->dev, "ick"); > > + if (IS_ERR(dispc.dss_ick)) { > > + dev_err(dispc.fbdev->dev, "can't get ick\n"); > > return PTR_ERR(dispc.dss_ick); > > } > > > > - if (IS_ERR((dispc.dss1_fck = clk_get(dispc.fbdev->dev, "dss1_fck")))) { > > + dispc.dss1_fck = clk_get(dispc.fbdev->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); > > } > > > > - if (IS_ERR((dispc.dss_54m_fck = > > - clk_get(dispc.fbdev->dev, "dss_54m_fck")))) { > > - dev_err(dispc.fbdev->dev, "can't get dss_54m_fck\n"); > > + dispc.dss_54m_fck = clk_get(dispc.fbdev->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); > > clk_put(dispc.dss1_fck); > > - return PTR_ERR(dispc.dss_54m_fck); > > + > > } The return PTR_ERR(dispc.dss_54m_fck) should not be left out. Regards, Tony [-- Attachment #2: dispc-clkdev-v2.patch --] [-- Type: text/x-diff, Size: 4635 bytes --] commit 27db33cfadd3c47c9499def6e71aaf5d2fd51e60 Author: Tony Lindgren <tony@atomide.com> Date: Tue May 12 11:20:03 2009 -0700 ARM: OMAP2/3: Change omapfb to use clkdev for dispc and rfbi, v2 This makes the framebuffer work on omap3. Also fix the clk_get usage for checkpatch.pl "ERROR: do not use assignment in if condition". Cc: Imre Deak <imre.deak@nokia.com> Cc: linux-fbdev-devel@lists.sourceforge.net Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Tony Lindgren <tony@atomide.com> diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c index ff9b4c0..e4cef33 100644 --- a/arch/arm/mach-omap2/clock24xx.c +++ b/arch/arm/mach-omap2/clock24xx.c @@ -103,10 +103,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(NULL, "dss_ick", &dss_ick, CK_243X | CK_242X), - CLK(NULL, "dss1_fck", &dss1_fck, CK_243X | CK_242X), - CLK(NULL, "dss2_fck", &dss2_fck, CK_243X | CK_242X), - CLK(NULL, "dss_54m_fck", &dss_54m_fck, CK_243X | CK_242X), + 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), /* 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 a057539..ba05aa4 100644 --- a/arch/arm/mach-omap2/clock34xx.c +++ b/arch/arm/mach-omap2/clock34xx.c @@ -197,11 +197,11 @@ 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(NULL, "dss1_alwon_fck", &dss1_alwon_fck, CK_343X), - CLK(NULL, "dss_tv_fck", &dss_tv_fck, CK_343X), - CLK(NULL, "dss_96m_fck", &dss_96m_fck, CK_343X), - CLK(NULL, "dss2_alwon_fck", &dss2_alwon_fck, CK_343X), - CLK(NULL, "dss_ick", &dss_ick, CK_343X), + CLK("omapfb", "dss1_fck", &dss1_alwon_fck, CK_343X), + 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, CK_343X), 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 dfb72f5..148cbcc 100644 --- a/drivers/video/omap/dispc.c +++ b/drivers/video/omap/dispc.c @@ -880,20 +880,22 @@ static irqreturn_t omap_dispc_irq_handler(int irq, void *dev) static int get_dss_clocks(void) { - if (IS_ERR((dispc.dss_ick = clk_get(dispc.fbdev->dev, "dss_ick")))) { - dev_err(dispc.fbdev->dev, "can't get dss_ick\n"); + dispc.dss_ick = clk_get(dispc.fbdev->dev, "ick"); + if (IS_ERR(dispc.dss_ick)) { + dev_err(dispc.fbdev->dev, "can't get ick\n"); return PTR_ERR(dispc.dss_ick); } - if (IS_ERR((dispc.dss1_fck = clk_get(dispc.fbdev->dev, "dss1_fck")))) { + dispc.dss1_fck = clk_get(dispc.fbdev->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); } - if (IS_ERR((dispc.dss_54m_fck = - clk_get(dispc.fbdev->dev, "dss_54m_fck")))) { - dev_err(dispc.fbdev->dev, "can't get dss_54m_fck\n"); + dispc.dss_54m_fck = clk_get(dispc.fbdev->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); clk_put(dispc.dss1_fck); return PTR_ERR(dispc.dss_54m_fck); diff --git a/drivers/video/omap/rfbi.c b/drivers/video/omap/rfbi.c index a13c8dc..9332d6c 100644 --- a/drivers/video/omap/rfbi.c +++ b/drivers/video/omap/rfbi.c @@ -83,12 +83,14 @@ static inline u32 rfbi_read_reg(int idx) static int rfbi_get_clocks(void) { - if (IS_ERR((rfbi.dss_ick = clk_get(rfbi.fbdev->dev, "dss_ick")))) { - dev_err(rfbi.fbdev->dev, "can't get dss_ick\n"); + rfbi.dss_ick = clk_get(rfbi.fbdev->dev, "ick"); + if (IS_ERR(rfbi.dss_ick)) { + dev_err(rfbi.fbdev->dev, "can't get ick\n"); return PTR_ERR(rfbi.dss_ick); } - if (IS_ERR((rfbi.dss1_fck = clk_get(rfbi.fbdev->dev, "dss1_fck")))) { + rfbi.dss1_fck = clk_get(rfbi.fbdev->dev, "dss1_fck"); + if (IS_ERR(rfbi.dss1_fck)) { dev_err(rfbi.fbdev->dev, "can't get dss1_fck\n"); clk_put(rfbi.dss_ick); return PTR_ERR(rfbi.dss1_fck); ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 6/8] ARM: OMAP2/3: Change omapfb to use clkdev for dispc and rfbi 2009-05-14 20:28 ` Tony Lindgren @ 2009-05-16 9:06 ` Russell King - ARM Linux 2009-05-16 15:25 ` Tony Lindgren 0 siblings, 1 reply; 7+ messages in thread From: Russell King - ARM Linux @ 2009-05-16 9:06 UTC (permalink / raw) To: Tony Lindgren Cc: Krzysztof Helt, linux-arm-kernel, Imre Deak, linux-omap, linux-fbdev-devel On Thu, May 14, 2009 at 01:28:06PM -0700, Tony Lindgren wrote: > commit 27db33cfadd3c47c9499def6e71aaf5d2fd51e60 > Author: Tony Lindgren <tony@atomide.com> > Date: Tue May 12 11:20:03 2009 -0700 > > ARM: OMAP2/3: Change omapfb to use clkdev for dispc and rfbi, v2 > > This makes the framebuffer work on omap3. > > Also fix the clk_get usage for checkpatch.pl > "ERROR: do not use assignment in if condition". > > Cc: Imre Deak <imre.deak@nokia.com> > Cc: linux-fbdev-devel@lists.sourceforge.net > Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl> > Signed-off-by: Tony Lindgren <tony@atomide.com> This isn't a bug fix - the current code works, although checkpatch will complain about the assignment in the if condition. The rest of the patch is just a conversion from the old way of doing things to the new way, and I don't think is -rc material. ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 6/8] ARM: OMAP2/3: Change omapfb to use clkdev for dispc and rfbi 2009-05-16 9:06 ` Russell King - ARM Linux @ 2009-05-16 15:25 ` Tony Lindgren 2009-05-16 16:22 ` Russell King - ARM Linux 0 siblings, 1 reply; 7+ messages in thread From: Tony Lindgren @ 2009-05-16 15:25 UTC (permalink / raw) To: Russell King - ARM Linux Cc: Krzysztof Helt, linux-arm-kernel, Imre Deak, linux-omap, linux-fbdev-devel * Russell King - ARM Linux <linux@arm.linux.org.uk> [090516 02:06]: > On Thu, May 14, 2009 at 01:28:06PM -0700, Tony Lindgren wrote: > > commit 27db33cfadd3c47c9499def6e71aaf5d2fd51e60 > > Author: Tony Lindgren <tony@atomide.com> > > Date: Tue May 12 11:20:03 2009 -0700 > > > > ARM: OMAP2/3: Change omapfb to use clkdev for dispc and rfbi, v2 > > > > This makes the framebuffer work on omap3. > > > > Also fix the clk_get usage for checkpatch.pl > > "ERROR: do not use assignment in if condition". > > > > Cc: Imre Deak <imre.deak@nokia.com> > > Cc: linux-fbdev-devel@lists.sourceforge.net > > Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl> > > Signed-off-by: Tony Lindgren <tony@atomide.com> > > This isn't a bug fix - the current code works, although checkpatch will > complain about the assignment in the if condition. > > The rest of the patch is just a conversion from the old way of doing > things to the new way, and I don't think is -rc material. The code does not work for omap3 without this patch because of the different clock names. It only works for 24xx. And because of the different source clocks, it's pointless trying to fix it in any other way for -rc series. Dropping anyways from the omap-fixes series, we can wait a bit longer. Tony ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 6/8] ARM: OMAP2/3: Change omapfb to use clkdev for dispc and rfbi 2009-05-16 15:25 ` Tony Lindgren @ 2009-05-16 16:22 ` Russell King - ARM Linux 2009-05-16 18:02 ` Tony Lindgren 0 siblings, 1 reply; 7+ messages in thread From: Russell King - ARM Linux @ 2009-05-16 16:22 UTC (permalink / raw) To: Tony Lindgren Cc: Krzysztof Helt, linux-arm-kernel, Imre Deak, linux-omap, linux-fbdev-devel On Sat, May 16, 2009 at 08:25:43AM -0700, Tony Lindgren wrote: > The code does not work for omap3 without this patch because of the > different clock names. It only works for 24xx. And because of the > different source clocks, it's pointless trying to fix it in any > other way for -rc series. If that's the case, leave it in please. ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 6/8] ARM: OMAP2/3: Change omapfb to use clkdev for dispc and rfbi 2009-05-16 16:22 ` Russell King - ARM Linux @ 2009-05-16 18:02 ` Tony Lindgren 0 siblings, 0 replies; 7+ messages in thread From: Tony Lindgren @ 2009-05-16 18:02 UTC (permalink / raw) To: Russell King - ARM Linux Cc: Krzysztof Helt, linux-arm-kernel, Imre Deak, linux-omap, linux-fbdev-devel * Russell King - ARM Linux <linux@arm.linux.org.uk> [090516 09:22]: > On Sat, May 16, 2009 at 08:25:43AM -0700, Tony Lindgren wrote: > > The code does not work for omap3 without this patch because of the > > different clock names. It only works for 24xx. And because of the > > different source clocks, it's pointless trying to fix it in any > > other way for -rc series. > > If that's the case, leave it in please. OK, thanks. I'll add it back and send an updated pull request too. Regards, Tony ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2009-05-16 18:02 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20090514174100.12080.9736.stgit@localhost>
2009-05-14 17:49 ` [PATCH 6/8] ARM: OMAP2/3: Change omapfb to use clkdev for dispc and rfbi Tony Lindgren
2009-05-14 19:03 ` Krzysztof Helt
2009-05-14 20:28 ` Tony Lindgren
2009-05-16 9:06 ` Russell King - ARM Linux
2009-05-16 15:25 ` Tony Lindgren
2009-05-16 16:22 ` Russell King - ARM Linux
2009-05-16 18:02 ` Tony Lindgren
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).