* [PATCH 1/2 v3] device-tree: nexus7: Remove power gpio key entry and use pmic8xxx-pwrkey
@ 2016-04-26 17:44 John Stultz
2016-04-26 17:44 ` [PATCH 2/2] device-tree: nexus7: Add bq27541 battery interface to dts John Stultz
0 siblings, 1 reply; 3+ messages in thread
From: John Stultz @ 2016-04-26 17:44 UTC (permalink / raw)
To: lkml
Cc: John Stultz, Rob Herring, Andy Gross, Bjorn Andersson,
Stephen Boyd, linux-arm-msm, devicetree
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>
---
v2:
- Added wakeup-source entry as suggested by
Sudeep Holla <sudeep.holla@arm.com>
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(-)
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 = <KEY_POWER>;
- gpio-key,wakeup;
- };
volume_up {
label = "Volume Up";
gpios = <&pm8921_gpio 4 GPIO_ACTIVE_HIGH>;
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] device-tree: nexus7: Add bq27541 battery interface to dts
2016-04-26 17:44 [PATCH 1/2 v3] device-tree: nexus7: Remove power gpio key entry and use pmic8xxx-pwrkey John Stultz
@ 2016-04-26 17:44 ` John Stultz
2016-04-26 17:56 ` John Stultz
0 siblings, 1 reply; 3+ messages in thread
From: John Stultz @ 2016-04-26 17:44 UTC (permalink / raw)
To: lkml
Cc: John Stultz, Rob Herring, Andy Gross, Bjorn Andersson,
Stephen Boyd, linux-arm-msm, devicetree
Add support for battery level reading on the Nexus7 by
enabling the bq27541 driver in the nexus7 dts
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>
---
arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 6 ++++++
1 file changed, 6 insertions(+)
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 751aded..7b05f07 100644
--- a/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
+++ b/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
@@ -218,6 +218,12 @@
reg = <0x52>;
pagesize = <32>;
};
+
+ bq27541@55 {
+ compatible = "ti,bq27541";
+ reg = <0x55>;
+ };
+
};
};
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 2/2] device-tree: nexus7: Add bq27541 battery interface to dts
2016-04-26 17:44 ` [PATCH 2/2] device-tree: nexus7: Add bq27541 battery interface to dts John Stultz
@ 2016-04-26 17:56 ` John Stultz
0 siblings, 0 replies; 3+ messages in thread
From: John Stultz @ 2016-04-26 17:56 UTC (permalink / raw)
To: lkml
Cc: John Stultz, Rob Herring, Andy Gross, Bjorn Andersson,
Stephen Boyd, linux-arm-msm@vger.kernel.org, devicetree
On Tue, Apr 26, 2016 at 10:44 AM, John Stultz <john.stultz@linaro.org> wrote:
> Add support for battery level reading on the Nexus7 by
> enabling the bq27541 driver in the nexus7 dts
>
> 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>
Hey Andy,
Sorry for re-sending this I didn't realize you already have it
queued, and just now noticed its in -next.
thanks
-john
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-04-26 17:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-26 17:44 [PATCH 1/2 v3] device-tree: nexus7: Remove power gpio key entry and use pmic8xxx-pwrkey John Stultz
2016-04-26 17:44 ` [PATCH 2/2] device-tree: nexus7: Add bq27541 battery interface to dts John Stultz
2016-04-26 17:56 ` John Stultz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).