Re: [PATCH v3 6/8] arm64: dts: rockchip: Add power key to GeekBox

Julien Chauveau
2016-03-10T23:04:17Z

> Le 6 mars 2016 à 20:53, Andreas Färber <afaerber@suse.de> a écrit :
>
> Signed-off-by: Andreas Färber <afaerber@suse.de>
> ---
> v2 -> v3:
> * Adopted wakeup-source instead of gpio-key,wakeup (Julien)
> * Dropped gpio-keys #address-cells and #size-cells properties (Julien)
> * Dropped power button reg property (Julien)
> * Adopted KEY_POWER (Julien)
> * Fixed power button pinctrl pull setting (Julien)
>
> v2: New
>
> arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts b/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
> index 098be3700a6f..7036b49c9206 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
> @@ -42,6 +42,7 @@
>
> /dts-v1/;
> #include "rk3368.dtsi"
> +#include <dt-bindings/input/input.h>
>
> / {
> model = "GeekBox";
> @@ -70,6 +71,19 @@
> pinctrl-0 = <&ir_int>;
> };
>
> + keys: gpio-keys {

I think you don't need the "keys" label, because there’s no phandle that refers to this.

> + compatible = "gpio-keys";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pwr_key>;
> +
> + button@0 {

Here you should use "power" instead of "button@0".

> + gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
> + label = "GPIO Power";
> + linux,code = <KEY_POWER>;

According to Documentation/input/event-codes.txt, there’s a special event type for the power button.
Should we use it here for that purpose?

linux,input-type = <EV_PWR>

> + wakeup-source;
> + };
> + };
> +
> leds: gpio-leds {
> compatible = "gpio-leds";
>
> @@ -265,6 +279,12 @@
> };
> };
>
> + keys {
> + pwr_key: pwr-key {
> + rockchip,pins = <0 2 RK_FUNC_GPIO &pcfg_pull_none>;
> + };
> + };
> +
> pmic {
> pmic_sleep: pmic-sleep {
> rockchip,pins = <0 0 RK_FUNC_2 &pcfg_pull_none>;
> --
> 2.6.2
>