]> git.itanic.dy.fi Git - linux-stable/commitdiff
ARM: dts: renesas: marzen: Rename keyboard nodes
authorGeert Uytterhoeven <geert+renesas@glider.be>
Wed, 25 Oct 2023 10:04:23 +0000 (12:04 +0200)
committerGeert Uytterhoeven <geert+renesas@glider.be>
Mon, 13 Nov 2023 13:35:37 +0000 (14:35 +0100)
make dtbs_check:

    arch/arm/boot/dts/renesas/r8a7779-marzen.dtb: /: keyboard-gpio: {'compatible': ['gpio-keys-polled'], 'poll-interval': [[50]], 'pinctrl-0': [[29]], 'pinctrl-names': ['default'], 'key-3': {'gpios': [[28, 19, 1]], 'linux,code': [[4]], 'label': ['SW1-3'], 'debounce-interval': [[20]]}, 'key-4': {'gpios': [[28, 20, 1]], 'linux,code': [[5]], 'label': ['SW1-4'], 'debounce-interval': [[20]]}} is not of type 'array'
    from schema $id: http://devicetree.org/schemas/gpio/gpio-consumer.yaml#
    arch/arm/boot/dts/renesas/r8a7779-marzen.dtb: pinctrl@fffc0000: keyboard-gpio: {'pins': ['GP_0_19', 'GP_0_20'], 'bias-pull-up': True, 'phandle': [[29]]} is not of type 'array'
    from schema $id: http://devicetree.org/schemas/gpio/gpio-consumer.yaml#

Node names ending in "-gpio" confuse the checker.
Fix this by renaming the keyboards to "keypad-0" and "keypad-1", as they
are not full keyboards.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/eec1ccfb75c6215428609fdcaf3a37c75fe1fc87.1698228163.git.geert+renesas@glider.be
arch/arm/boot/dts/renesas/r8a7779-marzen.dts

index 1e192b8a73a05609493783e678721c91fb2dee8a..9b13e8d1538b00667e36cf342aada02d7d2b7b20 100644 (file)
@@ -52,10 +52,10 @@ vccq_sdhi0: regulator-vccq-sdhi0 {
                states = <3300000 1>, <1800000 0>;
        };
 
-       keyboard-irq {
+       keypad-0 {
                compatible = "gpio-keys";
 
-               pinctrl-0 = <&keyboard_irq_pins>;
+               pinctrl-0 = <&keypad0_pins>;
                pinctrl-names = "default";
 
                interrupt-parent = <&gpio0>;
@@ -76,11 +76,11 @@ key-2 {
                };
        };
 
-       keyboard-gpio {
+       keypad-1 {
                compatible = "gpio-keys-polled";
                poll-interval = <50>;
 
-               pinctrl-0 = <&keyboard_gpio_pins>;
+               pinctrl-0 = <&keypad1_pins>;
                pinctrl-names = "default";
 
                key-3 {
@@ -193,7 +193,7 @@ endpoint {
 };
 
 &gpio0 {
-       keyboard-irq-hog {
+       keypad0-hog {
                gpio-hog;
                gpios = <17 GPIO_ACTIVE_LOW>, <18 GPIO_ACTIVE_LOW>;
                input;
@@ -320,11 +320,11 @@ hspi0_pins: hspi0 {
                function = "hspi0";
        };
 
-       keyboard_irq_pins: keyboard-irq {
+       keypad0_pins: keypad-0 {
                pins = "GP_0_17", "GP_0_18";
                bias-pull-up;
        };
-       keyboard_gpio_pins: keyboard-gpio {
+       keypad1_pins: keypad-1 {
                pins = "GP_0_19", "GP_0_20";
                bias-pull-up;
        };