summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-02-22 12:37:02 -0500
committerTom Rini <trini@konsulko.com>2021-02-22 12:37:02 -0500
commit8f7a16aac36c2a38956bd04b53cb7b94b7a70180 (patch)
tree850e11d2c25da6a0b622a8e6fb9982e3e46bcb9f /arch
parentbced796e2dadc708ce213170d36be7f0428618a1 (diff)
parent2d339efb1ff941705a770e93494427912689ce18 (diff)
downloadu-boot-8f7a16aac36c2a38956bd04b53cb7b94b7a70180.tar.gz
u-boot-8f7a16aac36c2a38956bd04b53cb7b94b7a70180.tar.xz
u-boot-8f7a16aac36c2a38956bd04b53cb7b94b7a70180.zip
Merge tag 'u-boot-amlogic-20210222' of https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic
- adds adc-keys button driver - fix meson-saradc driver to get reference voltage - add adc-keys test for sandbox - enable adc-keys for VIM3 & VIM3L boards - fix button.h build
Diffstat (limited to 'arch')
-rw-r--r--arch/sandbox/dts/test.dts28
1 files changed, 27 insertions, 1 deletions
diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index d4195b45bb..2600360224 100644
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -2,6 +2,7 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/gpio/sandbox-gpio.h>
+#include <dt-bindings/input/input.h>
#include <dt-bindings/pinctrl/sandbox-pinmux.h>
#include <dt-bindings/mux/mux.h>
@@ -69,6 +70,30 @@
};
};
+ buttons2 {
+ compatible = "adc-keys";
+ io-channels = <&adc 3>;
+ keyup-threshold-microvolt = <3000000>;
+
+ button-up {
+ label = "button3";
+ linux,code = <KEY_F3>;
+ press-threshold-microvolt = <1500000>;
+ };
+
+ button-down {
+ label = "button4";
+ linux,code = <KEY_F4>;
+ press-threshold-microvolt = <1000000>;
+ };
+
+ button-enter {
+ label = "button5";
+ linux,code = <KEY_F5>;
+ press-threshold-microvolt = <500000>;
+ };
+ };
+
cros_ec: cros-ec {
reg = <0 0>;
compatible = "google,cros-ec-sandbox";
@@ -608,8 +633,9 @@
i2c-eeprom = <&bootcount_i2c>;
};
- adc@0 {
+ adc: adc@0 {
compatible = "sandbox,adc";
+ #io-channel-cells = <1>;
vdd-supply = <&buck2>;
vss-microvolts = <0>;
};