Skip to contentSkip to conversation

arm64: dts: imx8mm-kontron: Improvements and OSM board support

PATCH Superseded Frieder Schrempf 3 participants 12 messages Aug 1, 2022

Subsystems (3)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v2 cover arm64: dts: imx8mm-kontron: Improvements and OSM board support

From: Frieder Schrempf <[email protected]>

This set contains a few small improvements for the imx8mm-kontron devicetrees (patch 3-7) and support for a new SoM (patch 8, including baseboard) that complies to the Open Standard Module (OSM) 1.0 hardware specification, size S
(https://sget.org/standards/osm).

It also includes binding changes for the new board (patch 1) and a binding change for the PCA9450 PMIC regulators (patch2).

Changes in v2:
* move binding changes to beginning of patchset
* Allow arbitrary regulator names in PCA9450 bindings
* Use voltage rail names from schematic for PMIC regulator-names
* Add SPI NOR partition layout to devicetree
* Remove unneeded header include
* Add tags

Frieder Schrempf (8):
dt-bindings: arm: fsl: Add Kontron BL i.MX8MM OSM-S board
dt-bindings: regulator: pca9450: Allow arbitrary regulator names
arm64: dts: imx8mm-kontron: Adjust board and SoM model strings
arm64: dts: imx8mm-kontron: Use the VSELECT signal to switch SD card
IO voltage
arm64: dts: imx8mm-kontron: Remove low DDRC operating point
arm64: dts: imx8mm-kontron: Use voltage rail names from schematic for
PMIC regulator-names
arm64: dts: imx8mm-kontron: Add SPI NOR partition layout
arm64: dts: Add support for Kontron SL/BL i.MX8MM OSM-S

 .../devicetree/bindings/arm/fsl.yaml          |   6 +
 .../regulator/nxp,pca9450-regulator.yaml      |   8 +-
 arch/arm64/boot/dts/freescale/Makefile        |   1 +
 .../dts/freescale/imx8mm-kontron-n801x-s.dts  |   5 +-
 .../freescale/imx8mm-kontron-n801x-som.dtsi   |  51 ++-
 .../dts/freescale/imx8mm-kontron-n802x-s.dts  | 376 ++++++++++++++++++
 .../freescale/imx8mm-kontron-n802x-som.dtsi   | 330 +++++++++++++++
 7 files changed, 754 insertions(+), 23 deletions(-)
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-kontron-n802x-s.dts
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-kontron-n802x-som.dtsi
Signature · 1 line
2.37.1
#1 lore raw

PATCH v2 1/8 dt-bindings: arm: fsl: Add Kontron BL i.MX8MM OSM-S board

From: Frieder Schrempf <[email protected]>

Add bindings for the Kontron BL i.MX8MM OSM-S board.

---
Changes in v2:
* add A-b tag from Krzysztof (Thanks!)

---
 Documentation/devicetree/bindings/arm/fsl.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
Documentation/devicetree/bindings/arm/fsl.yaml +6 -0
index ef524378d449..ef99d948e908 100644
@@ -847,6 +847,12 @@ properties:
           - const: kontron,imx8mm-n801x-som
           - const: fsl,imx8mm
 
+      - description: Kontron BL i.MX8MM OSM-S (N802X S) Board
+        items:
+          - const: kontron,imx8mm-n802x-s
+          - const: kontron,imx8mm-n802x-som
+          - const: fsl,imx8mm
+
       - description: Toradex Boards with Verdin iMX8M Mini Modules
         items:
           - enum:
Signature · 1 line
2.37.1
#2 lore raw

PATCH v2 2/8 dt-bindings: regulator: pca9450: Allow arbitrary regulator names

In reply to Frieder Schrempf

From: Frieder Schrempf <[email protected]>

Instead of restricting regulator-name to non-descriptive names, allow to use arbitrary strings. This enables us to use the name of the voltage rail that is powered by the regulator as some board DTs already do.

---
Changes in v2:
* new patch

---
 .../bindings/regulator/nxp,pca9450-regulator.yaml         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/regulator/nxp,pca9450-regulator.yaml +4 -4
index b539781e39aa..b1e4fd09928b 100644
@@ -49,9 +49,9 @@ properties:
 
         properties:
           regulator-name:
-            pattern: "^LDO[1-5]$"
             description:
-              should be "LDO1", ..., "LDO5"
+              Should be "LDO1", ..., "LDO5" or whatever the name of the boards
+              voltage rail powered by this regulator is.
 
         unevaluatedProperties: false
 
@@ -63,9 +63,9 @@ properties:
 
         properties:
           regulator-name:
-            pattern: "^BUCK[1-6]$"
             description:
-              should be "BUCK1", ..., "BUCK6"
+              Should be "BUCK1", ..., "BUCK6" or whatever the name of the boards
+              voltage rail powered by this regulator is.
 
           nxp,dvs-run-voltage:
             $ref: "/schemas/types.yaml#/definitions/uint32"
Signature · 1 line
2.37.1
maintainer
#3 lore raw

Re: [PATCH v2 2/8] dt-bindings: regulator: pca9450: Allow arbitrary regulator names

Documentation/devicetree/bindings/regulator/nxp,pca9450-regulator.yaml properties: · line 54

Quoted 6 lines · Frieder Schrempf

regulator-name:

Documentation/devicetree/bindings/regulator/nxp,pca9450-regulator.yaml +2 -2
-            pattern: "^LDO[1-5]$"
             description:
-              should be "LDO1", ..., "LDO5"
+              Should be "LDO1", ..., "LDO5" or whatever the name of the boards
+              voltage rail powered by this regulator is.

This should simply be removed from the bindings for the device, devices have no business placing any constraint on this generic binding.

#4 lore raw

Re: [PATCH v2 2/8] dt-bindings: regulator: pca9450: Allow arbitrary regulator names

Am 01.08.22 um 15:21 schrieb Mark Brown:

Quoted 11 lines · Frieder Schrempf

Review

Quoted 7 lines

regulator-name:

(quoted diff) +2 -2
-            pattern: "^LDO[1-5]$"
             description:
-              should be "LDO1", ..., "LDO5"
+              Should be "LDO1", ..., "LDO5" or whatever the name of the boards
+              voltage rail powered by this regulator is.

This should simply be removed from the bindings for the device, devices have no business placing any constraint on this generic binding.

Ok, IIUC something like below should do then. I can change this in the next iteration of this series or send it separately if the rest of the set gets accepted as-is.

Documentation/devicetree/bindings/regulator/nxp,pca9450-regulator.yaml +0 -11
@@ -47,12 +47,6 @@ properties:
         description:
           Properties for single LDO regulator.
 
-        properties:
-          regulator-name:
-            pattern: "^LDO[1-5]$"
-            description:
-              should be "LDO1", ..., "LDO5"
-
         unevaluatedProperties: false
 
       "^BUCK[1-6]$":
@@ -62,11 +56,6 @@ properties:
           Properties for single BUCK regulator.
 
         properties:
-          regulator-name:
-            pattern: "^BUCK[1-6]$"
-            description:
-              should be "BUCK1", ..., "BUCK6"
-
           nxp,dvs-run-voltage:
             $ref: "/schemas/types.yaml#/definitions/uint32"
             minimum: 600000
maintainer
#5 lore raw

Re: [PATCH v2 2/8] dt-bindings: regulator: pca9450: Allow arbitrary regulator names

Quoted 8 lines · Frieder Schrempf

Am 01.08.22 um 15:21 schrieb Mark Brown:

Quoted 2 lines

This should simply be removed from the bindings for the device, devices have no business placing any constraint on this generic binding.

Ok, IIUC something like below should do then. I can change this in the next iteration of this series or send it separately if the rest of the set gets accepted as-is.

Yes, just send it any time and I can apply it as a fix.

#6 lore raw

PATCH v2 3/8 arm64: dts: imx8mm-kontron: Adjust board and SoM model strings

In reply to Frieder Schrempf

From: Frieder Schrempf <[email protected]>

The official naming includes "SL" (SoM-Line) or "BL" (Board-Line). The legacy identifiers are kept in brackets and are still used in file names and compatible strings.

---
Changes in v2:
* none

---
 arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-s.dts    | 2 +-
 arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-som.dtsi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-s.dts +1 -1
index 23be1ec538ba..cb8102bb8db5 100644
@@ -8,7 +8,7 @@
 #include "imx8mm-kontron-n801x-som.dtsi"
 
 / {
-	model = "Kontron i.MX8MM N801X S";
+	model = "Kontron BL i.MX8MM (N801X)";
 	compatible = "kontron,imx8mm-n801x-s", "kontron,imx8mm-n801x-som", "fsl,imx8mm";
 
 	aliases {
arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-som.dtsi +1 -1
index 8f90eb02550d..b6d90d646a5f 100644
@@ -6,7 +6,7 @@
 #include "imx8mm.dtsi"
 
 / {
-	model = "Kontron i.MX8MM N801X SoM";
+	model = "Kontron SL i.MX8MM (N801X)";
 	compatible = "kontron,imx8mm-n801x-som", "fsl,imx8mm";
 
 	memory@40000000 {
Signature · 1 line
2.37.1
#7 lore raw

PATCH v2 4/8 arm64: dts: imx8mm-kontron: Use the VSELECT signal to switch SD card IO voltage

In reply to Frieder Schrempf

From: Frieder Schrempf <[email protected]>

It turns out that it is not necessary to declare the VSELECT signal as GPIO and let the PMIC driver set it to a fixed high level. This switches the voltage between 3.3V and 1.8V by setting the PMIC register for LDO5 accordingly.

Instead we can do it like other boards already do and simply mux the VSELECT signal of the USDHC interface to the pin. This makes sure that the correct voltage is selected by setting the PMIC's SD_VSEL input to high or low accordingly.

---
Changes in v2:
* Add Heiko's R-b tag (Thanks!)

---
 arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-s.dts    | 3 +++
 arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-som.dtsi | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-s.dts +3 -0
index cb8102bb8db5..bc46426ad8f6 100644
@@ -321,6 +321,7 @@ MX8MM_IOMUXC_SD2_DATA1_USDHC2_DATA1		0x1d0
 			MX8MM_IOMUXC_SD2_DATA2_USDHC2_DATA2		0x1d0
 			MX8MM_IOMUXC_SD2_DATA3_USDHC2_DATA3		0x1d0
 			MX8MM_IOMUXC_SD2_CD_B_GPIO2_IO12		0x019
+			MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT		0x1d0
 		>;
 	};
 
@@ -333,6 +334,7 @@ MX8MM_IOMUXC_SD2_DATA1_USDHC2_DATA1		0x1d4
 			MX8MM_IOMUXC_SD2_DATA2_USDHC2_DATA2		0x1d4
 			MX8MM_IOMUXC_SD2_DATA3_USDHC2_DATA3		0x1d4
 			MX8MM_IOMUXC_SD2_CD_B_GPIO2_IO12		0x019
+			MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT		0x1d0
 		>;
 	};
 
@@ -345,6 +347,7 @@ MX8MM_IOMUXC_SD2_DATA1_USDHC2_DATA1		0x1d6
 			MX8MM_IOMUXC_SD2_DATA2_USDHC2_DATA2		0x1d6
 			MX8MM_IOMUXC_SD2_DATA3_USDHC2_DATA3		0x1d6
 			MX8MM_IOMUXC_SD2_CD_B_GPIO2_IO12		0x019
+			MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT		0x1d0
 		>;
 	};
 };
arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-som.dtsi +0 -2
index b6d90d646a5f..77c074b491a6 100644
@@ -86,7 +86,6 @@ pca9450: pmic@25 {
 		pinctrl-0 = <&pinctrl_pmic>;
 		interrupt-parent = <&gpio1>;
 		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
-		sd-vsel-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
 
 		regulators {
 			reg_vdd_soc: BUCK1 {
@@ -229,7 +228,6 @@ MX8MM_IOMUXC_I2C1_SDA_I2C1_SDA			0x400001c3
 	pinctrl_pmic: pmicgrp {
 		fsl,pins = <
 			MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0		0x141
-			MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4		0x141
 		>;
 	};
 
Signature · 1 line
2.37.1
#8 lore raw

PATCH v2 5/8 arm64: dts: imx8mm-kontron: Remove low DDRC operating point

In reply to Frieder Schrempf

From: Frieder Schrempf <[email protected]>

For some reason there is a problem with finding a DDR configuration that works on all operating points and all LPDDR4 types used on the SoM. Therefore the bootloader currently doesn't configure the lowest of the three operating points. Let's also skip this in the kernel devicetree to make sure it isn't used.

---
Changes in v2:
* none

---
 arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-som.dtsi | 4 ----
 1 file changed, 4 deletions(-)
arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-som.dtsi +0 -4
index 77c074b491a6..2d0661cce89b 100644
@@ -46,10 +46,6 @@ &ddrc {
 	ddrc_opp_table: opp-table {
 		compatible = "operating-points-v2";
 
-		opp-25M {
-			opp-hz = /bits/ 64 <25000000>;
-		};
-
 		opp-100M {
 			opp-hz = /bits/ 64 <100000000>;
 		};
Signature · 1 line
2.37.1
#9 lore raw

PATCH v2 6/8 arm64: dts: imx8mm-kontron: Use voltage rail names from schematic for PMIC regulator-names

In reply to Frieder Schrempf

From: Frieder Schrempf <[email protected]>

Improve the naming of the regulators to contain the voltage rail names from the schematic.

---
Changes in v2:
* new patch

---
 .../freescale/imx8mm-kontron-n801x-som.dtsi   | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)
arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-som.dtsi +11 -11
index 2d0661cce89b..c995592981c2 100644
@@ -85,7 +85,7 @@ pca9450: pmic@25 {
 
 		regulators {
 			reg_vdd_soc: BUCK1 {
-				regulator-name = "buck1";
+				regulator-name = "+0V8_VDD_SOC (BUCK1)";
 				regulator-min-microvolt = <800000>;
 				regulator-max-microvolt = <850000>;
 				regulator-boot-on;
@@ -96,7 +96,7 @@ reg_vdd_soc: BUCK1 {
 			};
 
 			reg_vdd_arm: BUCK2 {
-				regulator-name = "buck2";
+				regulator-name = "+0V9_VDD_ARM (BUCK2)";
 				regulator-min-microvolt = <850000>;
 				regulator-max-microvolt = <950000>;
 				regulator-boot-on;
@@ -107,7 +107,7 @@ reg_vdd_arm: BUCK2 {
 			};
 
 			reg_vdd_dram: BUCK3 {
-				regulator-name = "buck3";
+				regulator-name = "+0V9_VDD_DRAM&PU (BUCK3)";
 				regulator-min-microvolt = <850000>;
 				regulator-max-microvolt = <950000>;
 				regulator-boot-on;
@@ -115,7 +115,7 @@ reg_vdd_dram: BUCK3 {
 			};
 
 			reg_vdd_3v3: BUCK4 {
-				regulator-name = "buck4";
+				regulator-name = "+3V3 (BUCK4)";
 				regulator-min-microvolt = <3300000>;
 				regulator-max-microvolt = <3300000>;
 				regulator-boot-on;
@@ -123,7 +123,7 @@ reg_vdd_3v3: BUCK4 {
 			};
 
 			reg_vdd_1v8: BUCK5 {
-				regulator-name = "buck5";
+				regulator-name = "+1V8 (BUCK5)";
 				regulator-min-microvolt = <1800000>;
 				regulator-max-microvolt = <1800000>;
 				regulator-boot-on;
@@ -131,7 +131,7 @@ reg_vdd_1v8: BUCK5 {
 			};
 
 			reg_nvcc_dram: BUCK6 {
-				regulator-name = "buck6";
+				regulator-name = "+1V1_NVCC_DRAM (BUCK6)";
 				regulator-min-microvolt = <1100000>;
 				regulator-max-microvolt = <1100000>;
 				regulator-boot-on;
@@ -139,7 +139,7 @@ reg_nvcc_dram: BUCK6 {
 			};
 
 			reg_nvcc_snvs: LDO1 {
-				regulator-name = "ldo1";
+				regulator-name = "+1V8_NVCC_SNVS (LDO1)";
 				regulator-min-microvolt = <1800000>;
 				regulator-max-microvolt = <1800000>;
 				regulator-boot-on;
@@ -147,7 +147,7 @@ reg_nvcc_snvs: LDO1 {
 			};
 
 			reg_vdd_snvs: LDO2 {
-				regulator-name = "ldo2";
+				regulator-name = "+0V8_VDD_SNVS (LDO2)";
 				regulator-min-microvolt = <800000>;
 				regulator-max-microvolt = <900000>;
 				regulator-boot-on;
@@ -155,7 +155,7 @@ reg_vdd_snvs: LDO2 {
 			};
 
 			reg_vdda: LDO3 {
-				regulator-name = "ldo3";
+				regulator-name = "+1V8_VDDA (LDO3)";
 				regulator-min-microvolt = <1800000>;
 				regulator-max-microvolt = <1800000>;
 				regulator-boot-on;
@@ -163,7 +163,7 @@ reg_vdda: LDO3 {
 			};
 
 			reg_vdd_phy: LDO4 {
-				regulator-name = "ldo4";
+				regulator-name = "+0V9_VDD_PHY (LDO4)";
 				regulator-min-microvolt = <900000>;
 				regulator-max-microvolt = <900000>;
 				regulator-boot-on;
@@ -171,7 +171,7 @@ reg_vdd_phy: LDO4 {
 			};
 
 			reg_nvcc_sd: LDO5 {
-				regulator-name = "ldo5";
+				regulator-name = "NVCC_SD (LDO5)";
 				regulator-min-microvolt = <1800000>;
 				regulator-max-microvolt = <3300000>;
 			};
Signature · 1 line
2.37.1
#10 lore raw

PATCH v2 7/8 arm64: dts: imx8mm-kontron: Add SPI NOR partition layout

In reply to Frieder Schrempf

From: Frieder Schrempf <[email protected]>

This is the layout used by the bootloader. Add it to the kernel devicetree to make the same layout available in Linux and have the devicetrees synced.

---
Changes in v2:
* new patch

---
 .../freescale/imx8mm-kontron-n801x-som.dtsi   | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-som.dtsi +21 -0
index c995592981c2..bb87e8b166bf 100644
@@ -66,6 +66,27 @@ flash@0 {
 		compatible = "mxicy,mx25r1635f", "jedec,spi-nor";
 		spi-max-frequency = <80000000>;
 		reg = <0>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "u-boot";
+				reg = <0x0 0x1E0000>;
+			};
+
+			partition@1 {
+				label = "env";
+				reg = <0x1E0000 0x10000>;
+			};
+
+			partition@2 {
+				label = "env_redundant";
+				reg = <0x1F0000 0x10000>;
+			};
+		};
 	};
 };
 
Signature · 1 line
2.37.1
#11 lore raw

PATCH v2 8/8 arm64: dts: Add support for Kontron SL/BL i.MX8MM OSM-S

In reply to Frieder Schrempf

From: Frieder Schrempf <[email protected]>

This adds support for the Kontron Electronics SL i.MX8MM OSM-S SoM and the matching baseboard BL i.MX8MM OSM-S.

The SoM hardware complies to the Open Standard Module (OSM) 1.0 specification, size S (https://sget.org/standards/osm).

---
Changes in v2:
* add SPI NOR partitions
* use voltage rail names for PMIC regulator-name
* drop unused header include

---
 arch/arm64/boot/dts/freescale/Makefile        |   1 +
 .../dts/freescale/imx8mm-kontron-n802x-s.dts  | 376 ++++++++++++++++++
 .../freescale/imx8mm-kontron-n802x-som.dtsi   | 330 +++++++++++++++
 3 files changed, 707 insertions(+)
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-kontron-n802x-s.dts
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-kontron-n802x-som.dtsi
arch/arm64/boot/dts/freescale/Makefile +1 -0
index 238a83e5b8c6..87d1c66c6060 100644
@@ -56,6 +56,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mm-evk.dtb
 dtb-$(CONFIG_ARCH_MXC) += imx8mm-icore-mx8mm-ctouch2.dtb
 dtb-$(CONFIG_ARCH_MXC) += imx8mm-icore-mx8mm-edimm2.2.dtb
 dtb-$(CONFIG_ARCH_MXC) += imx8mm-kontron-n801x-s.dtb
+dtb-$(CONFIG_ARCH_MXC) += imx8mm-kontron-n802x-s.dtb
 dtb-$(CONFIG_ARCH_MXC) += imx8mm-mx8menlo.dtb
 dtb-$(CONFIG_ARCH_MXC) += imx8mm-nitrogen-r2.dtb
 dtb-$(CONFIG_ARCH_MXC) += imx8mm-tqma8mqml-mba8mx.dtb
arch/arm64/boot/dts/freescale/imx8mm-kontron-n802x-s.dts new file +376 -0

376 lines not on this page · raw message

arch/arm64/boot/dts/freescale/imx8mm-kontron-n802x-som.dtsi new file +330 -0

330 lines not on this page · raw message

Signature · 1 line
2.37.1