linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Max Krummenacher <max.oss.09@gmail.com>
To: max.krummenacher@toradex.com
Cc: Fabio Estevam <festevam@gmail.com>,
	Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
	NXP Linux Team <linux-imx@nxp.com>,
	Pengutronix Kernel Team <kernel@pengutronix.de>,
	Rob Herring <robh+dt@kernel.org>,
	Sascha Hauer <s.hauer@pengutronix.de>,
	Shawn Guo <shawnguo@kernel.org>,
	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	[thread overview]
Message-ID: <20220615115006.45672-9-max.oss.09@gmail.com> (raw)
In-Reply-To: <20220615115006.45672-1-max.oss.09@gmail.com>

From: Max Krummenacher <max.krummenacher@toradex.com>

Move gpio-keys to module-level device tree given it is standard Apalis
functionality.
Sort properties alphabetical.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---

(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 = <KEY_WAKEUP>;
-			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 = <KEY_WAKEUP>;
-			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 = <KEY_WAKEUP>;
+			wakeup-source;
+		};
+	};
+
 	lcd_display: disp0 {
 		compatible = "fsl,imx-parallel-display";
 		#address-cells = <1>;
-- 
2.20.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2022-06-15 11:54 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-15 11:49 [PATCH v2 00/18] ARM: dts: imx6q-apalis: Misc improvements and newly added carrier Max Krummenacher
2022-06-15 11:49 ` [PATCH v2 02/18] Revert "ARM: dts: imx6qdl-apalis: Avoid underscore in node name" Max Krummenacher
2022-06-15 11:49 ` [PATCH v2 03/18] ARM: dts: imx6q-apalis: Add gpio-line-names Max Krummenacher
2022-06-15 11:49 ` [PATCH v2 04/18] ARM: dts: imx6q-apalis: Command pmic to standby for poweroff Max Krummenacher
2022-06-15 11:49 ` [PATCH v2 05/18] ARM: dts: imx6q-apalis: Move parallel rgb interface to SoM dtsi Max Krummenacher
2022-06-15 11:49 ` [PATCH v2 06/18] ARM: dts: imx6q-apalis: Move pinmux groups " Max Krummenacher
2022-06-15 11:49 ` [PATCH v2 07/18] ARM: dts: imx6q-apalis: Move Atmel MXT touch ctrl " Max Krummenacher
2022-06-15 11:49 ` Max Krummenacher [this message]
2022-06-15 11:49 ` [PATCH v2 09/18] ARM: dts: imx6q-apalis: Add LVDS panel support Max Krummenacher
2022-06-15 11:49 ` [PATCH v2 10/18] ARM: dts: imx6q-apalis: Disable HDMI Max Krummenacher
2022-06-15 11:49 ` [PATCH v2 11/18] ARM: dts: imx6q-apalis: Disable stmpe touchscreen Max Krummenacher
2022-06-15 11:50 ` [PATCH v2 12/18] ARM: dts: imx6q-apalis: Add ov5640 mipi csi camera Max Krummenacher
2022-06-15 11:50 ` [PATCH v2 13/18] ARM: dts: imx6q-apalis: Add adv7280 video input Max Krummenacher
2022-06-15 11:50 ` [PATCH v2 14/18] ARM: dts: imx6q-apalis: Clean-up sd card support Max Krummenacher
2022-06-15 11:50 ` [PATCH v2 15/18] ARM: dts: imx6q-apalis: Add support for Toradex Ixora V1.2 carrier boards Max Krummenacher
2022-06-15 11:50 ` [PATCH v2 16/18] ARM: dts: imx6q-apalis: backlight pwm: Simplify inverted backlight Max Krummenacher
2022-06-15 11:50 ` [PATCH v2 17/18] ARM: dts: imx6q-apalis: backlight pwm: Adapt brightness steps Max Krummenacher
2022-06-15 11:50 ` [PATCH v2 18/18] ARM: dts: imx6q-apalis: Cleanup Max Krummenacher
2022-06-20  1:14 ` [PATCH v2 00/18] ARM: dts: imx6q-apalis: Misc improvements and newly added carrier Shawn Guo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220615115006.45672-9-max.oss.09@gmail.com \
    --to=max.oss.09@gmail.com \
    --cc=devicetree@vger.kernel.org \
    --cc=festevam@gmail.com \
    --cc=kernel@pengutronix.de \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-imx@nxp.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=max.krummenacher@toradex.com \
    --cc=robh+dt@kernel.org \
    --cc=s.hauer@pengutronix.de \
    --cc=shawnguo@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).