Merge "ARM: dts: Remove disabled camera nodes from sdxpoorwills" (3d6096a2) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm64/boot/dts/qcom/sda845-sdxpoorwills.dtsi

+1 −195

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2017-2018, 2021 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
		@@ -71,200 +71,6 @@
		status = "disabled";
		};

		&soc {
		qcom,cam-req-mgr {
		status = "disabled";
		};

		cam_csiphy0: qcom,csiphy@ac65000 {
		status = "disabled";
		};

		cam_csiphy1: qcom,csiphy@ac66000 {
		status = "disabled";
		};

		cam_csiphy2: qcom,csiphy@ac67000 {
		status = "disabled";
		};

		cam_cci: qcom,cci@ac4a000 {
		status = "disabled";

		i2c_freq_100Khz: qcom,i2c_standard_mode {
		status = "disabled";
		};

		i2c_freq_400Khz: qcom,i2c_fast_mode {
		status = "disabled";
		};

		i2c_freq_custom: qcom,i2c_custom_mode {
		status = "disabled";
		};

		i2c_freq_1Mhz: qcom,i2c_fast_plus_mode {
		status = "disabled";
		};
		};

		qcom,cam_smmu {
		status = "disabled";

		msm_cam_smmu_ife {
		ife_iova_mem_map: iova-mem-map {
		iova-mem-region-io {
		status = "disabled";
		};
		};
		};

		msm_cam_smmu_jpeg {
		jpeg_iova_mem_map: iova-mem-map {
		iova-mem-region-io {
		status = "disabled";
		};
		};
		};

		msm_cam_smmu_icp {
		icp_iova_mem_map: iova-mem-map {
		iova-mem-region-firmware {
		status = "disabled";
		};

		iova-mem-region-shared {
		status = "disabled";
		};

		iova-mem-region-io {
		status = "disabled";
		};
		};
		};

		msm_cam_smmu_cpas_cdm {
		cpas_cdm_iova_mem_map: iova-mem-map {
		iova-mem-region-io {
		status = "disabled";
		};
		};
		};

		msm_cam_smmu_fd {
		fd_iova_mem_map: iova-mem-map {
		iova-mem-region-io {
		status = "disabled";
		};
		};
		};
		};

		qcom,cam-cpas@ac40000 {
		status = "disabled";
		};

		qcom,cam-cdm-intf {
		status = "disabled";
		};

		qcom,cpas-cdm0@ac48000 {
		status = "disabled";
		};

		qcom,cam-isp {
		status = "disabled";
		};

		cam_csid0: qcom,csid0@acb3000 {
		status = "disabled";
		};

		cam_vfe0: qcom,vfe0@acaf000 {
		status = "disabled";
		};

		cam_csid1: qcom,csid1@acba000 {
		status = "disabled";
		};

		cam_vfe1: qcom,vfe1@acb6000 {
		status = "disabled";
		};

		cam_csid_lite: qcom,csid-lite@acc8000 {
		status = "disabled";
		};

		cam_vfe_lite: qcom,vfe-lite@acc4000 {
		status = "disabled";
		};

		qcom,cam-icp {
		status = "disabled";
		};

		cam_a5: qcom,a5@ac00000 {
		status = "disabled";
		};

		cam_ipe0: qcom,ipe0 {
		status = "disabled";
		};

		cam_ipe1: qcom,ipe1 {
		status = "disabled";
		};

		cam_bps: qcom,bps {
		status = "disabled";
		};

		clock_camcc: qcom,camcc@ad00000 {
		status = "disabled";
		};

		qcom,cam-jpeg {
		status = "disabled";
		};

		cam_jpeg_enc: qcom,jpegenc@ac4e000 {
		status = "disabled";
		};

		cam_jpeg_dma: qcom,jpegdma@0xac52000 {
		status = "disabled";
		};

		qcom,cam-fd {
		status = "disabled";
		};

		cam_fd: qcom,fd@ac5a000 {
		status = "disabled";
		};

		qcom,cam-sensor@0 {
		status = "disabled";
		};

		qcom,cam-sensor@1 {
		status = "disabled";
		};

		qcom,cam-sensor@2 {
		status = "disabled";
		};

		qcom,cam-sensor@3 {
		status = "disabled";
		};

		cam_csiphy3: qcom,csiphy@ac68000 {
		status = "disabled";
		};
		};

		&wil6210 {
		status = "disabled";
		};

kernel_headers.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -347,7 +347,7 @@ def run_headers_install(verbose, gen_dir, headers_install, unifdef, prefix, h):

		env = os.environ.copy()
		env["LOC_UNIFDEF"] = unifdef
		result = subprocess.call(['sh', headers_install, h, out_h], env=env)
		result = subprocess.call(['sh', headers_install, out_h_dirname, h_dirname, out_h_basename], env=env)

		if result != 0:
		print('error: run_headers_install: cmd %s failed %d' % (cmd, result))