[0/2,v5] twl4030-madc driver

Commit Message

J, KEERTHY May 3, 2011, 7:49 p.m. UTC

Hello Steve,

Can you try adding this patch?

Regards,
Keerthy

On Tue, May 3, 2011 at 8:44 PM, Steve Sakoman <[e-mail]> wrote:
> On Wed, Mar 2, 2011 at 2:15 AM, Samuel Ortiz <[e-mail]> wrote:
>> Hi Keerthy,
>>
>> On Tue, Mar 01, 2011 at 07:12:06PM +0530, Keerthy wrote:
>>> MADC(Monitoring ADC) driver enables monitoring analog signals using
>>> analog-to-digital conversion (ADC) on the input source.
>>> The previous discussion concluded in keeping the generic ADC
>>> functionality and the hwmon separate. The discussion can be found here:
>>>
>>> http://www.mail-archive.com/[e-mail]/msg41805.html
>> Thanks a lot, I applied those 2 patches.
>
> I'm attempting to use this drive on the Overo platform with 2.6.39-rc5.
>
> Other than enabling the module with CONFIG_SENSORS_TWL4030_MADC=m are
> there any board file modifications required other than the below?
>
> I have setup the platform data for the twl4030 madc driver:
>
> diff --git a/arch/arm/mach-omap2/board-overo.c
> b/arch/arm/mach-omap2/board-overo.c
> index 112dfc9..05dd3eb 100644
> --- a/arch/arm/mach-omap2/board-overo.c
> +++ b/arch/arm/mach-omap2/board-overo.c
> @@ -637,10 +637,15 @@ static struct twl4030_codec_data overo_codec_data = {
>        .audio = &overo_audio_data,
>  };
>
> +static struct twl4030_madc_platform_data overo_madc_data = {
> +       .irq_line       = 1,
> +};
> +
>  static struct twl4030_platform_data overo_twldata = {
>        .irq_base       = TWL4030_IRQ_BASE,
>        .irq_end        = TWL4030_IRQ_END,
>        .gpio           = &overo_gpio_data,
> +       .madc           = &overo_madc_data,
>        .usb            = &overo_usb_data,
>        .codec          = &overo_codec_data,
>        .vmmc1          = &overo_vmmc1,
>
> However, I am not seeing the sysfs entry created:
>
> # modprobe twl4030-madc-hwmon
> twl4030_madc_hwmon_init entry
>
> # lsmod
> Module                  Size  Used by
> twl4030_madc_hwmon      2594  0
> ipv6                  224256  16
> libertas_sdio          14867  0
> libertas               92429  1 libertas_sdio
> cfg80211              144256  1 libertas
> lib80211                5027  1 libertas
> firmware_class          5859  2 libertas_sdio,libertas
>
> # ls /sys/class/hwmon/
> #
>
> I added a couple of printk's to the driver at the entry points of init
> and probe, and as you can see above the init message is printed, but
> not the probe.
>
> Am I missing something really obvious here?
>
> Steve
>

Comments

Steve Sakoman May 4, 2011, 4:11 a.m. UTC | #1

On Tue, May 3, 2011 at 12:49 PM, J, KEERTHY <[e-mail]> 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.

Steve
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

J, KEERTHY May 4, 2011, 4:23 a.m. UTC | #2

On Wed, May 4, 2011 at 9:41 AM, Steve Sakoman <[e-mail]> wrote:
> On Tue, May 3, 2011 at 12:49 PM, J, KEERTHY <[e-mail]> 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.
> Steve
>

Patch

From a05c6cbb4494173e03ea5957666216caedb22d84 Mon Sep 17 00:00:00 2001
From: Keerthy <[e-mail]>
Date: Wed, 4 May 2011 01:14:50 +0530
Subject: [PATCH] Enabling Hwmon driver for twl4030-madc


Signed-off-by: Keerthy <[e-mail]>
---
 drivers/mfd/twl-core.c |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 960b5be..e6e99db 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -83,6 +83,13 @@ 
 #define twl_has_madc()	false
 #endif
 
+#if defined(CONFIG_SENSORS_TWL4030_MADC) ||\
+	 defined(CONFIG_SENSORS_TWL4030_MADC_MODULE)
+#define twl_has_madc_hwmon()  true
+#else
+#define twl_has_madc_hwmon()  false
+#endif
+
 #ifdef CONFIG_TWL4030_POWER
 #define twl_has_power()        true
 #else
@@ -609,6 +616,14 @@  add_children(struct twl4030_platform_data *pdata, unsigned long features)
 			return PTR_ERR(child);
 	}
 
+if (twl_has_madc_hwmon()) {
+		child = add_child(2, "twl4030_madc_hwmon",
+				NULL, 0,
+				true, pdata->irq_base + MADC_INTR_OFFSET, 0);
+		if (IS_ERR(child))
+			return PTR_ERR(child);
+	}
+
 	if (twl_has_rtc()) {
 		/*
 		 * REVISIT platform_data here currently might expose the
-- 
1.7.0.4