Skip to contentSkip to conversation

imx6-tqma6: Convert to OF_UPSTREAM

PATCH Applied Fabio Estevam 1 participant 2 messages Aug 9, 2024 – Aug 13, 2024

Subsystems (2)
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/1 imx6-tqma6: Convert to OF_UPSTREAM

From: Fabio Estevam <[email protected]>

Instead of using the local imx6-tqma6 devicetree copies from U-Boot, convert the imx6-tqma6 target to OF_UPSTREAM so that the upstream kernel devicetrees can be used instead.

---
 arch/arm/dts/Makefile              |   4 -
 arch/arm/dts/imx6dl-mba6b.dts      |  21 ---
 arch/arm/dts/imx6dl-tqma6a.dtsi    |  16 ---
 arch/arm/dts/imx6dl-tqma6b.dtsi    |  16 ---
 arch/arm/dts/imx6q-mba6b.dts       |  20 ---
 arch/arm/dts/imx6q-tqma6a.dtsi     |  16 ---
 arch/arm/dts/imx6q-tqma6b.dtsi     |  15 --
 arch/arm/dts/imx6qdl-tqma6.dtsi    | 215 -----------------------------
 arch/arm/dts/imx6qdl-tqma6a.dtsi   |  53 -------
 arch/arm/dts/imx6qdl-tqma6b.dtsi   |  33 -----
 board/tq/tqma6/Kconfig             |   1 +
 configs/tqma6dl_mba6_mmc_defconfig |   2 +-
 configs/tqma6dl_mba6_spi_defconfig |   2 +-
 configs/tqma6q_mba6_mmc_defconfig  |   2 +-
 configs/tqma6q_mba6_spi_defconfig  |   4 +-
 configs/tqma6s_mba6_mmc_defconfig  |   2 +-
 configs/tqma6s_mba6_spi_defconfig  |   2 +-
 17 files changed, 8 insertions(+), 416 deletions(-)
 delete mode 100644 arch/arm/dts/imx6dl-mba6b.dts
 delete mode 100644 arch/arm/dts/imx6dl-tqma6a.dtsi
 delete mode 100644 arch/arm/dts/imx6dl-tqma6b.dtsi
 delete mode 100644 arch/arm/dts/imx6q-mba6b.dts
 delete mode 100644 arch/arm/dts/imx6q-tqma6a.dtsi
 delete mode 100644 arch/arm/dts/imx6q-tqma6b.dtsi
 delete mode 100644 arch/arm/dts/imx6qdl-tqma6.dtsi
 delete mode 100644 arch/arm/dts/imx6qdl-tqma6a.dtsi
 delete mode 100644 arch/arm/dts/imx6qdl-tqma6b.dtsi
arch/arm/dts/Makefile +0 -4
index 871cfbbebabd..2d931c23fc83 100644
@@ -764,8 +764,6 @@ dtb-y += \
 	imx6dl-icore.dtb \
 	imx6dl-icore-mipi.dtb \
 	imx6dl-icore-rqs.dtb \
-	imx6dl-mba6a.dtb \
-	imx6dl-mba6b.dtb \
 	imx6dl-mamoj.dtb \
 	imx6dl-nitrogen6x.dtb \
 	imx6dl-pico.dtb \
@@ -815,8 +813,6 @@ dtb-y += \
 	imx6q-kp.dtb \
 	imx6q-logicpd.dtb \
 	imx6q-marsboard.dtb \
-	imx6q-mba6a.dtb \
-	imx6q-mba6b.dtb \
 	imx6q-mccmon6.dtb\
 	imx6q-nitrogen6x.dtb \
 	imx6q-novena.dtb \
