Skip to content

Commit 81967ef

Browse files
Saravana Kannangregkh
authored andcommitted
drivers: bus: Delete CONFIG_SIMPLE_PM_BUS
The simple-pm-bus driver is mandatory for CONFIG_OF based platforms to work with fw_devlink. So, always compile it in for CONFIG_OF and delete the config since it's no longer necessary. Tested-by: Ulf Hansson <ulf.hansson@linaro.org> Tested-by: Geert Uytterhoeven <geert+renesas@glider.be> Tested-by: Damien Le Moal <damien.lemoal@wdc.com> Cc: Rob Herring <robh+dt@kernel.org> Signed-off-by: Saravana Kannan <saravanak@google.com> Link: https://lore.kernel.org/r/20210929000735.585237-3-saravanak@google.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 98e96cf commit 81967ef

8 files changed

Lines changed: 1 addition & 19 deletions

File tree

arch/arm/configs/multi_v7_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ CONFIG_PCI_EPF_TEST=m
197197
CONFIG_DEVTMPFS=y
198198
CONFIG_DEVTMPFS_MOUNT=y
199199
CONFIG_OMAP_OCP2SCP=y
200-
CONFIG_SIMPLE_PM_BUS=y
201200
CONFIG_MTD=y
202201
CONFIG_MTD_CMDLINE_PARTS=y
203202
CONFIG_MTD_BLOCK=y

arch/arm/configs/oxnas_v6_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ CONFIG_DEVTMPFS=y
4646
CONFIG_DEVTMPFS_MOUNT=y
4747
CONFIG_DMA_CMA=y
4848
CONFIG_CMA_SIZE_MBYTES=64
49-
CONFIG_SIMPLE_PM_BUS=y
5049
CONFIG_MTD=y
5150
CONFIG_MTD_CMDLINE_PARTS=y
5251
CONFIG_MTD_BLOCK=y

arch/arm/configs/shmobile_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ CONFIG_PCI_RCAR_GEN2=y
4040
CONFIG_PCIE_RCAR_HOST=y
4141
CONFIG_DEVTMPFS=y
4242
CONFIG_DEVTMPFS_MOUNT=y
43-
CONFIG_SIMPLE_PM_BUS=y
4443
CONFIG_MTD=y
4544
CONFIG_MTD_BLOCK=y
4645
CONFIG_MTD_CFI=y

arch/arm/mach-omap2/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ config ARCH_OMAP2PLUS
112112
select PM_GENERIC_DOMAINS
113113
select PM_GENERIC_DOMAINS_OF
114114
select RESET_CONTROLLER
115-
select SIMPLE_PM_BUS
116115
select SOC_BUS
117116
select TI_SYSC
118117
select OMAP_IRQCHIP

arch/arm64/configs/defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,6 @@ CONFIG_DEVTMPFS_MOUNT=y
245245
CONFIG_FW_LOADER_USER_HELPER=y
246246
CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
247247
CONFIG_HISILICON_LPC=y
248-
CONFIG_SIMPLE_PM_BUS=y
249248
CONFIG_FSL_MC_BUS=y
250249
CONFIG_TEGRA_ACONNECT=m
251250
CONFIG_GNSS=m

drivers/bus/Kconfig

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -152,18 +152,6 @@ config QCOM_EBI2
152152
Interface 2, which can be used to connect things like NAND Flash,
153153
SRAM, ethernet adapters, FPGAs and LCD displays.
154154

155-
config SIMPLE_PM_BUS
156-
tristate "Simple Power-Managed Bus Driver"
157-
depends on OF && PM
158-
help
159-
Driver for transparent busses that don't need a real driver, but
160-
where the bus controller is part of a PM domain, or under the control
161-
of a functional clock, and thus relies on runtime PM for managing
162-
this PM domain and/or clock.
163-
An example of such a bus controller is the Renesas Bus State
164-
Controller (BSC, sometimes called "LBSC within Bus Bridge", or
165-
"External Bus Interface") as found on several Renesas ARM SoCs.
166-
167155
config SUN50I_DE2_BUS
168156
bool "Allwinner A64 DE2 Bus Driver"
169157
default ARM64

drivers/bus/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ obj-$(CONFIG_OMAP_OCP2SCP) += omap-ocp2scp.o
2727
obj-$(CONFIG_QCOM_EBI2) += qcom-ebi2.o
2828
obj-$(CONFIG_SUN50I_DE2_BUS) += sun50i-de2.o
2929
obj-$(CONFIG_SUNXI_RSB) += sunxi-rsb.o
30-
obj-$(CONFIG_SIMPLE_PM_BUS) += simple-pm-bus.o
30+
obj-$(CONFIG_OF) += simple-pm-bus.o
3131
obj-$(CONFIG_TEGRA_ACONNECT) += tegra-aconnect.o
3232
obj-$(CONFIG_TEGRA_GMI) += tegra-gmi.o
3333
obj-$(CONFIG_TI_PWMSS) += ti-pwmss.o

drivers/soc/canaan/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ config SOC_K210_SYSCTL
55
depends on RISCV && SOC_CANAAN && OF
66
default SOC_CANAAN
77
select PM
8-
select SIMPLE_PM_BUS
98
select SYSCON
109
select MFD_SYSCON
1110
help

0 commit comments

Comments
 (0)