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

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

Merge "soc: qcom: scm: Remap scm busy error codes to -EBUSY"

parents 0168d2ad 71ad6b09

arch/arm64/boot/dts/qcom/sdm855-rumi.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -72,6 +72,11 @@ 
		asoc-codec-names = "msm-stub-codec.1";

		qcom,wsa-max-devs = <0>;

	};



	wdog: qcom,wdt@17c10000{

		status = "disabled";

	};



};



#include "sdm855-pmic-overlay.dtsi"

arch/arm64/configs/sdm855-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -389,6 +389,7 @@ CONFIG_QCOM_QMI_HELPERS=y 
CONFIG_QCOM_SMEM=y

CONFIG_QCOM_SCM=y

CONFIG_QCOM_MEMORY_DUMP_V2=y

CONFIG_QCOM_WATCHDOG_V2=y

CONFIG_QCOM_SMP2P=y

CONFIG_MSM_SERVICE_LOCATOR=y

CONFIG_MSM_SERVICE_NOTIFIER=y

arch/arm64/configs/sdm855_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -400,6 +400,7 @@ CONFIG_QCOM_QMI_HELPERS=y 
CONFIG_QCOM_SMEM=y

CONFIG_QCOM_SCM=y

CONFIG_QCOM_MEMORY_DUMP_V2=y

CONFIG_QCOM_WATCHDOG_V2=y

CONFIG_QCOM_SMP2P=y

CONFIG_MSM_SERVICE_LOCATOR=y

CONFIG_MSM_SERVICE_NOTIFIER=y

drivers/soc/qcom/scm.c

+1 −2
Original line number Diff line number Diff line
@@ -96,9 +96,8 @@ static int scm_remap_error(int err) 
	case SCM_ENOMEM:

		return -ENOMEM;

	case SCM_EBUSY:

		return SCM_EBUSY;

	case SCM_V2_EBUSY:

		return SCM_V2_EBUSY;

		return -EBUSY;

	}

	return -EINVAL;

}