* [PATCH 1/3] ARM: dts: imx7s-warp: Drop undefined property in mipi_csi node
2021-12-02 22:19 [PATCH 0/3] ARM: dts: Fixes for imx7 mipi_csi Laurent Pinchart
@ 2021-12-02 22:19 ` Laurent Pinchart
2021-12-02 22:19 ` [PATCH 2/3] ARM: dts: imx7: Drop reset-names property for " Laurent Pinchart
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Laurent Pinchart @ 2021-12-02 22:19 UTC (permalink / raw)
To: devicetree
Cc: Rob Herring, linux-arm-kernel, NXP Linux Team, Fabio Estevam,
Pengutronix Kernel Team, Sascha Hauer, Shawn Guo
The fsl,csis-hs-settle property isn't defined by the
nxp,imx7-mipi-csi2.yaml binding, and isn't parsed by the corresponding
driver. Drop it.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
arch/arm/boot/dts/imx7s-warp.dts | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/boot/dts/imx7s-warp.dts b/arch/arm/boot/dts/imx7s-warp.dts
index 569bbd84e371..614d252f029f 100644
--- a/arch/arm/boot/dts/imx7s-warp.dts
+++ b/arch/arm/boot/dts/imx7s-warp.dts
@@ -248,7 +248,6 @@ mpl3115@60 {
&mipi_csi {
clock-frequency = <166000000>;
- fsl,csis-hs-settle = <3>;
status = "okay";
port@0 {
--
Regards,
Laurent Pinchart
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/3] ARM: dts: imx7: Drop reset-names property for mipi_csi node
2021-12-02 22:19 [PATCH 0/3] ARM: dts: Fixes for imx7 mipi_csi Laurent Pinchart
2021-12-02 22:19 ` [PATCH 1/3] ARM: dts: imx7s-warp: Drop undefined property in mipi_csi node Laurent Pinchart
@ 2021-12-02 22:19 ` Laurent Pinchart
2021-12-02 22:19 ` [PATCH 3/3] ARM: dts: imx7: Group mipi_csi 'port' children in a 'ports' node Laurent Pinchart
2021-12-14 3:16 ` [PATCH 0/3] ARM: dts: Fixes for imx7 mipi_csi Shawn Guo
3 siblings, 0 replies; 5+ messages in thread
From: Laurent Pinchart @ 2021-12-02 22:19 UTC (permalink / raw)
To: devicetree
Cc: Rob Herring, linux-arm-kernel, NXP Linux Team, Fabio Estevam,
Pengutronix Kernel Team, Sascha Hauer, Shawn Guo
The reset-names property isn't defined by the nxp,imx7-mipi-csi2.yaml
binding, and isn't used by the corresponding driver as it acquires the
reset with a NULL ID. Drop it.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
arch/arm/boot/dts/imx7s.dtsi | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 1843fc053870..7e6b99ece7e9 100644
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -819,7 +819,6 @@ mipi_csi: mipi-csi@30750000 {
power-domains = <&pgc_mipi_phy>;
phy-supply = <®_1p0d>;
resets = <&src IMX7_RESET_MIPI_PHY_MRST>;
- reset-names = "mrst";
status = "disabled";
port@0 {
--
Regards,
Laurent Pinchart
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/3] ARM: dts: imx7: Group mipi_csi 'port' children in a 'ports' node
2021-12-02 22:19 [PATCH 0/3] ARM: dts: Fixes for imx7 mipi_csi Laurent Pinchart
2021-12-02 22:19 ` [PATCH 1/3] ARM: dts: imx7s-warp: Drop undefined property in mipi_csi node Laurent Pinchart
2021-12-02 22:19 ` [PATCH 2/3] ARM: dts: imx7: Drop reset-names property for " Laurent Pinchart
@ 2021-12-02 22:19 ` Laurent Pinchart
2021-12-14 3:16 ` [PATCH 0/3] ARM: dts: Fixes for imx7 mipi_csi Shawn Guo
3 siblings, 0 replies; 5+ messages in thread
From: Laurent Pinchart @ 2021-12-02 22:19 UTC (permalink / raw)
To: devicetree
Cc: Rob Herring, linux-arm-kernel, NXP Linux Team, Fabio Estevam,
Pengutronix Kernel Team, Sascha Hauer, Shawn Guo
The nxp,imx7-mipi-csi2.yaml binding requires ports to be grouped in a
ports node, as multiple ports are present. Fix imx7s.dtsi and the only
board file that references the mipi_csi ports.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
arch/arm/boot/dts/imx7s-warp.dts | 13 +++++++------
arch/arm/boot/dts/imx7s.dtsi | 21 ++++++++++++---------
2 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/arch/arm/boot/dts/imx7s-warp.dts b/arch/arm/boot/dts/imx7s-warp.dts
index 614d252f029f..4f1edef06c92 100644
--- a/arch/arm/boot/dts/imx7s-warp.dts
+++ b/arch/arm/boot/dts/imx7s-warp.dts
@@ -250,14 +250,15 @@ &mipi_csi {
clock-frequency = <166000000>;
status = "okay";
- port@0 {
- reg = <0>;
+ ports {
+ port@0 {
+ reg = <0>;
- mipi_from_sensor: endpoint {
- remote-endpoint = <&ov2680_to_mipi>;
- data-lanes = <1>;
+ mipi_from_sensor: endpoint {
+ remote-endpoint = <&ov2680_to_mipi>;
+ data-lanes = <1>;
+ };
};
-
};
};
diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 7e6b99ece7e9..52a9aeecdbb2 100644
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -809,8 +809,6 @@ lcdif: lcdif@30730000 {
mipi_csi: mipi-csi@30750000 {
compatible = "fsl,imx7-mipi-csi2";
reg = <0x30750000 0x10000>;
- #address-cells = <1>;
- #size-cells = <0>;
interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX7D_IPG_ROOT_CLK>,
<&clks IMX7D_MIPI_CSI_ROOT_CLK>,
@@ -821,15 +819,20 @@ mipi_csi: mipi-csi@30750000 {
resets = <&src IMX7_RESET_MIPI_PHY_MRST>;
status = "disabled";
- port@0 {
- reg = <0>;
- };
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
- port@1 {
- reg = <1>;
+ port@0 {
+ reg = <0>;
+ };
- mipi_vc0_to_csi_mux: endpoint {
- remote-endpoint = <&csi_mux_from_mipi_vc0>;
+ port@1 {
+ reg = <1>;
+
+ mipi_vc0_to_csi_mux: endpoint {
+ remote-endpoint = <&csi_mux_from_mipi_vc0>;
+ };
};
};
};
--
Regards,
Laurent Pinchart
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 0/3] ARM: dts: Fixes for imx7 mipi_csi
2021-12-02 22:19 [PATCH 0/3] ARM: dts: Fixes for imx7 mipi_csi Laurent Pinchart
` (2 preceding siblings ...)
2021-12-02 22:19 ` [PATCH 3/3] ARM: dts: imx7: Group mipi_csi 'port' children in a 'ports' node Laurent Pinchart
@ 2021-12-14 3:16 ` Shawn Guo
3 siblings, 0 replies; 5+ messages in thread
From: Shawn Guo @ 2021-12-14 3:16 UTC (permalink / raw)
To: Laurent Pinchart
Cc: devicetree, Rob Herring, linux-arm-kernel, NXP Linux Team,
Fabio Estevam, Pengutronix Kernel Team, Sascha Hauer
On Fri, Dec 03, 2021 at 12:19:00AM +0200, Laurent Pinchart wrote:
> Hello,
>
> This small patch series is a follow up on Rob's nxp,imx7-mipi-csi2.yaml
> fix ([1]) and the dtb check warnings that started appearing as a result.
> There's not much else to be said, please see individual patches for
> details.
>
> [1] https://lore.kernel.org/all/20211202023021.3655384-1-robh@kernel.org/
>
> Laurent Pinchart (3):
> ARM: dts: imx7s-warp: Drop undefined property in mipi_csi node
> ARM: dts: imx7: Drop reset-names property for mipi_csi node
> ARM: dts: imx7: Group mipi_csi 'port' children in a 'ports' node
Applied all, thanks!
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread