* [PATCH 1/4] ARM: dts: imx7d: Fix coresight funnel ports
2023-10-12 8:15 [PATCH 0/4] i.MX7S/D DT fixes Alexander Stein
@ 2023-10-12 8:15 ` Alexander Stein
2023-10-12 8:15 ` [PATCH 2/4] ARM: dts: imx7s: Fix lcdif compatible Alexander Stein
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Alexander Stein @ 2023-10-12 8:15 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo,
Sascha Hauer, Fabio Estevam
Cc: Alexander Stein, Pengutronix Kernel Team, NXP Linux Team,
devicetree, linux-arm-kernel
imx7d uses two ports for 'in-ports', so the syntax port@<num> has to
be used. imx7d has both port and port@1 nodes present, raising these
error:
funnel@30041000: in-ports: More than one condition true in oneOf schema
funnel@30041000: Unevaluated properties are not allowed
('in-ports' was unexpected)
Fix this by also using port@0 for imx7s as well.
Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
---
arch/arm/boot/dts/nxp/imx/imx7d.dtsi | 3 ---
arch/arm/boot/dts/nxp/imx/imx7s.dtsi | 6 +++++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/nxp/imx/imx7d.dtsi b/arch/arm/boot/dts/nxp/imx/imx7d.dtsi
index 4b94b8afb55d9..0484e349e064e 100644
--- a/arch/arm/boot/dts/nxp/imx/imx7d.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx7d.dtsi
@@ -217,9 +217,6 @@ fec2: ethernet@30bf0000 {
};
&ca_funnel_in_ports {
- #address-cells = <1>;
- #size-cells = <0>;
-
port@1 {
reg = <1>;
ca_funnel_in_port1: endpoint {
diff --git a/arch/arm/boot/dts/nxp/imx/imx7s.dtsi b/arch/arm/boot/dts/nxp/imx/imx7s.dtsi
index 29b8fd03567a5..8e05ab545213e 100644
--- a/arch/arm/boot/dts/nxp/imx/imx7s.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx7s.dtsi
@@ -190,7 +190,11 @@ funnel@30041000 {
clock-names = "apb_pclk";
ca_funnel_in_ports: in-ports {
- port {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
ca_funnel_in_port0: endpoint {
remote-endpoint = <&etm0_out_port>;
};
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/4] ARM: dts: imx7s: Fix lcdif compatible
2023-10-12 8:15 [PATCH 0/4] i.MX7S/D DT fixes Alexander Stein
2023-10-12 8:15 ` [PATCH 1/4] ARM: dts: imx7d: Fix coresight funnel ports Alexander Stein
@ 2023-10-12 8:15 ` Alexander Stein
2023-10-12 8:15 ` [PATCH 3/4] ARM: dts: imx7s: Fix nand-controller #size-cells Alexander Stein
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Alexander Stein @ 2023-10-12 8:15 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo,
Sascha Hauer, Fabio Estevam
Cc: Alexander Stein, Pengutronix Kernel Team, NXP Linux Team,
devicetree, linux-arm-kernel
imx7d-lcdif is compatible to imx6sx-lcdif. MXSFB_V6 supports overlay
by using LCDC_AS_CTRL register. This registers used by overlay plane:
* LCDC_AS_CTRL
* LCDC_AS_BUF
* LCDC_AS_NEXT_BUF
are listed in i.MX7D RM as well.
Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
---
arch/arm/boot/dts/nxp/imx/imx7s.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/nxp/imx/imx7s.dtsi b/arch/arm/boot/dts/nxp/imx/imx7s.dtsi
index 8e05ab545213e..3d221f8cba743 100644
--- a/arch/arm/boot/dts/nxp/imx/imx7s.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx7s.dtsi
@@ -815,7 +815,7 @@ csi_from_csi_mux: endpoint {
};
lcdif: lcdif@30730000 {
- compatible = "fsl,imx7d-lcdif", "fsl,imx28-lcdif";
+ compatible = "fsl,imx7d-lcdif", "fsl,imx6sx-lcdif";
reg = <0x30730000 0x10000>;
interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX7D_LCDIF_PIXEL_ROOT_CLK>,
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/4] ARM: dts: imx7s: Fix nand-controller #size-cells
2023-10-12 8:15 [PATCH 0/4] i.MX7S/D DT fixes Alexander Stein
2023-10-12 8:15 ` [PATCH 1/4] ARM: dts: imx7d: Fix coresight funnel ports Alexander Stein
2023-10-12 8:15 ` [PATCH 2/4] ARM: dts: imx7s: Fix lcdif compatible Alexander Stein
@ 2023-10-12 8:15 ` Alexander Stein
2023-10-12 8:15 ` [PATCH 4/4] ARM: dts: imx7s: Add missing #thermal-sensor-cells Alexander Stein
2023-11-27 1:49 ` [PATCH 0/4] i.MX7S/D DT fixes Shawn Guo
4 siblings, 0 replies; 6+ messages in thread
From: Alexander Stein @ 2023-10-12 8:15 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo,
Sascha Hauer, Fabio Estevam
Cc: Alexander Stein, Pengutronix Kernel Team, NXP Linux Team,
devicetree, linux-arm-kernel
nand-controller.yaml bindings says #size-cells shall be set to 0.
Fixes the dtbs_check warning:
arch/arm/boot/dts/nxp/imx/imx7s-mba7.dtb: nand-controller@33002000:
#size-cells:0:0: 0 was expected
from schema $id: http://devicetree.org/schemas/mtd/gpmi-nand.yaml#
Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
---
arch/arm/boot/dts/nxp/imx/imx7s.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/nxp/imx/imx7s.dtsi b/arch/arm/boot/dts/nxp/imx/imx7s.dtsi
index 3d221f8cba743..608eeac4213b4 100644
--- a/arch/arm/boot/dts/nxp/imx/imx7s.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx7s.dtsi
@@ -1279,7 +1279,7 @@ dma_apbh: dma-controller@33000000 {
gpmi: nand-controller@33002000 {
compatible = "fsl,imx7d-gpmi-nand";
#address-cells = <1>;
- #size-cells = <1>;
+ #size-cells = <0>;
reg = <0x33002000 0x2000>, <0x33004000 0x4000>;
reg-names = "gpmi-nand", "bch";
interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/4] ARM: dts: imx7s: Add missing #thermal-sensor-cells
2023-10-12 8:15 [PATCH 0/4] i.MX7S/D DT fixes Alexander Stein
` (2 preceding siblings ...)
2023-10-12 8:15 ` [PATCH 3/4] ARM: dts: imx7s: Fix nand-controller #size-cells Alexander Stein
@ 2023-10-12 8:15 ` Alexander Stein
2023-11-27 1:49 ` [PATCH 0/4] i.MX7S/D DT fixes Shawn Guo
4 siblings, 0 replies; 6+ messages in thread
From: Alexander Stein @ 2023-10-12 8:15 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo,
Sascha Hauer, Fabio Estevam
Cc: Alexander Stein, Pengutronix Kernel Team, NXP Linux Team,
devicetree, linux-arm-kernel
imx-thermal.yaml is referencing thermal-sensor.yaml, thus this property
is required. Fixes the dtbs_check warning:
arch/arm/boot/dts/nxp/imx/imx7d-mba7.dtb: tempmon:
'#thermal-sensor-cells' is a required property
from schema $id: http://devicetree.org/schemas/thermal/imx-thermal.yaml#
Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
---
arch/arm/boot/dts/nxp/imx/imx7s.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/boot/dts/nxp/imx/imx7s.dtsi b/arch/arm/boot/dts/nxp/imx/imx7s.dtsi
index 608eeac4213b4..b563383be6951 100644
--- a/arch/arm/boot/dts/nxp/imx/imx7s.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx7s.dtsi
@@ -609,6 +609,7 @@ tempmon: tempmon {
nvmem-cells = <&tempmon_calib>, <&fuse_grade>;
nvmem-cell-names = "calib", "temp_grade";
clocks = <&clks IMX7D_PLL_SYS_MAIN_CLK>;
+ #thermal-sensor-cells = <0>;
};
};
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 0/4] i.MX7S/D DT fixes
2023-10-12 8:15 [PATCH 0/4] i.MX7S/D DT fixes Alexander Stein
` (3 preceding siblings ...)
2023-10-12 8:15 ` [PATCH 4/4] ARM: dts: imx7s: Add missing #thermal-sensor-cells Alexander Stein
@ 2023-11-27 1:49 ` Shawn Guo
4 siblings, 0 replies; 6+ messages in thread
From: Shawn Guo @ 2023-11-27 1:49 UTC (permalink / raw)
To: Alexander Stein
Cc: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Sascha Hauer,
Fabio Estevam, Pengutronix Kernel Team, NXP Linux Team,
devicetree, linux-arm-kernel
On Thu, Oct 12, 2023 at 10:15:52AM +0200, Alexander Stein wrote:
> Alexander Stein (4):
> ARM: dts: imx7d: Fix coresight funnel ports
> ARM: dts: imx7s: Fix lcdif compatible
> ARM: dts: imx7s: Fix nand-controller #size-cells
> ARM: dts: imx7s: Add missing #thermal-sensor-cells
Applied all, thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread