arm64: dts: qcom: apq8016-sbc-d3-camera-mezzanine: Move default ov5640 to a standalon...

At the moment we define a single ov5640 sensor in the apq8016-sbc and
disable that sensor.

The sensor mezzanine for this is a D3 Engineering Dual ov5640 mezzanine
card. Move the definition from the apq8016-sbc where it shouldn't be to a
standalone dts.

Enables the sensor by default, as we are adding a standalone mezzanine
structure.

Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20230811234738.2859417-7-bryan.odonoghue@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 a4ac83a2d3a1576f2634103e4391d16faf7296fd..2cca20563a1d69814b26e49a74bd9621e5e10b89 100644 (file)
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_ARCH_QCOM)        += apq8016-sbc.dtb
+dtb-$(CONFIG_ARCH_QCOM)        += apq8016-sbc-d3-camera-mezzanine.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += apq8039-t2.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += apq8094-sony-xperia-kitakami-karin_windy.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += apq8096-db820c.dtb

diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc-d3-camera-mezzanine.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc-d3-camera-mezzanine.dts
new file mode 100644 (file)
index 0000000..c08b4be
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc-d3-camera-mezzanine.dts
@@ -0,0 +1,81 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2023, Linaro Ltd.
+ */
+
+/dts-v1/;
+
+#include "apq8016-sbc.dts"
+
+/ {
+       camera_vdddo_1v8: camera-vdddo-1v8 {
+               compatible = "regulator-fixed";
+               regulator-name = "camera_vdddo";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               regulator-always-on;
+       };
+
+       camera_vdda_2v8: camera-vdda-2v8 {
+               compatible = "regulator-fixed";
+               regulator-name = "camera_vdda";
+               regulator-min-microvolt = <2800000>;
+               regulator-max-microvolt = <2800000>;
+               regulator-always-on;
+       };
+
+       camera_vddd_1v5: camera-vddd-1v5 {
+               compatible = "regulator-fixed";
+               regulator-name = "camera_vddd";
+               regulator-min-microvolt = <1500000>;
+               regulator-max-microvolt = <1500000>;
+               regulator-always-on;
+       };
+};
+
+&camss {
+       status = "okay";
+
+       ports {
+               port@0 {
+                       reg = <0>;
+                       csiphy0_ep: endpoint {
+                               data-lanes = <0 2>;
+                               remote-endpoint = <&ov5640_ep>;
+                       };
+               };
+       };
+};
+
+&cci {
+       status = "okay";
+};
+
+&cci_i2c0 {
+       camera_rear@3b {
+               compatible = "ovti,ov5640";
+               reg = <0x3b>;
+
+               powerdown-gpios = <&tlmm 34 GPIO_ACTIVE_HIGH>;
+               reset-gpios = <&tlmm 35 GPIO_ACTIVE_LOW>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&camera_rear_default>;
+
+               clocks = <&gcc GCC_CAMSS_MCLK0_CLK>;
+               clock-names = "xclk";
+               assigned-clocks = <&gcc GCC_CAMSS_MCLK0_CLK>;
+               assigned-clock-rates = <23880000>;
+
+               DOVDD-supply = <&camera_vdddo_1v8>;
+               AVDD-supply = <&camera_vdda_2v8>;
+               DVDD-supply = <&camera_vddd_1v5>;
+
+               port {
+                       ov5640_ep: endpoint {
+                               data-lanes = <1 2>;
+                               remote-endpoint = <&csiphy0_ep>;
+                       };
+               };
+       };
+};

diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
index ddb19709a9eee67a688422e651f91f386e0e6afe..c3cd08aa5c85bb0ddff38d97887122d38e894e69 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
@@ -34,30 +34,6 @@
                stdout-path = "serial0";
        };
 
-       camera_vdddo_1v8: camera-vdddo-1v8 {
-               compatible = "regulator-fixed";
-               regulator-name = "camera_vdddo";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <1800000>;
-               regulator-always-on;
-       };
-
-       camera_vdda_2v8: camera-vdda-2v8 {
-               compatible = "regulator-fixed";
-               regulator-name = "camera_vdda";
-               regulator-min-microvolt = <2800000>;
-               regulator-max-microvolt = <2800000>;
-               regulator-always-on;
-       };
-
-       camera_vddd_1v5: camera-vddd-1v5 {
-               compatible = "regulator-fixed";
-               regulator-name = "camera_vddd";
-               regulator-min-microvolt = <1500000>;
-               regulator-max-microvolt = <1500000>;
-               regulator-always-on;
-       };
-
        reserved-memory {
                ramoops@bff00000 {
                        compatible = "ramoops";
@@ -250,55 +226,6 @@
        label = "LS-UART1";
 };
 
-&camss {
-       status = "okay";
-       ports {
-               port@0 {
-                       reg = <0>;
-                       csiphy0_ep: endpoint {
-                               data-lanes = <0 2>;
-                               remote-endpoint = <&ov5640_ep>;
-                               status = "okay";
-                       };
-               };
-       };
-};
-
-&cci {
-       status = "okay";
-};
-
-&cci_i2c0 {
-       camera_rear@3b {
-               compatible = "ovti,ov5640";
-               reg = <0x3b>;
-
-               powerdown-gpios = <&tlmm 34 GPIO_ACTIVE_HIGH>;
-               reset-gpios = <&tlmm 35 GPIO_ACTIVE_LOW>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&camera_rear_default>;
-
-               clocks = <&gcc GCC_CAMSS_MCLK0_CLK>;
-               clock-names = "xclk";
-               assigned-clocks = <&gcc GCC_CAMSS_MCLK0_CLK>;
-               assigned-clock-rates = <23880000>;
-
-               DOVDD-supply = <&camera_vdddo_1v8>;
-               AVDD-supply = <&camera_vdda_2v8>;
-               DVDD-supply = <&camera_vddd_1v5>;
-
-               /* No camera mezzanine by default */
-               status = "disabled";
-
-               port {
-                       ov5640_ep: endpoint {
-                               data-lanes = <1 2>;
-                               remote-endpoint = <&csiphy0_ep>;
-                       };
-               };
-       };
-};
-
 &lpass {
        status = "okay";
 };