[PATCH v1 8/8] imx8mm: synchronise device tree with linux

26 Aug 2022

From: Marcel Ziswiler marcel.ziswiler@toradex.com
Synchronise device tree with linux v6.0-rc1.
Signed-off-by: Marcel Ziswiler marcel.ziswiler@toradex.com
---
arch/arm/dts/imx8mm-beacon-baseboard.dtsi |  4 +-
 arch/arm/dts/imx8mm-evk.dtsi              | 43 +++++++++++++++++++
 arch/arm/dts/imx8mm-icore-mx8mm.dtsi      | 12 +++---
 arch/arm/dts/imx8mm-mx8menlo.dts          |  4 +-
 arch/arm/dts/imx8mm-u-boot.dtsi           |  2 +-
 arch/arm/dts/imx8mm-venice-gw700x.dtsi    | 24 +++++------
 arch/arm/dts/imx8mm-venice-gw7901.dts     |  8 ++--
 arch/arm/dts/imx8mm-venice-gw7902.dts     | 10 ++---
 arch/arm/dts/imx8mm-venice-gw7903.dts     |  6 +--
 arch/arm/dts/imx8mm-verdin.dtsi           | 10 ++++-
 include/dt-bindings/interconnect/imx8mm.h | 50 +++++++++++++++++++++++
 11 files changed, 137 insertions(+), 36 deletions(-)
 create mode 100644 include/dt-bindings/interconnect/imx8mm.h

diff --git a/arch/arm/dts/imx8mm-beacon-baseboard.dtsi b/arch/arm/dts/imx8mm-beacon-baseboard.dtsi
index f338a886d81..03266bd90a0 100644
--- a/arch/arm/dts/imx8mm-beacon-baseboard.dtsi
+++ b/arch/arm/dts/imx8mm-beacon-baseboard.dtsi
@@ -285,14 +285,14 @@
 &usbotg1 {
    vbus-supply = <&reg_usbotg1>;
    disable-over-current;
-	dr_mode="otg";
+	dr_mode = "otg";
    status = "okay";
 };
&usbotg2 {
    pinctrl-names = "default";
    disable-over-current;
-	dr_mode="host";
+	dr_mode = "host";
    status = "okay";
 };
diff --git a/arch/arm/dts/imx8mm-evk.dtsi b/arch/arm/dts/imx8mm-evk.dtsi
index c42b966f7a6..7d6317d95b1 100644
--- a/arch/arm/dts/imx8mm-evk.dtsi
+++ b/arch/arm/dts/imx8mm-evk.dtsi
@@ -75,6 +75,11 @@
    	linux,autosuspend-period = <125>;
    };
+	audio_codec_bt_sco: audio-codec-bt-sco {
+		compatible = "linux,bt-sco";
+		#sound-dai-cells = <1>;
+	};
+
    wm8524: audio-codec {
    	#sound-dai-cells = <0>;
    	compatible = "wlf,wm8524";
@@ -83,6 +88,25 @@
    	wlf,mute-gpios = <&gpio5 21 GPIO_ACTIVE_LOW>;
    };
+	sound-bt-sco {
+		compatible = "simple-audio-card";
+		simple-audio-card,name = "bt-sco-audio";
+		simple-audio-card,format = "dsp_a";
+		simple-audio-card,bitclock-inversion;
+		simple-audio-card,frame-master = <&btcpu>;
+		simple-audio-card,bitclock-master = <&btcpu>;
+
+		btcpu: simple-audio-card,cpu {
+			sound-dai = <&sai2>;
+			dai-tdm-slot-num = <2>;
+			dai-tdm-slot-width = <16>;
+		};
+
+		simple-audio-card,codec {
+			sound-dai = <&audio_codec_bt_sco 1>;
+		};
+	};
+
    sound-wm8524 {
    	compatible = "simple-audio-card";
    	simple-audio-card,name = "wm8524-audio";
@@ -346,6 +370,16 @@
    status = "okay";
 };
+&sai2 {
+	#sound-dai-cells = <0>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_sai2>;
+	assigned-clocks = <&clk IMX8MM_CLK_SAI2>;
+	assigned-clock-parents = <&clk IMX8MM_AUDIO_PLL1_OUT>;
+	assigned-clock-rates = <24576000>;
+	status = "okay";
+};
+
 &sai3 {
    pinctrl-names = "default";
    pinctrl-0 = <&pinctrl_sai3>;
@@ -494,6 +528,15 @@
    	>;
    };