arch/arm/dts/imx6dl-mba6b.dts deleted +0 -21
deleted file mode 100644
index 610b19d2db0f..000000000000
@@ -1,21 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright 2013 Sascha Hauer, Pengutronix
- *
- * Copyright 2013-2021 TQ-Systems GmbH
- * Author: Markus Niebel <[email protected]>
- */
-
-/dts-v1/;
-
-#include <dt-bindings/gpio/gpio.h>
-#include "imx6dl-tqma6b.dtsi"
-#include "imx6qdl-mba6.dtsi"
-#include "imx6qdl-mba6b.dtsi"
-#include "imx6dl-mba6.dtsi"
-
-/ {
-	model = "TQ TQMa6S/DL on MBa6x";
-	compatible = "tq,imx6dl-mba6x-b", "tq,mba6b",
-		     "tq,imx6dl-tqma6dl-b", "fsl,imx6dl";
-};
arch/arm/dts/imx6dl-tqma6a.dtsi deleted +0 -16
deleted file mode 100644
index e891ef9b0091..000000000000
@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright 2013 Sascha Hauer, Pengutronix
- * Copyright 2013-2017 Markus Niebel <[email protected]>
- */
-
-#include "imx6dl.dtsi"
-#include "imx6qdl-tqma6a.dtsi"
-#include "imx6qdl-tqma6.dtsi"
-
-/ {
-	memory@10000000 {
-		device_type = "memory";
-		reg = <0x10000000 0x20000000>;
-	};
-};
arch/arm/dts/imx6dl-tqma6b.dtsi deleted +0 -16
deleted file mode 100644
index 38cd8501a886..000000000000
@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright 2013 Sascha Hauer, Pengutronix
- * Copyright 2013-2017 Markus Niebel <[email protected]>
- */
-
-#include "imx6dl.dtsi"
-#include "imx6qdl-tqma6b.dtsi"
-#include "imx6qdl-tqma6.dtsi"
-
-/ {
-	memory@10000000 {
-		device_type = "memory";
-		reg = <0x10000000 0x20000000>;
-	};
-};
arch/arm/dts/imx6q-mba6b.dts deleted +0 -20
deleted file mode 100644
index 02c9f3e91b8f..000000000000
@@ -1,20 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright 2013 Sascha Hauer, Pengutronix
- *
- * Copyright 2013-2021 TQ-Systems GmbH
- * Author: Markus Niebel <[email protected]>
- */
-
-/dts-v1/;
-
-#include "imx6q-tqma6b.dtsi"
-#include "imx6qdl-mba6.dtsi"
-#include "imx6qdl-mba6b.dtsi"
-#include "imx6q-mba6.dtsi"
-
-/ {
-	model = "TQ TQMa6Q on MBa6x";
-	compatible = "tq,imx6q-mba6x-b", "tq,mba6b",
-		     "tq,imx6q-tqma6q-b", "fsl,imx6q";
-};
arch/arm/dts/imx6q-tqma6a.dtsi deleted +0 -16
deleted file mode 100644
index ab4c07c13a13..000000000000
@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright 2013 Sascha Hauer, Pengutronix
- * Copyright 2013-2017 Markus Niebel <[email protected]>
- */
-
-#include "imx6q.dtsi"
-#include "imx6qdl-tqma6a.dtsi"
-#include "imx6qdl-tqma6.dtsi"
-
-/ {
-	memory@10000000 {
-		device_type = "memory";
-		reg = <0x10000000 0x40000000>;
-	};
-};
arch/arm/dts/imx6q-tqma6b.dtsi deleted +0 -15
deleted file mode 100644
index 7224c376c318..000000000000
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright 2013 Sascha Hauer, Pengutronix
- */
-
-#include "imx6q.dtsi"
-#include "imx6qdl-tqma6b.dtsi"
-#include "imx6qdl-tqma6.dtsi"
-
-/ {
-	memory@10000000 {
-		device_type = "memory";
-		reg = <0x10000000 0x40000000>;
-	};
-};
arch/arm/dts/imx6qdl-tqma6.dtsi deleted +0 -215

215 lines not on this page · raw message

arch/arm/dts/imx6qdl-tqma6a.dtsi deleted +0 -53

53 lines not on this page · raw message

arch/arm/dts/imx6qdl-tqma6b.dtsi deleted +0 -33
deleted file mode 100644
index dd0925766440..000000000000
@@ -1,33 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright 2013 Sascha Hauer, Pengutronix
- * Copyright 2013-2017 Markus Niebel <[email protected]>
- */
-
-#include <dt-bindings/gpio/gpio.h>
-
-&i2c3 {
-	pinctrl-names = "default", "gpio";
-	pinctrl-0 = <&pinctrl_i2c3>;
-	pinctrl-1 = <&pinctrl_i2c3_recovery>;
-	scl-gpios = <&gpio1 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-	sda-gpios = <&gpio1 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-	clock-frequency = <100000>;
-	status = "okay";
-
-	pmic: pmic@8 {
-		compatible = "fsl,pfuze100";
-		reg = <0x08>;
-	};
-
-	sensor@48 {
-		compatible = "national,lm75";
-		reg = <0x48>;
-	};
-
-	eeprom@50 {
-		compatible = "st,24c64", "atmel,24c64";
-		reg = <0x50>;
-		pagesize = <32>;
-	};
-};
board/tq/tqma6/Kconfig +1 -0
index e7f23367afd2..b42c8e24ade3 100644
@@ -72,6 +72,7 @@ config MBA6
 	select PHY_MICREL
 	select PHY_MICREL_KSZ90X1
 	select MXC_UART
