From patchwork Wed May 4 14:31:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 753932 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p44EW31j026050 for ; Wed, 4 May 2011 14:32:03 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754280Ab1EDOcB (ORCPT ); Wed, 4 May 2011 10:32:01 -0400 Received: from mail-vx0-f174.google.com ([209.85.220.174]:33159 "EHLO mail-vx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754226Ab1EDOcA convert rfc822-to-8bit (ORCPT ); Wed, 4 May 2011 10:32:00 -0400 Received: by vxi39 with SMTP id 39so1228317vxi.19 for ; Wed, 04 May 2011 07:31:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=3rrvGQz/7GTcEzO6MiL/lG9p9WIL+upYq6CFWh7gKcU=; b=rFMpRt5dBIeHO5uEx2sxmgQe1JPDEjpGpAiZiEdBRBEh3Mt0UE93ZyzauchZrKk75M YpaHPpBtyB9W8UXPD4LKCvswytgRfYL98vEbQqqgREICrIdJI1qEJnB1JYdLXVElJ4/p G3RRwLhHMkvHvwrD4xfoCdQXT0iO+yLBDrjZw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=RVD7LYHxGgQ0qF9bkh/G4xsphIyU/PuEgM9zVnuw9FJWfQg7+0OmF6mW2CauUwqzBx 71NGhjLSCETzhbDY57YUsqPC2RE7SVp+RjeXVUBoVQDrDap5H+al3efiWoKmv3Irut8U ea8mpIqVKEvnQJ2KO5ZDdGAm9AkQtTBpwC7Y4= MIME-Version: 1.0 Received: by 10.52.176.33 with SMTP id cf1mr1387593vdc.296.1304519519156; Wed, 04 May 2011 07:31:59 -0700 (PDT) Received: by 10.52.106.193 with HTTP; Wed, 4 May 2011 07:31:58 -0700 (PDT) In-Reply-To: References: <1298986926-31180-1-git-send-email-j-keerthy@ti.com> <20110302101512.GC16181@sortiz-mobl> Date: Wed, 4 May 2011 07:31:58 -0700 Message-ID: Subject: Re: [PATCH 0/2 v5] twl4030-madc driver From: Steve Sakoman To: "J, KEERTHY" Cc: lm-sensors@lm-sensors.org, guenter.roeck@ericsson.com, mikko.k.ylinen@nokia.com, amit.kucheria@canonical.com, linux-omap@vger.kernel.org, Samuel Ortiz Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 04 May 2011 14:32:04 +0000 (UTC) On Tue, May 3, 2011 at 9:23 PM, J, KEERTHY wrote: > On Wed, May 4, 2011 at 9:41 AM, Steve Sakoman wrote: >> On Tue, May 3, 2011 at 12:49 PM, J, KEERTHY wrote: >>> Hello Steve, >>> >>> Can you try adding this patch? >> >> Thanks! >> >> I tried the patch and it did indeed fix the issue.  We should try to >> get this in mainline since the hwmon driver won't work without it. >> > > Yes Steve. I am posting a patch today. I've also found that the madc clock needs to be enabled: From: Steve Sakoman Date: Sat, 23 Jan 2010 14:26:54 +0000 (-0800) Subject: mfd: twl-core: enable madc clock X-Git-Url: http://www.sakoman.com/cgi-bin/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff_plain;h=a1f1a1a6420f15e8351a0c5d63a81aa2444874f4 mfd: twl-core: enable madc clock Now that the madc driver has been merged it is also necessary to enable the clock to the madc block Signed-off-by: Steve Sakoman --- I'll submit this patch separately. Steve -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c index d9435e4..9096d7d 100644 --- a/drivers/mfd/twl-core.c +++ b/drivers/mfd/twl-core.c @@ -222,6 +222,11 @@ /* Few power values */ #define R_CFG_BOOT 0x05 +#define R_GPBR1 0x0C + +/* MADC clock values for R_GPBR1 */ +#define MADC_HFCLK_EN 0x80 +#define DEFAULT_MADC_CLK_EN 0x10 /* some fields in R_CFG_BOOT */ #define HFCLK_FREQ_19p2_MHZ (1 << 0) @@ -992,6 +997,9 @@ static void clocks_init(struct device *dev, e |= unprotect_pm_master(); /* effect->MADC+USB ck en */ + if (twl_has_madc()) + e |= twl_i2c_write_u8(TWL_MODULE_INTBR, + MADC_HFCLK_EN | DEFAULT_MADC_CLK_EN, R_GPBR1); e |= twl_i2c_write_u8(TWL_MODULE_PM_MASTER, ctrl, R_CFG_BOOT); e |= protect_pm_master(); diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h index 0c0d1ae..cbbf3b3 100644 --- a/include/linux/i2c/twl.h +++ b/include/linux/i2c/twl.h @@ -74,6 +74,7 @@ #define TWL_MODULE_USB TWL4030_MODULE_USB #define TWL_MODULE_AUDIO_VOICE TWL4030_MODULE_AUDIO_VOICE +#define TWL_MODULE_INTBR TWL4030_MODULE_INTBR #define TWL_MODULE_PIH TWL4030_MODULE_PIH #define TWL_MODULE_MADC TWL4030_MODULE_MADC #define TWL_MODULE_MAIN_CHARGE TWL4030_MODULE_MAIN_CHARGE