* [PATCH v2] ARM: dts: rockchip: add adc button for Firefly
@ 2017-05-30 15:52 Randy Li
2017-06-01 23:47 ` Heiko Stuebner
0 siblings, 1 reply; 2+ messages in thread
From: Randy Li @ 2017-05-30 15:52 UTC (permalink / raw)
To: devicetree
Cc: robh+dt, mark.rutland, linux, linux-arm-kernel, linux-rockchip,
linux-kernel, Randy Li
The only adc button connected to adc input is recovery button.
Signed-off-by: Randy Li <ayaka@soulik.info>
---
arch/arm/boot/dts/rk3288-firefly-reload.dts | 17 +++++++++++++++++
arch/arm/boot/dts/rk3288-firefly.dtsi | 13 +++++++++++++
2 files changed, 30 insertions(+)
diff --git a/arch/arm/boot/dts/rk3288-firefly-reload.dts b/arch/arm/boot/dts/rk3288-firefly-reload.dts
index d0b3204a..b11a282 100644
--- a/arch/arm/boot/dts/rk3288-firefly-reload.dts
+++ b/arch/arm/boot/dts/rk3288-firefly-reload.dts
@@ -48,6 +48,19 @@
model = "Firefly-RK3288-reload";
compatible = "firefly,firefly-rk3288-reload", "rockchip,rk3288";
+ adc-keys {
+ compatible = "adc-keys";
+ io-channels = <&saradc 1>;
+ io-channel-names = "buttons";
+ keyup-threshold-microvolt = <1800000>;
+
+ button-recovery {
+ label = "Recovery";
+ linux,code = <KEY_VENDOR>;
+ press-threshold-microvolt = <0>;
+ };
+ };
+
gpio-keys {
compatible = "gpio-keys";
@@ -246,6 +259,10 @@
status = "okay";
};
+&saradc {
+ status = "okay";
+};
+
&sdmmc {
bus-width = <4>;
cap-mmc-highspeed;
diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi
index 10793ac..b4b31a1 100644
--- a/arch/arm/boot/dts/rk3288-firefly.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly.dtsi
@@ -49,6 +49,19 @@
reg = <0 0x80000000>;
};
+ adc-keys {
+ compatible = "adc-keys";
+ io-channels = <&saradc 1>;
+ io-channel-names = "buttons";
+ keyup-threshold-microvolt = <1800000>;
+
+ button-recovery {
+ label = "Recovery";
+ linux,code = <KEY_VENDOR>;
+ press-threshold-microvolt = <0>;
+ };
+ };
+
dovdd_1v8: dovdd-1v8-regulator {
compatible = "regulator-fixed";
regulator-name = "dovdd_1v8";
--
2.9.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] ARM: dts: rockchip: add adc button for Firefly
2017-05-30 15:52 [PATCH v2] ARM: dts: rockchip: add adc button for Firefly Randy Li
@ 2017-06-01 23:47 ` Heiko Stuebner
0 siblings, 0 replies; 2+ messages in thread
From: Heiko Stuebner @ 2017-06-01 23:47 UTC (permalink / raw)
To: linux-rockchip
Cc: Randy Li, devicetree, mark.rutland, linux, linux-kernel, robh+dt,
linux-arm-kernel
Am Dienstag, 30. Mai 2017, 23:52:46 CEST schrieb Randy Li:
> The only adc button connected to adc input is recovery button.
>
> Signed-off-by: Randy Li <ayaka@soulik.info>
applied for 4.13
Thanks
Heiko
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-06-01 23:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-30 15:52 [PATCH v2] ARM: dts: rockchip: add adc button for Firefly Randy Li
2017-06-01 23:47 ` Heiko Stuebner
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).