diff mbox series

[v2,14/16] imx23: synchronise device tree with linux

Message ID 20221022215945.84052-15-marcel@ziswiler.com
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show
Series arm: dts: imx: sync device trees with upstream linux kernel part 2 | expand

Commit Message

Marcel Ziswiler Oct. 22, 2022, 9:59 p.m. UTC 
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

Synchronise device tree with linux v6.0-rc1.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---

(no changes since v1)

 arch/arm/dts/imx23-evk.dts     | 1 -
 arch/arm/dts/imx23-pinfunc.h   | 8 +-------
 arch/arm/dts/imx23-u-boot.dtsi | 7 +++----
 arch/arm/dts/imx23.dtsi        | 2 +-
 4 files changed, 5 insertions(+), 13 deletions(-)

Comments

Stefano Babic Oct. 24, 2022, 1:54 p.m. UTC | #1 
> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> Synchronise device tree with linux v6.0-rc1.
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic
diff mbox series

Patch

diff --git a/arch/arm/dts/imx23-evk.dts b/arch/arm/dts/imx23-evk.dts
index 8cbaf1c811..3b609d987d 100644
--- a/arch/arm/dts/imx23-evk.dts
+++ b/arch/arm/dts/imx23-evk.dts
@@ -79,7 +79,6 @@ 
 						MX23_PAD_LCD_RESET__GPIO_1_18
 						MX23_PAD_PWM3__GPIO_1_29
 						MX23_PAD_PWM4__GPIO_1_30
-						MX23_PAD_SSP1_DETECT__SSP1_DETECT
 					>;
 					fsl,drive-strength = <MXS_DRIVE_4mA>;
 					fsl,voltage = <MXS_VOLTAGE_HIGH>;
diff --git a/arch/arm/dts/imx23-pinfunc.h b/arch/arm/dts/imx23-pinfunc.h
index 5c0f32ca3a..468c079f3c 100644
--- a/arch/arm/dts/imx23-pinfunc.h
+++ b/arch/arm/dts/imx23-pinfunc.h
@@ -1,14 +1,8 @@ 
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Header providing constants for i.MX23 pinctrl bindings.
  *
  * Copyright (C) 2013 Lothar Waßmann <LW@KARO-electronics.de>
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
  */
 
 #ifndef __DT_BINDINGS_MX23_PINCTRL_H__
diff --git a/arch/arm/dts/imx23-u-boot.dtsi b/arch/arm/dts/imx23-u-boot.dtsi
index 5e87aca61b..5de62bbb90 100644
--- a/arch/arm/dts/imx23-u-boot.dtsi
+++ b/arch/arm/dts/imx23-u-boot.dtsi
@@ -1,14 +1,13 @@ 
 // SPDX-License-Identifier: GPL-2.0+
 
 &gpio0 {
-	gpio-ranges = <&pinctrl 0 0 32>;
+	gpio-ranges = <&{/apb@80000000/apbh@80000000/pinctrl@80018000} 0 0 32>;
 };
 
 &gpio1 {
-	gpio-ranges = <&pinctrl 0 32 31>;
+	gpio-ranges = <&{/apb@80000000/apbh@80000000/pinctrl@80018000} 0 32 31>;
 };
 
 &gpio2 {
-	gpio-ranges = <&pinctrl 0 63 32>;
+	gpio-ranges = <&{/apb@80000000/apbh@80000000/pinctrl@80018000} 0 63 32>;
 };
-
diff --git a/arch/arm/dts/imx23.dtsi b/arch/arm/dts/imx23.dtsi
index 4cfec77849..7f4c602454 100644
--- a/arch/arm/dts/imx23.dtsi
+++ b/arch/arm/dts/imx23.dtsi
@@ -105,7 +105,7 @@ 
 				status = "disabled";
 			};
 
-			pinctrl: pinctrl@80018000 {
+			pinctrl@80018000 {
 				#address-cells = <1>;
 				#size-cells = <0>;
 				compatible = "fsl,imx23-pinctrl", "simple-bus";