From patchwork Fri May 6 13:24:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 12841137 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 007E3C433F5 for ; Fri, 6 May 2022 13:29:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=4b6llGzf7A72mQ9Po11hi576QW/eqvHLp8swT9wFJwM=; b=XtmGWzY6Kt81RZ 7vcGsHFzDw6NJwqPSXJiod6bcKanNWHxZfsJ77XrVQjq6OGe5PDhzp2PLc2RNTZE3xr0q2Ml1vtm9 Go2cOWZKEGSXblUxZK5hcFxCAPZPlShNQp+GQMqWU1lgKTPZdETuftU9NWzSQ1d7yFUMs/8oL8g7S /V2WX6ELajuN8NfnRY18jxlB7eGMvSNiH2Ipp7VfkgJp/0XidZPIqz8zf6xeTlTCirRV9ThgHbnlR JVNn4bEcGSQaUYCdRDmBaJWSc5ZTqwXNOmJsxs2k2CY2BUtcl/5gYBpik4uCaD2Aj+2S5oWlHksIg stgSxDVAuz2o0qvAYhNg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nmy0E-003SZ7-TY; Fri, 06 May 2022 13:28:15 +0000 Received: from mout.perfora.net ([74.208.4.194]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nmxxG-003QpG-P8 for linux-arm-kernel@lists.infradead.org; Fri, 06 May 2022 13:25:12 +0000 Received: from toolbox.int.toradex.com ([81.221.85.15]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MXrmL-1nHOrz0GDH-00WlJU; Fri, 06 May 2022 15:25:00 +0200 From: Marcel Ziswiler To: linux-arm-kernel@lists.infradead.org Cc: Marcel Ziswiler , Fabio Estevam , Frank Rowand , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Russell King , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 12/13] ARM: dts: imx6ull-colibri: move gpio-keys node to som dtsi Date: Fri, 6 May 2022 15:24:15 +0200 Message-Id: <20220506132416.273965-13-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220506132416.273965-1-marcel@ziswiler.com> References: <20220506132416.273965-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:6M8m5aUlIenun24YVIZjE6nxPoM/mKqZEGnvhtPd1+zDd33+kIE mbIpTdoB8h7Q/RjBBvB7FhJm7XxklUdQjwNmsJHJ7sE8+Enwf0yGMCUgUk3Z9iT7r1M6fKR GBpzb7dfP39bTbcjt+reWB+dKx92uhIxr6YOrCTt8bxy74yU87RS1pVFY94Mq7LDLJmpTxj O3nzoQsjj/6+17najRyuQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:oYsiHfk45LE=:AtXr3RrEpz+8VAfPNur2DF vS2QFZvoot/nOyN9B1T0ak31L4Rj1ZEu4kSK4S+FhW71ORnUkzXdxjqW0gvdMS6dOx4+zw5Qu q/cySsnRvezj6MJtq4jVHT/+4B+tfYPTFhsfPpVrX4p4/b1Q2NRc/NeBfbUev8fNGgMXXurqF nPJCu09+E9B36uZ7QRhEgDHbWWCt0j0WETD/PhTpPL4cjR0zInFmHAUZL3pcFKu3A5NYN0ujq jSHCn3K1VnYCynAiUf9wCTsy46m0X/TewcibOWTnICaT/2+BIq9eapy3VtQv9mAbP66wW5HKw ZjmtqztWi3jgVsDnkfsgAAoLk15+00FeSCHd470eLUdNezJocngn2Iy9osqhZskvAq5gJ1Mf2 S0xLsJ1t9kubfBMJ4ZeaX/DQ+5DvnhQ06PzGKIM+cbwr8zTzBO8BQiveuBGdP/PdzMefjI9l+ 6MGUUZvV0tYfENB7ZnGEWAIF2nKVS+IXYNevZQFJiqPVrEErGNEEWF2aJTS37yOZahZ75jT9t gO3q5MUPzjE09fs8h2eBHwdeExVtN6TSWGZ4TJ8HcRKEVXSMP9QFEN6xKcEttuJpqLjHdjlWi opOWwCSCfC7C95LVelfWM9kha3QtNpJQovob+WEg74x8jOo8bd4vzB/lQ4P+7KwVfL7KM4yEB nFlNX5WNaFMVV+ROYsD4uS/3Yo+sMsLDJQ/EGafsrq3n+Yob7HvmRbhms2MK3sBcMWbP/gdgZ xB5M//qnAe3eJzgb X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220506_062510_956159_35C139CC X-CRM114-Status: UNSURE ( 9.86 ) X-CRM114-Notice: Please train this message. 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 From: Marcel Ziswiler The gpio-keys define module level wake-up pin functionality. Move it from the carrier board dts file to the Som dtsi file. While at it, also re-order the properties in the gpio-keys node alphabetically and rename to sub-node from power to wakeup. Signed-off-by: Marcel Ziswiler --- (no changes since v1) arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 15 --------------- arch/arm/boot/dts/imx6ull-colibri.dtsi | 16 +++++++++++++++- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi index 08197c66af12..e29907428c20 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi @@ -8,20 +8,6 @@ chosen { stdout-path = "serial0:115200n8"; }; - gpio-keys { - compatible = "gpio-keys"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_snvs_gpiokeys>; - - power { - label = "Wake-Up"; - gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; - linux,code = ; - debounce-interval = <10>; - wakeup-source; - }; - }; - /* fixed crystal dedicated to mcp2515 */ clk16m: clk16m { compatible = "fixed-clock"; @@ -29,7 +15,6 @@ clk16m: clk16m { clock-frequency = <16000000>; }; - reg_3v3: regulator-3v3 { compatible = "regulator-fixed"; regulator-name = "3.3V"; diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi index 4611fa890889..4292311bdc6e 100644 --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi @@ -24,6 +24,20 @@ backlight: backlight { status = "okay"; }; + gpio-keys { + compatible = "gpio-keys"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_snvs_gpiokeys>; + + wakeup { + debounce-interval = <10>; + gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; /* SODIMM 45 */ + label = "Wake-Up"; + linux,code = ; + wakeup-source; + }; + }; + panel_dpi: panel-dpi { compatible = "edt,et057090dhu"; backlight = <&backlight>; @@ -707,7 +721,7 @@ MX6ULL_PAD_SNVS_TAMPER2__GPIO5_IO02 0x130b0 pinctrl_snvs_gpiokeys: snvs-gpiokeys-grp { fsl,pins = < - MX6ULL_PAD_SNVS_TAMPER1__GPIO5_IO01 0x130a0 /* SODIMM 45 */ + MX6ULL_PAD_SNVS_TAMPER1__GPIO5_IO01 0x130a0 /* SODIMM 45 / WAKE_UP */ >; };