From patchwork Wed Apr 13 17:16:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 65744 Delivered-To: patches@linaro.org Received: by 10.140.93.198 with SMTP id d64csp130744qge; Wed, 13 Apr 2016 10:16:33 -0700 (PDT) X-Received: by 10.98.12.154 with SMTP id 26mr14483059pfm.20.1460567793030; Wed, 13 Apr 2016 10:16:33 -0700 (PDT) Return-Path: Received: from mail-pf0-x236.google.com (mail-pf0-x236.google.com. [2607:f8b0:400e:c00::236]) by mx.google.com with ESMTPS id km6si4771467pab.153.2016.04.13.10.16.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Apr 2016 10:16:33 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c00::236 as permitted sender) client-ip=2607:f8b0:400e:c00::236; 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::236 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-pf0-x236.google.com with SMTP id e128so36872883pfe.3 for ; Wed, 13 Apr 2016 10:16:32 -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=Q1d4cf5cXwE6b6bLg3lA2B8UiYFe/KyvzUhzVDb+Ej4=; b=T8GS1d03jX41mG25fB7qXAUxhs+RPMgIaDROQpENzOHb7wFQsexUvQZ/UATQ5TKM7V 8FlSrM9vmCFsc3UBfK64CpYA0FSUCDE0B1GXk29qSpWHsXRmyMAB2uccv+H1Ck085Jj9 NlHBp6D1ArNbJJodlEkXZdPQdRyD+Lh4/Lkz4= 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=Q1d4cf5cXwE6b6bLg3lA2B8UiYFe/KyvzUhzVDb+Ej4=; b=JANJx6ZdPePxW8WqjK5UdP1CTHhOWFruRodlW02a/QyFosUYdxCGKwYvss8kq+6QE5 saVibXUMePmUTYp02MlzX6GUPc4d7rPYjBidup4yKz4TFKxgLDUJOVUXgKU436AEdBXf YjhZkTPkyxg8BfRsJBJWm9B9+id6b9gQk+BgVFnmLPY70pw1EdWb/Beywwn1Sa7KRiYZ SzrCk1pq086xyvMGYlLsDsJBaRheIsxJxeB5D6oDHP7nvQpXmBvnKAs+XkFuSeBRKn+/ GhfLfFP5jrpIefyyFihmSzXrDLYUxZ++LEIcQghva3MZ9QTO6Mnh467Frn6A4E1s8W65 aLwA== X-Gm-Message-State: AOPr4FXc7tIM/+WEDEExQnshzuRzSQiaeUFBZC9ul7OmO0UPpL99UmtHBzFv50/IxH4XPQJi2lg= X-Received: by 10.98.73.88 with SMTP id w85mr14731135pfa.82.1460567792719; Wed, 13 Apr 2016 10:16:32 -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 c9sm52361053pfd.24.2016.04.13.10.16.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Apr 2016 10:16:32 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Rob Herring , Arnd Bergmann , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Andy Gross , Vinay Simha BN , Bjorn Andersson , Stephen Boyd , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH] device-tree: nexus7-flo: Remove power gpio key entry and use pmic8xxx-pwrkey Date: Wed, 13 Apr 2016 10:16:24 -0700 Message-Id: <1460567784-28017-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. The one gotcha with the pmic8xxx-pwrkey is it has a fairly long debounce delay, which we shorten here to make the button behave as expected. Cc: Rob Herring Cc: Arnd Bergmann Cc: Pawel Moll Cc: Mark Rutland Cc: Ian Campbell Cc: Kumar Gala Cc: Andy Gross Cc: Vinay Simha BN Cc: Bjorn Andersson Cc: Stephen Boyd Cc: linux-arm-msm@vger.kernel.org Cc: devicetree@vger.kernel.org Signed-off-by: John Stultz --- arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 15 +++++++++------ 1 file changed, 9 insertions(+), 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..7ac1c65 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>; @@ -190,6 +184,15 @@ }; }; + /* override default debounce for power-key */ + qcom,ssbi@500000 { + pmic@0 { + pwrkey@1c { + debounce = <1>; + }; + }; + }; + gsbi@16200000 { status = "okay"; qcom,mode = ;