From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756676AbdEUMus (ORCPT ); Sun, 21 May 2017 08:50:48 -0400 Received: from mail-ua0-f195.google.com ([209.85.217.195]:35071 "EHLO mail-ua0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753008AbdEUMtw (ORCPT ); Sun, 21 May 2017 08:49:52 -0400 From: Ralph Sennhauser To: linux-arm-kernel@lists.infradead.org Cc: Gregory Clement , Imre Kaloz , Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Rob Herring , Mark Rutland , Russell King , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Ralph Sennhauser Subject: [PATCH 11/13] ARM: dts: armada-385-linksys: fixup button node names Date: Sun, 21 May 2017 14:49:00 +0200 Message-Id: <20170521124903.11050-12-ralph.sennhauser@gmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170521124903.11050-1-ralph.sennhauser@gmail.com> References: <20170521124903.11050-1-ralph.sennhauser@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Buttons don't have a reg property; drop pseudo address and fixup names of individual button nodes. Also drop #address-cells and #size-cells properties. Signed-off-by: Ralph Sennhauser --- arch/arm/boot/dts/armada-385-linksys.dtsi | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi index 1bb974a..e1f355f 100644 --- a/arch/arm/boot/dts/armada-385-linksys.dtsi +++ b/arch/arm/boot/dts/armada-385-linksys.dtsi @@ -81,18 +81,16 @@ gpio_keys: gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; pinctrl-0 = <&gpio_keys_pins>; pinctrl-names = "default"; - button@1 { + wps { label = "WPS"; linux,code = ; gpios = <&gpio0 24 GPIO_ACTIVE_LOW>; }; - button@2 { + reset { label = "Factory Reset Button"; linux,code = ; gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; -- 2.10.2