Skip to content

Commit 395a480

Browse files
anderssondavem330
andersson
authored and
davem330
committed
soc: qcom: smd: Remove standalone driver
Remove the standalone SMD implementation as we have transitioned the client drivers to use the RPMSG based one. Also remove all dependencies on QCOM_SMD from Kconfig files, in order to keep them selectable in the absence of the removed symbol. Acked-by: Andy Gross <andy.gross@linaro.org> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 5052de8 commit 395a480

7 files changed

Lines changed: 4 additions & 1713 deletions

File tree

‎drivers/remoteproc/Kconfig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ config QCOM_ADSP_PIL
7676
depends on OF && ARCH_QCOM
7777
depends on REMOTEPROC
7878
depends on QCOM_SMEM
79-
depends on RPMSG_QCOM_SMD || QCOM_SMD || (COMPILE_TEST && QCOM_SMD=n && RPMSG_QCOM_SMD=n)
79+
depends on RPMSG_QCOM_SMD || (COMPILE_TEST && RPMSG_QCOM_SMD=n)
8080
select MFD_SYSCON
8181
select QCOM_MDT_LOADER
8282
select QCOM_RPROC_COMMON
@@ -93,7 +93,7 @@ config QCOM_Q6V5_PIL
9393
depends on OF && ARCH_QCOM
9494
depends on QCOM_SMEM
9595
depends on REMOTEPROC
96-
depends on RPMSG_QCOM_SMD || QCOM_SMD || (COMPILE_TEST && QCOM_SMD=n && RPMSG_QCOM_SMD=n)
96+
depends on RPMSG_QCOM_SMD || (COMPILE_TEST && RPMSG_QCOM_SMD=n)
9797
select MFD_SYSCON
9898
select QCOM_RPROC_COMMON
9999
select QCOM_SCM
@@ -104,7 +104,7 @@ config QCOM_Q6V5_PIL
104104
config QCOM_WCNSS_PIL
105105
tristate "Qualcomm WCNSS Peripheral Image Loader"
106106
depends on OF && ARCH_QCOM
107-
depends on RPMSG_QCOM_SMD || QCOM_SMD || (COMPILE_TEST && QCOM_SMD=n && RPMSG_QCOM_SMD=n)
107+
depends on RPMSG_QCOM_SMD || (COMPILE_TEST && RPMSG_QCOM_SMD=n)
108108
depends on QCOM_SMEM
109109
depends on REMOTEPROC
110110
select QCOM_MDT_LOADER

‎drivers/rpmsg/Kconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ config RPMSG_CHAR
1616
config RPMSG_QCOM_SMD
1717
tristate "Qualcomm Shared Memory Driver (SMD)"
1818
depends on QCOM_SMEM
19-
depends on QCOM_SMD=n
2019
select RPMSG
2120
help
2221
Say y here to enable support for the Qualcomm Shared Memory Driver

‎drivers/soc/qcom/Kconfig‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,6 @@ config QCOM_SMEM
3333
The driver provides an interface to items in a heap shared among all
3434
processors in a Qualcomm platform.
3535

36-
config QCOM_SMD
37-
tristate "Qualcomm Shared Memory Driver (SMD)"
38-
depends on QCOM_SMEM
39-
help
40-
Say y here to enable support for the Qualcomm Shared Memory Driver
41-
providing communication channels to remote processors in Qualcomm
42-
platforms.
43-
4436
config QCOM_SMD_RPM
4537
tristate "Qualcomm Resource Power Manager (RPM) over SMD"
4638
depends on ARCH_QCOM

‎drivers/soc/qcom/Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
obj-$(CONFIG_QCOM_GSBI) += qcom_gsbi.o
22
obj-$(CONFIG_QCOM_MDT_LOADER) += mdt_loader.o
33
obj-$(CONFIG_QCOM_PM) += spm.o
4-
obj-$(CONFIG_QCOM_SMD) += smd.o
54
obj-$(CONFIG_QCOM_SMD_RPM) += smd-rpm.o
65
obj-$(CONFIG_QCOM_SMEM) += smem.o
76
obj-$(CONFIG_QCOM_SMEM_STATE) += smem_state.o

0 commit comments

Comments
 (0)