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: 1320331 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 0203B40210 for ; Tue, 14 Aug 2012 14:27:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756130Ab2HNO1z (ORCPT ); Tue, 14 Aug 2012 10:27:55 -0400 Received: from na3sys009aog123.obsmtp.com ([74.125.149.149]:47699 "EHLO na3sys009aog123.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756263Ab2HNOXC (ORCPT ); Tue, 14 Aug 2012 10:23:02 -0400 Received: from mail-qc0-f179.google.com ([209.85.216.179]) (using TLSv1) by na3sys009aob123.postini.com ([74.125.148.12]) with SMTP ID DSNKUCpfRX8UbZ17qMNH46Ng6CacTI4RHXp0@postini.com; Tue, 14 Aug 2012 07:23:02 PDT Received: by qcse14 with SMTP id e14so338975qcs.24 for ; Tue, 14 Aug 2012 07:23:00 -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=GCES35uhaZ2VQeR7gJzo/TgtAdQiyLZQXwF8q74d/N7Osvf8b0IBU45maLuCJeAwE2 n2yT4hWxeC1tqv6I6UXYU1yxLLg5rqAZCwgq0McOconlqI3Fe4k0Eyt39I0n9LotIP6J DjY/RCGWTebV9agunO0Od+U+GszRUSquH5jrIvpENRJBuMYJ0KPacnDiy1NvFBRmrgno BiCN3V3DA/e7IlfZnA18rP+4vTG4NvPvg2OEHf6mmiffDx68GXvCq1BoXBsPT76OdCwV ccklcd2eCQYWBfPd6uH2+rnLP5hUpeiIAyXTqh16Ad5Zk0PYkxO+U/+MzgG4HjE1XFEO L10w== 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 Cc: Tero Kristo , alsa-devel@alsa-project.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree-discuss@lists.ozlabs.org, Benoit Cousson , linux-kernel@vger.kernel.org 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: ALoCoQm+0IW0ja2fDVV3Yy4i+fUzQkM7jz4JZo3QC9typr2T1gcEOpjDNfkyZrquxPRqG/uae0Os 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();