arm64: dts: qcom: qrb5165-rb5-vision-mezzanine: Convert mezzanine riser to dtbo

Convert the navigation / camera mezzanine from its own dts to a dtso. A
small amount of additional includes / address / cell size change needs to
be applied to convert.

Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> # rb5
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20241025-b4-linux-next-24-10-25-camss-dts-fixups-v1-1-cdff2f1a5792@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index c65d19117395b02ee53c9e97f6427b8c8d9956f8..a55f275f9337df5e8786f67d793342838f95ae6b 100644 (file)
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -118,6 +118,9 @@ dtb-$(CONFIG_ARCH_QCOM)     += qdu1000-idp.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += qrb2210-rb1.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += qrb4210-rb2.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += qrb5165-rb5.dtb
+
+qrb5165-rb5-vision-mezzanine-dtbs      := qrb5165-rb5.dtb qrb5165-rb5-vision-mezzanine.dtbo
+
 dtb-$(CONFIG_ARCH_QCOM)        += qrb5165-rb5-vision-mezzanine.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += qru1000-idp.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += sa8155p-adp.dtb

diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dts
deleted file mode 100644 (file)
index edc0e42..0000000
--- a/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dts
+++ /dev/null
@@ -1,62 +0,0 @@
-// SPDX-License-Identifier: BSD-3-Clause
-/*
- * Copyright (c) 2022, Linaro Ltd.
- */
-
-/dts-v1/;
-
-#include "qrb5165-rb5.dts"
-
-&camcc {
-       status = "okay";
-};
-
-&camss {
-       vdda-phy-supply = <&vreg_l5a_0p88>;
-       vdda-pll-supply = <&vreg_l9a_1p2>;
-       status = "okay";
-
-       ports {
-               /* The port index denotes CSIPHY id i.e. csiphy2 */
-               port@2 {
-                       csiphy2_ep: endpoint {
-                               clock-lanes = <7>;
-                               data-lanes = <0 1 2 3>;
-                               remote-endpoint = <&imx577_ep>;
-                       };
-               };
-       };
-};
-
-&cci1 {
-       status = "okay";
-};
-
-&cci1_i2c0 {
-       camera@1a {
-               compatible = "sony,imx577";
-               reg = <0x1a>;
-
-               reset-gpios = <&tlmm 78 GPIO_ACTIVE_LOW>;
-               pinctrl-names = "default", "suspend";
-               pinctrl-0 = <&cam2_default>;
-               pinctrl-1 = <&cam2_suspend>;
-
-               clocks = <&camcc CAM_CC_MCLK2_CLK>;
-               assigned-clocks = <&camcc CAM_CC_MCLK2_CLK>;
-               assigned-clock-rates = <24000000>;
-
-               dovdd-supply = <&vreg_l7f_1p8>;
-               avdd-supply = <&vdc_5v>;
-               dvdd-supply = <&vdc_5v>;
-
-               port {
-                       imx577_ep: endpoint {
-                               clock-lanes = <1>;
-                               link-frequencies = /bits/ 64 <600000000>;
-                               data-lanes = <1 2 3 4>;
-                               remote-endpoint = <&csiphy2_ep>;
-                       };
-               };
-       };
-};

diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso b/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso
new file mode 100644 (file)
index 0000000..0603954
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso
@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2022, Linaro Ltd.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/clock/qcom,camcc-sm8250.h>
+#include <dt-bindings/gpio/gpio.h>
+
+&camcc {
+       status = "okay";
+};
+
+&camss {
+       vdda-phy-supply = <&vreg_l5a_0p88>;
+       vdda-pll-supply = <&vreg_l9a_1p2>;
+       status = "okay";
+
+       ports {
+               /* The port index denotes CSIPHY id i.e. csiphy2 */
+               port@2 {
+                       csiphy2_ep: endpoint {
+                               clock-lanes = <7>;
+                               data-lanes = <0 1 2 3>;
+                               remote-endpoint = <&imx577_ep>;
+                       };
+               };
+       };
+};
+
+&cci1 {
+       status = "okay";
+};
+
+&cci1_i2c0 {
+       #address-cells = <1>;
+       #size-cells = <0>;
+
+       camera@1a {
+               compatible = "sony,imx577";
+               reg = <0x1a>;
+
+               reset-gpios = <&tlmm 78 GPIO_ACTIVE_LOW>;
+               pinctrl-names = "default", "suspend";
+               pinctrl-0 = <&cam2_default>;
+               pinctrl-1 = <&cam2_suspend>;
+
+               clocks = <&camcc CAM_CC_MCLK2_CLK>;
+               assigned-clocks = <&camcc CAM_CC_MCLK2_CLK>;
+               assigned-clock-rates = <24000000>;
+
+               dovdd-supply = <&vreg_l7f_1p8>;
+               avdd-supply = <&vdc_5v>;
+               dvdd-supply = <&vdc_5v>;
+
+               port {
+                       imx577_ep: endpoint {
+                               clock-lanes = <1>;
+                               link-frequencies = /bits/ 64 <600000000>;
+                               data-lanes = <1 2 3 4>;
+                               remote-endpoint = <&csiphy2_ep>;
+                       };
+               };
+       };
+};