arm64: dts: qcom: sdm845-db845c-navigation-mezzanine: Convert mezzanine riser to...

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> # rb3
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-2-cdff2f1a5792@linaro.org
[bjorn: Corrected up makefile syntax, added missing cells for cci_i2c1]
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 a55f275f9337df5e8786f67d793342838f95ae6b..6ca8db4b8afe3023c31efac157bc2447963894fe 100644 (file)
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -213,6 +213,9 @@ dtb-$(CONFIG_ARCH_QCOM)     += sdm845-cheza-r1.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += sdm845-cheza-r2.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += sdm845-cheza-r3.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += sdm845-db845c.dtb
+
+sdm845-db845c-navigation-mezzanine-dtbs        := sdm845-db845c.dtb sdm845-db845c-navigation-mezzanine.dtbo
+
 dtb-$(CONFIG_ARCH_QCOM)        += sdm845-db845c-navigation-mezzanine.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += sdm845-lg-judyln.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += sdm845-lg-judyp.dtb

diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dts
deleted file mode 100644 (file)
index a21caa6..0000000
--- a/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dts
+++ /dev/null
@@ -1,104 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (c) 2022, Linaro Ltd.
- */
-
-/dts-v1/;
-
-#include "sdm845-db845c.dts"
-
-&camss {
-       vdda-phy-supply = <&vreg_l1a_0p875>;
-       vdda-pll-supply = <&vreg_l26a_1p2>;
-
-       status = "okay";
-
-       ports {
-               port@0 {
-                       csiphy0_ep: endpoint {
-                               data-lanes = <0 1 2 3>;
-                               remote-endpoint = <&ov8856_ep>;
-                       };
-               };
-       };
-};
-
-&cci {
-       status = "okay";
-};
-
-&cci_i2c0 {
-       camera@10 {
-               compatible = "ovti,ov8856";
-               reg = <0x10>;
-
-               /* CAM0_RST_N */
-               reset-gpios = <&tlmm 9 GPIO_ACTIVE_LOW>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&cam0_default>;
-
-               clocks = <&clock_camcc CAM_CC_MCLK0_CLK>;
-               clock-names = "xvclk";
-               clock-frequency = <19200000>;
-
-               /*
-                * The &vreg_s4a_1p8 trace is powered on as a,
-                * so it is represented by a fixed regulator.
-                *
-                * The 2.8V vdda-supply and 1.2V vddd-supply regulators
-                * both have to be enabled through the power management
-                * gpios.
-                */
-               dovdd-supply = <&vreg_lvs1a_1p8>;
-               avdd-supply = <&cam0_avdd_2v8>;
-               dvdd-supply = <&cam0_dvdd_1v2>;
-
-               port {
-                       ov8856_ep: endpoint {
-                               link-frequencies = /bits/ 64
-                                       <360000000 180000000>;
-                               data-lanes = <1 2 3 4>;
-                               remote-endpoint = <&csiphy0_ep>;
-                       };
-               };
-       };
-};
-
-&cci_i2c1 {
-       camera@60 {
-               compatible = "ovti,ov7251";
-
-               /* I2C address as per ov7251.txt linux documentation */
-               reg = <0x60>;
-
-               /* CAM3_RST_N */
-               enable-gpios = <&tlmm 21 GPIO_ACTIVE_HIGH>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&cam3_default>;
-
-               clocks = <&clock_camcc CAM_CC_MCLK3_CLK>;
-               clock-names = "xclk";
-               clock-frequency = <24000000>;
-
-               /*
-                * The &vreg_s4a_1p8 trace always powered on.
-                *
-                * The 2.8V vdda-supply regulator is enabled when the
-                * vreg_s4a_1p8 trace is pulled high.
-                * It too is represented by a fixed regulator.
-                *
-                * No 1.2V vddd-supply regulator is used.
-                */
-               vdddo-supply = <&vreg_lvs1a_1p8>;
-               vdda-supply = <&cam3_avdd_2v8>;
-
-               status = "disabled";
-
-               port {
-                       ov7251_ep: endpoint {
-                               data-lanes = <0 1>;
-/*                             remote-endpoint = <&csiphy3_ep>; */
-                       };
-               };
-       };
-};

diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso b/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso
new file mode 100644 (file)
index 0000000..b5f717d
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso
@@ -0,0 +1,112 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) 2022, Linaro Ltd.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/clock/qcom,camcc-sdm845.h>
+#include <dt-bindings/gpio/gpio.h>
+
+&camss {
+       vdda-phy-supply = <&vreg_l1a_0p875>;
+       vdda-pll-supply = <&vreg_l26a_1p2>;
+
+       status = "okay";
+
+       ports {
+               port@0 {
+                       csiphy0_ep: endpoint {
+                               data-lanes = <0 1 2 3>;
+                               remote-endpoint = <&ov8856_ep>;
+                       };
+               };
+       };
+};
+
+&cci {
+       status = "okay";
+};
+
+&cci_i2c0 {
+       #address-cells = <1>;
+       #size-cells = <0>;
+
+       camera@10 {
+               compatible = "ovti,ov8856";
+               reg = <0x10>;
+
+               /* CAM0_RST_N */
+               reset-gpios = <&tlmm 9 GPIO_ACTIVE_LOW>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&cam0_default>;
+
+               clocks = <&clock_camcc CAM_CC_MCLK0_CLK>;
+               clock-names = "xvclk";
+               clock-frequency = <19200000>;
+
+               /*
+                * The &vreg_s4a_1p8 trace is powered on as a,
+                * so it is represented by a fixed regulator.
+                *
+                * The 2.8V vdda-supply and 1.2V vddd-supply regulators
+                * both have to be enabled through the power management
+                * gpios.
+                */
+               dovdd-supply = <&vreg_lvs1a_1p8>;
+               avdd-supply = <&cam0_avdd_2v8>;
+               dvdd-supply = <&cam0_dvdd_1v2>;
+
+               port {
+                       ov8856_ep: endpoint {
+                               link-frequencies = /bits/ 64
+                                       <360000000 180000000>;
+                               data-lanes = <1 2 3 4>;
+                               remote-endpoint = <&csiphy0_ep>;
+                       };
+               };
+       };
+};
+
+&cci_i2c1 {
+       #address-cells = <1>;
+       #size-cells = <0>;
+
+       camera@60 {
+               compatible = "ovti,ov7251";
+
+               /* I2C address as per ov7251.txt linux documentation */
+               reg = <0x60>;
+
+               /* CAM3_RST_N */
+               enable-gpios = <&tlmm 21 GPIO_ACTIVE_HIGH>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&cam3_default>;
+
+               clocks = <&clock_camcc CAM_CC_MCLK3_CLK>;
+               clock-names = "xclk";
+               clock-frequency = <24000000>;
+
+               /*
+                * The &vreg_s4a_1p8 trace always powered on.
+                *
+                * The 2.8V vdda-supply regulator is enabled when the
+                * vreg_s4a_1p8 trace is pulled high.
+                * It too is represented by a fixed regulator.
+                *
+                * No 1.2V vddd-supply regulator is used.
+                */
+               vdddo-supply = <&vreg_lvs1a_1p8>;
+               vdda-supply = <&cam3_avdd_2v8>;
+
+               status = "disabled";
+
+               port {
+                       ov7251_ep: endpoint {
+                               data-lanes = <0 1>;
+/*                             remote-endpoint = <&csiphy3_ep>; */
+                       };
+               };
+       };
+};