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: 66194 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp321605wrd; Wed, 8 Mar 2023 05:11:49 -0800 (PST) X-Google-Smtp-Source: AK7set/cTjoQ/sCp9GCvpBwQ4BtK/56HhPtaVLSEX2WKKPq5LMxpiGHFmEFHiwg2bvh0bMnoFCFl X-Received: by 2002:a17:906:a248:b0:8b1:94cc:4a6b with SMTP id bi8-20020a170906a24800b008b194cc4a6bmr19027571ejb.37.1678281109408; Wed, 08 Mar 2023 05:11:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678281109; cv=none; d=google.com; s=arc-20160816; b=tYkljeynm39Z85CUi4iQ2G14AFkl/3WtYS1KJT7Y/Yxr/FNuo9Z02E7z/9+D0wGdPV 28bNxrulzdDhcNvGp+T6X6NM9A7L/ND9jHGfqDCWjyHlCPAvcoSEoCiZJDlolrKmHFaX CecB1wlSr5IgSyB6+yLwiaspcV+6C8CsKT6MkVLPnhaByhqpbbRyahXDbQQh1tJsxOtV MHbNhCv85KuDI+KjXw+8OvhqxFcs2Ixal0dl5YM9HFLgq2fO9aQy+VHHsPN3/UutX7DM LP0hlY5PfUqY/TEuhJ8LnxWf6JsvMAQ0219OpzgE5epm8yBe9/rJfptdFMd69mGdpzIm WgXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+esKEIUPPeT9GFP8mI+48+Ci8GHxaKOSpowqQinb48M=; b=KQbcihVHXI+LsBMuTlq3xYMqOEEKZ+vrCSIdZsG9sfu23y48uuECv8pLtJluZONNyZ bVGx+SagQuwJUFBs0Cx9E3LcwBP3TFolgmahPTytuWkYG55+rYRI2kmpc1PwlaS43bO7 +jBA+wOyXHgBBkzmo1zAzCePxGLrtBSv+ztF173j71E8jYnkjf4j79OEf78J6G5c+CrR 7MqRit3w/SoFz8prbQ0N2AtdAnj0HQX89Lm+FLKmryoUbG1Qss1UybbfgAkvs59rqX5t CL+trRk3+R8MebldBu7i5kf/S5/OUjWOPKDUIu0fkYxFCUzqNbZUrTUnLoeaa9O9v9i9 oqiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@pschenker.ch header.s=20220412 header.b="gsg65/KV"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=pschenker.ch Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w1-20020a170906130100b008dd491949d1si15322226ejb.198.2023.03.08.05.11.13; Wed, 08 Mar 2023 05:11:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@pschenker.ch header.s=20220412 header.b="gsg65/KV"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=pschenker.ch Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231486AbjCHNBW (ORCPT + 99 others); Wed, 8 Mar 2023 08:01:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37670 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231433AbjCHNAe (ORCPT ); Wed, 8 Mar 2023 08:00:34 -0500 Received: from smtp-42aa.mail.infomaniak.ch (smtp-42aa.mail.infomaniak.ch [IPv6:2001:1600:4:17::42aa]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A187907AC for ; Wed, 8 Mar 2023 04:59:54 -0800 (PST) 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-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759805292638800803?= X-GMAIL-MSGID: =?utf-8?q?1759805292638800803?= 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>;