From nobody Mon Sep 29 21:22:40 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87099C00140 for ; Mon, 15 Aug 2022 22:43:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351365AbiHOWna (ORCPT ); Mon, 15 Aug 2022 18:43:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351317AbiHOWh6 (ORCPT ); Mon, 15 Aug 2022 18:37:58 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2B3B1322E4; Mon, 15 Aug 2022 12:51:03 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3825A6123B; Mon, 15 Aug 2022 19:51:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3ED21C433D6; Mon, 15 Aug 2022 19:51:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660593062; bh=VDHLpJeXgtOYXNXVIclwxev6mqDfXvY9gFVcYGXaWFk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ca/s8FF3rsDsF/sXodVIP93SZpOBlmuU1Oe2JQSctLJP+d0cbVeX6yEholuPvcgHz ypDWQOC48mY9y9uZW6dKKf0chhIDFFtZ6qDxnTipCMtuCm9/0gaDdZFx9yVG/gSe/y B6JKl5+6uqegsrMoq4G2fLhbzRBYkSBWKzDZWjYA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marcel Ziswiler , Shawn Guo , Sasha Levin Subject: [PATCH 5.19 0207/1157] ARM: dts: imx7-colibri: move aliases, chosen, extcon and gpio-keys Date: Mon, 15 Aug 2022 19:52:43 +0200 Message-Id: <20220815180447.924486635@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180439.416659447@linuxfoundation.org> References: <20220815180439.416659447@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Marcel Ziswiler [ Upstream commit 0ef1969ea5699b00394e1a8c8c7f927b2d0bc5bb ] Move aliases, chosen, extcon and gpio-keys to module-level device tree given they are standard Colibri functionalities. Signed-off-by: Marcel Ziswiler Signed-off-by: Shawn Guo Signed-off-by: Sasha Levin --- arch/arm/boot/dts/imx7-colibri-aster.dtsi | 18 ------------ arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 31 -------------------- arch/arm/boot/dts/imx7-colibri.dtsi | 32 +++++++++++++++++++++ 3 files changed, 32 insertions(+), 49 deletions(-) diff --git a/arch/arm/boot/dts/imx7-colibri-aster.dtsi b/arch/arm/boot/dts/= imx7-colibri-aster.dtsi index 69ee85084ad4..02c49ed686a8 100644 --- a/arch/arm/boot/dts/imx7-colibri-aster.dtsi +++ b/arch/arm/boot/dts/imx7-colibri-aster.dtsi @@ -5,24 +5,6 @@ */ =20 / { - chosen { - stdout-path =3D "serial0:115200n8"; - }; - - gpio-keys { - compatible =3D "gpio-keys"; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&pinctrl_gpiokeys>; - - power { - label =3D "Wake-Up"; - gpios =3D <&gpio1 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; - linux,code =3D ; - debounce-interval =3D <10>; - wakeup-source; - }; - }; - reg_3v3: regulator-3v3 { compatible =3D "regulator-fixed"; regulator-name =3D "3.3V"; diff --git a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi b/arch/arm/boot/dt= s/imx7-colibri-eval-v3.dtsi index d6775e3c64f1..4cf4107fb642 100644 --- a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +++ b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi @@ -4,15 +4,6 @@ */ =20 / { - aliases { - rtc0 =3D &rtc; - rtc1 =3D &snvs_rtc; - }; - - chosen { - stdout-path =3D "serial0:115200n8"; - }; - /* fixed crystal dedicated to mpc258x */ clk16m: clk16m { compatible =3D "fixed-clock"; @@ -20,27 +11,6 @@ clk16m: clk16m { clock-frequency =3D <16000000>; }; =20 - extcon_usbc_det: usbc-det { - compatible =3D "linux,extcon-usb-gpio"; - id-gpio =3D <&gpio7 14 GPIO_ACTIVE_HIGH>; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&pinctrl_usbc_det>; - }; - - gpio-keys { - compatible =3D "gpio-keys"; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&pinctrl_gpiokeys>; - - power { - label =3D "Wake-Up"; - gpios =3D <&gpio1 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; - linux,code =3D ; - debounce-interval =3D <10>; - wakeup-source; - }; - }; - reg_3v3: regulator-3v3 { compatible =3D "regulator-fixed"; regulator-name =3D "3.3V"; @@ -148,7 +118,6 @@ &uart3 { }; =20 &usbotg1 { - extcon =3D <0>, <&extcon_usbc_det>; status =3D "okay"; }; =20 diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-c= olibri.dtsi index 4146564c3e4b..79f041988c7b 100644 --- a/arch/arm/boot/dts/imx7-colibri.dtsi +++ b/arch/arm/boot/dts/imx7-colibri.dtsi @@ -6,6 +6,11 @@ #include =20 / { + aliases { + rtc0 =3D &rtc; + rtc1 =3D &snvs_rtc; + }; + backlight: backlight { brightness-levels =3D <0 45 63 88 119 158 203 255>; compatible =3D "pwm-backlight"; @@ -18,6 +23,32 @@ backlight: backlight { status =3D "disabled"; }; =20 + chosen { + stdout-path =3D "serial0:115200n8"; + }; + + extcon_usbc_det: usbc-det { + compatible =3D "linux,extcon-usb-gpio"; + debounce =3D <25>; + id-gpio =3D <&gpio7 14 GPIO_ACTIVE_HIGH>; /* SODIMM 137 / USBC_DET */ + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_usbc_det>; + }; + + gpio-keys { + compatible =3D "gpio-keys"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_gpiokeys>; + + wakeup { + debounce-interval =3D <10>; + gpios =3D <&gpio1 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* SODIMM 45 = */ + label =3D "Wake-Up"; + linux,code =3D ; + wakeup-source; + }; + }; + panel_dpi: panel-dpi { backlight =3D <&backlight>; compatible =3D "edt,et057090dhu"; @@ -498,6 +529,7 @@ &uart3 { =20 &usbotg1 { dr_mode =3D "otg"; + extcon =3D <0>, <&extcon_usbc_det>; }; =20 &usdhc1 { --=20 2.35.1