From patchwork Tue Mar 14 10:24:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Schenker X-Patchwork-Id: 13174128 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 8F4F0C6FD1C for ; Tue, 14 Mar 2023 11:47:02 +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=n/ZIEgTPW3RT2oWo/3iW2E8+OenhMCfshnEGhbm8QAE=; b=DuTXmId4+C9/vJ MADO4pnK/PTSJPTr6xE9ufjsb0RVfum+ktUwy7rGTLXpD0dQsNEGo7O5apb6VsqdBrtp40VGiLE2F clqzHJ2M/nIf41HRDYxh5VuqQ1KTicqHDvuHS+BfqH/lTNGdjDEoTbF57BJBBz+q1xWeeVjwtOq4Y nzjEIylQGOYwWGLwKyp5LaT4zadJep5rjAaDx5cPWxAoW0XAkAI9W3yZSm6mqn3Kwlj1++zLq4CDi 8gBGDOzRYnCXRcA3TcunMHYY4fKU0SqjJ9un9srY29uyBLXh8a2Xh/HGlWBRTQJeHLS4l03/kAQIW lVo4HonOzYJm+u5a9uRw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pc36c-009xY3-0X; Tue, 14 Mar 2023 11:46:14 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pc36Z-009xWY-2i for linux-arm-kernel@bombadil.infradead.org; Tue, 14 Mar 2023 11:46:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=mrqWtKMa0XagJo/WFIgUduzr3YpcZlGbwK1+FcUyjMw=; b=LKMkGQtJL/oLKfrqoADykpYp+6 5XrX8xbimtwKNxxDaeK+DEPu3qX2Yu0iGiLZOltEe2n88xpmnjpxZObz78TjfQ6fdgbeppPqIq7o5 bOFe8mjoNogFStoaebvdL9T9hxZGox0CvZfvMOeTL8cPF6Ue295DCxKyI6/M+YMZske2M03WH77P+ NWEaXIDFLO/mqudzCpuhuTtujda33bgjLoX5GKsI6Cpk0zvHZHT4chYngFZ70ONLpDNB25TAt3SRX Z4FOahzViu99EG8wAMrxSfYVUXgcylmdVFcZF6v4/W92LCNuBd5xH3JWR86abdls7ncCvDl3QEPZn oIkRjr4g==; Received: from smtp-bc0e.mail.infomaniak.ch ([45.157.188.14]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pc1pZ-001kEN-2Y for linux-arm-kernel@lists.infradead.org; Tue, 14 Mar 2023 10:24:36 +0000 Received: from smtp-3-0000.mail.infomaniak.ch (unknown [10.4.36.107]) by smtp-3-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4PbV4v6YwjzMqQWF; Tue, 14 Mar 2023 11:24:31 +0100 (CET) Received: from unknown by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4PbV4v2qyjz2N4G; Tue, 14 Mar 2023 11:24:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pschenker.ch; s=20220412; t=1678789471; bh=oDmzZoOyBIwUWooe1ysmdzU43k7yTVJ0y76naMMCSc8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Xqcfc8pzlw3nVLalZ5+XdRNpmrKGfarIZjlHjR2JE4dM8VdIjWCcpl3XMdn0JEdFt PcpQfJQac63WZ9F+wjwpVDRVMmqV2PHibEbmTKlaESlCf8MjzmOTkkkJko9cCRm1VI 0HuolR6VBirKJfpa3XuH2wmMm/3Rq+AwsgZTlma0= From: Philippe Schenker To: devicetree@vger.kernel.org, Shawn Guo , Sascha Hauer Cc: NXP Linux Team , Frank Rowand , Rob Herring , Krzysztof Kozlowski , Fabio Estevam , Pengutronix Kernel Team , linux-arm-kernel@lists.infradead.org, Philippe Schenker , linux-kernel@vger.kernel.org Subject: [PATCH v2 18/23] arm64: dts: colibri-imx8x: Move gpio-keys to som level Date: Tue, 14 Mar 2023 11:24:04 +0100 Message-Id: <20230314102410.424773-19-dev@pschenker.ch> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314102410.424773-1-dev@pschenker.ch> References: <20230314102410.424773-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-20230314_102434_167252_79C3F092 X-CRM114-Status: GOOD ( 11.29 ) 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 --- (no changes since v1) .../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 14d479b50656..7264d784ae72 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 { #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"; }; &i2c1 { diff --git a/arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi b/arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi index 1e41965e2d01..ff5ad88febc8 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-name = "+V3.3";