From patchwork Mon Sep 10 10:46:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 1431411 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 18401DF28C for ; Mon, 10 Sep 2012 10:48:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757287Ab2IJKqk (ORCPT ); Mon, 10 Sep 2012 06:46:40 -0400 Received: from na3sys009aog137.obsmtp.com ([74.125.149.18]:52562 "EHLO na3sys009aog137.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757017Ab2IJKqg (ORCPT ); Mon, 10 Sep 2012 06:46:36 -0400 Received: from mail-oa0-f46.google.com ([209.85.219.46]) (using TLSv1) by na3sys009aob137.postini.com ([74.125.148.12]) with SMTP ID DSNKUE3FCxw/rIpJCUd5k9nOt0M8ACtDndr6@postini.com; Mon, 10 Sep 2012 03:46:35 PDT Received: by oago6 with SMTP id o6so444513oag.19 for ; Mon, 10 Sep 2012 03:46:35 -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=PiBgUBdiLDGLz++zOpOUWPD51oCM1XCSIpgkIQDAplc=; b=Wjq1mG8Gjarzda4BxKM7hUSpdczRO2o5ahxv4gvjjNBB9Ul3YBBq+dHvXe53yV4geN gm4CmPkzAbUjv5OPPFadJg5l0FzIYgcRC9zHjLB8TnmoIDboeaMqzBmUtVitEodFzxQL Dj9IKGx2CJ0dJyUh927gi1fIl0OVNQPAXPYA07KeeFhAHR5ma0W+0yewydsxL2vrKQUu XuhqIobL3LmKwEdpSpb0zimVoKt3O49LIgEShfOR7mYW/2naCy4aUbogpl08nlD925kX POt8Y60Mt2wEOMxd4oOJW9J0XppsHJrFhAIEe0WK+2ZTZLhVZ4P5XfC3zB8BLRBvdndI 3N0Q== Received: by 10.182.131.98 with SMTP id ol2mr13363670obb.69.1347273995023; Mon, 10 Sep 2012 03:46:35 -0700 (PDT) Received: from barack.emea.dhcp.ti.com (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id 5sm8888098oeq.4.2012.09.10.03.46.31 (version=SSLv3 cipher=OTHER); Mon, 10 Sep 2012 03:46:34 -0700 (PDT) From: Peter Ujfalusi To: Mark Brown , Liam Girdwood , Tony Lindgren , Samuel Ortiz , Dmitry Torokhov , 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 v4 08/14] Input: twl4030-vibra: Support for DT booted kernel Date: Mon, 10 Sep 2012 13:46:26 +0300 Message-Id: <1347273992-9107-9-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 1.7.12 In-Reply-To: <1347273992-9107-1-git-send-email-peter.ujfalusi@ti.com> References: <1347273992-9107-1-git-send-email-peter.ujfalusi@ti.com> X-Gm-Message-State: ALoCoQnOGr1wMoMten8iS9Q4NnHv+bD3AiJiLDo5uHiCDJjwl8wwreeiWtGxWhywvoR5mPrwa4Dc 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 Acked-by: Dmitry Torokhov --- drivers/input/misc/twl4030-vibra.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c index fc0ed9b..2194a3c 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,26 @@ 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; + + if (of_find_node_by_name(node, "codec")) + return true; + + 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 +224,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();