| Message ID | 20190318100458.5619-9-narmstrong@baylibre.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | arm64: dts: g12a: Add boards peripherals | expand |
On Mon, Mar 18, 2019 at 11:06 AM Neil Armstrong <narmstrong@baylibre.com> wrote: > > Add support for the : > - ADC Touch key > - Bluetooth Module on UART A > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> I have no details about this board but the changes look sane, so (apart from one nit-pick below): Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> > --- > .../boot/dts/amlogic/meson-g12a-sei510.dts | 30 +++++++++++++++++++ > 1 file changed, 30 insertions(+) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts > index 43d57e20294a..ebdad5a192f1 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts > +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts > @@ -7,6 +7,7 @@ > > #include "meson-g12a.dtsi" > #include <dt-bindings/gpio/gpio.h> > +#include <dt-bindings/input/input.h> > #include <dt-bindings/gpio/meson-g12a-gpio.h> > > / { > @@ -17,6 +18,19 @@ > serial0 = &uart_AO; > }; > > + adc_keys { in meson-gxm-khadas-vim2.dts we use "adc-keys". Other Allwinner and Rockchip board also use "adc-keys" instead of "adc_keys". I prefer if we go with "adc-keys" (we can clean up the two occurrences of "adc_keys" in arch/arm64/boot/dts/amlogic later) Regards Martin
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts index 43d57e20294a..ebdad5a192f1 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts @@ -7,6 +7,7 @@ #include "meson-g12a.dtsi" #include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> #include <dt-bindings/gpio/meson-g12a-gpio.h> / { @@ -17,6 +18,19 @@ serial0 = &uart_AO; }; + adc_keys { + compatible = "adc-keys"; + io-channels = <&saradc 0>; + io-channel-names = "buttons"; + keyup-threshold-microvolt = <1800000>; + + button-onoff { + label = "On/Off"; + linux,code = <KEY_POWER>; + press-threshold-microvolt = <1700000>; + }; + }; + ao_5v: regulator-ao_5v { compatible = "regulator-fixed"; regulator-name = "AO_5V"; @@ -87,7 +101,23 @@ vin-supply = <&vddao_3v3>; regulator-always-on; }; +}; + +&saradc { + status = "okay"; + vref-supply = <&vddio_ao1v8>; +}; + +&uart_A { + status = "okay"; + pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; + pinctrl-names = "default"; + uart-has-rtscts; + bluetooth { + compatible = "brcm,bcm43438-bt"; + shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; + }; }; &uart_AO {
Add support for the : - ADC Touch key - Bluetooth Module on UART A Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- .../boot/dts/amlogic/meson-g12a-sei510.dts | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+)