Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26e76725 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add camera sensor info properly for msm8953 based target"

parents 11aa39f2 408b0967

arch/arm64/boot/dts/qcom/msm8953-camera-sensor-cdp.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ 
		qcom,clock-rates = <19200000 0>;

	};



	qcom,camera@0 {

	camera0: qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";

		reg = <0x0>;

arch/arm64/boot/dts/qcom/msm8953-camera-sensor-mtp.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ 
		qcom,clock-rates = <19200000 0>;

	};



	qcom,camera@0 {

	camera0: qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";

		reg = <0x0>;

arch/arm64/boot/dts/qcom/msm8953-cdp.dts

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include "pmi8950.dtsi"

#include "msm8953-cdp.dtsi"

#include "msm8953-pmi8950.dtsi"

#include "msm8953-camera-sensor-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8953 + PMI8950 CDP";

arch/arm64/boot/dts/qcom/msm8953-cdp.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/clock/msm-clocks-8953.h>

#include "msm8953-audio-cdp.dtsi"

#include "msm8953-camera-sensor-cdp.dtsi"



&blsp1_uart0 {

	status = "ok";

arch/arm64/boot/dts/qcom/msm8953-ext-codec-mtp.dts

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include "pmi8950.dtsi"

#include "msm8953-mtp.dtsi"

#include "msm8953-pmi8950.dtsi"

#include "msm8953-camera-sensor-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8953 + PMI8950 Ext Codec MTP";