From patchwork Thu May 28 21:03:04 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 26796 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n4SL2SF5002308 for ; Thu, 28 May 2009 21:03:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762597AbZE1VDT (ORCPT ); Thu, 28 May 2009 17:03:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761411AbZE1VDT (ORCPT ); Thu, 28 May 2009 17:03:19 -0400 Received: from mho-01-ewr.mailhop.org ([204.13.248.71]:58438 "EHLO mho-01-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759432AbZE1VDS (ORCPT ); Thu, 28 May 2009 17:03:18 -0400 Received: from c-67-160-239-110.hsd1.ca.comcast.net ([67.160.239.110] helo=localhost.localdomain) by mho-01-ewr.mailhop.org with esmtpa (Exim 4.68) (envelope-from ) id 1M9mkq-000DSn-Mp; Thu, 28 May 2009 21:03:13 +0000 Received: from Mutt by mutt-smtp-wrapper.pl 1.2 (www.zdo.com/articles/mutt-smtp-wrapper.shtml) X-Mail-Handler: MailHop Outbound by DynDNS X-Originating-IP: 67.160.239.110 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/mailhop/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1/bgCFhzTn4tdAb35FlfqZq Date: Thu, 28 May 2009 14:03:04 -0700 From: Tony Lindgren To: Andrew de Quincey Cc: Russell King - ARM Linux , linux-arm-kernel@lists.arm.linux.org.uk, Imre Deak , linux-omap@vger.kernel.org, linux-fbdev-devel@lists.sourceforge.net Subject: Re: [PATCH 05/10] ARM: OMAP1: Make 770 LCD work, v3 Message-ID: <20090528210303.GI32453@atomide.com> References: <20090519232905.12760.15490.stgit@localhost> <20090519233732.12760.34595.stgit@localhost> <20090525092911.GC28195@n2100.arm.linux.org.uk> <20090525142128.17675cl0tvdr0y1k@lidskialf.net> <20090525174055.127744136qxu9vk0@lidskialf.net> <20090528182047.GF32453@atomide.com> <20090528194442.39896ichvj5e3dzs@lidskialf.net> <20090528191138.GG32453@atomide.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20090528191138.GG32453@atomide.com> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org * Tony Lindgren [090528 12:12]: > * Andrew de Quincey [090528 11:44]: > > Quoting Tony Lindgren : > > > >> * Andrew de Quincey [090525 09:41]: > >>> Quoting Andrew de Quincey : > >>> > >>>> Quoting Russell King - ARM Linux : > >>>> > >>>>> On Tue, May 19, 2009 at 04:37:32PM -0700, Tony Lindgren wrote: > >>>>>> Make 770 LCD work by passing the clock from platform data. > >>>>>> Also remove the old unused functions. > >>>>> > >>>>> I don't like this - because its passing struct clk's through platform > >>>>> data. That's not how things are supposed to work. > >>>>> > >>>>> The way PXA solves this problem is to have clock aliases - see > >>>>> clk_add_alias(). > >>>> > >>>> Interesting idea - I now have a prototype patch implementing this, > >>>> which I'll send when I get home (otherwise it would be an "it > >>>> compiles" "test" :) > >>>> > >>>> There isn't a common definition of clk_add_alias() though - that > >>>> symbol is defined in arch/arm/mach-pxa/clock.c, so I had to copy it > >>>> into arch/arm/plat-omap/clock.c > >>> > >>> Attached is a patch implementing this method. I don't like the > >>> duplication of the clk_alias code, but I imagine that could be resolved > >>> if this method was chosen.... > >> > >> Andrew, can you please reply with your Signed-off-by? > > > > Sure - sorry I was holding off in case there were any comments on the > > method... > > I added a note about maybe moving the clk_add_alias() to > arch/arm/common/clkdev.c later. > > Also noticed there were some whitespace errors, updated version below. One more time with clk_add_alias() in a separate patch. Tony From b2b1702dccf8ab070ecf3fdb59c77c552bbc103f Mon Sep 17 00:00:00 2001 From: Andrew de Quincey Date: Thu, 28 May 2009 13:47:48 -0700 Subject: [PATCH] ARM: OMAP1: Make 770 LCD work Make 770 LCD work by adding clk_add_alias(). Also remove the old unused functions. Note that the clk_add_alias() could probably be moved to arch/arm/clkdev.c later on. Cc: linux-fbdev-devel@lists.sourceforge.net Signed-off-by: Andrew de Quincey Signed-off-by: Imre Deak Signed-off-by: Tony Lindgren #include #include +#include #include #include #include +#include #define ADS7846_PENDOWN_GPIO 15 @@ -163,6 +165,15 @@ static struct spi_board_info nokia770_spi_board_info[] __initdata = { }, }; +static struct hwa742_platform_data nokia770_hwa742_platform_data = { + .te_connected = 1, +}; + +static void hwa742_dev_init(void) +{ + clk_add_alias("hwa_sys_ck", NULL, "bclk", NULL); + omapfb_set_ctrl_platform_data(&nokia770_hwa742_platform_data); +} /* assume no Mini-AB port */ @@ -371,6 +382,7 @@ static void __init omap_nokia770_init(void) omap_serial_init(); omap_register_i2c_bus(1, 100, NULL, 0); omap_dsp_init(); + hwa742_dev_init(); ads7846_dev_init(); mipid_dev_init(); omap_usb_init(&nokia770_usb_config); diff --git a/arch/arm/plat-omap/include/mach/hwa742.h b/arch/arm/plat-omap/include/mach/hwa742.h index 577f492..886248d 100644 --- a/arch/arm/plat-omap/include/mach/hwa742.h +++ b/arch/arm/plat-omap/include/mach/hwa742.h @@ -2,10 +2,6 @@ #define _HWA742_H struct hwa742_platform_data { - void (*power_up)(struct device *dev); - void (*power_down)(struct device *dev); - unsigned long (*get_clock_rate)(struct device *dev); - unsigned te_connected:1; }; diff --git a/drivers/video/omap/hwa742.c b/drivers/video/omap/hwa742.c index 8aa6e47..5d4f348 100644 --- a/drivers/video/omap/hwa742.c +++ b/drivers/video/omap/hwa742.c @@ -133,8 +133,7 @@ struct { struct lcd_ctrl_extif *extif; struct lcd_ctrl *int_ctrl; - void (*power_up)(struct device *dev); - void (*power_down)(struct device *dev); + struct clk *sys_ck; } hwa742; struct lcd_ctrl hwa742_ctrl; @@ -915,14 +914,13 @@ static void hwa742_suspend(void) hwa742_set_update_mode(OMAPFB_UPDATE_DISABLED); /* Enable sleep mode */ hwa742_write_reg(HWA742_POWER_SAVE, 1 << 1); - if (hwa742.power_down != NULL) - hwa742.power_down(hwa742.fbdev->dev); + clk_disable(hwa742.sys_ck); } static void hwa742_resume(void) { - if (hwa742.power_up != NULL) - hwa742.power_up(hwa742.fbdev->dev); + clk_enable(hwa742.sys_ck); + /* Disable sleep mode */ hwa742_write_reg(HWA742_POWER_SAVE, 0); while (1) { @@ -955,14 +953,13 @@ static int hwa742_init(struct omapfb_device *fbdev, int ext_mode, omapfb_conf = fbdev->dev->platform_data; ctrl_conf = omapfb_conf->ctrl_platform_data; - if (ctrl_conf == NULL || ctrl_conf->get_clock_rate == NULL) { + if (ctrl_conf == NULL) { dev_err(fbdev->dev, "HWA742: missing platform data\n"); r = -ENOENT; goto err1; } - hwa742.power_down = ctrl_conf->power_down; - hwa742.power_up = ctrl_conf->power_up; + hwa742.sys_ck = clk_get(NULL, "hwa_sys_ck"); spin_lock_init(&hwa742.req_lock); @@ -972,12 +969,11 @@ static int hwa742_init(struct omapfb_device *fbdev, int ext_mode, if ((r = hwa742.extif->init(fbdev)) < 0) goto err2; - ext_clk = ctrl_conf->get_clock_rate(fbdev->dev); + ext_clk = clk_get_rate(hwa742.sys_ck); if ((r = calc_extif_timings(ext_clk, &extif_mem_div)) < 0) goto err3; hwa742.extif->set_timings(&hwa742.reg_timings); - if (hwa742.power_up != NULL) - hwa742.power_up(fbdev->dev); + clk_enable(hwa742.sys_ck); calc_hwa742_clk_rates(ext_clk, &sys_clk, &pix_clk); if ((r = calc_extif_timings(sys_clk, &extif_mem_div)) < 0) @@ -1040,8 +1036,7 @@ static int hwa742_init(struct omapfb_device *fbdev, int ext_mode, return 0; err4: - if (hwa742.power_down != NULL) - hwa742.power_down(fbdev->dev); + clk_disable(hwa742.sys_ck); err3: hwa742.extif->cleanup(); err2: @@ -1055,8 +1050,7 @@ static void hwa742_cleanup(void) hwa742_set_update_mode(OMAPFB_UPDATE_DISABLED); hwa742.extif->cleanup(); hwa742.int_ctrl->cleanup(); - if (hwa742.power_down != NULL) - hwa742.power_down(hwa742.fbdev->dev); + clk_disable(hwa742.sys_ck); } struct lcd_ctrl hwa742_ctrl = {