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: 69455 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1677436wrd; Tue, 14 Mar 2023 03:36:05 -0700 (PDT) X-Google-Smtp-Source: AK7set8Vt9Rul60eUcZ9GqyzGhP4xI9XBGuSqelC8Jic8V0MG1k+b18Sgh8354bEe2pPFO0EZeMG X-Received: by 2002:a05:6a20:3c9f:b0:d4:964d:34f3 with SMTP id b31-20020a056a203c9f00b000d4964d34f3mr5277335pzj.7.1678790165088; Tue, 14 Mar 2023 03:36:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678790165; cv=none; d=google.com; s=arc-20160816; b=dV8I8HoQb5MbF/soIkUHHST/OhF7Q8iVD/4FKHKBpHz7aNjHttYi3dE/w9281fM7qk y1MVfV8OxoAUWTg9DV184p+PDpnZdJJQL8pRtuuvJZ71YVV0c+KPqsrwNDOEyWWSktbP fCaY7EVGA0ri0hhmMzoeaM71WIXQUw/58b1u/NmT2MKjs8rsxemii+9ZsKmlRQHtzXlt gNkZYRPnFri7oEcnl1VgR3OSuqbbqfsD8y2JmMh68u6dE4T/5KFEJlYbK4AXY9EY9x00 Ki+qsC74AsHibDZngwq1cClTEs7hbvvRmbElB5FV1U86dYtS6BdOzdkJN5IwaLBL24iM GpFg== 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=mrqWtKMa0XagJo/WFIgUduzr3YpcZlGbwK1+FcUyjMw=; b=Nji5o11DSbDa3jotg3VetIQHwbNdYG6e9Z9h+u4jlxeMrl+Hc8C4Umt2Q9zHCkPo+b SS/+q6btY/9MIKXM6dNG829jEjtIizIP1cecBe50eiMTu/91/CaN2J602t3M2G6Nt681 OkON+lhsP6m+JW/w4znqasCjyeacUyA38tg5jIDr8Oc2QSfJs7r4WVfq35/jCiOpg4/v /wo/hy+mHq1+zCQPPbovG8RGd3upEDNrsnjIESa8aRxtBbNQMwmVXuT9Ae0EmHcVVinu k0/nvzGoryQGxQVcANT/k+G06ETN93hwd2lMDHQ2aOEZ8tLzafm9QNKNLVMNeWIi2jdh vyuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@pschenker.ch header.s=20220412 header.b=Xqcfc8pz; 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 b3-20020aa78ec3000000b005a81866ff8csi1899807pfr.319.2023.03.14.03.35.52; Tue, 14 Mar 2023 03:36:05 -0700 (PDT) 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=Xqcfc8pz; 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 S231303AbjCNK0q (ORCPT + 99 others); Tue, 14 Mar 2023 06:26:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229832AbjCNKZ2 (ORCPT ); Tue, 14 Mar 2023 06:25:28 -0400 Received: from smtp-190a.mail.infomaniak.ch (smtp-190a.mail.infomaniak.ch [IPv6:2001:1600:4:17::190a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6905562868 for ; Tue, 14 Mar 2023 03:25:06 -0700 (PDT) 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-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=unavailable 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?1760339076388592789?= X-GMAIL-MSGID: =?utf-8?q?1760339076388592789?= 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";