From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Stultz Subject: [RESEND][PATCH] device-tree: nexus7: Remove power gpio key entry and use pmic8xxx-pwrkey Date: Wed, 22 Jun 2016 16:45:50 -0700 Message-ID: <1466639150-27814-1-git-send-email-john.stultz@linaro.org> Return-path: Received: from mail-pf0-f179.google.com ([209.85.192.179]:34787 "EHLO mail-pf0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750847AbcFVXp5 (ORCPT ); Wed, 22 Jun 2016 19:45:57 -0400 Received: by mail-pf0-f179.google.com with SMTP id h14so22231747pfe.1 for ; Wed, 22 Jun 2016 16:45:56 -0700 (PDT) Sender: linux-arm-msm-owner@vger.kernel.org List-Id: linux-arm-msm@vger.kernel.org To: lkml Cc: John Stultz , Rob Herring , Andy Gross , Bjorn Andersson , Stephen Boyd , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org 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 --- 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 32fedfa..7b05f07 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>; -- 1.9.1