From patchwork Thu Apr 14 08:51:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 12813178 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 2532CC433EF for ; Thu, 14 Apr 2022 09:01:30 +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=81UJc2thIItgdlWE8InV8+Z4tP8h72UHsPOJtU6yy1U=; b=X2eEHzF9M/QlIH nbvXhxF773Ak7gCaglr35HL1bK7GxNRP0QlpzbP2Uhxfi6LEOgE+lVPU//Iedmvvom4+JSJLlI5hq NP/bg2t0ZLMwKYCpU87b7L1Rf/bSymZA5HNMHvmEbwD4scNVIDXh0bBA+MF8fwZtFcNQt8Zfswht5 Hj0x4X/yjwv6+T/2TB3Xtj8LSDBYJSGgmnbWWdGzbfOQ03bDM6jANxcfP1rZWbmBPB3XoRHBmoktP Wk+zOtpGYsnlaPMBfL3Fukoxo/K267DALQHs5kCcLyF5xk0rlPpKGOTG9Fuld/+QAS4ZrgRTKSq49 wCFQj5SuXDHwDwHLe2qA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nevKg-004iFc-NL; Thu, 14 Apr 2022 09:00:07 +0000 Received: from mout.perfora.net ([74.208.4.197]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nevD9-004eFd-6j for linux-arm-kernel@lists.infradead.org; Thu, 14 Apr 2022 08:52:20 +0000 Received: from toolbox.toradex.int ([31.10.206.124]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1N8oCQ-1nz3LP3x4g-015t9W; Thu, 14 Apr 2022 10:52:06 +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 v1 14/14] ARM: dts: imx6ull-colibri: move gpio-keys node to som dtsi Date: Thu, 14 Apr 2022 10:51:06 +0200 Message-Id: <20220414085106.18621-15-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414085106.18621-1-marcel@ziswiler.com> References: <20220414085106.18621-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:t4Eu9Yla157sKjIMqXBTLTyk1QFmNGXZN6GQRUh6lSLFewEOTC3 6fESAbwY56Rx70TRW+51iAM3scxk8ubUD/nxQgWlOLMFocN6e+mN1p/uhLmzjvv3et4pbn4 szXY4CRMVIyDY3YISCc6pUnk7NXSuN7XBh2Yg26qvWPIMUt50b4ZoeBcEIr6VdJDXD+9g2u N1S7cjLtKuMq0aFMeIAXA== X-UI-Out-Filterresults: notjunk:1;V03:K0:3O2Al+diOKo=:RQPRgZ8d6Ud+DZpszriMn6 WSHcbCE43LBvtegma1TK9LwjI/I37GN4rgTlstVndzi2oMRYHeEOdBopRece2XQcP3A7uZdui hNeoOWh0C/MX5KyDXLYGAXMhvDJgG6fQBOtacY/l9AfWaFXxUOdmI2JjK9rIRwmv6Lt25dC0h l6aTxTfxXHO6HODWay6z/AS3e78yyC9CJS1B4krkkFav4g1RDn7PQb6U/0zr57cE3IP6YLoGg uyYFGJQpMaJCdoURISLJkHplMo5BX4X4E2Ur6y8iiXhVBQWw4FonqsQBtAWVYt4Y8OYxyuQVB +NlibE9c/ckMrR1e/WVS0PxwjIFZnHGRFtzRMSHH9ymeq1OvStSNR1gEHwocZkZ34Ry6sM91Y sCbO2cr6Nl5mvXOWzEZZ4dHnV5jUHO3AbG3joSHj+Qr2e7+nngNjvY8gX/rHPTi4kuOUFtXAK 7Ty/GYoLU1Tx1gCUjtWKVr3pOkKcVLyOripv+nYyuB1ng0FCzPvJgUu4j8qiRS2C51J0aAXm0 mCD0WBQ4RUfNUQx3PJN3BiL3uekmE/wD32f0efAJYZ1SNJx0Ed1r4Wp9CXDUqkYnvwghjngg1 pDshWNN8gMb4i8LvMIUu232PowVX0eRjN/jE5SdJ9J7xa0XcuZbSZdEUWESgxM9QlnVmjWswd HkAYq1dbfq4QRk+2jZSMCdEmk4NRs3O9BiQ0A5j+xb3pNFmKjNlANDkyiNgApgxJgznz2g4M4 tq26hyzhefwaDftvd6hk75Wt65j+oXnIF9OJrEE8eTZboS2Plsw8zznCGtpaOvb/hviShSqH3 EAnYI7AfT5LLMk/r5W+ALtibUC6Gw== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220414_015219_383176_6C98AC65 X-CRM114-Status: UNSURE ( 9.79 ) 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 --- 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 f6fbc5c0e1ee..300c28db8e7a 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 */ >; };