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: 66718 Delivered-To: patches@linaro.org Received: by 10.140.93.198 with SMTP id d64csp1747704qge; Tue, 26 Apr 2016 10:44:19 -0700 (PDT) X-Received: by 10.98.44.70 with SMTP id s67mr5425057pfs.59.1461692658968; Tue, 26 Apr 2016 10:44:18 -0700 (PDT) Return-Path: Received: from mail-pf0-x232.google.com (mail-pf0-x232.google.com. [2607:f8b0:400e:c00::232]) by mx.google.com with ESMTPS id r6si21028pfr.51.2016.04.26.10.44.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Apr 2016 10:44:18 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c00::232 as permitted sender) client-ip=2607:f8b0:400e:c00::232; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c00::232 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-pf0-x232.google.com with SMTP id 206so9577869pfu.0 for ; Tue, 26 Apr 2016 10:44:18 -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=VpuZzW/NHjo2NJLgN2BnX+giODDNLil8dLkxXvGBSpLeW0lW+jxZhUyZgY/6iIxiLw F/EWzEGUem3Jt5PtNnc3pKo1R6j2/FWkjvuMdIq8XP/bHrx/6Gp2AyCq34CJ5OoAE3KW DdAYWuvvBmlDwRbft9+V7H+VtXThc18aBejccn+qsBgN1GsjWg3dXytgUoVaXFAfiflw sf6jgCOY5uMGDA/evVyI3Oj6SbZqywm4jo5+lhOUDx2woQCUco8JZjvhabNO57z7NTuf FPFoMLy0WhvpPeO1Q9JBVb8x7OgptJqcwh3Db3BCz4090nfIjIil/BzFsda3Lfv+Ryc8 nkTg== X-Gm-Message-State: AOPr4FVXpVPN7oY3JyhQevi1MIRk7Gl+uJO8Jv9Xp1uetl2mX5Uk4dqvFVutqwaJSyXEWct7Lqg= X-Received: by 10.98.69.75 with SMTP id s72mr5481345pfa.66.1461692658639; Tue, 26 Apr 2016 10:44:18 -0700 (PDT) Return-Path: 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 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(-) -- 1.9.1 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>;