From patchwork Tue Aug 14 14:22:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 1320631 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 9FB283FC81 for ; Tue, 14 Aug 2012 14:40:23 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T1IDC-0005Mk-1T; Tue, 14 Aug 2012 14:35:15 +0000 Received: from na3sys009aog115.obsmtp.com ([74.125.149.238]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1T1I1O-0004eT-H1 for linux-arm-kernel@lists.infradead.org; Tue, 14 Aug 2012 14:23:05 +0000 Received: from mail-qc0-f169.google.com ([209.85.216.169]) (using TLSv1) by na3sys009aob115.postini.com ([74.125.148.12]) with SMTP ID DSNKUCpfRX8UbZ17qMNH46Ng6CacTI4RHXp0@postini.com; Tue, 14 Aug 2012 07:23:02 PDT Received: by qcsd16 with SMTP id d16so340454qcs.0 for ; Tue, 14 Aug 2012 07:23:01 -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=acT5ffUXFdrszzZKECKfUBpSc6XxGDKtt3MCkqJs1tto6GX6lEQc33RV9A9W60rlsZ Ebk8l9XgbpkaLRv7RTYPSG/0qNxWh3r0QXk8oZonVp+VJVkzbmcA4KfH1MlGkuc8U0ak Qy7wyxxbD8lMypirVBJNMxLoKx41J8u6IYpYeJ0DPMK5juLmfwZoZyIqp5n5tV3rJgnK nPMxRvXfahX4jHiFaAlQ8mJaYx10vbMBoCVnnQpWwICji5yPUyPTaYTQxWcBIDSmcwbM xTFwKHvEs2ipajODzlVzm+9biaFg0TdhTnYqywrQXLYdePj1ez/mNip+JZGlc1NfHRvZ 7yRQ== Received: by 10.60.168.230 with SMTP id zz6mr25668844oeb.11.1344954180812; Tue, 14 Aug 2012 07:23:00 -0700 (PDT) Received: from barack.emea.dhcp.ti.com (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id kc5sm2799741obb.21.2012.08.14.07.22.57 (version=SSLv3 cipher=OTHER); Tue, 14 Aug 2012 07:23:00 -0700 (PDT) From: Peter Ujfalusi To: Mark Brown , Liam Girdwood , Tony Lindgren , Grant Likely , Rob Herring Subject: [PATCH v2 08/14] Input: twl4030-vibra: Support for DT booted kernel Date: Tue, 14 Aug 2012 17:22:36 +0300 Message-Id: <1344954162-7985-9-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1344954162-7985-1-git-send-email-peter.ujfalusi@ti.com> References: <1344954162-7985-1-git-send-email-peter.ujfalusi@ti.com> X-Gm-Message-State: ALoCoQmcbdQZKc+Osx+IEH6WWJIY+bs+Ta4PlNXWPhb9BXtpBvBhW4sC7wMZIbqutjdxH0gN3BYI X-Spam-Note: CRM114 invocation failed X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [74.125.149.238 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: alsa-devel@alsa-project.org, Benoit Cousson , devicetree-discuss@lists.ozlabs.org, linux-kernel@vger.kernel.org, Tero Kristo , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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();