From patchwork Wed Jun 22 23:45:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 70699 Delivered-To: patches@linaro.org Received: by 10.140.28.4 with SMTP id 4csp159076qgy; Wed, 22 Jun 2016 16:45:56 -0700 (PDT) X-Received: by 10.66.150.10 with SMTP id ue10mr26852548pab.71.1466639156851; Wed, 22 Jun 2016 16:45:56 -0700 (PDT) Return-Path: Received: from mail-pf0-x22a.google.com (mail-pf0-x22a.google.com. [2607:f8b0:400e:c00::22a]) by mx.google.com with ESMTPS id i82si2656612pfd.11.2016.06.22.16.45.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jun 2016 16:45:56 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c00::22a as permitted sender) client-ip=2607:f8b0:400e:c00::22a; 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::22a as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-pf0-x22a.google.com with SMTP id t190so22179335pfb.3 for ; Wed, 22 Jun 2016 16:45:56 -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=whq2P/UQ4RejatdGrnQxCjOHsOXo5QjdoCXlImjOUUE=; b=Fr+FVuFHMG50gKMA6sWrefs0fhZCUWkIoE8ZwoWWJF5M/cnueQtmMmBXiBon/KhMYz a0YOkdaERSH8hU846XC/zaFh46T1o0Dj5UEuRNgRtiuujnpzw8cJPulmmFujytZuRH7H ZBggJCyQnLghhY4Q7rvsuopgu5Q50R5fTnuBk= 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=whq2P/UQ4RejatdGrnQxCjOHsOXo5QjdoCXlImjOUUE=; b=iDB0Jp15uaj9rBUutAha63ME0IsH53GyqLibiXQyyyebQ6FPpLj5Wz/fclN4gqa9rj /guewmUEEjl6UI7K/oe8ZVjCsdczrINM/gDlqAZf75/mv4rcaRAxvuAu/pjaer0PoW17 gGIrdUwELnfNXg+cch9QYirMMUie8hR5ZtVOZo+8egIfLDxHz8kPl53FRiCqHjoMoOTn Iei3IncQL0yPVqpcf9GpBeSxXT6X3g86QwBV6ubRTD7iIYyBHJhfI+HX0yiW7k8NUscN BBrQEOgTwNedcWoxlnt9i3rEmABldwxUNSHD1t8FHIOOHhjrQK14MU3sxSUX4AMIkg35 IO2Q== X-Gm-Message-State: ALyK8tJDvZ4UeHj7MRmLldmT/ismSTIrAi/T+Wo4Uy+uhe9+Der6QmF3NQ1wJvpXMQgLS3m8AZ8= X-Received: by 10.98.206.77 with SMTP id y74mr37951035pfg.55.1466639156419; Wed, 22 Jun 2016 16:45:56 -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 x66sm2168269pfi.84.2016.06.22.16.45.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Jun 2016 16:45:55 -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: [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> 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 --- 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 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>;