+	imply OF_UPSTREAM
 	help
 	  Select the MBa6 starterkit. This features a GigE Phy, USB, SD-Card
 	  etc.
configs/tqma6dl_mba6_mmc_defconfig +1 -1
index 1534a2e9262a..be891d24537f 100644
@@ -7,7 +7,7 @@ CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x100000
 CONFIG_MX6DL=y
 CONFIG_TARGET_TQMA6=y
-CONFIG_DEFAULT_DEVICE_TREE="imx6dl-mba6b"
+CONFIG_DEFAULT_DEVICE_TREE="nxp/imx/imx6dl-mba6b"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_SUPPORT_RAW_INITRD=y
configs/tqma6dl_mba6_spi_defconfig +1 -1
index 5eaa9eb270ce..953ceba66260 100644
@@ -9,7 +9,7 @@ CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_MX6DL=y
 CONFIG_TARGET_TQMA6=y
 CONFIG_TQMA6X_SPI_BOOT=y
-CONFIG_DEFAULT_DEVICE_TREE="imx6dl-mba6b"
+CONFIG_DEFAULT_DEVICE_TREE="nxp/imx/imx6dl-mba6b"
 CONFIG_ENV_OFFSET_REDUND=0x90000
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
configs/tqma6q_mba6_mmc_defconfig +1 -1
index 3fcc1f8d54e1..d6706afe0406 100644
@@ -7,7 +7,7 @@ CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x100000
 CONFIG_MX6Q=y
 CONFIG_TARGET_TQMA6=y
-CONFIG_DEFAULT_DEVICE_TREE="imx6q-mba6b"
+CONFIG_DEFAULT_DEVICE_TREE="nxp/imx/imx6q-mba6b"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_SUPPORT_RAW_INITRD=y
configs/tqma6q_mba6_spi_defconfig +2 -2
index a7ffc9edb5b4..28b1bfc41f45 100644
@@ -9,7 +9,7 @@ CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_MX6Q=y
 CONFIG_TARGET_TQMA6=y
 CONFIG_TQMA6X_SPI_BOOT=y
-CONFIG_DEFAULT_DEVICE_TREE="imx6q-mba6b"
+CONFIG_DEFAULT_DEVICE_TREE="nxp/imx/imx6q-mba6b"
 CONFIG_ENV_OFFSET_REDUND=0x90000
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
@@ -18,7 +18,7 @@ CONFIG_BOOTDELAY=3
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="sf probe; run mmcboot; run netboot; run panicboot"
-CONFIG_DEFAULT_FDT_FILE="imx6q-mba6x.dtb"
+CONFIG_DEFAULT_FDT_FILE="nxp/imx/imx6q-mba6x.dtb"
 CONFIG_SYS_PBSIZE=532
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
configs/tqma6s_mba6_mmc_defconfig +1 -1
index 7839c4858478..7bed776507ab 100644
@@ -7,7 +7,7 @@ CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x100000
 CONFIG_MX6S=y
 CONFIG_TARGET_TQMA6=y
-CONFIG_DEFAULT_DEVICE_TREE="imx6dl-mba6b"
+CONFIG_DEFAULT_DEVICE_TREE="nxp/imx/imx6dl-mba6b"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_SUPPORT_RAW_INITRD=y
configs/tqma6s_mba6_spi_defconfig +1 -1
index c3bb44025b34..0af80d5c2e10 100644
@@ -9,7 +9,7 @@ CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_MX6S=y
 CONFIG_TARGET_TQMA6=y
 CONFIG_TQMA6X_SPI_BOOT=y
-CONFIG_DEFAULT_DEVICE_TREE="imx6dl-mba6b"
+CONFIG_DEFAULT_DEVICE_TREE="nxp/imx/imx6dl-mba6b"
 CONFIG_ENV_OFFSET_REDUND=0x90000
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
Signature · 1 line
2.34.1
author reviewer Applied
#1 lore raw
Quoted 8 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

Instead of using the local imx6-tqma6 devicetree copies from U-Boot, convert the imx6-tqma6 target to OF_UPSTREAM so that the upstream kernel devicetrees can be used instead.

Applied, thanks.