xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

firmware: arm_scmi: Add SMCCC discovery dependency in Kconfig

Browse Source 
[ Upstream commit c05b07963e965ae34e75ee8c33af1095350cd87e ]

ARM_SCMI_PROTOCOL depends on either MAILBOX or HAVE_ARM_SMCCC_DISCOVERY,
not MAILBOX alone. Fix the depedency in Kconfig file and driver to
reflect the same.

Link: https://lore.kernel.org/r/20210521134055.24271-1-etienne.carriere@linaro.org
Reviewed-by: Cristian Marussi <cristian.marussi@arm.com>
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
[sudeep.holla: Minor tweaks to subject and change log]
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Etienne Carriere
2021-05-21 15:40:51 +02:00
committed by Greg Kroah-Hartman
parent 41e2bcca23
commit b4009ea92f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/firmware/Kconfig
View File

@@ -9,7 +9,7 @@ menu "Firmware Drivers"
config ARM_SCMI_PROTOCOL config ARM_SCMI_PROTOCOL
tristate "ARM System Control and Management Interface (SCMI) Message Protocol" tristate "ARM System Control and Management Interface (SCMI) Message Protocol"
depends on ARM || ARM64 || COMPILE_TEST depends on ARM || ARM64 || COMPILE_TEST
depends on MAILBOX depends on MAILBOX || HAVE_ARM_SMCCC_DISCOVERY
help help
ARM System Control and Management Interface (SCMI) protocol is a ARM System Control and Management Interface (SCMI) protocol is a
set of operating system-independent software interfaces that are set of operating system-independent software interfaces that are

2
drivers/firmware/arm_scmi/common.h
View File

@@ -243,7 +243,7 @@ struct scmi_desc {
}; };
extern const struct scmi_desc scmi_mailbox_desc; extern const struct scmi_desc scmi_mailbox_desc;
#ifdef CONFIG_HAVE_ARM_SMCCC #ifdef CONFIG_HAVE_ARM_SMCCC_DISCOVERY
extern const struct scmi_desc scmi_smc_desc; extern const struct scmi_desc scmi_smc_desc;
#endif #endif