From patchwork Wed Jun 15 11:49:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 12882234 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 08D1FC433EF for ; Wed, 15 Jun 2022 11:54:49 +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=/gsLISdZDprbogqixOod120+SM8XcrwXcN8FKwQAbis=; b=JxlkMiWJ34hylu FKawNg6Xu1zJRfDWAPDQ9hcI4bao04+XaM2qB08wuPH1rQfqv16XwwbOqz1BcOPrP64keG8I9qjIj QdsNQAKppSZPdE0Fqv+aYEOOkj9pEC0EAcYAKpiXRs/B4JnjDv4HIftKoI9VYPNaQatXLYkRzcLVW N945GzZG9n5LUdmSGZX2g7uGFSYGJEZ6f8GRD2neceOcaFATNcmt5zlYwQpMZOu/nEKKk47Ko/EBB LPMWEUJO3wq9PZkA20s8SgLnfRHw8z/CDYZZARdejqJx/pJGHfxngHWF4Z3nBEoHpwfxrKsSeEsjF tQw/2mYjm25YwHmxKe3g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RaZ-00EIEx-4e; Wed, 15 Jun 2022 11:53:35 +0000 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RXz-00EGkl-Rm for linux-arm-kernel@lists.infradead.org; Wed, 15 Jun 2022 11:50:57 +0000 Received: by mail-ej1-x631.google.com with SMTP id fu3so22682264ejc.7 for ; Wed, 15 Jun 2022 04:50:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NVB55DEg2bPk+Jun3avPAlytYLNNRhGqMzJbc0Lw+GQ=; b=MZVLOdCFSGgMG13oaCBG7RstHuIo08+WtxMPHblfkDD/Btj2afR4FoVA9HFEddTdF2 cBGkfcEeIjTRXeGZcBdVuKMqnlQFaPLjixZBNVF3RwuJ9j2VYyYG4yEz+XjGpv56IO2B JxFqHS8oWjmKqbMH+1m2OfNwv/N5p5fvfMi6U4mt2mlh5JgDT2rV/+0qP2codJc7yk+v mkjVAk5PtaZiN7yHfwbXjzQlVQ5UjdVG6Q0/h0ofyOTzT9kIX4XaM0n0mEGrCg/tXJCH cD16MTJu5ACLIDDehaHoDhyzjb4S7Jt+JEKTpDUZIvto7p0uvb0E9OpXkhqfs6Ss56HW 13Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NVB55DEg2bPk+Jun3avPAlytYLNNRhGqMzJbc0Lw+GQ=; b=o561KqY6+bnM754i9sHc0H5iNzJZH9gc486sm25hXNP/PbAIWqyTlW4X/AnESfEjpT 9jC9yvL8ZIclbzwMp4TMpGDOp6GxS/RzQvVDASUh825E8oGUIBJV2hPUWBlLv0zHHkqG rYltMNCFpQDAW2FIjUcXUbqHtHc0dFq145FVOdfMCsKyimMniqMFlqlc4hlbuRYTfuGl ppg8l4nmGG5ePvI4swHkxKUEjpcP2xy9mdDGX8tcdyoUPNMXmaY73TmwMMQbKgGw9Bds 3IIwXKIMDFqvifAUHNyXZqkAyY6/N/6fq7vl7hm60PAyVcAZi3nJbUFqb2t36QznG0Sj qdGw== X-Gm-Message-State: AOAM531ljnfVlvDLULm1HKTfClg0gzlonaiNxwOjWYJTfUjX3lRHdnIf O02xbnyc6iM7Bu3ummkesnI= X-Google-Smtp-Source: AGRyM1sHQrHOVNyibv+XTyKQRzzevxy8F2eT1fvSbkEFBB13kwwGjNp2Cw4QM+lQow7uNDWrJQ0Jbg== X-Received: by 2002:a17:907:1ca3:b0:705:5a6c:d113 with SMTP id nb35-20020a1709071ca300b007055a6cd113mr8999375ejc.535.1655293853494; Wed, 15 Jun 2022 04:50:53 -0700 (PDT) Received: from linuxdev2.toradex.int (31-10-206-125.static.upc.ch. [31.10.206.125]) by smtp.gmail.com with ESMTPSA id t6-20020a17090616c600b00715a02874acsm4561158ejd.35.2022.06.15.04.50.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 04:50:53 -0700 (PDT) From: Max Krummenacher To: max.krummenacher@toradex.com Cc: Fabio Estevam , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 08/18] ARM: dts: imx6q-apalis: move gpio-keys to SoM dtsi Date: Wed, 15 Jun 2022 13:49:56 +0200 Message-Id: <20220615115006.45672-9-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220615115006.45672-1-max.oss.09@gmail.com> References: <20220615115006.45672-1-max.oss.09@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220615_045055_947560_909A51F5 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: Max Krummenacher Move gpio-keys to module-level device tree given it is standard Apalis functionality. Sort properties alphabetical. Signed-off-by: Max Krummenacher --- (no changes since v1) arch/arm/boot/dts/imx6q-apalis-eval.dts | 14 -------------- arch/arm/boot/dts/imx6q-apalis-ixora.dts | 14 -------------- arch/arm/boot/dts/imx6qdl-apalis.dtsi | 14 ++++++++++++++ 3 files changed, 14 insertions(+), 28 deletions(-) diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/imx6q-apalis-eval.dts index 5985d1169be1..fdcb740a7a54 100644 --- a/arch/arm/boot/dts/imx6q-apalis-eval.dts +++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts @@ -30,20 +30,6 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys { - compatible = "gpio-keys"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_gpio_keys>; - - wakeup { - label = "Wake-Up"; - gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; - linux,code = ; - debounce-interval = <10>; - wakeup-source; - }; - }; - reg_pcie_switch: regulator-pcie-switch { compatible = "regulator-fixed"; regulator-name = "pcie_switch"; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts index 6743617ad1c1..e6fc76776b2e 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts @@ -30,20 +30,6 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys { - compatible = "gpio-keys"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_gpio_keys>; - - wakeup { - label = "Wake-Up"; - gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; - linux,code = ; - debounce-interval = <10>; - wakeup-source; - }; - }; - leds { compatible = "gpio-leds"; diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi index 3aa66b6d0c88..240783d0901c 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -29,6 +29,20 @@ status = "disabled"; }; + gpio-keys { + compatible = "gpio-keys"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_keys>; + + wakeup { + debounce-interval = <10>; + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; + label = "Wake-Up"; + linux,code = ; + wakeup-source; + }; + }; + lcd_display: disp0 { compatible = "fsl,imx-parallel-display"; #address-cells = <1>;