]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
mfd: twl-core: Register twl4030-madc child only for twl4030 class
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Tue, 13 Nov 2012 08:28:42 +0000 (09:28 +0100)
committerSamuel Ortiz <sameo@linux.intel.com>
Wed, 21 Nov 2012 15:07:58 +0000 (16:07 +0100)
twl4030-madc driver can only handle twl4030 class MADC. The newer revisions
of twl does not have MADC, instead they have different IP called GPADC which
is not backward compatible.

Acked-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
drivers/mfd/twl-core.c

index 4ae6423202058c0e1e7d7c9c262b8c25fd38d917..262466837689d68e651a5c1177069857cc2dfb0c 100644 (file)
@@ -646,7 +646,8 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
                        return PTR_ERR(child);
        }
 
-       if (IS_ENABLED(CONFIG_TWL4030_MADC) && pdata->madc) {
+       if (IS_ENABLED(CONFIG_TWL4030_MADC) && pdata->madc &&
+           twl_class_is_4030()) {
                child = add_child(2, "twl4030_madc",
                                pdata->madc, sizeof(*pdata->madc),
                                true, irq_base + MADC_INTR_OFFSET, 0);