From patchwork Wed Aug 8 09:41:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 1293951 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id C8D15DF223 for ; Wed, 8 Aug 2012 09:44:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030301Ab2HHJoH (ORCPT ); Wed, 8 Aug 2012 05:44:07 -0400 Received: from na3sys009aog112.obsmtp.com ([74.125.149.207]:55809 "EHLO na3sys009aog112.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030262Ab2HHJl4 (ORCPT ); Wed, 8 Aug 2012 05:41:56 -0400 Received: from mail-yx0-f178.google.com ([209.85.213.178]) (using TLSv1) by na3sys009aob112.postini.com ([74.125.148.12]) with SMTP ID DSNKUCI0ZIa+Z8KAVrazD/aWANuwYSV4JB6s@postini.com; Wed, 08 Aug 2012 02:41:56 PDT Received: by yenm2 with SMTP id m2so671585yen.23 for ; Wed, 08 Aug 2012 02:41:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=XwbJzy3i+ypZDus+le0Zu/LXTxmUn217nrLL9yiJpJI=; b=jtcxMdhXMcJyM6Ein3EaIoRc9Nd5yMc4PuuKyO0JC3bVRB4h+GLwrsXXHFyTdOu019 JhPGieOxOJ1j08W60dBDWYKoFgxScWCVkXOn+yfg4P7UH4RlBk7AmTarrTswMkcY+HMj Yaujs389k4obN+k6kA2DjAiv8FUzoG5LFUmXISUeH8z2i0oqiqYbQdfgzfL6ruh/m3eX yoezu5BMLnTbowm4oGTer5gBf/gyJUObvtqVA9NmQJxPA4x/95yQ7XbLrCCcCS/hSx1u c1uouZO3wIlwEXdGvMTmEp4I+Pb+E30N12pNCyjVTNED6yZW9RzU4SjZyKXAy5q++ZzH r/AQ== Received: by 10.60.172.202 with SMTP id be10mr29055351oec.53.1344418915637; Wed, 08 Aug 2012 02:41:55 -0700 (PDT) Received: from barack.emea.dhcp.ti.com (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id c6sm22141308obn.13.2012.08.08.02.41.52 (version=SSLv3 cipher=OTHER); Wed, 08 Aug 2012 02:41:55 -0700 (PDT) From: Peter Ujfalusi To: Samuel Ortiz , Mark Brown , Liam Girdwood , Tony Lindgren , Dmitry Torokhov Cc: alsa-devel@alsa-project.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, Benoit Cousson Subject: [PATCH 05/11] Input: twl4030-vibra: Support for DT booted kernel Date: Wed, 8 Aug 2012 12:41:21 +0300 Message-Id: <1344418887-5262-6-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1344418887-5262-1-git-send-email-peter.ujfalusi@ti.com> References: <1344418887-5262-1-git-send-email-peter.ujfalusi@ti.com> X-Gm-Message-State: ALoCoQlRX0qp79LSZdaS70gd0RX47r2oQV8owAX90nBe2b3/Y4mN0W/7osmOPDqutUax+cNrcPzj Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Add support when the kernel has been booted with DT blob. In this case the pdata is NULL, we need to reach up to the core node and check if the codec part has been enabled to determine if we need to coexist with the codec or not. Signed-off-by: Peter Ujfalusi --- drivers/input/misc/twl4030-vibra.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c index d1e1a7e..2cfc6c7 100644 --- a/drivers/input/misc/twl4030-vibra.c +++ b/drivers/input/misc/twl4030-vibra.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -194,13 +195,28 @@ static int twl4030_vibra_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(twl4030_vibra_pm_ops, twl4030_vibra_suspend, twl4030_vibra_resume); +static bool twl4030_vibra_check_coexist(struct twl4030_vibra_data *pdata, + struct device_node *node) +{ + if (pdata && pdata->coexist) + return true; + +#ifdef CONFIG_OF + if (of_find_node_by_name(node, "codec")) + return true; +#endif + + return false; +} + static int __devinit twl4030_vibra_probe(struct platform_device *pdev) { struct twl4030_vibra_data *pdata = pdev->dev.platform_data; + struct device_node *twl4030_core_node = pdev->dev.parent->of_node; struct vibra_info *info; int ret; - if (!pdata) { + if (!pdata && !twl4030_core_node) { dev_dbg(&pdev->dev, "platform_data not available\n"); return -EINVAL; } @@ -210,7 +226,7 @@ static int __devinit twl4030_vibra_probe(struct platform_device *pdev) return -ENOMEM; info->dev = &pdev->dev; - info->coexist = pdata->coexist; + info->coexist = twl4030_vibra_check_coexist(pdata, twl4030_core_node); INIT_WORK(&info->play_work, vibra_play_work); info->input_dev = input_allocate_device();