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

Commit 1dc1f981 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: change subtype ID for Reddragon 360camera"

parents 6b5ff575 cb5a8eb5

arch/arm64/boot/dts/qcom/qcs605-360camera-overlay.dts

+3 −3
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -23,10 +23,10 @@ 
#include "qcs605-360camera.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. QCS605 PM660+PM660L 360camera";

	model = "Qualcomm Technologies, Inc. QCS605 PM660+PM660L VRcamera";

	compatible = "qcom,qcs605-mtp", "qcom,qcs605", "qcom,mtp";

	qcom,msm-id = <347 0x0>;

	qcom,board-id = <0x0000000b 1>;

	qcom,board-id = <8 5>;

	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,

		       <0x0001001b 0x0102001a 0x0 0x0>,

		       <0x0001001b 0x0201011a 0x0 0x0>;

arch/arm64/boot/dts/qcom/qcs605-360camera.dts

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -20,7 +20,7 @@ 
/ {

	model = "Qualcomm Technologies, Inc. QCS605 PM660 + PM660L 360camera";

	compatible = "qcom,qcs605-mtp", "qcom,qcs605", "qcom,mtp";

	qcom,board-id = <0x0000000b 1>;

	qcom,board-id = <8 5>;

	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,

		       <0x0001001b 0x0102001a 0x0 0x0>,

		       <0x0001001b 0x0201011a 0x0 0x0>;

arch/arm64/boot/dts/qcom/qcs605-360camera.dtsi

+9 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -39,6 +39,14 @@ 
	status = "disabled";

};



&dsi_dual_nt36850_truly_cmd_display {

	status = "disabled";

};



&dsi_dual_nt35597_truly_video {

	status = "disabled";

};



&int_codec {

	qcom,model = "sdm670-360cam-snd-card";

	qcom,audio-routing =