From patchwork Tue Apr 26 17:44:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 8942021 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: X-Original-To: patchwork-linux-arm-msm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9CF1CBF29F for ; Tue, 26 Apr 2016 17:45:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BF4E7201FE for ; Tue, 26 Apr 2016 17:45:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D8A9E201EC for ; Tue, 26 Apr 2016 17:45:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752673AbcDZRow (ORCPT ); Tue, 26 Apr 2016 13:44:52 -0400 Received: from mail-pf0-f181.google.com ([209.85.192.181]:36320 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752227AbcDZRoT (ORCPT ); Tue, 26 Apr 2016 13:44:19 -0400 Received: by mail-pf0-f181.google.com with SMTP id c189so9537624pfb.3 for ; Tue, 26 Apr 2016 10:44:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=zbvl1WIw+DxUfkLxPnhw4Ha6Uz9cneqz8y6MllgTQ30=; b=LmgbHcoRGeA9sYXJ0BSNDx9Hl3KIilLZN8a4aS9JqjFl0a/Pe1rvirMSpID6L0GHdW wzF0P4KFtuUkyJvDetgMi6T5B8FcENRQWw7Ou/KlN7O80ey0jAs98JvnAGHFYvle8NvC t92M/SdiTVpvaUUFknyQJf9Ktf50/MwgJ8vLE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=zbvl1WIw+DxUfkLxPnhw4Ha6Uz9cneqz8y6MllgTQ30=; b=fnaOXm6FlilGS6zPUQZqFPsZOnA1n87lq9RGsdtLen2ggONQqNyhzZvG9ooUjrrc2P Su8/WPm/amN5b8GM+ZHBOAKHImP0fGhLIQEoD0xLkYsMO0HNuNXUjeE8QtVe3wKv5K06 5aYQN1vplFrxEmDcXkS/0p+5LwDQqLCNpS840n/IGV0iSL49eqLQMiuISdXtkHCPgCJ2 0IzJ1bumClIYXfPZ0cmo3uHtS5P7SWqaXVSZ7N7TacNffOQXjqZFtmwD6f7syfSCJ+fh 8kUnQRoURZbdSMHWcWC3evE04PuR0IG4FggPDSc5/tV/+bmGAKkIq52XW7UQlryiK5dJ tH/Q== X-Gm-Message-State: AOPr4FWOpGRYT9cEEnOt9bZ3wRCBrvGZg23eiMK5/XE6iNrARaBeTFIJXTwjyWQtnUJXDpQK X-Received: by 10.98.69.75 with SMTP id s72mr5481345pfa.66.1461692658639; Tue, 26 Apr 2016 10:44:18 -0700 (PDT) Received: from localhost.localdomain (c-73-67-244-238.hsd1.or.comcast.net. [73.67.244.238]) by smtp.gmail.com with ESMTPSA id kh2sm6792104pad.9.2016.04.26.10.44.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Apr 2016 10:44:17 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Rob Herring , Andy Gross , Bjorn Andersson , Stephen Boyd , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH 1/2 v3] device-tree: nexus7: Remove power gpio key entry and use pmic8xxx-pwrkey Date: Tue, 26 Apr 2016 10:44:13 -0700 Message-Id: <1461692654-27448-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,TVD_SUBJ_WIPE_DEBT,T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since the pmic8xxx-pwrkey driver is already supported in the qcom-apq8064.dtsi, and the pmic8xxx-pwrkey supports logic to configure proper device shutdown when ps_hold goes low, it is better to use that driver then a generic gpio button. Thus this patch remove the gpio power key entry here, so we don't get double input events from having two drivers enabled. Cc: Rob Herring Cc: Andy Gross Cc: Bjorn Andersson Cc: Stephen Boyd Cc: linux-arm-msm@vger.kernel.org Cc: devicetree@vger.kernel.org Acked-by: Rob Herring Acked-by: Bjorn Andersson Signed-off-by: John Stultz --- v2: - Added wakeup-source entry as suggested by Sudeep Holla v3: - Dropped the entire debounce override, as that was found to be a bug in the driver that Stephen has since fixed arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts b/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts index c535b3f..751aded 100644 --- a/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts +++ b/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts @@ -29,12 +29,6 @@ gpio-keys { compatible = "gpio-keys"; - power { - label = "Power"; - gpios = <&tlmm_pinmux 26 GPIO_ACTIVE_LOW>; - linux,code = ; - gpio-key,wakeup; - }; volume_up { label = "Volume Up"; gpios = <&pm8921_gpio 4 GPIO_ACTIVE_HIGH>;