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

Commit d4b996cb authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: dts: enable ais ife driver for automotive"

parents a9ffb424 c5e383be

arch/arm64/boot/dts/qcom/sa6155p-camera.dtsi

0 → 100644
+74 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2020, 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



&cam_isp_mgr {

	status = "disabled";

};



&cam_csid0 {

	compatible = "qcom,ais-csid170";

};



&cam_vfe0 {

	compatible = "qcom,ais-vfe170";

};



&cam_csid1 {

	compatible = "qcom,ais-csid170";

};



&cam_vfe1 {

	compatible = "qcom,ais-vfe170";

};



&cam_csid_lite {

	compatible = "qcom,ais-csid-lite170";

};



&cam_vfe_lite {

	compatible = "qcom,ais-vfe-lite170";

};



&cam_lrme_mgr {

	status = "disabled";

};

&cam_lrme {

	status = "disabled";

};





&soc {

	/delete-node/ cam_isp_mgr;

	/delete-node/ cam_fd_mgr;

	/delete-node/ cam_fd;

	/delete-node/ cam_lrme_mgr;

	/delete-node/ cam_lrme;



	qcom,ais-ife0 {

		compatible = "qcom,ais-ife";

		cell-index = <0>;

		status = "ok";

	};



	qcom,ais-ife1 {

		compatible = "qcom,ais-ife";

		cell-index = <1>;

		status = "ok";

	};



	qcom,ais-ife2 {

		compatible = "qcom,ais-ife";

		cell-index = <2>;

		status = "ok";

	};

};

arch/arm64/boot/dts/qcom/sa6155p.dtsi

+3 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2020, 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
@@ -13,7 +13,8 @@ 
#include "sm6150.dtsi"

#include "sa6155-pmic.dtsi"

#include "sa6155-display.dtsi"

#include "sm6150-camera-sensor-adp.dtsi"

#include "sa6155p-camera.dtsi"

#include "sa6155p-camera-sensor.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA6155P";

arch/arm64/boot/dts/qcom/sa8155-camera.dtsi

0 → 100644
+96 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2020, 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



&cam_isp_mgr {

	status = "disabled";

};



&cam_csid0 {

	compatible = "qcom,ais-csid175";

};



&cam_vfe0 {

	compatible = "qcom,ais-vfe175";

};



&cam_csid1 {

	compatible = "qcom,ais-csid175";

};



&cam_vfe1 {

	compatible = "qcom,ais-vfe175";

};



&cam_csid_lite0 {

	compatible = "qcom,ais-csid-lite175";

};



&cam_vfe_lite0 {

	compatible = "qcom,ais-vfe-lite175";

};



&cam_csid_lite1 {

	compatible = "qcom,ais-csid-lite175";

};



&cam_vfe_lite1 {

	compatible = "qcom,ais-vfe-lite175";

};





&cam_fd_mgr {

	status = "disabled";

};

&cam_fd {

	status = "disabled";

};



&cam_lrme_mgr {

	status = "disabled";

};

&cam_lrme {

	status = "disabled";

};





&soc {

	/delete-node/ cam_isp_mgr;

	/delete-node/ cam_fd_mgr;

	/delete-node/ cam_fd;

	/delete-node/ cam_lrme_mgr;

	/delete-node/ cam_lrme;



	qcom,ais-ife0 {

		compatible = "qcom,ais-ife";

		cell-index = <0>;

		status = "ok";

	};



	qcom,ais-ife1 {

		compatible = "qcom,ais-ife";

		cell-index = <1>;

		status = "ok";

	};



	qcom,ais-ife2 {

		compatible = "qcom,ais-ife";

		cell-index = <2>;

		status = "ok";

	};



	qcom,ais-ife3 {

		compatible = "qcom,ais-ife";

		cell-index = <3>;

		status = "ok";

	};

};

arch/arm64/boot/dts/qcom/sa8155.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -769,4 +769,5 @@ 
};



#include "sa8155-audio.dtsi"

#include "sa8155-camera.dtsi"

#include "sa8155-camera-sensor.dtsi"