On Sat, 4 Sept 2021 at 02:05, Saravana Kannan <saravanak@xxxxxxxxxx> wrote: > > 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. > > Signed-off-by: Saravana Kannan <saravanak@xxxxxxxxxx> Tested-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx> Kind regards Uffe > --- > arch/arm/configs/multi_v7_defconfig | 1 - > arch/arm/configs/oxnas_v6_defconfig | 1 - > arch/arm/configs/shmobile_defconfig | 1 - > arch/arm/mach-omap2/Kconfig | 1 - > arch/arm64/configs/defconfig | 1 - > drivers/bus/Kconfig | 12 ------------ > drivers/bus/Makefile | 2 +- > drivers/soc/canaan/Kconfig | 1 - > 8 files changed, 1 insertion(+), 19 deletions(-) > > diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig > index d9abaae118dd..362720ae8d65 100644 > --- a/arch/arm/configs/multi_v7_defconfig > +++ b/arch/arm/configs/multi_v7_defconfig > @@ -196,7 +196,6 @@ CONFIG_PCI_EPF_TEST=m > CONFIG_DEVTMPFS=y > CONFIG_DEVTMPFS_MOUNT=y > CONFIG_OMAP_OCP2SCP=y > -CONFIG_SIMPLE_PM_BUS=y > CONFIG_MTD=y > CONFIG_MTD_CMDLINE_PARTS=y > CONFIG_MTD_BLOCK=y > diff --git a/arch/arm/configs/oxnas_v6_defconfig b/arch/arm/configs/oxnas_v6_defconfig > index cae0db6b4eaf..de37f7e90999 100644 > --- a/arch/arm/configs/oxnas_v6_defconfig > +++ b/arch/arm/configs/oxnas_v6_defconfig > @@ -46,7 +46,6 @@ CONFIG_DEVTMPFS=y > CONFIG_DEVTMPFS_MOUNT=y > CONFIG_DMA_CMA=y > CONFIG_CMA_SIZE_MBYTES=64 > -CONFIG_SIMPLE_PM_BUS=y > CONFIG_MTD=y > CONFIG_MTD_CMDLINE_PARTS=y > CONFIG_MTD_BLOCK=y > diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig > index d9a27e4e0914..18d2a960b2d2 100644 > --- a/arch/arm/configs/shmobile_defconfig > +++ b/arch/arm/configs/shmobile_defconfig > @@ -40,7 +40,6 @@ CONFIG_PCI_RCAR_GEN2=y > CONFIG_PCIE_RCAR_HOST=y > CONFIG_DEVTMPFS=y > CONFIG_DEVTMPFS_MOUNT=y > -CONFIG_SIMPLE_PM_BUS=y > CONFIG_MTD=y > CONFIG_MTD_BLOCK=y > CONFIG_MTD_CFI=y > diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig > index 7df8f5276ddf..02f2f3157f07 100644 > --- a/arch/arm/mach-omap2/Kconfig > +++ b/arch/arm/mach-omap2/Kconfig > @@ -112,7 +112,6 @@ config ARCH_OMAP2PLUS > select PM_GENERIC_DOMAINS > select PM_GENERIC_DOMAINS_OF > select RESET_CONTROLLER > - select SIMPLE_PM_BUS > select SOC_BUS > select TI_SYSC > select OMAP_IRQCHIP > diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig > index f423d08b9a71..474b1f2e3f06 100644 > --- a/arch/arm64/configs/defconfig > +++ b/arch/arm64/configs/defconfig > @@ -245,7 +245,6 @@ CONFIG_DEVTMPFS_MOUNT=y > CONFIG_FW_LOADER_USER_HELPER=y > CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y > CONFIG_HISILICON_LPC=y > -CONFIG_SIMPLE_PM_BUS=y > CONFIG_FSL_MC_BUS=y > CONFIG_TEGRA_ACONNECT=m > CONFIG_GNSS=m > diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig > index e7f7eee6ee9a..dc3801369488 100644 > --- a/drivers/bus/Kconfig > +++ b/drivers/bus/Kconfig > @@ -141,18 +141,6 @@ config QCOM_EBI2 > Interface 2, which can be used to connect things like NAND Flash, > SRAM, ethernet adapters, FPGAs and LCD displays. > > -config SIMPLE_PM_BUS > - tristate "Simple Power-Managed Bus Driver" > - depends on OF && PM > - help > - Driver for transparent busses that don't need a real driver, but > - where the bus controller is part of a PM domain, or under the control > - of a functional clock, and thus relies on runtime PM for managing > - this PM domain and/or clock. > - An example of such a bus controller is the Renesas Bus State > - Controller (BSC, sometimes called "LBSC within Bus Bridge", or > - "External Bus Interface") as found on several Renesas ARM SoCs. > - > config SUN50I_DE2_BUS > bool "Allwinner A64 DE2 Bus Driver" > default ARM64 > diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile > index 397e35392bff..86aacd36a56d 100644 > --- a/drivers/bus/Makefile > +++ b/drivers/bus/Makefile > @@ -26,7 +26,7 @@ obj-$(CONFIG_OMAP_OCP2SCP) += omap-ocp2scp.o > obj-$(CONFIG_QCOM_EBI2) += qcom-ebi2.o > obj-$(CONFIG_SUN50I_DE2_BUS) += sun50i-de2.o > obj-$(CONFIG_SUNXI_RSB) += sunxi-rsb.o > -obj-$(CONFIG_SIMPLE_PM_BUS) += simple-pm-bus.o > +obj-$(CONFIG_OF) += simple-pm-bus.o > obj-$(CONFIG_TEGRA_ACONNECT) += tegra-aconnect.o > obj-$(CONFIG_TEGRA_GMI) += tegra-gmi.o > obj-$(CONFIG_TI_PWMSS) += ti-pwmss.o > diff --git a/drivers/soc/canaan/Kconfig b/drivers/soc/canaan/Kconfig > index 8179b69518b4..853096b7e84c 100644 > --- a/drivers/soc/canaan/Kconfig > +++ b/drivers/soc/canaan/Kconfig > @@ -5,7 +5,6 @@ config SOC_K210_SYSCTL > depends on RISCV && SOC_CANAAN && OF > default SOC_CANAAN > select PM > - select SIMPLE_PM_BUS > select SYSCON > select MFD_SYSCON > help > -- > 2.33.0.153.gba50c8fa24-goog >
