Merge tag 'rproc-v5.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux
Pull remoteproc fix from Bjorn Andersson: "The interaction between the various Qualcomm remoteproc drivers and the Qualcomm 'QMP' driver (used to communicate with the power-management hardware) was reworked in v5.17-rc1, but failed to account for the new Kconfig dependency" * tag 'rproc-v5.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux: remoteproc: qcom: q6v5: fix service routines build errors
This commit is contained in:
@@ -180,6 +180,7 @@ config QCOM_Q6V5_ADSP
|
||||
depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n
|
||||
depends on QCOM_SYSMON || QCOM_SYSMON=n
|
||||
depends on RPMSG_QCOM_GLINK || RPMSG_QCOM_GLINK=n
|
||||
depends on QCOM_AOSS_QMP || QCOM_AOSS_QMP=n
|
||||
select MFD_SYSCON
|
||||
select QCOM_PIL_INFO
|
||||
select QCOM_MDT_LOADER
|
||||
@@ -199,6 +200,7 @@ config QCOM_Q6V5_MSS
|
||||
depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n
|
||||
depends on QCOM_SYSMON || QCOM_SYSMON=n
|
||||
depends on RPMSG_QCOM_GLINK || RPMSG_QCOM_GLINK=n
|
||||
depends on QCOM_AOSS_QMP || QCOM_AOSS_QMP=n
|
||||
select MFD_SYSCON
|
||||
select QCOM_MDT_LOADER
|
||||
select QCOM_PIL_INFO
|
||||
@@ -218,6 +220,7 @@ config QCOM_Q6V5_PAS
|
||||
depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n
|
||||
depends on QCOM_SYSMON || QCOM_SYSMON=n
|
||||
depends on RPMSG_QCOM_GLINK || RPMSG_QCOM_GLINK=n
|
||||
depends on QCOM_AOSS_QMP || QCOM_AOSS_QMP=n
|
||||
select MFD_SYSCON
|
||||
select QCOM_PIL_INFO
|
||||
select QCOM_MDT_LOADER
|
||||
@@ -239,6 +242,7 @@ config QCOM_Q6V5_WCSS
|
||||
depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n
|
||||
depends on QCOM_SYSMON || QCOM_SYSMON=n
|
||||
depends on RPMSG_QCOM_GLINK || RPMSG_QCOM_GLINK=n
|
||||
depends on QCOM_AOSS_QMP || QCOM_AOSS_QMP=n
|
||||
select MFD_SYSCON
|
||||
select QCOM_MDT_LOADER
|
||||
select QCOM_PIL_INFO
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/soc/qcom/qcom_aoss.h>
|
||||
#include <linux/soc/qcom/smem.h>
|
||||
#include <linux/soc/qcom/smem_state.h>
|
||||
#include <linux/remoteproc.h>
|
||||
|
||||
Reference in New Issue
Block a user