From patchwork Wed Mar 8 12:52:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Schenker X-Patchwork-Id: 13165689 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 9BA3FC64EC4 for ; Wed, 8 Mar 2023 13:02:41 +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=blB9uUUUlI6U0fll8//y0Lgdqgqa2W0T5mBHjlZ0LtM=; b=lc62aMZDUpW6JE RnCoTCoah4+UZiL5h4gBaTiBaDGIbTY7Z5gdwLzwCdiAXWLtpEu8aAdOg8I7V7hTfwLLnLY6z0O2Y F5gAYYpj3wwkns9QaMWUbFkp/t7wiVNF84CKQa69HtyFNbJIuAnhLiskkvQjEsaL0n+wgREEKVJx0 DtxMENaldx6ZhqNWmFsA1zbjtz8BEeW21Vc273PDqjSlZlwTYXyzEc9mbR+si1nyriTjP5LHxUw/x jx6aoTnQ/qyok7GnyXFhz9HCSabAwJCoX+bXD+Ram92xTwNBhVpofrunqYOV+1lpsa+CmQYHLxulk 82SKhj8uGBlhrlusPSkQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pZtQC-0050Uw-Ec; Wed, 08 Mar 2023 13:01:32 +0000 Received: from smtp-42aa.mail.infomaniak.ch ([2001:1600:4:17::42aa]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pZtII-004wHb-03 for linux-arm-kernel@lists.infradead.org; Wed, 08 Mar 2023 12:53:26 +0000 Received: from smtp-2-0000.mail.infomaniak.ch (unknown [10.5.36.107]) by smtp-3-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4PWsgL52tszMrV3l; Wed, 8 Mar 2023 13:53:18 +0100 (CET) Received: from unknown by smtp-2-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4PWsgL1LbNzMslsG; Wed, 8 Mar 2023 13:53:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pschenker.ch; s=20220412; t=1678279998; bh=0aQVO4QE3EMr93GN5aXwmbhmG3BGBh3gFzNFrkt2N0g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gsg65/KV/cgzEWYToZ/LwcomvquWGvXDVck548yXZVn0mIHYPi/a9Izsza8lHr8vO x9bbrNwrU2cngGB6Q5otz7ha1f0DvP3Rd8wJnkBFQH4+JUP2STcgdDTLEo8UoxKLeO qOUcQlZH4jCLmeRF6DrKYDwmUJUI/UM1RmNhX26Y= From: Philippe Schenker To: devicetree@vger.kernel.org, Shawn Guo , Sascha Hauer Cc: NXP Linux Team , Krzysztof Kozlowski , Rob Herring , Pengutronix Kernel Team , Frank Rowand , linux-arm-kernel@lists.infradead.org, Fabio Estevam , Philippe Schenker , linux-kernel@vger.kernel.org Subject: [PATCH v1 20/25] arm64: dts: colibri-imx8x: Move gpio-keys to som level Date: Wed, 8 Mar 2023 13:52:54 +0100 Message-Id: <20230308125300.58244-21-dev@pschenker.ch> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230308125300.58244-1-dev@pschenker.ch> References: <20230308125300.58244-1-dev@pschenker.ch> MIME-Version: 1.0 X-Infomaniak-Routing: alpha X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230308_045322_259143_503CA888 X-CRM114-Status: GOOD ( 11.93 ) 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: Philippe Schenker SODIMM_45 that is connected to "&lsio_gpio3 10" is defined in the Colibri standard to be a wakeup pin. Move this to the SoM level device-tree and keep it disabled by default but do enable it again on the carrier-board. Signed-off-by: Philippe Schenker --- .../dts/freescale/imx8x-colibri-eval-v3.dtsi | 16 +++------------- arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/imx8x-colibri-eval-v3.dtsi b/arch/arm64/boot/dts/freescale/imx8x-colibri-eval-v3.dtsi index e7e3cf462408..8dfcb2cfdb68 100644 --- a/arch/arm64/boot/dts/freescale/imx8x-colibri-eval-v3.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8x-colibri-eval-v3.dtsi @@ -17,20 +17,10 @@ clk16m: clock-16mhz-fixed { #clock-cells = <0>; clock-frequency = <16000000>; }; +}; - gpio-keys { - compatible = "gpio-keys"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_gpiokeys>; - - key-wakeup { - label = "Wake-Up"; - gpios = <&lsio_gpio3 10 GPIO_ACTIVE_HIGH>; - linux,code = ; - debounce-interval = <10>; - wakeup-source; - }; - }; +&colibri_gpio_keys { + status = "okay"; }; /* Colibri FastEthernet */ diff --git a/arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi b/arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi index 2f86a2eb4ff3..e93e22c4053b 100644 --- a/arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi @@ -8,6 +8,21 @@ chosen { stdout-path = &lpuart3; }; + colibri_gpio_keys: gpio-keys { + compatible = "gpio-keys"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpiokeys>; + status = "disabled"; + + key-wakeup { + debounce-interval = <10>; + gpios = <&lsio_gpio3 10 GPIO_ACTIVE_HIGH>; + label = "Wake-Up"; + linux,code = ; + wakeup-source; + }; + }; + reg_module_3v3: regulator-module-3v3 { compatible = "regulator-fixed"; regulator-max-microvolt = <3300000>;