diff options
| author | John Stultz <john.stultz@linaro.org> | 2016-04-26 10:44:13 -0700 |
|---|---|---|
| committer | Andy Gross <andy.gross@linaro.org> | 2016-06-27 17:36:54 -0500 |
| commit | 72f3cd64dccf663b0a1705bf215987cd5a2a11d2 (patch) | |
| tree | 312724acd13bafd54e39a445b3ed5878a3c5047b /arch/arm/boot | |
| parent | 30f1e2dde68d22022a77a9c1c4ddfdcf2fc3b4f3 (diff) | |
device-tree: nexus7: Remove power gpio key entry and use pmic8xxx-pwrkey
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 <robh+dt@kernel.org>
Cc: Andy Gross <agross@codeaurora.org>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Stephen Boyd <stephen.boyd@linaro.org>
Cc: linux-arm-msm@vger.kernel.org
Cc: devicetree@vger.kernel.org
Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 6 |
1 files changed, 0 insertions, 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 32fedfa149d0..7b05f072bfc2 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 = <KEY_POWER>; - gpio-key,wakeup; - }; volume_up { label = "Volume Up"; gpios = <&pm8921_gpio 4 GPIO_ACTIVE_HIGH>; |