From patchwork Mon Jul 1 14:56:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13718247 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D1657C2BD09 for ; Mon, 1 Jul 2024 14:57:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=JATPX/JRe6q4Z3TotQ5wEOtjsde3mkXmcqQGJxoMG3g=; b=pEaIDVmMhycE691Udac/U2fCj0 VVNjuJVnU49xHtu28sMNot7azeja1x8icz4tGJcn6sIm7sPcoHXQ2EPpViblXD9Rs8DGTlcccPo3v ZgwYAjpBE23o+sc2ILK2hqurerMunaN4NHm7vS6ae55gkD7EjBEWIUi4w49UVYdMgTAFt4UTk3BM5 PIabmGrXhnMR/4zcvtVKliuS0M1eM0cWHrQWD9vKQoOc3BOzwwz596PjO0/trNPOaqhJsxfTwrBcA b9DkRXn+6vsWxO6xU/yhrkwIFMO98ExnphvnAdgyEO2dZjMUEOK/uLJDXhynqFhbs2caskwtt1bky jmZq4rmQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sOISn-00000003oTC-40Tt; Mon, 01 Jul 2024 14:57:05 +0000 Received: from mail-lj1-x229.google.com ([2a00:1450:4864:20::229]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sOISU-00000003oJQ-3Ohx for linux-arm-kernel@lists.infradead.org; Mon, 01 Jul 2024 14:56:48 +0000 Received: by mail-lj1-x229.google.com with SMTP id 38308e7fff4ca-2ec52fbb50aso36513231fa.3 for ; Mon, 01 Jul 2024 07:56:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719845804; x=1720450604; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=JATPX/JRe6q4Z3TotQ5wEOtjsde3mkXmcqQGJxoMG3g=; b=fsqfg58JUiyuvJnOVhAjB6aAbhNNKIlbXqtX5a04VGrY4t52f17TAcj5oLVvahnEg2 10s/SQYCoAFnYHspZ3eKnSYcaIf3xpYTJcnHFYfNx9rtkH0i6v1quS2g7FB8L8YU0wGd aKzqbTNKPAlrGHIaoFUy7iujG6UwfVcgGTAghccZwHD7Oc/MO0z3tfb3fAU5EDFmVX5u YBGQ02h/24fUFKl2+HxiV1cX4dTn+zqpxxU4kErCfuSafZ7pUJOvxvPWH4uJEFx/zZjH ncmOxKDrQyoRgV4+6DoRNi9K5UdXXUIGRsc6Rn2ZTY3uqyDbogjqQnOuDHdUv3+sSU9p dC+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719845804; x=1720450604; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JATPX/JRe6q4Z3TotQ5wEOtjsde3mkXmcqQGJxoMG3g=; b=Go3q/zFrMlqaMfs1odgpDXc3VlMHT1tEbBn/2ozT9bUexBtvGb32Y34jZu/pGPr6zT fx4zFh2E1PnQy1ksAKfn3A2Xvkc4LoHUcljTDD8LOpKxCL2Oe92L8WD//Onm51C+NMkp m4E3rAsAmwq8E26ubXUsDls/i7Altngxtu3ET/PigFenqS6JyAKHpcB3/Da65IMO1LXE 2tE0atBB+MGC5yuDxoLKWoW/reIp3hlK5ux2BHRlQ4P7VaZscKOiZYimEtecVGUfjmOs FnVSTDxhFW74JiVFU3ScZmuJiI/bsXdKqEdw3WTQdm3ezLXzdZogBORjNOl67OAKNwbQ zclw== X-Gm-Message-State: AOJu0Yy0cdukJtGLD+IcwYNNP4VWaUYWY+ArIlQZF/CDVhApBqTds62I QsGpaohUQQ6N5KXyEQOFY17JwiDHxgA5HxS7soIfTedptIrrirACg8m9w9skYSI= X-Google-Smtp-Source: AGHT+IE22RIOChFZZa4znuI1O9mOLun25MwFCbFMZiEdl8Iwww43ZJGWH2ZmYlbDClkh5/Wy0lb1+g== X-Received: by 2002:a2e:a889:0:b0:2ec:558d:4e0a with SMTP id 38308e7fff4ca-2ee5e393e16mr52979781fa.19.1719845804485; Mon, 01 Jul 2024 07:56:44 -0700 (PDT) Received: from [127.0.1.1] ([178.197.219.137]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4256b0c0f99sm160062915e9.41.2024.07.01.07.56.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 07:56:43 -0700 (PDT) From: Krzysztof Kozlowski Date: Mon, 01 Jul 2024 16:56:34 +0200 Subject: [PATCH 1/7] ARM: dts: marvell: kirkwood: align GPIO keys node name with bindings MIME-Version: 1.0 Message-Id: <20240701-dts-marvell-cleanup-v1-1-4773bd20691a@linaro.org> References: <20240701-dts-marvell-cleanup-v1-0-4773bd20691a@linaro.org> In-Reply-To: <20240701-dts-marvell-cleanup-v1-0-4773bd20691a@linaro.org> To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=17045; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=79NJk/kks064XT4lzuhqDllc7V+WZUytw1GlsOlds7Q=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBmgsOjPa79i2wAY3BT1qCSZzyYEo45o+HlfiOBX DDT8xAZS8aJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZoLDowAKCRDBN2bmhouD 1z66EACSRfVcHB/qDzhjBWmIncYpKirAvYh9JjoXYCUikttoWxnFj62tNR3/Uz7eEf2dzOZLy1e OxfGmkQhKL05rOl8WVvzIp5d9328lTDV6H3ok82YqDchLYrkjFZnfTT6F5v+9TpJXPXK0iN2QXd sNJsQLSqL6ZUMoqHqLjAvuESYaRDXnCQcuPyzegjLi6wGY+cpt/C2aO+PGxmww4Timf+LTIwVhn 2ayBiXVeh0MT0CPAhM47k3A3u7J/ZnboA6K97qyhUA7knDkE0PO6HTMJ0OsF7maMOF9lfgWHpie 7FSxVynlnt3CJo9OGTbBznGsMcPVcaTD7xADyeABGIChDBEQ0c/N9uG+jZpuU98uf5O55rrWYQK QnElBLVqAsGHGIFdW8g4iRFTI8ITjWOa12uPqRc51Gl1gSlkyKKNaHEQbWXcLaxa8Gfii2QRpxE aB1EBNPyRNhfcRo2G9iwvQZCGzi5eAufY3nbRO01/IbLkGFa2d/4t19kX5NJnNGjpF8ZWy52P4p UTB9Z5PRuPwFYUzPFbCzB9DV9dw44BVLBcFs5GndmygjF9cXivGSEOOIywXJB+HI5EUXuvU52FH waiRVuafwvcyjuuj5euIhHx0dljW9OQDcdIe1BdAyTFVXkG0rB+v0p9LefkvwMioUcc/RDImOXC BwpsZw4SrDqGvLQ== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240701_075646_898729_BF858D83 X-CRM114-Status: GOOD ( 13.90 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Bindings expect the GPIO key node names to follow certain pattern, see dtbs_check warnings: kirkwood-laplug.dtb: gpio_keys: 'power' does not match any of the regexes: '^(button|event|key|switch|(button|event|key|switch)... Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/marvell/kirkwood-blackarmor-nas220.dts | 4 ++-- arch/arm/boot/dts/marvell/kirkwood-c200-v1.dts | 8 ++++---- arch/arm/boot/dts/marvell/kirkwood-cloudbox.dts | 2 +- arch/arm/boot/dts/marvell/kirkwood-dir665.dts | 4 ++-- arch/arm/boot/dts/marvell/kirkwood-dnskw.dtsi | 6 +++--- arch/arm/boot/dts/marvell/kirkwood-ib62x0.dts | 4 ++-- arch/arm/boot/dts/marvell/kirkwood-iconnect.dts | 4 ++-- arch/arm/boot/dts/marvell/kirkwood-iomega_ix2_200.dts | 6 +++--- arch/arm/boot/dts/marvell/kirkwood-l-50.dts | 2 +- arch/arm/boot/dts/marvell/kirkwood-laplug.dts | 2 +- arch/arm/boot/dts/marvell/kirkwood-linksys-viper.dts | 4 ++-- arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi | 6 +++--- arch/arm/boot/dts/marvell/kirkwood-mv88f6281gtw-ge.dts | 4 ++-- arch/arm/boot/dts/marvell/kirkwood-netxbig.dtsi | 6 +++--- arch/arm/boot/dts/marvell/kirkwood-ns2-common.dtsi | 2 +- arch/arm/boot/dts/marvell/kirkwood-nsa310s.dts | 6 +++--- arch/arm/boot/dts/marvell/kirkwood-nsa3x0-common.dtsi | 6 +++--- arch/arm/boot/dts/marvell/kirkwood-openblocks_a6.dts | 2 +- arch/arm/boot/dts/marvell/kirkwood-pogoplug-series-4.dts | 2 +- arch/arm/boot/dts/marvell/kirkwood-t5325.dts | 2 +- arch/arm/boot/dts/marvell/kirkwood-ts219-6281.dts | 4 ++-- arch/arm/boot/dts/marvell/kirkwood-ts219-6282.dts | 4 ++-- arch/arm/boot/dts/marvell/kirkwood-ts419.dtsi | 4 ++-- 23 files changed, 47 insertions(+), 47 deletions(-) diff --git a/arch/arm/boot/dts/marvell/kirkwood-blackarmor-nas220.dts b/arch/arm/boot/dts/marvell/kirkwood-blackarmor-nas220.dts index 07fbfca444d5..f34c3897ff48 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-blackarmor-nas220.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-blackarmor-nas220.dts @@ -35,13 +35,13 @@ gpio_poweroff { gpio_keys { compatible = "gpio-keys"; - reset { + button-reset { label = "Reset"; linux,code = ; gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; }; - button { + button-power { label = "Power"; linux,code = ; gpios = <&gpio0 26 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/marvell/kirkwood-c200-v1.dts b/arch/arm/boot/dts/marvell/kirkwood-c200-v1.dts index f59ff7578dfc..7e3ee64d4bdf 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-c200-v1.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-c200-v1.dts @@ -29,25 +29,25 @@ keys { pinctrl-0 = <&pmx_buttons>; pinctrl-names = "default"; - power { + button-power { label = "Power Button"; linux,code = ; gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>; }; - reset { + button-reset { label = "Reset Button"; linux,code = ; gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; }; - usb1 { + button-usb1 { label = "USB1 Button"; linux,code = ; gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; }; - usb2 { + button-usb2 { label = "USB2 Button"; linux,code = ; gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/marvell/kirkwood-cloudbox.dts b/arch/arm/boot/dts/marvell/kirkwood-cloudbox.dts index 448b0cd23b5f..2582b84d8415 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-cloudbox.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-cloudbox.dts @@ -61,7 +61,7 @@ gpio_keys { #address-cells = <1>; #size-cells = <0>; - power { + key-power { label = "Power push button"; linux,code = ; gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/marvell/kirkwood-dir665.dts b/arch/arm/boot/dts/marvell/kirkwood-dir665.dts index 0c0851cd9bec..e8eff0ba1c99 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-dir665.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-dir665.dts @@ -179,12 +179,12 @@ gpio-keys { #address-cells = <1>; #size-cells = <0>; - reset { + button-reset { label = "reset"; linux,code = ; gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; }; - wps { + button-wps { label = "wps"; linux,code = ; gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/marvell/kirkwood-dnskw.dtsi b/arch/arm/boot/dts/marvell/kirkwood-dnskw.dtsi index 0738eb679fcd..baea14c68520 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-dnskw.dtsi +++ b/arch/arm/boot/dts/marvell/kirkwood-dnskw.dtsi @@ -14,17 +14,17 @@ gpio_keys { &pmx_button_reset>; pinctrl-names = "default"; - power { + button-power { label = "Power button"; linux,code = ; gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; }; - eject { + button-eject { label = "USB unmount button"; linux,code = ; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; - reset { + button-reset { label = "Reset button"; linux,code = ; gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/marvell/kirkwood-ib62x0.dts b/arch/arm/boot/dts/marvell/kirkwood-ib62x0.dts index 962a910a6f5c..d76dbbce16f1 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-ib62x0.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-ib62x0.dts @@ -63,12 +63,12 @@ gpio_keys { pinctrl-0 = <&pmx_button_reset &pmx_button_usb_copy>; pinctrl-names = "default"; - copy { + button-copy { label = "USB Copy"; linux,code = ; gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; }; - reset { + button-reset { label = "Reset"; linux,code = ; gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/marvell/kirkwood-iconnect.dts b/arch/arm/boot/dts/marvell/kirkwood-iconnect.dts index aed20185fd7a..ea98ff13700e 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-iconnect.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-iconnect.dts @@ -127,13 +127,13 @@ gpio_keys { pinctrl-0 = < &pmx_button_reset &pmx_button_otb >; pinctrl-names = "default"; - otb { + button-otb { label = "OTB Button"; linux,code = ; gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; debounce-interval = <100>; }; - reset { + button-reset { label = "Reset"; linux,code = ; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/marvell/kirkwood-iomega_ix2_200.dts b/arch/arm/boot/dts/marvell/kirkwood-iomega_ix2_200.dts index 2338f495d517..fa7ace071de8 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-iomega_ix2_200.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-iomega_ix2_200.dts @@ -154,17 +154,17 @@ gpio-keys { pinctrl-names = "default"; - Power { + button-power { label = "Power Button"; linux,code = ; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; - Reset { + button-reset { label = "Reset Button"; linux,code = ; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; - OTB { + button-otb { label = "OTB Button"; linux,code = ; gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/marvell/kirkwood-l-50.dts b/arch/arm/boot/dts/marvell/kirkwood-l-50.dts index c841eb8e7fb1..094854743dde 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-l-50.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-l-50.dts @@ -193,7 +193,7 @@ express_card_pwr { keys { compatible = "gpio-keys"; - factory_defaults { + button-factory-defaults { label = "factory_defaults"; gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; linux,code = ; diff --git a/arch/arm/boot/dts/marvell/kirkwood-laplug.dts b/arch/arm/boot/dts/marvell/kirkwood-laplug.dts index 8c2b540eaf4f..8296486a5931 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-laplug.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-laplug.dts @@ -51,7 +51,7 @@ pmx_usb_power_enable: pmx-usb-power-enable { gpio_keys { compatible = "gpio-keys"; - power { + button-power { label = "Power push button"; linux,code = ; gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm/boot/dts/marvell/kirkwood-linksys-viper.dts b/arch/arm/boot/dts/marvell/kirkwood-linksys-viper.dts index 27fd6e2337d5..3f97240fda74 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-linksys-viper.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-linksys-viper.dts @@ -38,13 +38,13 @@ gpio_keys { pinctrl-0 = < &pmx_btn_wps &pmx_btn_reset >; pinctrl-names = "default"; - wps { + button-wps { label = "WPS Button"; linux,code = ; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; - reset { + button-reset { label = "Reset Button"; linux,code = ; gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi index f80af24b9e90..a86dbc490600 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi +++ b/arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi @@ -113,18 +113,18 @@ gpio_keys { &pmx_power_auto_switch>; pinctrl-names = "default"; - option { + button-option { label = "Function Button"; linux,code = ; gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; }; - reserved { + button-reserved { label = "Power-on Switch"; linux,code = ; linux,input-type = <5>; gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; }; - power { + button-power { label = "Power-auto Switch"; linux,code = ; linux,input-type = <5>; diff --git a/arch/arm/boot/dts/marvell/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/marvell/kirkwood-mv88f6281gtw-ge.dts index 5a77286136c7..0d5d85c873b5 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-mv88f6281gtw-ge.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-mv88f6281gtw-ge.dts @@ -96,12 +96,12 @@ gpio_keys { pinctrl-0 = <&pmx_keys>; pinctrl-names = "default"; - restart { + button-restart { label = "SWR Button"; linux,code = ; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; - wps { + button-wps { label = "WPS Button"; linux,code = ; gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/marvell/kirkwood-netxbig.dtsi b/arch/arm/boot/dts/marvell/kirkwood-netxbig.dtsi index b5737026e244..d0f85893aeca 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-netxbig.dtsi +++ b/arch/arm/boot/dts/marvell/kirkwood-netxbig.dtsi @@ -60,19 +60,19 @@ gpio-keys { * esc and power represent a three position rocker * switch. Thus the conventional KEY_POWER does not fit */ - exc { + button-exc { label = "Back power switch (on|auto)"; linux,code = ; linux,input-type = <5>; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; - power { + button-power { label = "Back power switch (auto|off)"; linux,code = ; linux,input-type = <5>; gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; }; - option { + button-option { label = "Function button"; linux,code = ; gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/marvell/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/marvell/kirkwood-ns2-common.dtsi index 51530ea86622..6cc068a05673 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-ns2-common.dtsi +++ b/arch/arm/boot/dts/marvell/kirkwood-ns2-common.dtsi @@ -58,7 +58,7 @@ gpio_keys { #address-cells = <1>; #size-cells = <0>; - power { + button-power { label = "Power push button"; linux,code = ; gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm/boot/dts/marvell/kirkwood-nsa310s.dts b/arch/arm/boot/dts/marvell/kirkwood-nsa310s.dts index 49da633a1bc0..767f34ab434e 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-nsa310s.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-nsa310s.dts @@ -40,19 +40,19 @@ keys { pinctrl-0 = <&pmx_buttons>; pinctrl-names = "default"; - power { + button-power { label = "Power Button"; linux,code = ; gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>; }; - copy { + button-copy { label = "Copy Button"; linux,code = ; gpios = <&gpio0 25 GPIO_ACTIVE_LOW>; }; - reset { + button-reset { label = "Reset Button"; linux,code = ; gpios = <&gpio0 24 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/marvell/kirkwood-nsa3x0-common.dtsi b/arch/arm/boot/dts/marvell/kirkwood-nsa3x0-common.dtsi index ea3d36512e9f..bdce8a86ce51 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-nsa3x0-common.dtsi +++ b/arch/arm/boot/dts/marvell/kirkwood-nsa3x0-common.dtsi @@ -68,17 +68,17 @@ gpio_keys { pinctrl-0 = <&pmx_btn_reset &pmx_btn_copy &pmx_btn_power>; pinctrl-names = "default"; - power { + button-power { label = "Power Button"; linux,code = ; gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; }; - copy { + button-copy { label = "Copy Button"; linux,code = ; gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; }; - reset { + button-reset { label = "Reset Button"; linux,code = ; gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/marvell/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/marvell/kirkwood-openblocks_a6.dts index 8ea430168ea5..ef6d6d7a4008 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-openblocks_a6.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-openblocks_a6.dts @@ -118,7 +118,7 @@ gpio_keys { #address-cells = <1>; #size-cells = <0>; - power { + button-power { label = "Init Button"; linux,code = ; gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm/boot/dts/marvell/kirkwood-pogoplug-series-4.dts b/arch/arm/boot/dts/marvell/kirkwood-pogoplug-series-4.dts index 5aa4669ae254..601760041c99 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-pogoplug-series-4.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-pogoplug-series-4.dts @@ -34,7 +34,7 @@ gpio_keys { pinctrl-0 = <&pmx_button_eject>; pinctrl-names = "default"; - eject { + button-eject { debounce-interval = <50>; wakeup-source; linux,code = ; diff --git a/arch/arm/boot/dts/marvell/kirkwood-t5325.dts b/arch/arm/boot/dts/marvell/kirkwood-t5325.dts index ad093324e075..6703e412c8e2 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-t5325.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-t5325.dts @@ -161,7 +161,7 @@ gpio_keys { pinctrl-0 = <&pmx_button_power>; pinctrl-names = "default"; - power { + button-power { label = "Power Button"; linux,code = ; gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm/boot/dts/marvell/kirkwood-ts219-6281.dts b/arch/arm/boot/dts/marvell/kirkwood-ts219-6281.dts index 30892c19aceb..859521b5b84e 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-ts219-6281.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-ts219-6281.dts @@ -40,12 +40,12 @@ gpio_keys { pinctrl-0 = <&pmx_reset_button &pmx_USB_copy_button>; pinctrl-names = "default"; - copy { + button-copy { label = "USB Copy"; linux,code = ; gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; }; - reset { + button-reset { label = "Reset"; linux,code = ; gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/marvell/kirkwood-ts219-6282.dts b/arch/arm/boot/dts/marvell/kirkwood-ts219-6282.dts index aba1205981f1..3b0a4ed588e8 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-ts219-6282.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-ts219-6282.dts @@ -40,12 +40,12 @@ gpio_keys { pinctrl-0 = <&pmx_reset_button &pmx_USB_copy_button>; pinctrl-names = "default"; - copy { + button-copy { label = "USB Copy"; linux,code = ; gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; }; - reset { + button-reset { label = "Reset"; linux,code = ; gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/marvell/kirkwood-ts419.dtsi b/arch/arm/boot/dts/marvell/kirkwood-ts419.dtsi index 717236853e45..126db753c8fe 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-ts419.dtsi +++ b/arch/arm/boot/dts/marvell/kirkwood-ts419.dtsi @@ -41,12 +41,12 @@ gpio_keys { pinctrl-0 = <&pmx_reset_button &pmx_USB_copy_button>; pinctrl-names = "default"; - copy { + button-copy { label = "USB Copy"; linux,code = ; gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; }; - reset { + button-reset { label = "Reset"; linux,code = ; gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; From patchwork Mon Jul 1 14:56:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13718248 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D3671C3065A for ; Mon, 1 Jul 2024 14:57:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=rXFEZx0udsk0lxzY2jdV+4pcISLPkDF6XpicWae74LU=; b=GxTib3nLMBS4U0qkB/4PNSCJdl wUsd7LxWO2v5GwYA2CTgeuhOfjmWkNTeezGgs/3a8uvlzLsJ+U7JY3JXhiEAVyEIOmikCgu04JpNi Bf5DrjdeIR2Gmf6QW68/72MgWZxNbzMXZsyNvsj3/2yq7tln7YXqIeldAB+KEe95YMZ6/AAeHx8BH WJMRrLZ3QLhR2J1C4c4oPzJa2ofRLOMIc8iEIkb6JpanmveMszSoW0ag6qFlSWGRQ6bwwyVM9JNHw 0g6J/bC19C++6bsyYp/LqIXz3a63WDTwAJz/U4F4u1DIFSHiLPsTBQRHAyXz2AeSuDjff9p6jWDto Gkfx3d9w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sOISv-00000003oWk-3khd; Mon, 01 Jul 2024 14:57:14 +0000 Received: from mail-lj1-x22e.google.com ([2a00:1450:4864:20::22e]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sOISW-00000003oKD-0VGV for linux-arm-kernel@lists.infradead.org; Mon, 01 Jul 2024 14:56:49 +0000 Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2ebe0a81dc8so41981771fa.2 for ; Mon, 01 Jul 2024 07:56:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719845806; x=1720450606; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=rXFEZx0udsk0lxzY2jdV+4pcISLPkDF6XpicWae74LU=; b=Wh9r6NNPvCqmINVAC/VfjZwYoAAlLFcCqARM8o+eB/BRgGBrWiQZjcMY1hpJ8Cwqr5 R9t4Zvl8gkkjHIaWpfczv0/faYQdrK3Ag+q71eabPT9Ef5jRDWuItXIpoMcfQE2+XU6J EG+enNEWCuAGd+zt/imXnI1sDI9DhIJyhyyU9J9FNKtjnLKgQ4OYZK/l8bS9tQIIs1+p M5YQ1dbjO5YSubX+3TShfQlIW+6cx2ub16U49GdXCxu7WjcxdW83na9OWq+MvTt7/CEa oHIpCK5EB1a+VCMdZkwUovhw2X1JXqF+DNQslKG1Wc3X76hQddAw9RptObaUJmRRXo0u LTCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719845806; x=1720450606; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rXFEZx0udsk0lxzY2jdV+4pcISLPkDF6XpicWae74LU=; b=B5pV7u9gIS8Bzwey9RoioTaou1OOf0W3wcr2YbaLDo3UJq3Ntw66SuuGHI++01fY7i gOmauGAYi2UgoJxhaDJg3Wlmg7RrjH0iEwaIgHlV9AWGRASl+P/muIAFnc0/eIWr17QK m5yINLPKaM6Hlej6JejTYthaZh4QElm75YI8avRpRZKdQ/EX9oP0+48/K2plEV9fwDQf BKO0S/VdugSZQFs+AXg/TVyohw0rMNuSu7wIV5xtPd6TuhcakdxPOLr1eWi9+4Np7cWy 5gdtotglSms2Obv/bZ6oM7Gz5LECumbjhYp6oSJn4XJuvL8l8GebyM4h7wAMo6Lc/c6V aPRA== X-Gm-Message-State: AOJu0YyUPhDNA/Y+w3hObTiGxAVBKV2TdVCrSpDawCLYkITKVb7PlIZ2 /pT2ByzR2rZQxT/tFaHPq/Wrz4zkbcXbeYz1WhnSxZgKoOMZJXajMy6mt/wxMS4= X-Google-Smtp-Source: AGHT+IGUuYy2SeiLbKShnwuk0VB0f/oTMLlaglBaLfapZR2FTp7i7OuuISmeZFTge5g5+GjjgV+adA== X-Received: by 2002:a2e:9a13:0:b0:2ee:64cf:f8f3 with SMTP id 38308e7fff4ca-2ee64cffe44mr44493271fa.33.1719845805812; Mon, 01 Jul 2024 07:56:45 -0700 (PDT) Received: from [127.0.1.1] ([178.197.219.137]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4256b0c0f99sm160062915e9.41.2024.07.01.07.56.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 07:56:45 -0700 (PDT) From: Krzysztof Kozlowski Date: Mon, 01 Jul 2024 16:56:35 +0200 Subject: [PATCH 2/7] ARM: dts: marvell: kirkwood: drop incorrect address/size-cells in GPIO keys MIME-Version: 1.0 Message-Id: <20240701-dts-marvell-cleanup-v1-2-4773bd20691a@linaro.org> References: <20240701-dts-marvell-cleanup-v1-0-4773bd20691a@linaro.org> In-Reply-To: <20240701-dts-marvell-cleanup-v1-0-4773bd20691a@linaro.org> To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=12028; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=NEPSfOxaqM8gOXmgm7ZxD/8mLRI8BGKty4k6NfrPTow=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBmgsOk6ud2OwR0U4BFEE8tFivP5+DYlM03AaQwi dz/E48OzC2JAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZoLDpAAKCRDBN2bmhouD 1ywhD/4ycQwgCU7+gy/WuQM/uuU/l3Nildt45XTPANM4XHK4OY5J7RPJTr32U5DwF0OgwgQX1fH P2pdOU/CKzFYlNF1VPWAq+n9rDOjiHeh+hEsAxg/mYuaAdbpjEy31FO9Qg92arKlu2EMvR9+wYh R8/qjql7ORKMiLiLGMZjTM7GksqA/p4iHIKcLK3IJm4E2NCUx5kgu6Fz1dFzHTsnM1RHLESAtHl MqT0HsxVcDaGrcwXOJnJoAOUU/8q69U+oUkt9C5jaMmqTh6OojtCZMyHf3Q0STwzHO8oFm+5X5T YRB9iNYWLnY64+uZR4Apj+TFGg/Gba5B/0y7sSgH8hqUrG6BtgMXUvpa5iHaJkseAQOzA75rupx wN/FnKP2FnKlOFfLDsrWWm+GbIu8FIpuAz60dP1pWLlgz2BO49KXM/k09MEfBYuGaJIE5oK19pq Njy2hfnVrZy0KWXcQPgZcTxOQ2XFn8uLlTzWP+0JrskIF0E+uzuqVzfFBOgmVsS5iO1vE1PzzWd G3ztrAFfsdR0hAx5z2pDf2jH2H2UJEE5tEk3toeC4WIyaB+NJ4dq6U1r6Jg9WHY8ZLc3NUtN1Js xxkTYOlhLoH9uAtQ2wPkjCMFWxz+pntTUbbLrLUwqM4bTlJu9hyWNwqhS1slPm7IaYqSsS+J4aA pOg6eGn9yn0p49g== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240701_075648_271507_2008CF4E X-CRM114-Status: GOOD ( 11.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Bindings do not allow address/size-cells in GPIO keys and the GPIO keys is not a bus, see dtbs_check warnings: kirkwood-openblocks_a7.dtb: gpio_keys: '#address-cells', '#size-cells' do not match any of the regexes: '^(button|event|key|switch|(button|event|key|switch)... Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/marvell/kirkwood-cloudbox.dts | 2 -- arch/arm/boot/dts/marvell/kirkwood-dir665.dts | 2 -- arch/arm/boot/dts/marvell/kirkwood-dnskw.dtsi | 2 -- arch/arm/boot/dts/marvell/kirkwood-ib62x0.dts | 2 -- arch/arm/boot/dts/marvell/kirkwood-iconnect.dts | 2 -- arch/arm/boot/dts/marvell/kirkwood-iomega_ix2_200.dts | 2 -- arch/arm/boot/dts/marvell/kirkwood-linkstation.dtsi | 2 -- arch/arm/boot/dts/marvell/kirkwood-linksys-viper.dts | 2 -- arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi | 2 -- arch/arm/boot/dts/marvell/kirkwood-mv88f6281gtw-ge.dts | 2 -- arch/arm/boot/dts/marvell/kirkwood-netxbig.dtsi | 2 -- arch/arm/boot/dts/marvell/kirkwood-ns2-common.dtsi | 2 -- arch/arm/boot/dts/marvell/kirkwood-nsa310s.dts | 2 -- arch/arm/boot/dts/marvell/kirkwood-nsa3x0-common.dtsi | 2 -- arch/arm/boot/dts/marvell/kirkwood-openblocks_a6.dts | 2 -- arch/arm/boot/dts/marvell/kirkwood-openblocks_a7.dts | 2 -- arch/arm/boot/dts/marvell/kirkwood-pogoplug-series-4.dts | 2 -- arch/arm/boot/dts/marvell/kirkwood-t5325.dts | 2 -- arch/arm/boot/dts/marvell/kirkwood-ts219-6281.dts | 2 -- arch/arm/boot/dts/marvell/kirkwood-ts219-6282.dts | 2 -- arch/arm/boot/dts/marvell/kirkwood-ts419.dtsi | 2 -- 21 files changed, 42 deletions(-) diff --git a/arch/arm/boot/dts/marvell/kirkwood-cloudbox.dts b/arch/arm/boot/dts/marvell/kirkwood-cloudbox.dts index 2582b84d8415..92897f8b637b 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-cloudbox.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-cloudbox.dts @@ -58,8 +58,6 @@ partition@0 { gpio_keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; key-power { label = "Power push button"; diff --git a/arch/arm/boot/dts/marvell/kirkwood-dir665.dts b/arch/arm/boot/dts/marvell/kirkwood-dir665.dts index e8eff0ba1c99..1d1f4cdedab2 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-dir665.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-dir665.dts @@ -176,8 +176,6 @@ blue-24g { gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; button-reset { label = "reset"; diff --git a/arch/arm/boot/dts/marvell/kirkwood-dnskw.dtsi b/arch/arm/boot/dts/marvell/kirkwood-dnskw.dtsi index baea14c68520..20bcd031f3f5 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-dnskw.dtsi +++ b/arch/arm/boot/dts/marvell/kirkwood-dnskw.dtsi @@ -8,8 +8,6 @@ / { gpio_keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; pinctrl-0 = <&pmx_button_power &pmx_button_unmount &pmx_button_reset>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/marvell/kirkwood-ib62x0.dts b/arch/arm/boot/dts/marvell/kirkwood-ib62x0.dts index d76dbbce16f1..0f50eb2d5931 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-ib62x0.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-ib62x0.dts @@ -58,8 +58,6 @@ sata@80000 { gpio_keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; pinctrl-0 = <&pmx_button_reset &pmx_button_usb_copy>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/marvell/kirkwood-iconnect.dts b/arch/arm/boot/dts/marvell/kirkwood-iconnect.dts index ea98ff13700e..a2782fe3d379 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-iconnect.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-iconnect.dts @@ -122,8 +122,6 @@ otb { gpio_keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; pinctrl-0 = < &pmx_button_reset &pmx_button_otb >; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/marvell/kirkwood-iomega_ix2_200.dts b/arch/arm/boot/dts/marvell/kirkwood-iomega_ix2_200.dts index fa7ace071de8..91409ae949c4 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-iomega_ix2_200.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-iomega_ix2_200.dts @@ -147,8 +147,6 @@ backup_led { }; gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; pinctrl-0 = <&pmx_button_reset &pmx_button_power &pmx_button_otb>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/marvell/kirkwood-linkstation.dtsi b/arch/arm/boot/dts/marvell/kirkwood-linkstation.dtsi index b54c9980f636..8a11d2b9d449 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-linkstation.dtsi +++ b/arch/arm/boot/dts/marvell/kirkwood-linkstation.dtsi @@ -88,8 +88,6 @@ partition@70000 { gpio_keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; pinctrl-0 = <&pmx_button_function &pmx_power_switch &pmx_power_auto_switch>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/marvell/kirkwood-linksys-viper.dts b/arch/arm/boot/dts/marvell/kirkwood-linksys-viper.dts index 3f97240fda74..ddefaf628501 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-linksys-viper.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-linksys-viper.dts @@ -33,8 +33,6 @@ chosen { gpio_keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; pinctrl-0 = < &pmx_btn_wps &pmx_btn_reset >; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi index a86dbc490600..c0f80146706d 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi +++ b/arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi @@ -107,8 +107,6 @@ partition@70000 { gpio_keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; pinctrl-0 = <&pmx_button_function &pmx_power_switch &pmx_power_auto_switch>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/marvell/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/marvell/kirkwood-mv88f6281gtw-ge.dts index 0d5d85c873b5..fd3813ace0c1 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-mv88f6281gtw-ge.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-mv88f6281gtw-ge.dts @@ -91,8 +91,6 @@ green-usb { gpio_keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; pinctrl-0 = <&pmx_keys>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/marvell/kirkwood-netxbig.dtsi b/arch/arm/boot/dts/marvell/kirkwood-netxbig.dtsi index d0f85893aeca..d4edf2727388 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-netxbig.dtsi +++ b/arch/arm/boot/dts/marvell/kirkwood-netxbig.dtsi @@ -53,8 +53,6 @@ sata@80000 { gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; /* * esc and power represent a three position rocker diff --git a/arch/arm/boot/dts/marvell/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/marvell/kirkwood-ns2-common.dtsi index 6cc068a05673..28f09f71b24d 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-ns2-common.dtsi +++ b/arch/arm/boot/dts/marvell/kirkwood-ns2-common.dtsi @@ -55,8 +55,6 @@ eeprom@50 { gpio_keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; button-power { label = "Power push button"; diff --git a/arch/arm/boot/dts/marvell/kirkwood-nsa310s.dts b/arch/arm/boot/dts/marvell/kirkwood-nsa310s.dts index 767f34ab434e..47deb93c90a5 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-nsa310s.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-nsa310s.dts @@ -35,8 +35,6 @@ gpio_poweroff { keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; pinctrl-0 = <&pmx_buttons>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/marvell/kirkwood-nsa3x0-common.dtsi b/arch/arm/boot/dts/marvell/kirkwood-nsa3x0-common.dtsi index bdce8a86ce51..e9bd9c551af5 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-nsa3x0-common.dtsi +++ b/arch/arm/boot/dts/marvell/kirkwood-nsa3x0-common.dtsi @@ -63,8 +63,6 @@ gpio_poweroff { gpio_keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; pinctrl-0 = <&pmx_btn_reset &pmx_btn_copy &pmx_btn_power>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/marvell/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/marvell/kirkwood-openblocks_a6.dts index ef6d6d7a4008..20c6290d2037 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-openblocks_a6.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-openblocks_a6.dts @@ -115,8 +115,6 @@ gpio_keys { compatible = "gpio-keys"; pinctrl-0 = <&pmx_gpio_init>; pinctrl-names = "default"; - #address-cells = <1>; - #size-cells = <0>; button-power { label = "Init Button"; diff --git a/arch/arm/boot/dts/marvell/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/marvell/kirkwood-openblocks_a7.dts index 946f0f453dd1..9c438f10f737 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-openblocks_a7.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-openblocks_a7.dts @@ -136,8 +136,6 @@ gpio_keys { compatible = "gpio-keys"; pinctrl-0 = <&pmx_gpio_init>; pinctrl-names = "default"; - #address-cells = <1>; - #size-cells = <0>; button { label = "Init Button"; diff --git a/arch/arm/boot/dts/marvell/kirkwood-pogoplug-series-4.dts b/arch/arm/boot/dts/marvell/kirkwood-pogoplug-series-4.dts index 601760041c99..b66fc4d57410 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-pogoplug-series-4.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-pogoplug-series-4.dts @@ -29,8 +29,6 @@ chosen { gpio_keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; pinctrl-0 = <&pmx_button_eject>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/marvell/kirkwood-t5325.dts b/arch/arm/boot/dts/marvell/kirkwood-t5325.dts index 6703e412c8e2..a6e77a487d00 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-t5325.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-t5325.dts @@ -156,8 +156,6 @@ usb_power: regulator@1 { gpio_keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; pinctrl-0 = <&pmx_button_power>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/marvell/kirkwood-ts219-6281.dts b/arch/arm/boot/dts/marvell/kirkwood-ts219-6281.dts index 859521b5b84e..a2e0ad4b84d8 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-ts219-6281.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-ts219-6281.dts @@ -35,8 +35,6 @@ pmx_board_id: pmx-board-id { gpio_keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; pinctrl-0 = <&pmx_reset_button &pmx_USB_copy_button>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/marvell/kirkwood-ts219-6282.dts b/arch/arm/boot/dts/marvell/kirkwood-ts219-6282.dts index 3b0a4ed588e8..35be6bce1dba 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-ts219-6282.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-ts219-6282.dts @@ -35,8 +35,6 @@ pmx_board_id: pmx-board-id { gpio_keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; pinctrl-0 = <&pmx_reset_button &pmx_USB_copy_button>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/marvell/kirkwood-ts419.dtsi b/arch/arm/boot/dts/marvell/kirkwood-ts419.dtsi index 126db753c8fe..f136059607b7 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-ts419.dtsi +++ b/arch/arm/boot/dts/marvell/kirkwood-ts419.dtsi @@ -36,8 +36,6 @@ pmx_jumper_jp1: pmx-jumper_jp1 { gpio_keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; pinctrl-0 = <&pmx_reset_button &pmx_USB_copy_button>; pinctrl-names = "default"; From patchwork Mon Jul 1 14:56:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13718249 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 55D27C3065D for ; Mon, 1 Jul 2024 14:57:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=mQ0c+IOKkUe0E3OrCRXiJ8eeG27mFVJAKR5cx71uFwg=; b=vWLB5yTkmmTamKLk8T2KBTgwp+ 82vNQNZNw2wRAxi3uadVJkxW4t1b4CD0gAGMwIE9abo5gAG0zGq0Qz2Ur071oureldUfYzyTZwaOg fIYxQbeNRPWH5wugToDodvcZs4sAU8bEcBJXi9sV4E1VW8Jy0Ps3VgkgHXeuphrV4PqrVyeqxy9Ry S/JzQMxhMi3UtCxfSIBjyTrvBpl5V9S7ZcK94HZXnFEJaO/JDyK+Eus9XPTPWfyEveF7XzdDDPN5g 9xIrL9TxH/uUT66MWc67NEu6R1OC5tg43ashKOXltSs9qiE6HwA8V1U1oRcDbEDcrf5uRFhMWV7Gs heBvy/9w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sOIT4-00000003ocN-41DA; Mon, 01 Jul 2024 14:57:24 +0000 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sOISX-00000003oLD-1Oml for linux-arm-kernel@lists.infradead.org; Mon, 01 Jul 2024 14:56:52 +0000 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-42579b60af1so14443425e9.2 for ; Mon, 01 Jul 2024 07:56:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719845807; x=1720450607; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=mQ0c+IOKkUe0E3OrCRXiJ8eeG27mFVJAKR5cx71uFwg=; b=GoVJ8dvs9dcI+Yy6jqqt9SCIHWHDUbcUxvE1UFwzqyKs0O9apFcq0QSK7FxIPz7z0I BDjuKuWTwo03lJax0V8qlgwWpECQqzzXTeHyI/nmgMfiTYi0MxaXAad7gGsylMByMOtc 71wxTco1sTnMJ97VnQc52VonIbSa6uZgMSNQZfqQGZMQDc/tVcFRByplMt5j1zsEfYV1 vGiV/WVy5/U1Cn8nJzRf0pCXyiNOPXSJf6FVAuPGKMhVeH/aDpBcf0Pog+PRAzIEzmNi udNa8w+rGDzBEij+rRS1/x2PCyPVRQX/0cR2VeNSUmcsFx5udb+T53Tf6ew6ueNWjIby UwNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719845807; x=1720450607; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mQ0c+IOKkUe0E3OrCRXiJ8eeG27mFVJAKR5cx71uFwg=; b=wLmor4kHXSVGNeKmzYdflzcBX1lxDG9FP0y9v4jL4yg/eBu6N2Pu56xei9qo4LrQgj ckAvgZMWjfJ3HSovIaWHNxYtRLZYIdzqksZeQbXO/ji7YmgfH5GUdFX/bISzRR/t1tNo HEwRSn9dbE54D+UXMJSpYu3DSCoxGVOHPIxaBf8mK4B+MvNCdM9HWXiogYBozxFz59pQ hG4XTp/NEy4eFoXGRyMmCsuyKWkbMDteiv/LFnMODGyjNsvSP7N3n1R89pvxH20RYPnL RwIc3p8dpPx8+YwjruEAyb/lVKt9NG5ZuMuAo5tiZOLz2rv0EpWMkV2O56mvkynjt3Nh kKFA== X-Gm-Message-State: AOJu0YxiE4Sgq/CIKJEYv9v0TVaPw+BH+ZocwK5DRRNlCYeljs9fD+0q G6Ta080Yfg467/tZSaExwO3ymRcJF/jyElavfipRovNZTQM8usut3iQzbvRy0lflfjocxdwGD6X W X-Google-Smtp-Source: AGHT+IEqgPzDRjbCsJB/7GrlivE3MAxrFEqYxvomzupSXQraXO65qTSvx8t6+a3i44nvsYyUkG3sEg== X-Received: by 2002:a7b:ca4a:0:b0:423:b756:cdaf with SMTP id 5b1f17b1804b1-4257a02f3b2mr38614135e9.23.1719845807277; Mon, 01 Jul 2024 07:56:47 -0700 (PDT) Received: from [127.0.1.1] ([178.197.219.137]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4256b0c0f99sm160062915e9.41.2024.07.01.07.56.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 07:56:46 -0700 (PDT) From: Krzysztof Kozlowski Date: Mon, 01 Jul 2024 16:56:36 +0200 Subject: [PATCH 3/7] ARM: dts: marvell: kirkwood: align LED node name with bindings MIME-Version: 1.0 Message-Id: <20240701-dts-marvell-cleanup-v1-3-4773bd20691a@linaro.org> References: <20240701-dts-marvell-cleanup-v1-0-4773bd20691a@linaro.org> In-Reply-To: <20240701-dts-marvell-cleanup-v1-0-4773bd20691a@linaro.org> To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=33749; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=Q1NUZUtC4GG3C6QOvJgf4AOWOBQMLmgY6uYJKF+rfe4=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBmgsOljOJ5Lnn9VbFjhoyoybYNhM57XfPS6W8lx GzbaCZixbeJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZoLDpQAKCRDBN2bmhouD 14YqD/9Zemi6xlrATyH2lb95bAAooYZdus4yuJ4KdUwI/K/7DVoU3OU6FLXdeE3FFE246BVZpjb u7V1wHP39KOpuq2iIMKpO661GpSQC5hRmvhROMaDBac1j2P7qdQQVdoZHDgIw46mKH6jC9lo5Do AmumZnojuQlsORELMnYql8PYTikkn01qsOO+WAUO69GagBKiUdgLmfhZIEW6Ft0FLFWNn7Hcn+7 kckBRdQ60DYn+MJWc5pgpn0XOszflcH3EMjQL7jT++h4sBKLvUHLkAZ2m+mbD3RFVDaxq78KwNm 2Uh5hi40HMWrbsJmBhuX48bQqN1XeVoDRAmoZ4XPsiANJ8wWMRWF2LIad6gmpXY29BA0qBcMT/G 4l2lazV/j+0o8na1CKS2rTgRylvEY+zgWMuaqPVc+6P/8HX0AtmPO18iGxUR45v/libJcL/LxCH I7h1WI9Nj926/68wutM2KR3OYDabhrHTxu0DqtnHvc4W8hmYkXKojGL6/ULNfey0MlYi3Cr/sC3 mGUrTzhnCPcqJO3Pz6PboIJ3eGqQDafw55iy4kR0KicWo9Wc5KiRiNHg8MaXqcYynkr1w804oCW lffp8CIGgcOtr1PJYNpeaAOwNY0vP7Z7vB+pBlktjOuzZ5TIaIaglJgDrKk2DY8uUECmQQyiHXA /ElLOyzmcoF72OA== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240701_075649_575688_F35D7F9B X-CRM114-Status: GOOD ( 13.94 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Bindings expect the LED node names to follow certain pattern, see dtbs_check warnings: kirkwood-ds409slim.dtb: gpio-leds-alarm-12: 'hdd1-green' does not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+' Signed-off-by: Krzysztof Kozlowski --- .../dts/marvell/kirkwood-blackarmor-nas220.dts | 2 +- arch/arm/boot/dts/marvell/kirkwood-cloudbox.dts | 4 +- arch/arm/boot/dts/marvell/kirkwood-d2net.dts | 2 +- arch/arm/boot/dts/marvell/kirkwood-dir665.dts | 16 +++--- arch/arm/boot/dts/marvell/kirkwood-dns320.dts | 10 ++-- arch/arm/boot/dts/marvell/kirkwood-dns325.dts | 10 ++-- arch/arm/boot/dts/marvell/kirkwood-dockstar.dts | 4 +- arch/arm/boot/dts/marvell/kirkwood-dreamplug.dts | 6 +-- arch/arm/boot/dts/marvell/kirkwood-goflexnet.dts | 20 ++++---- .../dts/marvell/kirkwood-guruplug-server-plus.dts | 8 +-- arch/arm/boot/dts/marvell/kirkwood-ib62x0.dts | 6 +-- arch/arm/boot/dts/marvell/kirkwood-iconnect.dts | 14 +++--- .../boot/dts/marvell/kirkwood-iomega_ix2_200.dts | 8 +-- arch/arm/boot/dts/marvell/kirkwood-l-50.dts | 18 +++---- arch/arm/boot/dts/marvell/kirkwood-laplug.dts | 4 +- .../boot/dts/marvell/kirkwood-linksys-viper.dts | 4 +- arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi | 10 ++-- arch/arm/boot/dts/marvell/kirkwood-mplcec4.dts | 12 ++--- .../boot/dts/marvell/kirkwood-mv88f6281gtw-ge.dts | 6 +-- arch/arm/boot/dts/marvell/kirkwood-ns2-common.dtsi | 2 +- arch/arm/boot/dts/marvell/kirkwood-ns2lite.dts | 2 +- arch/arm/boot/dts/marvell/kirkwood-nsa310.dts | 20 ++++---- arch/arm/boot/dts/marvell/kirkwood-nsa310a.dts | 18 +++---- arch/arm/boot/dts/marvell/kirkwood-nsa320.dts | 18 +++---- arch/arm/boot/dts/marvell/kirkwood-nsa325.dts | 18 +++---- arch/arm/boot/dts/marvell/kirkwood-pogo_e02.dts | 4 +- .../dts/marvell/kirkwood-pogoplug-series-4.dts | 4 +- .../boot/dts/marvell/kirkwood-sheevaplug-esata.dts | 2 +- arch/arm/boot/dts/marvell/kirkwood-sheevaplug.dts | 4 +- arch/arm/boot/dts/marvell/kirkwood-synology.dtsi | 58 +++++++++++----------- 30 files changed, 157 insertions(+), 157 deletions(-) diff --git a/arch/arm/boot/dts/marvell/kirkwood-blackarmor-nas220.dts b/arch/arm/boot/dts/marvell/kirkwood-blackarmor-nas220.dts index f34c3897ff48..36b90c632fd6 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-blackarmor-nas220.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-blackarmor-nas220.dts @@ -51,7 +51,7 @@ button-power { gpio-leds { compatible = "gpio-leds"; - blue-power { + led-blue-power { label = "nas220:blue:power"; gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; linux,default-trigger = "default-on"; diff --git a/arch/arm/boot/dts/marvell/kirkwood-cloudbox.dts b/arch/arm/boot/dts/marvell/kirkwood-cloudbox.dts index 92897f8b637b..151edcd140a0 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-cloudbox.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-cloudbox.dts @@ -69,11 +69,11 @@ key-power { gpio-leds { compatible = "gpio-leds"; - red-fail { + led-red-fail { label = "cloudbox:red:fail"; gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; }; - blue-sata { + led-blue-sata { label = "cloudbox:blue:sata"; gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; }; diff --git a/arch/arm/boot/dts/marvell/kirkwood-d2net.dts b/arch/arm/boot/dts/marvell/kirkwood-d2net.dts index bd3b266dd766..fcce8730d3e3 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-d2net.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-d2net.dts @@ -37,7 +37,7 @@ NS_V2_LED_ON 1 1 gpio-leds { compatible = "gpio-leds"; - red-fail { + led-red-fail { label = "d2net_v2:red:fail"; gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; }; diff --git a/arch/arm/boot/dts/marvell/kirkwood-dir665.dts b/arch/arm/boot/dts/marvell/kirkwood-dir665.dts index 1d1f4cdedab2..2f6793f794cd 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-dir665.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-dir665.dts @@ -137,38 +137,38 @@ ehci@50000 { gpio-leds { compatible = "gpio-leds"; - blue-usb { + led-blue-usb { label = "dir665:blue:usb"; gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; }; - blue-internet { + led-blue-internet { /* Can only be turned on if the Internet * Ethernet port has Link */ label = "dir665:blue:internet"; gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; }; - amber-internet { + led-amber-internet { label = "dir665:amber:internet"; gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; }; - blue-wifi5g { + led-blue-wifi5g { label = "dir665:blue:5g"; gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; }; - blue-status { + led-blue-status { label = "dir665:blue:status"; gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; }; - blue-wps { + led-blue-wps { label = "dir665:blue:wps"; gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>; }; - amber-status { + led-amber-status { label = "dir665:amber:status"; gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>; }; - blue-24g { + led-blue-24g { label = "dir665:blue:24g"; gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; }; diff --git a/arch/arm/boot/dts/marvell/kirkwood-dns320.dts b/arch/arm/boot/dts/marvell/kirkwood-dns320.dts index d6b0f418fd01..d8279e0c4c4f 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-dns320.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-dns320.dts @@ -24,24 +24,24 @@ &pmx_led_red_left_hdd &pmx_led_red_right_hdd &pmx_led_white_usb>; pinctrl-names = "default"; - blue-power { + led-blue-power { label = "dns320:blue:power"; gpios = <&gpio0 26 GPIO_ACTIVE_LOW>; default-state = "keep"; }; - blue-usb { + led-blue-usb { label = "dns320:blue:usb"; gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; }; - orange-l_hdd { + led-orange-l_hdd { label = "dns320:orange:l_hdd"; gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; }; - orange-r_hdd { + led-orange-r_hdd { label = "dns320:orange:r_hdd"; gpios = <&gpio0 27 GPIO_ACTIVE_LOW>; }; - orange-usb { + led-orange-usb { label = "dns320:orange:usb"; gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; /* GPIO 35 */ }; diff --git a/arch/arm/boot/dts/marvell/kirkwood-dns325.dts b/arch/arm/boot/dts/marvell/kirkwood-dns325.dts index 94d9c06cbbf5..7f396195e977 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-dns325.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-dns325.dts @@ -24,24 +24,24 @@ &pmx_led_red_left_hdd &pmx_led_red_right_hdd &pmx_led_white_usb>; pinctrl-names = "default"; - white-power { + led-white-power { label = "dns325:white:power"; gpios = <&gpio0 26 GPIO_ACTIVE_LOW>; default-state = "keep"; }; - white-usb { + led-white-usb { label = "dns325:white:usb"; gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; /* GPIO 43 */ }; - red-l_hdd { + led-red-l_hdd { label = "dns325:red:l_hdd"; gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; }; - red-r_hdd { + led-red-r_hdd { label = "dns325:red:r_hdd"; gpios = <&gpio0 27 GPIO_ACTIVE_LOW>; }; - red-usb { + led-red-usb { label = "dns325:red:usb"; gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; }; diff --git a/arch/arm/boot/dts/marvell/kirkwood-dockstar.dts b/arch/arm/boot/dts/marvell/kirkwood-dockstar.dts index 264938dfa4d9..090f1e2e5bb6 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-dockstar.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-dockstar.dts @@ -42,12 +42,12 @@ gpio-leds { pinctrl-0 = <&pmx_led_green &pmx_led_orange>; pinctrl-names = "default"; - health { + led-health { label = "status:green:health"; gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; default-state = "keep"; }; - fault { + led-fault { label = "status:orange:fault"; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; diff --git a/arch/arm/boot/dts/marvell/kirkwood-dreamplug.dts b/arch/arm/boot/dts/marvell/kirkwood-dreamplug.dts index 328516351e84..590bee3c561c 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-dreamplug.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-dreamplug.dts @@ -85,15 +85,15 @@ gpio-leds { &pmx_led_wifi_ap >; pinctrl-names = "default"; - bluetooth { + led-bluetooth { label = "dreamplug:blue:bluetooth"; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; - wifi { + led-wifi { label = "dreamplug:green:wifi"; gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; }; - wifi-ap { + led-wifi-ap { label = "dreamplug:green:wifi_ap"; gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; }; diff --git a/arch/arm/boot/dts/marvell/kirkwood-goflexnet.dts b/arch/arm/boot/dts/marvell/kirkwood-goflexnet.dts index d4cb3cd3e2a2..d5ac4e3974da 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-goflexnet.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-goflexnet.dts @@ -85,44 +85,44 @@ &pmx_led_right_cap_2 &pmx_led_right_cap_3 >; pinctrl-names = "default"; - health { + led-health { label = "status:green:health"; gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; default-state = "keep"; }; - fault { + led-fault { label = "status:orange:fault"; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; - left0 { + led-left0 { label = "status:white:left0"; gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; }; - left1 { + led-left1 { label = "status:white:left1"; gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; }; - left2 { + led-left2 { label = "status:white:left2"; gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>; }; - left3 { + led-left3 { label = "status:white:left3"; gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; }; - right0 { + led-right0 { label = "status:white:right0"; gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; }; - right1 { + led-right1 { label = "status:white:right1"; gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; }; - right2 { + led-right2 { label = "status:white:right2"; gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; }; - right3 { + led-right3 { label = "status:white:right3"; gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>; }; diff --git a/arch/arm/boot/dts/marvell/kirkwood-guruplug-server-plus.dts b/arch/arm/boot/dts/marvell/kirkwood-guruplug-server-plus.dts index dfb41393941d..d5aa8b505cc0 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-guruplug-server-plus.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-guruplug-server-plus.dts @@ -59,19 +59,19 @@ gpio-leds { &pmx_led_wmode_r &pmx_led_wmode_g >; pinctrl-names = "default"; - health-r { + led-health-r { label = "guruplug:red:health"; gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; }; - health-g { + led-health-g { label = "guruplug:green:health"; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; - wmode-r { + led-wmode-r { label = "guruplug:red:wmode"; gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; }; - wmode-g { + led-wmode-g { label = "guruplug:green:wmode"; gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; }; diff --git a/arch/arm/boot/dts/marvell/kirkwood-ib62x0.dts b/arch/arm/boot/dts/marvell/kirkwood-ib62x0.dts index 0f50eb2d5931..018c6b8f3e8a 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-ib62x0.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-ib62x0.dts @@ -79,16 +79,16 @@ gpio-leds { &pmx_led_usb_transfer>; pinctrl-names = "default"; - green-os { + led-green-os { label = "ib62x0:green:os"; gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>; default-state = "keep"; }; - red-os { + led-red-os { label = "ib62x0:red:os"; gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>; }; - usb-copy { + led-usb-copy { label = "ib62x0:red:usb_copy"; gpios = <&gpio0 27 GPIO_ACTIVE_HIGH>; }; diff --git a/arch/arm/boot/dts/marvell/kirkwood-iconnect.dts b/arch/arm/boot/dts/marvell/kirkwood-iconnect.dts index a2782fe3d379..91b46e77e0b6 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-iconnect.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-iconnect.dts @@ -89,32 +89,32 @@ led-level { gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>; default-state = "on"; }; - power-blue { + led-power-blue { label = "power:blue"; gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; default-state = "keep"; }; - power-red { + led-power-red { label = "power:red"; gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; }; - usb1 { + led-usb1 { label = "usb1:blue"; gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>; }; - usb2 { + led-usb2 { label = "usb2:blue"; gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; }; - usb3 { + led-usb3 { label = "usb3:blue"; gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; }; - usb4 { + led-usb4 { label = "usb4:blue"; gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>; }; - otb { + led-otb { label = "otb:blue"; gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>; }; diff --git a/arch/arm/boot/dts/marvell/kirkwood-iomega_ix2_200.dts b/arch/arm/boot/dts/marvell/kirkwood-iomega_ix2_200.dts index 91409ae949c4..039362152650 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-iomega_ix2_200.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-iomega_ix2_200.dts @@ -127,20 +127,20 @@ gpio-leds { &pmx_led_rebuild &pmx_led_health >; pinctrl-names = "default"; - power_led { + led-power-led { label = "status:white:power_led"; gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>; default-state = "keep"; }; - rebuild_led { + led-rebuild-led { label = "status:white:rebuild_led"; gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; }; - health_led { + led-health-led { label = "status:red:health_led"; gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; }; - backup_led { + led-backup-led { label = "status:blue:backup_led"; gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; }; diff --git a/arch/arm/boot/dts/marvell/kirkwood-l-50.dts b/arch/arm/boot/dts/marvell/kirkwood-l-50.dts index 094854743dde..974bc9de4702 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-l-50.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-l-50.dts @@ -97,52 +97,52 @@ rtc@30 { leds { compatible = "gpio-leds"; - status_green { + led-status-green { label = "l-50:green:status"; gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; }; - status_red { + led-status-red { label = "l-50:red:status"; gpios = <&gpio3 2 GPIO_ACTIVE_LOW>; }; - wifi { + led-wifi { label = "l-50:green:wifi"; gpios = <&gpio2 7 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; - internet_green { + led-internet-green { label = "l-50:green:internet"; gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; }; - internet_red { + led-internet-red { label = "l-50:red:internet"; gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; }; - usb1_green { + led-usb1-green { label = "l-50:green:usb1"; gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; linux,default-trigger = "usbport"; trigger-sources = <&hub_port3>; }; - usb1_red { + led-usb1-red { label = "l-50:red:usb1"; gpios = <&gpio2 4 GPIO_ACTIVE_LOW>; }; - usb2_green { + led-usb2-green { label = "l-50:green:usb2"; gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; linux,default-trigger = "usbport"; trigger-sources = <&hub_port1>; }; - usb2_red { + led-usb2-red { label = "l-50:red:usb2"; gpios = <&gpio2 5 GPIO_ACTIVE_LOW>; }; diff --git a/arch/arm/boot/dts/marvell/kirkwood-laplug.dts b/arch/arm/boot/dts/marvell/kirkwood-laplug.dts index 8296486a5931..90ea6cdee8e0 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-laplug.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-laplug.dts @@ -61,11 +61,11 @@ button-power { gpio-leds { compatible = "gpio-leds"; - red-fail { + led-red-fail { label = "laplug_v2:red:power"; gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; }; - blue-power { + led-blue-power { label = "laplug_v2:blue:power"; gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; linux,default-trigger = "default-on"; diff --git a/arch/arm/boot/dts/marvell/kirkwood-linksys-viper.dts b/arch/arm/boot/dts/marvell/kirkwood-linksys-viper.dts index ddefaf628501..8a1c38ab6111 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-linksys-viper.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-linksys-viper.dts @@ -54,12 +54,12 @@ gpio-leds { pinctrl-0 = < &pmx_led_white_health &pmx_led_white_pulse >; pinctrl-names = "default"; - white-health { + led-white-health { label = "viper:white:health"; gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>; }; - white-pulse { + led-white-pulse { label = "viper:white:pulse"; gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; }; diff --git a/arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi index c0f80146706d..5e0b139dd4fb 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi +++ b/arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi @@ -137,28 +137,28 @@ &pmx_led_info &pmx_led_power &pmx_led_function_blue>; pinctrl-names = "default"; - func_blue { + led-func-blue { label = "lsxl:blue:func"; gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; }; - alarm { + led-alarm { label = "lsxl:red:alarm"; gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; }; - info { + led-info { label = "lsxl:amber:info"; gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; }; - power { + led-power { label = "lsxl:blue:power"; gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; default-state = "keep"; }; - func_red { + led-func-red { label = "lsxl:red:func"; gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; }; diff --git a/arch/arm/boot/dts/marvell/kirkwood-mplcec4.dts b/arch/arm/boot/dts/marvell/kirkwood-mplcec4.dts index e87ea7146546..6533b49a15b2 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-mplcec4.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-mplcec4.dts @@ -114,36 +114,36 @@ &pmx_led_user0g &pmx_led_misc >; pinctrl-names = "default"; - health { + led-health { label = "status:green:health"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; }; - user1o { + led-user1o { label = "user1:orange"; gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; default-state = "on"; }; - user1g { + led-user1g { label = "user1:green"; gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; default-state = "on"; }; - user0o { + led-user0o { label = "user0:orange"; gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; default-state = "on"; }; - user0g { + led-user0g { label = "user0:green"; gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; default-state = "on"; }; - misc { + led-misc { label = "status:orange:misc"; gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; default-state = "on"; diff --git a/arch/arm/boot/dts/marvell/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/marvell/kirkwood-mv88f6281gtw-ge.dts index fd3813ace0c1..e3b41784c876 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-mv88f6281gtw-ge.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-mv88f6281gtw-ge.dts @@ -73,17 +73,17 @@ gpio-leds { pinctrl-0 = <&pmx_leds &pmx_usb_led>; pinctrl-names = "default"; - green-status { + led-green-status { label = "gtw:green:Status"; gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>; }; - red-status { + led-red-status { label = "gtw:red:Status"; gpios = <&gpio0 21 GPIO_ACTIVE_HIGH>; }; - green-usb { + led-green-usb { label = "gtw:green:USB"; gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; }; diff --git a/arch/arm/boot/dts/marvell/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/marvell/kirkwood-ns2-common.dtsi index 28f09f71b24d..d6b615cf6390 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-ns2-common.dtsi +++ b/arch/arm/boot/dts/marvell/kirkwood-ns2-common.dtsi @@ -66,7 +66,7 @@ button-power { gpio-leds { compatible = "gpio-leds"; - red-fail { + led-red-fail { label = "ns2:red:fail"; gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; }; diff --git a/arch/arm/boot/dts/marvell/kirkwood-ns2lite.dts b/arch/arm/boot/dts/marvell/kirkwood-ns2lite.dts index b0cb5907ed63..686bcd6f0f3c 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-ns2lite.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-ns2lite.dts @@ -24,7 +24,7 @@ sata@80000 { gpio-leds { compatible = "gpio-leds"; - blue-sata { + led-blue-sata { label = "ns2:blue:sata"; gpios = <&gpio0 30 GPIO_ACTIVE_LOW>; linux,default-trigger = "disk-activity"; diff --git a/arch/arm/boot/dts/marvell/kirkwood-nsa310.dts b/arch/arm/boot/dts/marvell/kirkwood-nsa310.dts index c1799a07816e..3555ac1c3b15 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-nsa310.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-nsa310.dts @@ -87,43 +87,43 @@ &pmx_led_copy_green &pmx_led_copy_red &pmx_led_hdd_green &pmx_led_hdd_red>; pinctrl-names = "default"; - green-sys { + led-green-sys { label = "nsa310:green:sys"; gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>; }; - red-sys { + led-red-sys { label = "nsa310:red:sys"; gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; }; - green-hdd { + led-green-hdd { label = "nsa310:green:hdd"; gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>; }; - red-hdd { + led-red-hdd { label = "nsa310:red:hdd"; gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; }; - green-esata { + led-green-esata { label = "nsa310:green:esata"; gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; }; - red-esata { + led-red-esata { label = "nsa310:red:esata"; gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; }; - green-usb { + led-green-usb { label = "nsa310:green:usb"; gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; }; - red-usb { + led-red-usb { label = "nsa310:red:usb"; gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>; }; - green-copy { + led-green-copy { label = "nsa310:green:copy"; gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; }; - red-copy { + led-red-copy { label = "nsa310:red:copy"; gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; }; diff --git a/arch/arm/boot/dts/marvell/kirkwood-nsa310a.dts b/arch/arm/boot/dts/marvell/kirkwood-nsa310a.dts index b85e314f045a..ddf84092aade 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-nsa310a.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-nsa310a.dts @@ -75,39 +75,39 @@ lm85: lm85@2e { gpio-leds { compatible = "gpio-leds"; - green-sys { + led-green-sys { label = "nsa310:green:sys"; gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>; }; - red-sys { + led-red-sys { label = "nsa310:red:sys"; gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; }; - green-hdd { + led-green-hdd { label = "nsa310:green:hdd"; gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>; }; - red-hdd { + led-red-hdd { label = "nsa310:red:hdd"; gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; }; - green-esata { + led-green-esata { label = "nsa310:green:esata"; gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; }; - red-esata { + led-red-esata { label = "nsa310:red:esata"; gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; }; - green-usb { + led-green-usb { label = "nsa310:green:usb"; gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; }; - green-copy { + led-green-copy { label = "nsa310:green:copy"; gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; }; - red-copy { + led-red-copy { label = "nsa310:red:copy"; gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; }; diff --git a/arch/arm/boot/dts/marvell/kirkwood-nsa320.dts b/arch/arm/boot/dts/marvell/kirkwood-nsa320.dts index 652405e65006..dd5c8ffc8781 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-nsa320.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-nsa320.dts @@ -142,39 +142,39 @@ &pmx_led_copy_green &pmx_led_copy_red &pmx_led_hdd1_green &pmx_led_hdd1_red>; pinctrl-names = "default"; - green-sys { + led-green-sys { label = "nsa320:green:sys"; gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>; }; - orange-sys { + led-orange-sys { label = "nsa320:orange:sys"; gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; }; - green-hdd1 { + led-green-hdd1 { label = "nsa320:green:hdd1"; gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>; }; - red-hdd1 { + led-red-hdd1 { label = "nsa320:red:hdd1"; gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; }; - green-hdd2 { + led-green-hdd2 { label = "nsa320:green:hdd2"; gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; }; - red-hdd2 { + led-red-hdd2 { label = "nsa320:red:hdd2"; gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; }; - green-usb { + led-green-usb { label = "nsa320:green:usb"; gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; }; - green-copy { + led-green-copy { label = "nsa320:green:copy"; gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; }; - red-copy { + led-red-copy { label = "nsa320:red:copy"; gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; }; diff --git a/arch/arm/boot/dts/marvell/kirkwood-nsa325.dts b/arch/arm/boot/dts/marvell/kirkwood-nsa325.dts index 371456de34b2..f0786a5f2ce6 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-nsa325.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-nsa325.dts @@ -162,39 +162,39 @@ &pmx_led_copy_green &pmx_led_copy_red &pmx_led_hdd1_green &pmx_led_hdd1_red>; pinctrl-names = "default"; - green-sys { + led-green-sys { label = "nsa325:green:sys"; gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>; }; - orange-sys { + led-orange-sys { label = "nsa325:orange:sys"; gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; }; - green-hdd1 { + led-green-hdd1 { label = "nsa325:green:hdd1"; gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>; }; - red-hdd1 { + led-red-hdd1 { label = "nsa325:red:hdd1"; gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; }; - green-hdd2 { + led-green-hdd2 { label = "nsa325:green:hdd2"; gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; }; - red-hdd2 { + led-red-hdd2 { label = "nsa325:red:hdd2"; gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; }; - green-usb { + led-green-usb { label = "nsa325:green:usb"; gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; }; - green-copy { + led-green-copy { label = "nsa325:green:copy"; gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; }; - red-copy { + led-red-copy { label = "nsa325:red:copy"; gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; }; diff --git a/arch/arm/boot/dts/marvell/kirkwood-pogo_e02.dts b/arch/arm/boot/dts/marvell/kirkwood-pogo_e02.dts index f9e95e55f36d..39a5345332da 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-pogo_e02.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-pogo_e02.dts @@ -33,12 +33,12 @@ chosen { gpio-leds { compatible = "gpio-leds"; - health { + led-health { label = "pogo_e02:green:health"; gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; default-state = "keep"; }; - fault { + led-fault { label = "pogo_e02:orange:fault"; gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; }; diff --git a/arch/arm/boot/dts/marvell/kirkwood-pogoplug-series-4.dts b/arch/arm/boot/dts/marvell/kirkwood-pogoplug-series-4.dts index b66fc4d57410..0e9c4cf79822 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-pogoplug-series-4.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-pogoplug-series-4.dts @@ -46,12 +46,12 @@ gpio-leds { pinctrl-0 = <&pmx_led_green &pmx_led_red>; pinctrl-names = "default"; - health { + led-health { label = "pogoplugv4:green:health"; gpios = <&gpio0 22 GPIO_ACTIVE_LOW>; default-state = "on"; }; - fault { + led-fault { label = "pogoplugv4:red:fault"; gpios = <&gpio0 24 GPIO_ACTIVE_LOW>; }; diff --git a/arch/arm/boot/dts/marvell/kirkwood-sheevaplug-esata.dts b/arch/arm/boot/dts/marvell/kirkwood-sheevaplug-esata.dts index ae8f493c9a0f..eb185273376e 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-sheevaplug-esata.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-sheevaplug-esata.dts @@ -33,7 +33,7 @@ gpio-leds { pinctrl-0 = <&pmx_led_blue>; pinctrl-names = "default"; - health { + led-health { label = "sheevaplug:blue:health"; gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; default-state = "keep"; diff --git a/arch/arm/boot/dts/marvell/kirkwood-sheevaplug.dts b/arch/arm/boot/dts/marvell/kirkwood-sheevaplug.dts index c73cc904e5c4..ce73fcf2255f 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-sheevaplug.dts +++ b/arch/arm/boot/dts/marvell/kirkwood-sheevaplug.dts @@ -28,13 +28,13 @@ gpio-leds { pinctrl-0 = <&pmx_led_blue &pmx_led_red>; pinctrl-names = "default"; - health { + led-health { label = "sheevaplug:blue:health"; gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; default-state = "keep"; }; - misc { + led-misc { label = "sheevaplug:red:misc"; gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; }; diff --git a/arch/arm/boot/dts/marvell/kirkwood-synology.dtsi b/arch/arm/boot/dts/marvell/kirkwood-synology.dtsi index 20964eb48fd7..6b7c5218b1fb 100644 --- a/arch/arm/boot/dts/marvell/kirkwood-synology.dtsi +++ b/arch/arm/boot/dts/marvell/kirkwood-synology.dtsi @@ -410,7 +410,7 @@ gpio-leds-alarm-12 { pinctrl-0 = <&pmx_alarmled_12>; pinctrl-names = "default"; - hdd1-green { + led-hdd1-green { label = "synology:alarm"; gpios = <&gpio0 21 GPIO_ACTIVE_LOW>; }; @@ -424,42 +424,42 @@ &pmx_hddled_23 &pmx_hddled_24 &pmx_hddled_25 &pmx_hddled_26 &pmx_hddled_27>; pinctrl-names = "default"; - hdd1-green { + led-hdd1-green { label = "synology:green:hdd1"; gpios = <&gpio0 20 GPIO_ACTIVE_LOW>; }; - hdd1-amber { + led-hdd1-amber { label = "synology:amber:hdd1"; gpios = <&gpio0 21 GPIO_ACTIVE_LOW>; }; - hdd2-green { + led-hdd2-green { label = "synology:green:hdd2"; gpios = <&gpio0 22 GPIO_ACTIVE_LOW>; }; - hdd2-amber { + led-hdd2-amber { label = "synology:amber:hdd2"; gpios = <&gpio0 23 GPIO_ACTIVE_LOW>; }; - hdd3-green { + led-hdd3-green { label = "synology:green:hdd3"; gpios = <&gpio0 24 GPIO_ACTIVE_LOW>; }; - hdd3-amber { + led-hdd3-amber { label = "synology:amber:hdd3"; gpios = <&gpio0 25 GPIO_ACTIVE_LOW>; }; - hdd4-green { + led-hdd4-green { label = "synology:green:hdd4"; gpios = <&gpio0 26 GPIO_ACTIVE_LOW>; }; - hdd4-amber { + led-hdd4-amber { label = "synology:amber:hdd4"; gpios = <&gpio0 27 GPIO_ACTIVE_LOW>; }; @@ -471,12 +471,12 @@ gpio-leds-hdd-21-1 { pinctrl-0 = <&pmx_hddled_21 &pmx_hddled_23>; pinctrl-names = "default"; - hdd1-green { + led-hdd1-green { label = "synology:green:hdd1"; gpios = <&gpio0 21 GPIO_ACTIVE_LOW>; }; - hdd1-amber { + led-hdd1-amber { label = "synology:amber:hdd1"; gpios = <&gpio0 23 GPIO_ACTIVE_LOW>; }; @@ -488,22 +488,22 @@ gpio-leds-hdd-21-2 { pinctrl-0 = <&pmx_hddled_21 &pmx_hddled_23 &pmx_hddled_20 &pmx_hddled_22>; pinctrl-names = "default"; - hdd1-green { + led-hdd1-green { label = "synology:green:hdd1"; gpios = <&gpio0 21 GPIO_ACTIVE_LOW>; }; - hdd1-amber { + led-hdd1-amber { label = "synology:amber:hdd1"; gpios = <&gpio0 23 GPIO_ACTIVE_LOW>; }; - hdd2-green { + led-hdd2-green { label = "synology:green:hdd2"; gpios = <&gpio0 20 GPIO_ACTIVE_LOW>; }; - hdd2-amber { + led-hdd2-amber { label = "synology:amber:hdd2"; gpios = <&gpio0 22 GPIO_ACTIVE_LOW>; }; @@ -518,52 +518,52 @@ &pmx_hddled_42 &pmx_hddled_43 &pmx_hddled_44 &pmx_hddled_45>; pinctrl-names = "default"; - hdd1-green { + led-hdd1-green { label = "synology:green:hdd1"; gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; }; - hdd1-amber { + led-hdd1-amber { label = "synology:amber:hdd1"; gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; }; - hdd2-green { + led-hdd2-green { label = "synology:green:hdd2"; gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; }; - hdd2-amber { + led-hdd2-amber { label = "synology:amber:hdd2"; gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; }; - hdd3-green { + led-hdd3-green { label = "synology:green:hdd3"; gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; }; - hdd3-amber { + led-hdd3-amber { label = "synology:amber:hdd3"; gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; }; - hdd4-green { + led-hdd4-green { label = "synology:green:hdd4"; gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; }; - hdd4-amber { + led-hdd4-amber { label = "synology:amber:hdd4"; gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; }; - hdd5-green { + led-hdd5-green { label = "synology:green:hdd5"; gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; }; - hdd5-amber { + led-hdd5-amber { label = "synology:amber:hdd5"; gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; }; @@ -575,22 +575,22 @@ gpio-leds-hdd-38 { pinctrl-0 = <&pmx_hddled_38 &pmx_hddled_39 &pmx_hddled_36 &pmx_hddled_37>; pinctrl-names = "default"; - hdd1-green { + led-hdd1-green { label = "synology:green:hdd1"; gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; }; - hdd1-amber { + led-hdd1-amber { label = "synology:amber:hdd1"; gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; }; - hdd2-green { + led-hdd2-green { label = "synology:green:hdd2"; gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; }; - hdd2-amber { + led-hdd2-amber { label = "synology:amber:hdd2"; gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; }; From patchwork Mon Jul 1 14:56:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13718250 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 19278C3065A for ; Mon, 1 Jul 2024 14:57:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=RmnlXVSk8Bmi7VgmYcl1HcRpFD6VX2h6iLn8P1zKdUs=; b=MgBDvBviE82oo4Uk1HXDTnWOLH GViMBvLCmEyYnOGrTSyczFhVU2GqKWsi15IL28Xdz6CdqRHN8lP64wTJnslvEafE0sZ6FAF6R8p5Y vSlQDc2kiPYWqxhLexgt9HM0CXnWopKW+ZmFvage4+g44+B+xFQ4/zsFiyt7/ArVqgkIK2rNPRwTX M4ZG+KigPUO8ZrpgiBJw+LTQ52Uexx888AErfeAicTXDgDfSDyg75hX+pugp25vQEUReT/t6TRxZb yCNBaBwxLv0gHULDohI3MUOvTf1tVeN0X0ypzazr0MN/gAtMeHafpMi3ccWo5W9AwB8Mgf9wa4kER Hpqg3JWg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sOITD-00000003ogH-1Os0; Mon, 01 Jul 2024 14:57:31 +0000 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sOISY-00000003oMP-43m1 for linux-arm-kernel@lists.infradead.org; Mon, 01 Jul 2024 14:56:52 +0000 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4256788e13bso23139835e9.2 for ; Mon, 01 Jul 2024 07:56:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719845809; x=1720450609; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=RmnlXVSk8Bmi7VgmYcl1HcRpFD6VX2h6iLn8P1zKdUs=; b=OP4UoAlX0n3GUmxQItK4q+GmFbuXcGcZEj5YKCYd0hP0L7ZtmdwrNijQvPFX2XJI4T AeXW9GYic2lUaPbcChc5nsSdTYEIvIpXZz9dm1/VTFroHQwLXkFIvYXVMJTnwTJLO01f Cd/Vs3AF/9mFuI6NmZ3Ylqi/UNCyUu2OE5cVJQ8e9a973z2aCeWxvXCAR9jrzK2VfdTO YSTVFDtp/pepANiCr9Crt6t19Li5rVpgqNrLv9fZOj+/03rrA3wg9ukaS7EpammqWH2F pggrPtuQtzFLaEp6x2gZG5/FBDA0oLZ/L0Uwps0C4uTKTVJnybKBrAhqrpiwr62chdct E50w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719845809; x=1720450609; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RmnlXVSk8Bmi7VgmYcl1HcRpFD6VX2h6iLn8P1zKdUs=; b=WfgUAHURMH0vnavBdjtJSDCsmLZY14rd0Vohcxn1VexkxROmQYx6uRPz2qZKY+WlZS 5czp+bdddS0+iHlvkLiorzCamScpB9aspNBj9Lgl2492pEV1ZmSGdyxwpnnxu//KdMtW xrsXNtva+x4lD9Y3wYPtJRIPcALKuDgv8WggNjS/GS/upOeKNthyW4pt/JuitODMQMZH 8kKzALvUXdK7VZ4m/znQq/T3O2bJjITZjE+hbnBNgz/zbLo6imXbSLh1X7q1FXRDjjDL ztzAzALwLvbTR4rqV0b94VtcvSCCrI3MzMou9ao7ti2fYht6YXXPlV6nyg+XgU/YAN5Q gXaQ== X-Gm-Message-State: AOJu0YyJnV6JyDMZSklQiZpwjkBCqbyopUgQc+9iBnsnQGweyhNB4pPo nP5wqQdvxJJppYGQV7quWVQxFZ2Vs6YsHRtCVxQIQLsDUB91B7Bv8GB91Spi9jdwxenOLPcdNak Z X-Google-Smtp-Source: AGHT+IGra1rN0CktmnXJF4vfHe896ROGlb3rDY4QCV/i7d+MRtIToMqbGMp6dcTl/zTwo3hzkxk+Sg== X-Received: by 2002:a05:600c:2255:b0:421:7b9d:5b9b with SMTP id 5b1f17b1804b1-4257a03022fmr47607455e9.15.1719845808875; Mon, 01 Jul 2024 07:56:48 -0700 (PDT) Received: from [127.0.1.1] ([178.197.219.137]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4256b0c0f99sm160062915e9.41.2024.07.01.07.56.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 07:56:48 -0700 (PDT) From: Krzysztof Kozlowski Date: Mon, 01 Jul 2024 16:56:37 +0200 Subject: [PATCH 4/7] ARM: dts: marvell: orion: align GPIO keys node name with bindings MIME-Version: 1.0 Message-Id: <20240701-dts-marvell-cleanup-v1-4-4773bd20691a@linaro.org> References: <20240701-dts-marvell-cleanup-v1-0-4773bd20691a@linaro.org> In-Reply-To: <20240701-dts-marvell-cleanup-v1-0-4773bd20691a@linaro.org> To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=4380; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=kb1FnQDn0ZT17ALs01+HilXnHppqjDF6c8veki67I7Y=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBmgsOm1UBLm7b69zUMX/zcTfKcYyhS1/iRpO2En +Uex+ylj8yJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZoLDpgAKCRDBN2bmhouD 144FD/4xlTp2kYFnF/dp6I0lBkqMMr4j5u9JWCbw/26hD3Oqy24gqwEtJJOoSIxn8cGbZV/S5o/ 8vWFvPXXQToXoBGQMCvBfsZ6/eASPEvN3WApo/hg5Vgm2tRmXUAdIL8g+8TzXMpl0HGWhFOhyD2 tlp+j82/ShcJPiTt7I7T2IOnTrulSfBaX3HCGqorljFL9aVP8+k57NRBvZ+x2DH8G+twa4IRPw5 nGwygRHMpPbIKG1V+7JTQ7tXhppg/+zN6+CrxRuFv0E3Z1OOIXzE5VE2fKoQQIJ1qQgEzYaEm2k cKDZx/pA9c2lhYZmhrh3cvCfr+BXqKAm7Ak46Kdi9VEzfPf1zRgT4Y2pxZZ40bBQ7ppabmYdvxi NOBY3hLZCpLSqYWHiGfzP6XeeCwJqxqZ1bWeVtTe4g4D+gWbdLfeBcxMgMH6eRu8YlBjSNzRfwr rkerLlYETsBwmN9wUakwtDsjYfAVu2fG0N7xmGFqoYqV/HOrVsw3py7P5RU7WPlM4uKMbNRukGZ WKv85CR0c7+5IL8f1Ch+I4AfOej9aLnATT0HpdQPmSLleGlPUwxmwuKkwl+swVrljlEktJvuBDH 1dSN8JnfBCz9hHkMwo846IurWcibjKFmQGV0+qiVdc1av8+uLIgGpSY82bGnOq9fM6lXp5RTVC2 5a5rH6Lckm+4FsQ== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240701_075651_069468_466802EF X-CRM114-Status: GOOD ( 12.94 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Bindings expect the GPIO key node names to follow certain pattern, see dtbs_check warnings: orion5x-lacie-d2-network.dtb: gpio-keys: 'front_button', 'power_rocker_sw_off', 'power_rocker_sw_on' do not match any of the regexes: '^(button|event|key|switch| ... Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/marvell/orion5x-lacie-d2-network.dts | 7 ++++--- arch/arm/boot/dts/marvell/orion5x-linkstation-lschl.dts | 2 +- arch/arm/boot/dts/marvell/orion5x-lswsgl.dts | 7 ++++--- arch/arm/boot/dts/marvell/orion5x-maxtor-shared-storage-2.dts | 5 +++-- arch/arm/boot/dts/marvell/orion5x-netgear-wnr854t.dts | 2 +- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/marvell/orion5x-lacie-d2-network.dts b/arch/arm/boot/dts/marvell/orion5x-lacie-d2-network.dts index 03471d30bfd9..3d6c5af0e843 100644 --- a/arch/arm/boot/dts/marvell/orion5x-lacie-d2-network.dts +++ b/arch/arm/boot/dts/marvell/orion5x-lacie-d2-network.dts @@ -37,20 +37,21 @@ gpio-keys { pinctrl-names = "default"; #address-cells = <1>; #size-cells = <0>; - front_button { + + button-front { label = "Front Push Button"; linux,code = ; gpios = <&gpio0 18 GPIO_ACTIVE_HIGH>; }; - power_rocker_sw_on { + switch-power-rocker-sw-on { label = "Power rocker switch (on|auto)"; linux,input-type = <5>; /* EV_SW */ linux,code = <1>; /* D2NET_SWITCH_POWER_ON */ gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; }; - power_rocker_sw_off { + switch-power-rocker-sw-off { label = "Power rocker switch (auto|off)"; linux,input-type = <5>; /* EV_SW */ linux,code = <2>; /* D2NET_SWITCH_POWER_OFF */ diff --git a/arch/arm/boot/dts/marvell/orion5x-linkstation-lschl.dts b/arch/arm/boot/dts/marvell/orion5x-linkstation-lschl.dts index ee751995c8d0..624b737a8be4 100644 --- a/arch/arm/boot/dts/marvell/orion5x-linkstation-lschl.dts +++ b/arch/arm/boot/dts/marvell/orion5x-linkstation-lschl.dts @@ -61,7 +61,7 @@ memory { /* 128 MB */ }; gpio_keys { - func { + func-button { label = "Function Button"; linux,code = ; gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/marvell/orion5x-lswsgl.dts b/arch/arm/boot/dts/marvell/orion5x-lswsgl.dts index 2fbc17d6dfa4..e2829fb0c8b2 100644 --- a/arch/arm/boot/dts/marvell/orion5x-lswsgl.dts +++ b/arch/arm/boot/dts/marvell/orion5x-lswsgl.dts @@ -76,20 +76,21 @@ gpio-keys { pinctrl-names = "default"; #address-cells = <1>; #size-cells = <0>; - func { + + key-func { label = "Function Button"; linux,code = ; gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; }; - power { + key-power { label = "Power-on Switch"; linux,input-type = <5>; /* EV_SW */ linux,code = ; /* LSMINI_SW_POWER */ gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; }; - autopower { + key-autopower { label = "Power-auto Switch"; linux,input-type = <5>; /* EV_SW */ linux,code = ; /* LSMINI_SW_AUTOPOWER */ diff --git a/arch/arm/boot/dts/marvell/orion5x-maxtor-shared-storage-2.dts b/arch/arm/boot/dts/marvell/orion5x-maxtor-shared-storage-2.dts index d57859998350..90ce5fa883a4 100644 --- a/arch/arm/boot/dts/marvell/orion5x-maxtor-shared-storage-2.dts +++ b/arch/arm/boot/dts/marvell/orion5x-maxtor-shared-storage-2.dts @@ -37,13 +37,14 @@ gpio-keys { pinctrl-names = "default"; #address-cells = <1>; #size-cells = <0>; - power { + + key-power { label = "Power"; linux,code = ; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; - reset { + key-reset { label = "Reset"; linux,code = ; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/marvell/orion5x-netgear-wnr854t.dts b/arch/arm/boot/dts/marvell/orion5x-netgear-wnr854t.dts index fb203e7d37f5..d63ea15539aa 100644 --- a/arch/arm/boot/dts/marvell/orion5x-netgear-wnr854t.dts +++ b/arch/arm/boot/dts/marvell/orion5x-netgear-wnr854t.dts @@ -35,7 +35,7 @@ gpio-keys { pinctrl-0 = <&pmx_reset_button>; pinctrl-names = "default"; - reset { + key-reset { label = "Reset Button"; linux,code = ; gpios = <&gpio0 1 GPIO_ACTIVE_LOW>; From patchwork Mon Jul 1 14:56:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13718251 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id ABD48C3065A for ; Mon, 1 Jul 2024 14:57:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=NUpi2VJkABStrX7HzvU2tGfXK2NmMthUnHbMUzSZqBo=; b=v0zPUQXLfPA+o+bluI+cBcDeK7 j7PcnumplzTTicM2JJG9UhfAx8Gr7491pvBC+2OMQ6NN+A34OaBdYM2KagkEVYtEZNxEKQTfRCwzL 1JB44SFcBw5a0eYdiv33A1U9fR4zA2L8C+aA2Txq7imCAkC4/wk4ogO7cv2h14V7LZny8qSd27O5y ICYVBl5xDSIKG4WoQovErVrjjzwCxfz8O0YubVxkoNP/ULGBGt+ca2A0tuGj/S9x3DUU5pD8atESW qwdFuyfQT7assDG35U9sV7AMzb/4XNht2COMzfjr4NCqBcaaEFD4fvOBS+w3/4J4kz8IwogaTxzCQ Vje2OhBA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sOITR-00000003oph-0cHg; Mon, 01 Jul 2024 14:57:45 +0000 Received: from mail-lf1-x132.google.com ([2a00:1450:4864:20::132]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sOISa-00000003oNE-1XEl for linux-arm-kernel@lists.infradead.org; Mon, 01 Jul 2024 14:56:53 +0000 Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-52cdf4bc083so4590816e87.2 for ; Mon, 01 Jul 2024 07:56:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719845810; x=1720450610; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=NUpi2VJkABStrX7HzvU2tGfXK2NmMthUnHbMUzSZqBo=; b=POXr6dGYlP/DVAAyPUTtgV/nHokv1UMiSpqtqelPNsVYFl0u3fTvLLKGk97ggzrZnG 4EXDlIFR4UbVdWofjs39ITkZ2JmB1uUopzywWIOLPPPeYEu0zWJ5V0zwDbOwxuAzjuTP SoxLnzEM/HGsFTDbl5ijY/SCFrvYE9a85qfpB/SdsQ+lwAG7SuFoGASt0bEZFbmtV+aG jkfdntrL/HLyvn06kmnBmi89SX5opaYqKGNypk0SI45rtVVSmN7wy5ReWvTswZT7XBXP jO1bcJ2BxpwoCHAjL2SwikkSI44d9MzhpMROO8A/dtd7hizrTBm6/+2mbazT6Zmzc0xm OvsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719845810; x=1720450610; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NUpi2VJkABStrX7HzvU2tGfXK2NmMthUnHbMUzSZqBo=; b=ua3roK54xu5fpvnsT1vHA1g7M37xQNUa7w5tHNEXu9JhAvwzTxTRCIH4xkGWqz/ds5 TkxaLOYBwO7e23ELQrWB+RwuKpJUWuvr7Bqge5/iX8uR5rzrtEdlIZOh97WZN+wvuvM3 V0Q8SVZOf2aUG08QcJsg8Re1hFW7g+NCDCsaaYQjSjPKrpJWsA+mMBr3CuFX7b272hFZ +sG2PcAIhERPD9Ndp/jXxIExIJiBYctW+3H2MfwkDOCAcOLwfQe809y7jPI5fVML4qQB 31zawxZgjb/LGCxWx981Pq7vPOz+oOD+UhqhI9uFhefOBzO6NIMPqcpT0CHahcE0w+LG xN6A== X-Gm-Message-State: AOJu0YzrV6VfGOF82vGy2M2C2ARcrUdLcN45h4CoVnDck1ZFxHcsBOEh pea1AocjsvII1lJ/6mjmBWwnUaqGEDcxPDBfeGzZ0rYBpzQLMA9UfKlgkndBfb7Zhnk6DlIylJU S X-Google-Smtp-Source: AGHT+IFFp745yEV965FCA9ZDSTzXceFaQmPua61KrHO+jS7pR48Zr2ItYavo6QP7EPy0qxYjywPA6Q== X-Received: by 2002:a05:6512:3b88:b0:52c:e180:4eba with SMTP id 2adb3069b0e04-52e8272ab82mr4811218e87.62.1719845810194; Mon, 01 Jul 2024 07:56:50 -0700 (PDT) Received: from [127.0.1.1] ([178.197.219.137]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4256b0c0f99sm160062915e9.41.2024.07.01.07.56.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 07:56:49 -0700 (PDT) From: Krzysztof Kozlowski Date: Mon, 01 Jul 2024 16:56:38 +0200 Subject: [PATCH 5/7] ARM: dts: marvell: orion: drop incorrect address/size-cells in GPIO keys MIME-Version: 1.0 Message-Id: <20240701-dts-marvell-cleanup-v1-5-4773bd20691a@linaro.org> References: <20240701-dts-marvell-cleanup-v1-0-4773bd20691a@linaro.org> In-Reply-To: <20240701-dts-marvell-cleanup-v1-0-4773bd20691a@linaro.org> To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3473; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=8rvACG9Tldw0R7sQczKSuOfqyU9GkDAAi2aaVVlRDUg=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBmgsOnYGPTqX0InmDJtlGWHZ8pHsKB+xFcgOmO+ c/3NIdFdkeJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZoLDpwAKCRDBN2bmhouD 11YkD/0eImE54i7vier1CiQt2gmuahj1JbBKzyoZEacQ5RTErV27ttNXgFxKeillcW5MMDvd+z5 eSor3RtcGQzjfmVb/M8VPHV++mCZSVIk8mXv/L1Kju1MQPR+Sk8Zpzg1Vm62Qj7AZipqRLq/whJ NgzIXIUF4z5L/rse9q2pAu/RwwCwsi2OUUgJLz1Zyibij4nH8nDYoqOkmCdw6hZzD6padk33++W 9ZimJ+h1JdZ3nOVLMqlPscZYdgblIfAD56rMPsznAbP0WFO9bToz5Z/sFtQUNXO8JLBPZ5uRalh aTEiRjYYiVMprk3wXbJa9aoT+dlPoJ7jC9oUTZxkjt0uRjrDmije4z2yKxLgZ98bJ7GdpNKD+L/ 7gfajGJw8UqtonIaSdW6QobEbfPcYjcCjfAzJSmPZPuEs9SqjIqngeHF83qJg2UKibhh1OjN3V6 eqD1wjKXalmsEnn7TXMgZcxbXnAg4rIThvpgHU+nTuW7jzKO/QC4QtSc7OmTzk0hNDW37dyI3p5 q1b6hiJ1PjIOKMu4FwRKYndL7q7z0jg6R8g9IYfED9biLtgwrN5hpBps3CLM5FgbCFx8q8YJcXY z6L4h3aqYLbAxTdziYjw701T8cfaQOwAdNu4PtQSjEOhjdLQ7iMFL5Fy4VqFmrh0r37cOBFsYtB zFqu1u4rZF6kpyQ== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240701_075652_447405_0DCA04FB X-CRM114-Status: GOOD ( 13.06 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Bindings do not allow address/size-cells in GPIO keys and the GPIO keys is not a bus, see dtbs_check warnings: orion5x-lacie-ethernet-disk-mini-v2.dtb: gpio-keys: '#address-cells', '#size-cells' do not match any of the regexes: '^(button|event|key|switch|... Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/marvell/mvebu-linkstation-gpio-simple.dtsi | 2 -- arch/arm/boot/dts/marvell/orion5x-lacie-d2-network.dts | 2 -- arch/arm/boot/dts/marvell/orion5x-lacie-ethernet-disk-mini-v2.dts | 5 ++--- arch/arm/boot/dts/marvell/orion5x-lswsgl.dts | 2 -- arch/arm/boot/dts/marvell/orion5x-maxtor-shared-storage-2.dts | 2 -- 5 files changed, 2 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/marvell/mvebu-linkstation-gpio-simple.dtsi b/arch/arm/boot/dts/marvell/mvebu-linkstation-gpio-simple.dtsi index c2d87ba6190a..055ac754c5fd 100644 --- a/arch/arm/boot/dts/marvell/mvebu-linkstation-gpio-simple.dtsi +++ b/arch/arm/boot/dts/marvell/mvebu-linkstation-gpio-simple.dtsi @@ -48,8 +48,6 @@ / { gpio_keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; pinctrl-0 = <&pmx_power_switch>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/marvell/orion5x-lacie-d2-network.dts b/arch/arm/boot/dts/marvell/orion5x-lacie-d2-network.dts index 3d6c5af0e843..12a4aac2633e 100644 --- a/arch/arm/boot/dts/marvell/orion5x-lacie-d2-network.dts +++ b/arch/arm/boot/dts/marvell/orion5x-lacie-d2-network.dts @@ -35,8 +35,6 @@ gpio-keys { compatible = "gpio-keys"; pinctrl-0 = <&pmx_buttons>; pinctrl-names = "default"; - #address-cells = <1>; - #size-cells = <0>; button-front { label = "Front Push Button"; diff --git a/arch/arm/boot/dts/marvell/orion5x-lacie-ethernet-disk-mini-v2.dts b/arch/arm/boot/dts/marvell/orion5x-lacie-ethernet-disk-mini-v2.dts index f17e25ac98dd..a7586370b1d5 100644 --- a/arch/arm/boot/dts/marvell/orion5x-lacie-ethernet-disk-mini-v2.dts +++ b/arch/arm/boot/dts/marvell/orion5x-lacie-ethernet-disk-mini-v2.dts @@ -39,9 +39,8 @@ gpio-keys { compatible = "gpio-keys"; pinctrl-0 = <&pmx_power_button>; pinctrl-names = "default"; - #address-cells = <1>; - #size-cells = <0>; - button@1 { + + button-1 { label = "Power-on Switch"; linux,code = ; gpios = <&gpio0 18 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm/boot/dts/marvell/orion5x-lswsgl.dts b/arch/arm/boot/dts/marvell/orion5x-lswsgl.dts index e2829fb0c8b2..35dffb24b8b5 100644 --- a/arch/arm/boot/dts/marvell/orion5x-lswsgl.dts +++ b/arch/arm/boot/dts/marvell/orion5x-lswsgl.dts @@ -74,8 +74,6 @@ gpio-keys { compatible = "gpio-keys"; pinctrl-0 = <&pmx_buttons>; pinctrl-names = "default"; - #address-cells = <1>; - #size-cells = <0>; key-func { label = "Function Button"; diff --git a/arch/arm/boot/dts/marvell/orion5x-maxtor-shared-storage-2.dts b/arch/arm/boot/dts/marvell/orion5x-maxtor-shared-storage-2.dts index 90ce5fa883a4..cb1bd24b7ae3 100644 --- a/arch/arm/boot/dts/marvell/orion5x-maxtor-shared-storage-2.dts +++ b/arch/arm/boot/dts/marvell/orion5x-maxtor-shared-storage-2.dts @@ -35,8 +35,6 @@ gpio-keys { compatible = "gpio-keys"; pinctrl-0 = <&pmx_buttons>; pinctrl-names = "default"; - #address-cells = <1>; - #size-cells = <0>; key-power { label = "Power"; From patchwork Mon Jul 1 14:56:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13718252 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C0A29C3065A for ; Mon, 1 Jul 2024 14:58:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=RsUHCrNvsKr1kdBukb0DCbmncyLmfrL3JXYTmXFdBlM=; b=qScWHFMiOr7/GEGbqTV3hm34fO /suNuzY8lNZoWm+N2N27VHYtF9LIDvGWH66++6yuuwMIU+BroPFPGTJKWrYNvg1reCsAjJ3K9LhM3 jDVVG6aIg1VNSV8x24fuqqR8PIvU+uAZ5PEdKJPlYZZlbroIcBKGTfy9fLz2uuln3kAOGuQbRus8Z tINnjfLvSFAG0wf2SFvsjPAyjahB+lEUgvSYlBYlr1s0ffSyCzYj6zOvsx4sqMj1t3iRPz/0fZjrt ayfGOpSq4N37KX8EN1VwR9hDApfi+O3f/jw4dLHHsdRU3kQXeZI/rx1OA01Ob+s5D8XiM/euntr/F mXd7hkfg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sOITc-00000003oxk-1umM; Mon, 01 Jul 2024 14:57:56 +0000 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sOISb-00000003oNW-1Zy4 for linux-arm-kernel@lists.infradead.org; Mon, 01 Jul 2024 14:56:54 +0000 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-424ad991c1cso28239175e9.1 for ; Mon, 01 Jul 2024 07:56:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719845811; x=1720450611; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=RsUHCrNvsKr1kdBukb0DCbmncyLmfrL3JXYTmXFdBlM=; b=pZ4FldzsseuyZHcG8oRE0nCFAqeibTnedHeKInHpMLvHCdisxIymaZmOy4a9SDTjqS 5plxz3VOAtKTaln4yWZxZ6EXTeBmYwzPMw9G4/tPZBxTtn0ndMj3RvNyNeQf14VdTQu0 iu0ebyBqcYgj0Bx2mFy3h33o1MpuEF3LK1ELLQvj48fBzlbT7QSESYfl57IklHUZnQDb g9S1hQv1Z4QGBI54WSs7gwxOdERI1EyJCMNe1SlE3iOZNknsfKOzeR7b3bC2nhmOHaH5 7p0wvIBegbivUApn83YRML9Gv+lcgJbgtHfafU3FYlWhsNz+gte0hmrbdS5mSpmCxZkc OoDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719845811; x=1720450611; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RsUHCrNvsKr1kdBukb0DCbmncyLmfrL3JXYTmXFdBlM=; b=TWNzFXfCehmbontSDTvUpaFXXe3+5sqxkiZ7tbZ05CBupm79rHMeSwADoqDuFgYawk tzuaVuCzbqEFkCYY79w1usVId4dVketY8P4q2zOhKbw2GtUoLYJGzZYs4A1wWcJHnj/u C1vnwpF+gZdThjSiNGxiLpzfvPw80YHcO3gtlkpNa63Ftw3oQ2JtNSe1phUpfJYMu6St OblrovZhhqySJ/zTHbAFGkdn4uWsKx0yTlBpw4xJ7P8b3x+iyJt4I5UF2t0vuw9T47AI TjsDW1XG0yR+gNM7XMhkvVWBUaSGUGy+wUuqT3ePwNEfmXjYkXBPI27E4a3VoeRx20oo NsGg== X-Gm-Message-State: AOJu0YxBwypgYoRqpClXcPoZBct5/Mqeg6xfIIXHtnnGtATMJipRa9dG Dfo7+K6iN/9ecq9HEqFdq1e2m6UuhfAWv8vLbczILkHbppQg3K/72KRUWlr8Kiw= X-Google-Smtp-Source: AGHT+IEmqNIzKh8Lu6RZ6/4U5CX2P1NYzyEdM/Eu1XeQVHEX0sMUaOg1okVoBqrKIIsHkxzsu3DaIg== X-Received: by 2002:a05:600c:181b:b0:424:c837:f54b with SMTP id 5b1f17b1804b1-4257a0270f4mr45205645e9.38.1719845811435; Mon, 01 Jul 2024 07:56:51 -0700 (PDT) Received: from [127.0.1.1] ([178.197.219.137]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4256b0c0f99sm160062915e9.41.2024.07.01.07.56.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 07:56:50 -0700 (PDT) From: Krzysztof Kozlowski Date: Mon, 01 Jul 2024 16:56:39 +0200 Subject: [PATCH 6/7] ARM: dts: marvell: orion5x-lswsgl: use 'gpios' property for LEDs MIME-Version: 1.0 Message-Id: <20240701-dts-marvell-cleanup-v1-6-4773bd20691a@linaro.org> References: <20240701-dts-marvell-cleanup-v1-0-4773bd20691a@linaro.org> In-Reply-To: <20240701-dts-marvell-cleanup-v1-0-4773bd20691a@linaro.org> To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1266; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=SrDosKmap1qHqwbZN81p8+TgKWBukS6DTItRBt59i+A=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBmgsOo52DMHYvFkxcBePY3Llxu+r5mkmHz3B2jW gUj7B2onLiJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZoLDqAAKCRDBN2bmhouD 12xdD/sHkxSwaK3wAj9bJIFQd3SxEZXMuhG3VHlejfhkDTDqCGJ/tDwTn3Kb6/i7OvydZs5xVD8 Jqz1uAb7w9U1PAKN1tpNLdLH5yJZYa/N7daMCP/T1K9b82GUE1Ok1kzhlamuzu+G9j4GiZQ/1/K SYWvJrnoZk/0WRIZ27P/UAqVoQ7l3K1OHBngBCAx/zbOcaDWhSeXh5wMgBSxP1b/2kSaIIUh5g+ EHnaTSyJ9+XW/iJDr3N1EEx8PlGRz860TXJIobzaBTY+K+EYciNz4+2xXMhGd3YxVH1VUg3WzWv XXsxWl0L1hbJwEEFEoyE+OnTgrMv57MQKcC5Y8Ww5w4mVsS/nQubbhDi9T+gMpxkgtVKa2KXJFv kDb9h6gdIPfzqUvDbU3LhLuDHpOG9JWtVtDEJf+4PfaycfNCjyiw2oRKHcGlSJSKOA+KIJky/8J fPFSySO4nk+KujrpPQn1EV5rNsmrMHm6s7zuhx1ZB6tePzDsfo1xISx92V0ug/ieWTvB1BWSiCO omLydkmrFmTBfNcNNyxuBelJuKobwj6VPj/GxdccsaT+4Cfdm7/Ri1FSiU9t/V4vgbApBdW9Qwh 4v3ECsVbkQOaAF4JKshTTbfMVQzpmFcDcL2AzBr5Dlcdfa9lqqEjEW0vPRQu3rQB24poyEgAp5E 8E3FyOAFyk4dCLQ== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240701_075653_448712_214C0724 X-CRM114-Status: GOOD ( 11.22 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The 'gpio' property in GPIO LEDs is deprecated, as reported by dtbs_check: orion5x-lswsgl.dtb: gpio-leds: led-alarm: Unevaluated properties are not allowed ('gpio' was unexpected) Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/marvell/orion5x-lswsgl.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/marvell/orion5x-lswsgl.dts b/arch/arm/boot/dts/marvell/orion5x-lswsgl.dts index 35dffb24b8b5..802cd6ff6169 100644 --- a/arch/arm/boot/dts/marvell/orion5x-lswsgl.dts +++ b/arch/arm/boot/dts/marvell/orion5x-lswsgl.dts @@ -104,22 +104,22 @@ gpio-leds { alarm { label = "lswsgl:alarm:red"; - gpio = <&gpio0 2 GPIO_ACTIVE_LOW>; + gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; }; info { label = "lswsgl:info:amber"; - gpio = <&gpio0 3 GPIO_ACTIVE_LOW>; + gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; }; func { label = "lswsgl:func:blue:top"; - gpio = <&gpio0 9 GPIO_ACTIVE_LOW>; + gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; power { label = "lswsgl:power:blue:bottom"; - gpio = <&gpio0 14 GPIO_ACTIVE_LOW>; + gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; default-state = "on"; }; }; From patchwork Mon Jul 1 14:56:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13718253 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2A301C2BD09 for ; Mon, 1 Jul 2024 14:58:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=NQf5Ish3Av0gD9Da5lEuRdMWHvRT8TUq9V7uM/AJGRM=; b=cIbu3YbF8yQpQgCcpwOrQ4d1gN WNQFT4mVcmJBB6yjI9RM6nTLclK92AUZOd/Fu/IMOO9vVE3nWjoabJu/gR8TZ49SAsElPIg4a7l+K rl/GT0dN7KDA2hCSyLPY2Shq+YAQ6v8HIWPH/i80JUc3Gvi1lJr0PjNu6ZR7Ds8ZHiG2Fh2dHkX+N V+kpH3ulK48Y3dCiQBzcqC1hJtUdWJQlcDrGs3qpqhCofrAzhPbTSIyk7VMts1LkjSNhTmq8bi9tf ORae6mjeHOqYFrV3h+iMN9Z4+ru/MNZftdtrPdajFLuIHD67J8K2XqRGxJm34Lu8oz9bLsiIFiLlH 0rRvm4LA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sOITl-00000003p2B-2PaA; Mon, 01 Jul 2024 14:58:05 +0000 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sOISb-00000003oO1-3p5H for linux-arm-kernel@lists.infradead.org; Mon, 01 Jul 2024 14:56:55 +0000 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-424ad289949so23211465e9.2 for ; Mon, 01 Jul 2024 07:56:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719845812; x=1720450612; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=NQf5Ish3Av0gD9Da5lEuRdMWHvRT8TUq9V7uM/AJGRM=; b=zj3poR2A6DKTr3EozPxHncZpaeTM4qOtrLGToZ7z5m+1JLjwUqPzU9zz5JbD/aSqL4 LTG9MsfDaKfgs6JDe4I0M+Izf7p0ptuoXbDAUtG0nJRt6ZFcKr8ERAfLRMqOiYETgzOW 3+W0/EBxMHFjcsUpzHFpMAWso8v58MbuAc+JV4DDgzEFALCFHf0ixbNHHGWR9Ap8tIqq ETwnl3CFFKGYDdeDMuuIVCzHmeOnB+4PtFY3ByizCIsjh3FBxb/tRxXvf0Ff8xhYkYn3 wMCbc+HV9DmOEvluYBnnMKhU+EMsArjpB7YWnapwI/R3KbWPPG/s+gCLzwm5vprZo6kl 4J3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719845812; x=1720450612; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NQf5Ish3Av0gD9Da5lEuRdMWHvRT8TUq9V7uM/AJGRM=; b=P5rkDzUr2+0RvTUUC/Xd7B/bVOJxDXItYZKRJ1kV7V2S8RToaCpUwWnrlbE5vUBy+v NFPTD9zK6WPjuhLGOWSkkXScgpuBXn57i6UPnEe2XaJRWryK5rwXU6sbOw0aPKwSdeJ7 Lzv3Hsh3fb/OOweSn8iEdNoLQZ/87VoyP33OBQY6NLwwKF5c1HlreNPXmwhqIvL9gBZZ uX3Z80kuf30ZHp9DkT9lBRiK4K1JIS0uyUiFVCJ6MNeTAGfDabku4/sC5tbLlFuhVIJ8 SBM6QFNRqF3uxYMA672BtZJdRSkMGlJOQTBWwqG5of2Rd0eyITIKLmgzrAyweQbn1YKJ tfew== X-Gm-Message-State: AOJu0Yz0ba9rdg0NiJs6wvcgOvtV9hYMM9KFvrquGSvzXj9rDkwm5qEH /TEkF4i5a6Z1JltBk5Ha9z0zHnTpXsxmlS4QB4Ryueaq8RivrYCPRQQ2NADZ8jg= X-Google-Smtp-Source: AGHT+IFuoYQlLRqQ9dWAaFITgP1ycNsICaOHlaVoLz1A7a/V/dTh0+2D6q5hqGRXA8gtFdGZaYA6dA== X-Received: by 2002:a05:600c:1c88:b0:424:ab90:ecf0 with SMTP id 5b1f17b1804b1-4257a020ecdmr40982085e9.31.1719845812723; Mon, 01 Jul 2024 07:56:52 -0700 (PDT) Received: from [127.0.1.1] ([178.197.219.137]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4256b0c0f99sm160062915e9.41.2024.07.01.07.56.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 07:56:52 -0700 (PDT) From: Krzysztof Kozlowski Date: Mon, 01 Jul 2024 16:56:40 +0200 Subject: [PATCH 7/7] ARM: dts: marvell: orion: align LED node name with bindings MIME-Version: 1.0 Message-Id: <20240701-dts-marvell-cleanup-v1-7-4773bd20691a@linaro.org> References: <20240701-dts-marvell-cleanup-v1-0-4773bd20691a@linaro.org> In-Reply-To: <20240701-dts-marvell-cleanup-v1-0-4773bd20691a@linaro.org> To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3014; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=lulhEHbDI9HXkLTpJhxhZ2CGZpInoFABmokVqba+H/o=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBmgsOpTixCygCACa26/Ig9SNDnBxhrjatBdht+K 3quMnNm3yKJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZoLDqQAKCRDBN2bmhouD 19McD/9JoJH1/47Ibse8yXq5ZQrHqBFbdg/aRfFIFNiriij2A6v4YY2hWO50iWr4K6f8gRaKhIC nasnu5umdaYkTDXGzQL1kEAVnJ4t3VwyZga9PUsrm9eUfV7cIvTz2lj+OYIoQU1kY1Ei6IgRA3H 4o1zaQ5tdtxmAyNGOf6j3Jw3Ie+9yHdvJ96/GZ+JknCWi6VV5WBea78i/0+YU//r+f8Bvp7kjYN dsOCP8duMYZ0U0NZb1MgSX4lFc0vN8GZsQ3PmY3Pnfp0ALC/8IOdqahgvS0e67YXjBrnKG5ozRg uCfLlNGVJ5r6X67Ftj9lMGJ5wqOqE+tKcgstllUqCaJ2X1Jy3sIC/54jpw0LY7P2XDTpim9V/ZU MHgq2LFfQEdY5FkLkVbyrFvOQhtidDk17t+HZBE9vJkH/V3a9PVEKIF5CqdsjnVdLcvNOzGFXFz WTTUKCScF9zNDqhqVwCMgRgfpWO6iiVM85fLgYW21paImgl99ZOJrzJ0Z8ClWDTkYXPdsqdA5RR LNhM8efXnN94m7Ijoh3G/I08uLEK3uiMHbnN3Bkhw3DrwyQGpEdbRV8ib8wP5fNTxysdZZreUZ8 oL+F9ROB2CEcKBe2PAkAZNH24gM9ZmzyoVtRxT7/P5+RnhTDw5HeoeGA7/Xa99sUTFCw5jtXxe8 XJ+DIrZg1rzUJIA== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240701_075654_060115_83FAA7AF X-CRM114-Status: GOOD ( 11.77 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Bindings expect the LED node names to follow certain pattern, see dtbs_check warnings: orion5x-lswsgl.dtb: gpio-leds: led-alarm: Unevaluated properties are not allowed ('gpio' was unexpected) Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/marvell/orion5x-lacie-ethernet-disk-mini-v2.dts | 2 +- arch/arm/boot/dts/marvell/orion5x-linkstation-lschl.dts | 2 +- arch/arm/boot/dts/marvell/orion5x-lswsgl.dts | 8 ++++---- arch/arm/boot/dts/marvell/orion5x-rd88f5182-nas.dts | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/marvell/orion5x-lacie-ethernet-disk-mini-v2.dts b/arch/arm/boot/dts/marvell/orion5x-lacie-ethernet-disk-mini-v2.dts index a7586370b1d5..f81acb9b7223 100644 --- a/arch/arm/boot/dts/marvell/orion5x-lacie-ethernet-disk-mini-v2.dts +++ b/arch/arm/boot/dts/marvell/orion5x-lacie-ethernet-disk-mini-v2.dts @@ -52,7 +52,7 @@ gpio-leds { pinctrl-0 = <&pmx_power_led>; pinctrl-names = "default"; - led@1 { + led-1 { label = "power:blue"; gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; }; diff --git a/arch/arm/boot/dts/marvell/orion5x-linkstation-lschl.dts b/arch/arm/boot/dts/marvell/orion5x-linkstation-lschl.dts index 624b737a8be4..79fee048c900 100644 --- a/arch/arm/boot/dts/marvell/orion5x-linkstation-lschl.dts +++ b/arch/arm/boot/dts/marvell/orion5x-linkstation-lschl.dts @@ -90,7 +90,7 @@ amber-info-led { gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; }; - func { + func-led { label = "lschl:func:blue:top"; gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; }; diff --git a/arch/arm/boot/dts/marvell/orion5x-lswsgl.dts b/arch/arm/boot/dts/marvell/orion5x-lswsgl.dts index 802cd6ff6169..e0da406c430f 100644 --- a/arch/arm/boot/dts/marvell/orion5x-lswsgl.dts +++ b/arch/arm/boot/dts/marvell/orion5x-lswsgl.dts @@ -102,22 +102,22 @@ gpio-leds { &pmx_led_power>; pinctrl-names = "default"; - alarm { + led-alarm { label = "lswsgl:alarm:red"; gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; }; - info { + led-info { label = "lswsgl:info:amber"; gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; }; - func { + led-func { label = "lswsgl:func:blue:top"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; - power { + led-power { label = "lswsgl:power:blue:bottom"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; default-state = "on"; diff --git a/arch/arm/boot/dts/marvell/orion5x-rd88f5182-nas.dts b/arch/arm/boot/dts/marvell/orion5x-rd88f5182-nas.dts index fd78aa02a3c5..75ab913b21e5 100644 --- a/arch/arm/boot/dts/marvell/orion5x-rd88f5182-nas.dts +++ b/arch/arm/boot/dts/marvell/orion5x-rd88f5182-nas.dts @@ -32,7 +32,7 @@ gpio-leds { pinctrl-0 = <&pmx_debug_led>; pinctrl-names = "default"; - led@0 { + led-0 { label = "rd88f5182:cpu"; linux,default-trigger = "heartbeat"; gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>;