+	pinctrl_sai2: sai2grp {
+		fsl,pins = <
+			MX8MM_IOMUXC_SAI2_TXC_SAI2_TX_BCLK      0xd6
+			MX8MM_IOMUXC_SAI2_TXFS_SAI2_TX_SYNC     0xd6
+			MX8MM_IOMUXC_SAI2_TXD0_SAI2_TX_DATA0    0xd6
+			MX8MM_IOMUXC_SAI2_RXD0_SAI2_RX_DATA0    0xd6
+		>;
+	};
+
    pinctrl_sai3: sai3grp {
    	fsl,pins = <
    		MX8MM_IOMUXC_SAI3_TXFS_SAI3_TX_SYNC     0xd6
diff --git a/arch/arm/dts/imx8mm-icore-mx8mm.dtsi b/arch/arm/dts/imx8mm-icore-mx8mm.dtsi
index b40148d728e..9e6170d9394 100644
--- a/arch/arm/dts/imx8mm-icore-mx8mm.dtsi
+++ b/arch/arm/dts/imx8mm-icore-mx8mm.dtsi
@@ -84,42 +84,42 @@
    		};
reg_buck1: buck1 {
-				regulator-min-microvolt =  <400000>;
+				regulator-min-microvolt = <400000>;
    			regulator-max-microvolt = <1800000>;
    			regulator-always-on;
    			regulator-boot-on;
    		};
reg_buck2: buck2 {
-				regulator-min-microvolt =  <400000>;
+				regulator-min-microvolt = <400000>;
    			regulator-max-microvolt = <1800000>;
    			regulator-always-on;
    			regulator-boot-on;
    		};
reg_buck3: buck3 {
-				regulator-min-microvolt =  <400000>;
+				regulator-min-microvolt = <400000>;
    			regulator-max-microvolt = <1800000>;
    			regulator-always-on;
    			regulator-boot-on;
    		};
reg_buck4: buck4 {
-				regulator-min-microvolt =  <400000>;
+				regulator-min-microvolt = <400000>;
    			regulator-max-microvolt = <1800000>;
    			regulator-always-on;
    			regulator-boot-on;
    		};
reg_buck5: buck5 {
-				regulator-min-microvolt =  <400000>;
+				regulator-min-microvolt = <400000>;
    			regulator-max-microvolt = <1800000>;
    			regulator-always-on;
    			regulator-boot-on;
    		};
