| Message ID | 20230915092003.658361-7-ulf.hansson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | pmdomain: Move Kconfig options/files to the pmdomain subsystem | expand |
> Subject: [PATCH v2 06/17] pmdomain: imx: Move Kconfig options to the > pmdomain subsystem > > The Kconfig options belongs closer to the corresponding implementations, > hence let's move them from the soc- and firmware subsystem to the > pmdomain subsystem. > > Cc: Shawn Guo <shawnguo@kernel.org> > Cc: Sascha Hauer <s.hauer@pengutronix.de> > Cc: Fabio Estevam <festevam@gmail.com> > Cc: Peng Fan <peng.fan@nxp.com> > Cc: <kernel@pengutronix.de> > Cc: <linux-imx@nxp.com> > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Acked-by: Peng Fan <peng.fan@nxp.com> > --- > drivers/firmware/imx/Kconfig | 6 ------ > drivers/pmdomain/Kconfig | 1 + > drivers/pmdomain/imx/Kconfig | 29 +++++++++++++++++++++++++++++ > drivers/soc/imx/Kconfig | 19 ------------------- > 4 files changed, 30 insertions(+), 25 deletions(-) create mode 100644 > drivers/pmdomain/imx/Kconfig > > diff --git a/drivers/firmware/imx/Kconfig b/drivers/firmware/imx/Kconfig > index c027d99f2a59..183613f82a11 100644 > --- a/drivers/firmware/imx/Kconfig > +++ b/drivers/firmware/imx/Kconfig > @@ -22,9 +22,3 @@ config IMX_SCU > > This driver manages the IPC interface between host CPU and the > SCU firmware running on M4. > - > -config IMX_SCU_PD > - bool "IMX SCU Power Domain driver" > - depends on IMX_SCU > - help > - The System Controller Firmware (SCFW) based power domain driver. > diff --git a/drivers/pmdomain/Kconfig b/drivers/pmdomain/Kconfig index > ddc05d6af100..e2c85f20a0c3 100644 > --- a/drivers/pmdomain/Kconfig > +++ b/drivers/pmdomain/Kconfig > @@ -5,5 +5,6 @@ source "drivers/pmdomain/actions/Kconfig" > source "drivers/pmdomain/amlogic/Kconfig" > source "drivers/pmdomain/apple/Kconfig" > source "drivers/pmdomain/bcm/Kconfig" > +source "drivers/pmdomain/imx/Kconfig" > > endmenu > diff --git a/drivers/pmdomain/imx/Kconfig b/drivers/pmdomain/imx/Kconfig > new file mode 100644 index 000000000000..00203615c65e > --- /dev/null > +++ b/drivers/pmdomain/imx/Kconfig > @@ -0,0 +1,29 @@ > +# SPDX-License-Identifier: GPL-2.0-only menu "i.MX PM Domains" > + > +config IMX_GPCV2_PM_DOMAINS > + bool "i.MX GPCv2 PM domains" > + depends on ARCH_MXC || (COMPILE_TEST && OF) > + depends on PM > + select PM_GENERIC_DOMAINS > + select REGMAP_MMIO > + default y if SOC_IMX7D > + > +config IMX8M_BLK_CTRL > + bool > + default SOC_IMX8M && IMX_GPCV2_PM_DOMAINS > + depends on PM_GENERIC_DOMAINS > + depends on COMMON_CLK > + > +config IMX9_BLK_CTRL > + bool > + default SOC_IMX9 && IMX_GPCV2_PM_DOMAINS > + depends on PM_GENERIC_DOMAINS > + > +config IMX_SCU_PD > + bool "IMX SCU Power Domain driver" > + depends on IMX_SCU > + help > + The System Controller Firmware (SCFW) based power domain driver. > + > +endmenu > diff --git a/drivers/soc/imx/Kconfig b/drivers/soc/imx/Kconfig index > 76a4593baf0a..2a90ddd20104 100644 > --- a/drivers/soc/imx/Kconfig > +++ b/drivers/soc/imx/Kconfig > @@ -1,14 +1,6 @@ > # SPDX-License-Identifier: GPL-2.0-only menu "i.MX SoC drivers" > > -config IMX_GPCV2_PM_DOMAINS > - bool "i.MX GPCv2 PM domains" > - depends on ARCH_MXC || (COMPILE_TEST && OF) > - depends on PM > - select PM_GENERIC_DOMAINS > - select REGMAP_MMIO > - default y if SOC_IMX7D > - > config SOC_IMX8M > tristate "i.MX8M SoC family support" > depends on ARCH_MXC || COMPILE_TEST > @@ -28,15 +20,4 @@ config SOC_IMX9 > help > If you say yes here, you get support for the NXP i.MX9 family > > -config IMX8M_BLK_CTRL > - bool > - default SOC_IMX8M && IMX_GPCV2_PM_DOMAINS > - depends on PM_GENERIC_DOMAINS > - depends on COMMON_CLK > - > -config IMX9_BLK_CTRL > - bool > - default SOC_IMX9 && IMX_GPCV2_PM_DOMAINS > - depends on PM_GENERIC_DOMAINS > - > endmenu > -- > 2.34.1
diff --git a/drivers/firmware/imx/Kconfig b/drivers/firmware/imx/Kconfig index c027d99f2a59..183613f82a11 100644 --- a/drivers/firmware/imx/Kconfig +++ b/drivers/firmware/imx/Kconfig @@ -22,9 +22,3 @@ config IMX_SCU This driver manages the IPC interface between host CPU and the SCU firmware running on M4. - -config IMX_SCU_PD - bool "IMX SCU Power Domain driver" - depends on IMX_SCU - help - The System Controller Firmware (SCFW) based power domain driver. diff --git a/drivers/pmdomain/Kconfig b/drivers/pmdomain/Kconfig index ddc05d6af100..e2c85f20a0c3 100644 --- a/drivers/pmdomain/Kconfig +++ b/drivers/pmdomain/Kconfig @@ -5,5 +5,6 @@ source "drivers/pmdomain/actions/Kconfig" source "drivers/pmdomain/amlogic/Kconfig" source "drivers/pmdomain/apple/Kconfig" source "drivers/pmdomain/bcm/Kconfig" +source "drivers/pmdomain/imx/Kconfig" endmenu diff --git a/drivers/pmdomain/imx/Kconfig b/drivers/pmdomain/imx/Kconfig new file mode 100644 index 000000000000..00203615c65e --- /dev/null +++ b/drivers/pmdomain/imx/Kconfig @@ -0,0 +1,29 @@ +# SPDX-License-Identifier: GPL-2.0-only +menu "i.MX PM Domains" + +config IMX_GPCV2_PM_DOMAINS + bool "i.MX GPCv2 PM domains" + depends on ARCH_MXC || (COMPILE_TEST && OF) + depends on PM + select PM_GENERIC_DOMAINS + select REGMAP_MMIO + default y if SOC_IMX7D + +config IMX8M_BLK_CTRL + bool + default SOC_IMX8M && IMX_GPCV2_PM_DOMAINS + depends on PM_GENERIC_DOMAINS + depends on COMMON_CLK + +config IMX9_BLK_CTRL + bool + default SOC_IMX9 && IMX_GPCV2_PM_DOMAINS + depends on PM_GENERIC_DOMAINS + +config IMX_SCU_PD + bool "IMX SCU Power Domain driver" + depends on IMX_SCU + help + The System Controller Firmware (SCFW) based power domain driver. + +endmenu diff --git a/drivers/soc/imx/Kconfig b/drivers/soc/imx/Kconfig index 76a4593baf0a..2a90ddd20104 100644 --- a/drivers/soc/imx/Kconfig +++ b/drivers/soc/imx/Kconfig @@ -1,14 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only menu "i.MX SoC drivers" -config IMX_GPCV2_PM_DOMAINS - bool "i.MX GPCv2 PM domains" - depends on ARCH_MXC || (COMPILE_TEST && OF) - depends on PM - select PM_GENERIC_DOMAINS - select REGMAP_MMIO - default y if SOC_IMX7D - config SOC_IMX8M tristate "i.MX8M SoC family support" depends on ARCH_MXC || COMPILE_TEST @@ -28,15 +20,4 @@ config SOC_IMX9 help If you say yes here, you get support for the NXP i.MX9 family -config IMX8M_BLK_CTRL - bool - default SOC_IMX8M && IMX_GPCV2_PM_DOMAINS - depends on PM_GENERIC_DOMAINS - depends on COMMON_CLK - -config IMX9_BLK_CTRL - bool - default SOC_IMX9 && IMX_GPCV2_PM_DOMAINS - depends on PM_GENERIC_DOMAINS - endmenu
The Kconfig options belongs closer to the corresponding implementations, hence let's move them from the soc- and firmware subsystem to the pmdomain subsystem. Cc: Shawn Guo <shawnguo@kernel.org> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Fabio Estevam <festevam@gmail.com> Cc: Peng Fan <peng.fan@nxp.com> Cc: <kernel@pengutronix.de> Cc: <linux-imx@nxp.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> --- drivers/firmware/imx/Kconfig | 6 ------ drivers/pmdomain/Kconfig | 1 + drivers/pmdomain/imx/Kconfig | 29 +++++++++++++++++++++++++++++ drivers/soc/imx/Kconfig | 19 ------------------- 4 files changed, 30 insertions(+), 25 deletions(-) create mode 100644 drivers/pmdomain/imx/Kconfig