F:     drivers/i2c/muxes/i2c-demux-pinctrl.c
 
 GENERIC PM DOMAINS
-M:     "Rafael J. Wysocki" <rafael@kernel.org>
-M:     Kevin Hilman <khilman@kernel.org>
 M:     Ulf Hansson <ulf.hansson@linaro.org>
 L:     linux-pm@vger.kernel.org
 S:     Supported
 F:     Documentation/devicetree/bindings/power/power?domain*
-F:     drivers/base/power/domain*.c
-F:     include/linux/pm_domain.h
-
-GENERIC PM DOMAIN PROVIDERS
-M:     Ulf Hansson <ulf.hansson@linaro.org>
-L:     linux-pm@vger.kernel.org
-S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git
 F:     drivers/pmdomain/
+F:     include/linux/pm_domain.h
 
 GENERIC RADIX TREE
 M:     Kent Overstreet <kent.overstreet@linux.dev>
 
 obj-$(CONFIG_PM)       += sysfs.o generic_ops.o common.o qos.o runtime.o wakeirq.o
 obj-$(CONFIG_PM_SLEEP) += main.o wakeup.o wakeup_stats.o
 obj-$(CONFIG_PM_TRACE_RTC)     += trace.o
-obj-$(CONFIG_PM_GENERIC_DOMAINS)       +=  domain.o domain_governor.o
 obj-$(CONFIG_HAVE_CLK) += clock_ops.o
 obj-$(CONFIG_PM_QOS_KUNIT_TEST) += qos-test.o