Commit 6823df31 authored by Bryan O'Donoghue's avatar Bryan O'Donoghue Committed by Bjorn Andersson
Browse files

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



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: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20230811234738.2859417-7-bryan.odonoghue@linaro.org


Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent 4facccb4

arch/arm64/boot/dts/qcom/Makefile

+1 −0
Original line number Diff line number Diff line 
# 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

arch/arm64/boot/dts/qcom/apq8016-sbc-d3-camera-mezzanine.dts

0 → 100644
+81 −0
Original line number Diff line number Diff line 
// 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>;

			};

		};

	};

};

arch/arm64/boot/dts/qcom/apq8016-sbc.dts

+0 −73
Original line number Diff line number Diff line
@@ -34,30 +34,6 @@ chosen { 
		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 @@ &blsp_uart2 { 
	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";

};