From patchwork Wed Oct 21 10:10:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 55357 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lf0-f70.google.com (mail-lf0-f70.google.com [209.85.215.70]) by patches.linaro.org (Postfix) with ESMTPS id C51CB2303B for ; Wed, 21 Oct 2015 10:11:00 +0000 (UTC) Received: by lffy185 with SMTP id y185sf15494498lff.2 for ; Wed, 21 Oct 2015 03:10:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=PPoPkC5W6rzGhaFsl6uKuNkf5cNfgO1svv+ppd0pb90=; b=brNahbwhja89elkxQwtB++gMMxRnlLdiDpVu7v2I7BWQxnw3pANOcGgWZNroiAKAQU qO9brJra89GCsraa5PGjL0hGH9XbubARPsvxwA5jubzijDudphEGVBVeJwXvDkaPqGsJ B0aRVRCIj4Ns5uN6Td8xjcq9vJ3GwdyXomS2nlYrx+Efa0UTdSVhflLdg3I3L8DG9Z/A 3vMzhT0Kz+1fdoF6g4YlVQcyPswpfMv3/WoSp6AKC7TapUkufL9NtKFwqEJDphdmaxGd I5GafMQ0WUSUs6peT3CVr5tGNim8n3IKhA+Ppk0rVcPLg5kWxSbhr58YPgcISYtH7DQ7 HFqA== X-Gm-Message-State: ALoCoQm39bTXO1DRIPCYT3Xjo5CK0K+3Lr12AJP7FA7aHVsAImG1iEN71xO+TanvbLYtmsO7wXql X-Received: by 10.112.130.41 with SMTP id ob9mr1917928lbb.17.1445422259667; Wed, 21 Oct 2015 03:10:59 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.80.140 with SMTP id e134ls206556lfb.42.gmail; Wed, 21 Oct 2015 03:10:59 -0700 (PDT) X-Received: by 10.112.135.233 with SMTP id pv9mr4721850lbb.42.1445422259529; Wed, 21 Oct 2015 03:10:59 -0700 (PDT) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com. [209.85.217.181]) by mx.google.com with ESMTPS id sy6si5756753lbb.146.2015.10.21.03.10.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Oct 2015 03:10:59 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) client-ip=209.85.217.181; Received: by lbbwb3 with SMTP id wb3so34682684lbb.1 for ; Wed, 21 Oct 2015 03:10:59 -0700 (PDT) X-Received: by 10.112.202.35 with SMTP id kf3mr4771011lbc.19.1445422259414; Wed, 21 Oct 2015 03:10:59 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp2594676lbq; Wed, 21 Oct 2015 03:10:58 -0700 (PDT) X-Received: by 10.66.121.195 with SMTP id lm3mr9863996pab.84.1445422257452; Wed, 21 Oct 2015 03:10:57 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id sa10si12280198pac.110.2015.10.21.03.10.57 for ; Wed, 21 Oct 2015 03:10:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-input-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932556AbbJUKKt (ORCPT ); Wed, 21 Oct 2015 06:10:49 -0400 Received: from foss.arm.com ([217.140.101.70]:59950 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932550AbbJUKKs (ORCPT ); Wed, 21 Oct 2015 06:10:48 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id BE19D5E4; Wed, 21 Oct 2015 03:10:42 -0700 (PDT) Received: from e103737-lin.cambridge.arm.com (e103737-lin.cambridge.arm.com [10.1.207.150]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 2C2793F308; Wed, 21 Oct 2015 03:10:46 -0700 (PDT) From: Sudeep Holla To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org Cc: Sudeep Holla , Laxman Dewangan , Dmitry Torokhov , Thierry Reding , linux-input@vger.kernel.org, linux-tegra@vger.kernel.org Subject: [PATCH 06/19] input: tegra-kbc: enable support for the standard "wakeup-source" property Date: Wed, 21 Oct 2015 11:10:03 +0100 Message-Id: <1445422216-29375-7-git-send-email-sudeep.holla@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1445422216-29375-1-git-send-email-sudeep.holla@arm.com> References: <1445422216-29375-1-git-send-email-sudeep.holla@arm.com> Sender: linux-input-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: sudeep.holla@arm.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Though the mmc core driver should/will continue to support the legacy "nvidia,wakeup-source" property to enable SDIO as the wakeup source, we need to add support for the new standard property "wakeup-source". This patch adds support for "wakeup-source" property in addition to the existing "nvidia,wakeup-source" property. Cc: Laxman Dewangan Cc: Dmitry Torokhov Cc: Thierry Reding Cc: linux-input@vger.kernel.org Cc: linux-tegra@vger.kernel.org Signed-off-by: Sudeep Holla --- drivers/input/keyboard/tegra-kbc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c index f97c73bd14f8..f80c72d4ac8f 100644 --- a/drivers/input/keyboard/tegra-kbc.c +++ b/drivers/input/keyboard/tegra-kbc.c @@ -517,7 +517,8 @@ static int tegra_kbc_parse_dt(struct tegra_kbc *kbc) if (of_find_property(np, "nvidia,needs-ghost-filter", NULL)) kbc->use_ghost_filter = true; - if (of_find_property(np, "nvidia,wakeup-source", NULL)) + if (of_property_read_bool(np, "wakeup-source") || + of_property_read_bool(np, "nvidia,wakeup-source")) /* legacy */ kbc->wakeup = true; if (!of_get_property(np, "nvidia,kbc-row-pins", &proplen)) {