Merge 033db782f19bcc5b961fcb676404466c2c07d0f8 on remote branch (bf04cbcd) · Commits · e / devices / android_kernel_fairphone_FP3

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

+45 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
		* Copyright (c) 2016-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
		@@ -409,4 +409,48 @@
		clock-cntl-level = "turbo";
		clock-rates = <24000000>;
		};

		qcom,cam-sensor@3 {
		cell-index = <0>;
		compatible = "qcom,cam-sensor";
		reg = <0x0>;
		csiphy-sd-index = <0>;
		sensor-position-roll = <270>;
		sensor-position-pitch = <0>;
		sensor-position-yaw = <180>;
		led-flash-src = <&led_flash_rear>;
		actuator-src = <&actuator_rear>;
		ois-src = <&ois_rear>;
		eeprom-src = <&eeprom_rear>;
		cam_vio-supply = <&camera_vio_ldo>;
		cam_vana-supply = <&camera_vana_ldo>;
		cam_vdig-supply = <&camera_ldo>;
		cam_clk-supply = <&titan_top_gdsc>;
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",
		"cam_clk";
		rgltr-cntrl-support;
		rgltr-min-voltage = <1800000 2850000 1352000 0>;
		rgltr-max-voltage = <1800000 2850000 1352000 0>;
		rgltr-load-current = <0 80000 105000 0>;
		gpio-no-mux = <0>;
		pinctrl-names = "cam_default", "cam_suspend";
		pinctrl-0 = <&cam_sensor_mclk0_active
		&cam_sensor_rear_active>;
		pinctrl-1 = <&cam_sensor_mclk0_suspend
		&cam_sensor_rear_suspend>;
		gpios = <&tlmm 13 0>,
		<&tlmm 30 0>;
		gpio-reset = <1>;
		gpio-req-tbl-num = <0 1>;
		gpio-req-tbl-flags = <1 0>;
		gpio-req-tbl-label = "CAMIF_MCLK0",
		"CAM_RESET0";
		sensor-mode = <0>;
		cci-master = <0>;
		status = "ok";
		clocks = <&clock_camcc CAM_CC_MCLK0_CLK>;
		clock-names = "cam_clk";
		clock-cntl-level = "turbo";
		clock-rates = <24000000>;
		};
		};

arch/arm64/configs/sdm845-perf_defconfig

+0 −4

Original line number	Diff line number	Diff line
		@@ -301,9 +301,6 @@ CONFIG_USB_USBNET=y
		CONFIG_WIL6210=m
		# CONFIG_WIL6210_TRACING is not set
		CONFIG_WCNSS_MEM_PRE_ALLOC=y
		CONFIG_CNSS=y
		CONFIG_CNSS_SDIO=y
		CONFIG_CLD_HL_SDIO_CORE=y
		CONFIG_CLD_LL_CORE=y
		CONFIG_CNSS_GENL=y
		CONFIG_INPUT_EVDEV=y
		@@ -578,7 +575,6 @@ CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y
		CONFIG_QMP_DEBUGFS_CLIENT=y
		CONFIG_MEM_SHARE_QMI_SERVICE=y
		CONFIG_QSEE_IPC_IRQ_BRIDGE=y
		CONFIG_CNSS_CRYPTO=y
		CONFIG_QCOM_BIMC_BWMON=y
		CONFIG_ARM_MEMLAT_MON=y
		CONFIG_QCOMCCI_HWMON=y

arch/arm64/configs/sdm845_defconfig

+0 −3

Original line number	Diff line number	Diff line
		@@ -306,9 +306,6 @@ CONFIG_USB_RTL8152=y
		CONFIG_USB_USBNET=y
		CONFIG_WIL6210=m
		CONFIG_WCNSS_MEM_PRE_ALLOC=y
		CONFIG_CNSS=y
		CONFIG_CNSS_SDIO=y
		CONFIG_CLD_HL_SDIO_CORE=y
		CONFIG_CLD_LL_CORE=y
		CONFIG_CNSS_GENL=y
		CONFIG_INPUT_EVDEV=y

drivers/char/adsprpc.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -2755,6 +2755,11 @@ static int fastrpc_internal_munmap(struct fastrpc_file *fl,
		mutex_unlock(&fl->fl_map_mutex);
		if (err)
		goto bail;
		VERIFY(err, map != NULL);
		if (err) {
		err = -EINVAL;
		goto bail;
		}
		VERIFY(err, !fastrpc_munmap_on_dsp(fl, map->raddr,
		map->phys, map->size, map->flags));
		if (err)

drivers/gpu/msm/adreno_a6xx_preempt.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -783,7 +783,7 @@ void a6xx_preemption_context_destroy(struct kgsl_context *context)
		struct kgsl_device *device = context->device;
		struct adreno_device *adreno_dev = ADRENO_DEVICE(device);

		if (!adreno_is_preemption_enabled(adreno_dev))
		if (!ADRENO_FEATURE(adreno_dev, ADRENO_PREEMPTION))
		return;

		gpumem_free_entry(context->user_ctxt_record);
		@@ -798,7 +798,7 @@ int a6xx_preemption_context_init(struct kgsl_context *context)
		struct adreno_device *adreno_dev = ADRENO_DEVICE(device);
		uint64_t flags = 0;

		if (!adreno_is_preemption_enabled(adreno_dev))
		if (!ADRENO_FEATURE(adreno_dev, ADRENO_PREEMPTION))
		return 0;

		if (context->flags & KGSL_CONTEXT_SECURE)