reg_buck6: buck6 {
-				regulator-min-microvolt =  <400000>;
+				regulator-min-microvolt = <400000>;
    			regulator-max-microvolt = <1800000>;
    			regulator-always-on;
    			regulator-boot-on;
diff --git a/arch/arm/dts/imx8mm-mx8menlo.dts b/arch/arm/dts/imx8mm-mx8menlo.dts
index 92eaf4ef456..c97f4e06ae5 100644
--- a/arch/arm/dts/imx8mm-mx8menlo.dts
+++ b/arch/arm/dts/imx8mm-mx8menlo.dts
@@ -20,13 +20,13 @@
    	pinctrl-names = "default";
    	pinctrl-0 = <&pinctrl_led>;
-		user1 {
+		led-1 {
    		label = "TestLed601";
    		gpios = <&gpio4 18 GPIO_ACTIVE_HIGH>;
    		linux,default-trigger = "mmc0";
    	};
-		user2 {
+		led-2 {
    		label = "TestLed602";
    		gpios = <&gpio4 10 GPIO_ACTIVE_HIGH>;
    		linux,default-trigger = "heartbeat";
diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi
index f792b421e89..05fd3e6aac1 100644
--- a/arch/arm/dts/imx8mm-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-u-boot.dtsi
@@ -9,7 +9,7 @@
    };
 };
-&{/soc@0} {
+&soc {
    u-boot,dm-pre-reloc;
    u-boot,dm-spl;
 };
diff --git a/arch/arm/dts/imx8mm-venice-gw700x.dtsi b/arch/arm/dts/imx8mm-venice-gw700x.dtsi
index 00f86cada30..66a0d103c90 100644
--- a/arch/arm/dts/imx8mm-venice-gw700x.dtsi
+++ b/arch/arm/dts/imx8mm-venice-gw700x.dtsi
@@ -16,13 +16,13 @@
    gpio-keys {
    	compatible = "gpio-keys";
-		user-pb {
+		key-user-pb {
    		label = "user_pb";
    		gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
    		linux,code = <BTN_0>;
    	};
-		user-pb1x {
+		key-user-pb1x {
    		label = "user_pb1x";
    		linux,code = <BTN_1>;
    		interrupt-parent = <&gsc>;
@@ -36,14 +36,14 @@
    		interrupts = <1>;
    	};
-		eeprom-wp {
+		key-eeprom-wp {
    		label = "eeprom_wp";
    		linux,code = <BTN_3>;
    		interrupt-parent = <&gsc>;
    		interrupts = <2>;
    	};
-		tamper {
+		key-tamper {
    		label = "tamper";
    		linux,code = <BTN_4>;
    		interrupt-parent = <&gsc>;
@@ -286,8 +286,8 @@
    			regulator-name = "buck1";
    			regulator-min-microvolt = <800000>;
    			regulator-max-microvolt = <1000000>;
-				regulator-min-microamp  = <3800000>;
-				regulator-max-microamp  = <6800000>;
+				regulator-min-microamp = <3800000>;
+				regulator-max-microamp = <6800000>;
    			regulator-boot-on;
    			regulator-always-on;
    		};
@@ -297,8 +297,8 @@
    			regulator-name = "buck2";
    			regulator-min-microvolt = <800000>;
    			regulator-max-microvolt = <900000>;
-				regulator-min-microamp  = <2200000>;
-				regulator-max-microamp  = <5200000>;
+				regulator-min-microamp = <2200000>;
+				regulator-max-microamp = <5200000>;
    			regulator-boot-on;
    			regulator-always-on;
    		};
@@ -308,8 +308,8 @@
    			regulator-name = "buck3";
    			regulator-min-microvolt = <800000>;
    			regulator-max-microvolt = <1000000>;
-				regulator-min-microamp  = <3800000>;
-				regulator-max-microamp  = <6800000>;
+				regulator-min-microamp = <3800000>;
+				regulator-max-microamp = <6800000>;
    			regulator-always-on;
    		};
@@ -318,8 +318,8 @@
    			regulator-name = "buck4";
    			regulator-min-microvolt = <1800000>;
    			regulator-max-microvolt = <1800000>;
-				regulator-min-microamp  = <2200000>;
-				regulator-max-microamp  = <5200000>;
+				regulator-min-microamp = <2200000>;
+				regulator-max-microamp = <5200000>;
    			regulator-boot-on;
    			regulator-always-on;
    		};
diff --git a/arch/arm/dts/imx8mm-venice-gw7901.dts b/arch/arm/dts/imx8mm-venice-gw7901.dts
index 24737e89038..35fb929e7bc 100644
--- a/arch/arm/dts/imx8mm-venice-gw7901.dts
+++ b/arch/arm/dts/imx8mm-venice-gw7901.dts
@@ -38,13 +38,13 @@
    gpio-keys {
    	compatible = "gpio-keys";
-		user-pb {
+		key-user-pb {
    		label = "user_pb";
    		gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
    		linux,code = <BTN_0>;
    	};
-		user-pb1x {
+		key-user-pb1x {
    		label = "user_pb1x";
    		linux,code = <BTN_1>;
    		interrupt-parent = <&gsc>;
@@ -58,14 +58,14 @@
    		interrupts = <1>;
    	};
-		eeprom-wp {
+		key-eeprom-wp {
    		label = "eeprom_wp";
    		linux,code = <BTN_3>;
    		interrupt-parent = <&gsc>;
    		interrupts = <2>;
    	};
-		tamper {
+		key-tamper {
    		label = "tamper";
    		linux,code = <BTN_4>;
    		interrupt-parent = <&gsc>;
diff --git a/arch/arm/dts/imx8mm-venice-gw7902.dts b/arch/arm/dts/imx8mm-venice-gw7902.dts
index 407ab4592b4..6dc5eda2d25 100644
--- a/arch/arm/dts/imx8mm-venice-gw7902.dts
+++ b/arch/arm/dts/imx8mm-venice-gw7902.dts
@@ -42,13 +42,13 @@
    gpio-keys {
    	compatible = "gpio-keys";
-		user-pb {
+		key-user-pb {
    		label = "user_pb";
    		gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
    		linux,code = <BTN_0>;
    	};
-		user-pb1x {
+		key-user-pb1x {
    		label = "user_pb1x";
    		linux,code = <BTN_1>;
    		interrupt-parent = <&gsc>;
@@ -62,14 +62,14 @@
    		interrupts = <1>;
    	};
-		eeprom-wp {
+		key-eeprom-wp {
    		label = "eeprom_wp";
    		linux,code = <BTN_3>;
    		interrupt-parent = <&gsc>;
    		interrupts = <2>;
    	};
-		tamper {
+		key-tamper {
    		label = "tamper";
    		linux,code = <BTN_4>;
    		interrupt-parent = <&gsc>;
@@ -651,7 +651,7 @@
    pinctrl-names = "default";
    pinctrl-0 = <&pinctrl_uart1>, <&pinctrl_uart1_gpio>;
    rts-gpios = <&gpio4 10 GPIO_ACTIVE_LOW>;
-	cts-gpios = <&gpio4 11 GPIO_ACTIVE_LOW>;
+	cts-gpios = <&gpio4 24 GPIO_ACTIVE_LOW>;
    uart-has-rtscts;
    status = "okay";
 };
diff --git a/arch/arm/dts/imx8mm-venice-gw7903.dts b/arch/arm/dts/imx8mm-venice-gw7903.dts
index a7dae9bd4c1..a65761a53f2 100644
--- a/arch/arm/dts/imx8mm-venice-gw7903.dts
+++ b/arch/arm/dts/imx8mm-venice-gw7903.dts
@@ -33,13 +33,13 @@
    gpio-keys {
    	compatible = "gpio-keys";
-		user-pb {
+		key-user-pb {
    		label = "user_pb";
    		gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
    		linux,code = <BTN_0>;
    	};
-		user-pb1x {
+		key-user-pb1x {
    		label = "user_pb1x";
    		linux,code = <BTN_1>;
    		interrupt-parent = <&gsc>;
@@ -53,7 +53,7 @@
    		interrupts = <1>;
    	};
-		eeprom-wp {
+		key-eeprom-wp {
    		label = "eeprom_wp";
    		linux,code = <BTN_3>;
    		interrupt-parent = <&gsc>;
diff --git a/arch/arm/dts/imx8mm-verdin.dtsi b/arch/arm/dts/imx8mm-verdin.dtsi
index eafa88d980b..d1b4582f44c 100644
--- a/arch/arm/dts/imx8mm-verdin.dtsi
+++ b/arch/arm/dts/imx8mm-verdin.dtsi
@@ -43,7 +43,7 @@
    	pinctrl-names = "default";
    	pinctrl-0 = <&pinctrl_gpio_keys>;
-		wakeup {
+		key-wakeup {
    		debounce-interval = <10>;
    		/* Verdin CTRL_WAKE1_MICO# (SODIMM 252) */
    		gpios = <&gpio4 28 GPIO_ACTIVE_LOW>;
@@ -154,6 +154,14 @@
    cpu-supply = <&reg_vdd_arm>;
 };
+&cpu_alert0 {
+	temperature = <95000>;
+};
+
+&cpu_crit0 {
+	temperature = <105000>;
+};
+
 &ddrc {
    operating-points-v2 = <&ddrc_opp_table>;
diff --git a/include/dt-bindings/interconnect/imx8mm.h b/include/dt-bindings/interconnect/imx8mm.h
new file mode 100644
index 00000000000..8f10bb06cb5
--- /dev/null
+++ b/include/dt-bindings/interconnect/imx8mm.h
@@ -0,0 +1,50 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Interconnect framework driver for i.MX SoC
+ *
+ * Copyright (c) 2019, BayLibre
+ * Copyright (c) 2019-2020, NXP
+ * Author: Alexandre Bailon abailon@baylibre.com
+ */
+
+#ifndef __DT_BINDINGS_INTERCONNECT_IMX8MM_H
+#define __DT_BINDINGS_INTERCONNECT_IMX8MM_H
+
+#define IMX8MM_ICN_NOC		1
+#define IMX8MM_ICS_DRAM		2
+#define IMX8MM_ICS_OCRAM	3
+#define IMX8MM_ICM_A53		4
+
+#define IMX8MM_ICM_VPU_H1	5
+#define IMX8MM_ICM_VPU_G1	6
+#define IMX8MM_ICM_VPU_G2	7
+#define IMX8MM_ICN_VIDEO	8
+
+#define IMX8MM_ICM_GPU2D	9
+#define IMX8MM_ICM_GPU3D	10
+#define IMX8MM_ICN_GPU		11
+
+#define IMX8MM_ICM_CSI		12
+#define IMX8MM_ICM_LCDIF	13
+#define IMX8MM_ICN_MIPI		14
+
+#define IMX8MM_ICM_USB1		15
+#define IMX8MM_ICM_USB2		16
+#define IMX8MM_ICM_PCIE		17
+#define IMX8MM_ICN_HSIO		18
+
+#define IMX8MM_ICM_SDMA2	19
+#define IMX8MM_ICM_SDMA3	20
+#define IMX8MM_ICN_AUDIO	21
+
+#define IMX8MM_ICN_ENET		22
+#define IMX8MM_ICM_ENET		23
+
+#define IMX8MM_ICN_MAIN		24
+#define IMX8MM_ICM_NAND		25
+#define IMX8MM_ICM_SDMA1	26
+#define IMX8MM_ICM_USDHC1	27
+#define IMX8MM_ICM_USDHC2	28
+#define IMX8MM_ICM_USDHC3	29
+
+#endif /* __DT_BINDINGS_INTERCONNECT_IMX8MM_H */
-- 
2.35.1


    