Prepare to port i.MX7D support from the Linux kernel to the driver. Also fix the help text incorrectly stating that the driver manipulates power domains via the ATF.
Signed-off-by: Nora Schiffer <[email protected]> --- configs/imx8m_data_modul.config | 2 +- configs/imx8mm-cl-iot-gate-optee_defconfig | 2 +- configs/imx8mm-cl-iot-gate_defconfig | 2 +- configs/imx8mm-mx8menlo_defconfig | 2 +- configs/imx8mm-phygate-tauri-l_defconfig | 2 +- configs/imx8mm_evk_defconfig | 2 +- configs/imx8mm_phg_defconfig | 2 +- configs/imx8mm_venice_defconfig | 2 +- configs/imx8mn_venice_defconfig | 2 +- configs/imx8mp-libra-fpsc_defconfig | 2 +- configs/imx8mp_dhsom.config | 2 +- configs/imx8mp_evk_defconfig | 2 +- configs/imx8mp_venice_defconfig | 2 +- configs/imx8mq_evk_defconfig | 2 +- configs/imx8mq_phanbell_defconfig | 2 +- configs/imx8mq_reform2_defconfig | 2 +- configs/kontron-osm-s-mx8mp.config | 2 +- configs/kontron-sl-mx8mm_defconfig | 2 +- configs/kontron_pitx_imx8m_defconfig | 2 +- configs/librem5-devkit_defconfig | 2 +- configs/librem5_defconfig | 2 +- configs/phycore-imx8mm_defconfig | 2 +- configs/phycore-imx8mp_defconfig | 2 +- configs/pico-imx8mq_defconfig | 2 +- configs/toradex-smarc-imx8mp_defconfig | 2 +- configs/verdin-imx8mm_defconfig | 2 +- configs/verdin-imx8mp_defconfig | 2 +- drivers/power/domain/Kconfig | 15 +++--- drivers/power/domain/Makefile | 2 +- ...ower-domain.c => imx-gpcv2-power-domain.c} | 50 +++++++++---------- 30 files changed, 60 insertions(+), 61 deletions(-) rename drivers/power/domain/{imx8m-power-domain.c => imx-gpcv2-power-domain.c} (90%) diff --git a/configs/imx8m_data_modul.config b/configs/imx8m_data_modul.config index 92940ddb947..287bb851b24 100644 --- a/configs/imx8m_data_modul.config +++ b/configs/imx8m_data_modul.config @@ -116,7 +116,7 @@ CONFIG_GPIO_HOG=y CONFIG_HASH_VERIFY=y CONFIG_HUSH_PARSER=y CONFIG_I2C_EEPROM=y -CONFIG_IMX8M_POWER_DOMAIN=y +CONFIG_IMX_GPCV2_POWER_DOMAIN=y CONFIG_IMX_BOOTAUX=y CONFIG_IMX_TMU=y CONFIG_IMX_WATCHDOG=y diff --git a/configs/imx8mm-cl-iot-gate-optee_defconfig b/configs/imx8mm-cl-iot-gate-optee_defconfig index 32922b6c6bf..6f772b7694f 100644 --- a/configs/imx8mm-cl-iot-gate-optee_defconfig +++ b/configs/imx8mm-cl-iot-gate-optee_defconfig @@ -116,7 +116,7 @@ CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_IMX8M=y CONFIG_POWER_DOMAIN=y -CONFIG_IMX8M_POWER_DOMAIN=y +CONFIG_IMX_GPCV2_POWER_DOMAIN=y CONFIG_DM_PMIC=y CONFIG_DM_PMIC_BD71837=y CONFIG_SPL_DM_PMIC_BD71837=y diff --git a/configs/imx8mm-cl-iot-gate_defconfig b/configs/imx8mm-cl-iot-gate_defconfig index 0f69e2c0391..827d0ea343d 100644 --- a/configs/imx8mm-cl-iot-gate_defconfig +++ b/configs/imx8mm-cl-iot-gate_defconfig @@ -119,7 +119,7 @@ CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_IMX8M=y CONFIG_POWER_DOMAIN=y -CONFIG_IMX8M_POWER_DOMAIN=y +CONFIG_IMX_GPCV2_POWER_DOMAIN=y CONFIG_DM_PMIC=y CONFIG_DM_PMIC_BD71837=y CONFIG_SPL_DM_PMIC_BD71837=y diff --git a/configs/imx8mm-mx8menlo_defconfig b/configs/imx8mm-mx8menlo_defconfig index b3ba43a73a2..2d5d591b85a 100644 --- a/configs/imx8mm-mx8menlo_defconfig +++ b/configs/imx8mm-mx8menlo_defconfig @@ -136,7 +136,7 @@ CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_IMX8M=y CONFIG_POWER_DOMAIN=y -CONFIG_IMX8M_POWER_DOMAIN=y +CONFIG_IMX_GPCV2_POWER_DOMAIN=y CONFIG_DM_PMIC=y CONFIG_SPL_DM_PMIC_PCA9450=y CONFIG_DM_PMIC_PFUZE100=y diff --git a/configs/imx8mm-phygate-tauri-l_defconfig b/configs/imx8mm-phygate-tauri-l_defconfig index cacfe5b35b3..e6cbf5f3c01 100644 --- a/configs/imx8mm-phygate-tauri-l_defconfig +++ b/configs/imx8mm-phygate-tauri-l_defconfig @@ -93,7 +93,7 @@ CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_IMX8M=y CONFIG_POWER_DOMAIN=y -CONFIG_IMX8M_POWER_DOMAIN=y +CONFIG_IMX_GPCV2_POWER_DOMAIN=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y diff --git a/configs/imx8mm_evk_defconfig b/configs/imx8mm_evk_defconfig index b41082d45de..ad0b22ff4af 100644 --- a/configs/imx8mm_evk_defconfig +++ b/configs/imx8mm_evk_defconfig @@ -105,7 +105,7 @@ CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_IMX8M=y CONFIG_POWER_DOMAIN=y -CONFIG_IMX8M_POWER_DOMAIN=y +CONFIG_IMX_GPCV2_POWER_DOMAIN=y CONFIG_DM_PMIC=y CONFIG_SPL_DM_PMIC_PCA9450=y CONFIG_DM_REGULATOR=y diff --git a/configs/imx8mm_phg_defconfig b/configs/imx8mm_phg_defconfig index 5c59b90603d..ef0e304357c 100644 --- a/configs/imx8mm_phg_defconfig +++ b/configs/imx8mm_phg_defconfig @@ -88,7 +88,7 @@ CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_IMX8M=y CONFIG_POWER_DOMAIN=y -CONFIG_IMX8M_POWER_DOMAIN=y +CONFIG_IMX_GPCV2_POWER_DOMAIN=y CONFIG_DM_PMIC=y CONFIG_DM_PMIC_PCA9450=y CONFIG_SPL_DM_PMIC_PCA9450=y diff --git a/configs/imx8mm_venice_defconfig b/configs/imx8mm_venice_defconfig index c16f48e0c05..9088c19a45d 100644 --- a/configs/imx8mm_venice_defconfig +++ b/configs/imx8mm_venice_defconfig @@ -140,7 +140,7 @@ CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_IMX8M=y CONFIG_POWER_DOMAIN=y -CONFIG_IMX8M_POWER_DOMAIN=y +CONFIG_IMX_GPCV2_POWER_DOMAIN=y CONFIG_DM_PMIC=y CONFIG_DM_PMIC_BD71837=y CONFIG_SPL_DM_PMIC_BD71837=y diff --git a/configs/imx8mn_venice_defconfig b/configs/imx8mn_venice_defconfig index b99807ab46a..feb1e7eeb6e 100644 --- a/configs/imx8mn_venice_defconfig +++ b/configs/imx8mn_venice_defconfig @@ -134,7 +134,7 @@ CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_IMX8M=y CONFIG_POWER_DOMAIN=y -CONFIG_IMX8M_POWER_DOMAIN=y +CONFIG_IMX_GPCV2_POWER_DOMAIN=y CONFIG_DM_PMIC=y CONFIG_DM_PMIC_BD71837=y CONFIG_SPL_DM_PMIC_BD71837=y diff --git a/configs/imx8mp-libra-fpsc_defconfig b/configs/imx8mp-libra-fpsc_defconfig index 8f39175a9cd..6f9a3a4bcf5 100644 --- a/configs/imx8mp-libra-fpsc_defconfig +++ b/configs/imx8mp-libra-fpsc_defconfig @@ -135,7 +135,7 @@ CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_IMX8M=y CONFIG_POWER_DOMAIN=y -CONFIG_IMX8M_POWER_DOMAIN=y +CONFIG_IMX_GPCV2_POWER_DOMAIN=y CONFIG_IMX8MP_HSIOMIX_BLKCTRL=y CONFIG_DM_PMIC=y CONFIG_DM_PMIC_PCA9450=y diff --git a/configs/imx8mp_dhsom.config b/configs/imx8mp_dhsom.config index 35a59c15a4d..0a5293e0b02 100644 --- a/configs/imx8mp_dhsom.config +++ b/configs/imx8mp_dhsom.config @@ -114,7 +114,7 @@ CONFIG_DM_PMIC_PCA9450=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_DM_REGULATOR_PCA9450=y CONFIG_IMX8MP_HSIOMIX_BLKCTRL=y -CONFIG_IMX8M_POWER_DOMAIN=y +CONFIG_IMX_GPCV2_POWER_DOMAIN=y CONFIG_POWER_DOMAIN=y CONFIG_SPL_DM_PMIC_PCA9450=y CONFIG_SPL_DM_REGULATOR=y diff --git a/configs/imx8mp_evk_defconfig b/configs/imx8mp_evk_defconfig index 3f815f5fb66..083315bd290 100644 --- a/configs/imx8mp_evk_defconfig +++ b/configs/imx8mp_evk_defconfig @@ -126,7 +126,7 @@ CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_IMX8M=y CONFIG_POWER_DOMAIN=y -CONFIG_IMX8M_POWER_DOMAIN=y +CONFIG_IMX_GPCV2_POWER_DOMAIN=y CONFIG_IMX8MP_HSIOMIX_BLKCTRL=y CONFIG_DM_PMIC=y CONFIG_DM_PMIC_PCA9450=y diff --git a/configs/imx8mp_venice_defconfig b/configs/imx8mp_venice_defconfig index 92660aeef0c..cfcece798cf 100644 --- a/configs/imx8mp_venice_defconfig +++ b/configs/imx8mp_venice_defconfig @@ -139,7 +139,7 @@ CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_IMX8M=y CONFIG_POWER_DOMAIN=y -CONFIG_IMX8M_POWER_DOMAIN=y +CONFIG_IMX_GPCV2_POWER_DOMAIN=y CONFIG_IMX8MP_HSIOMIX_BLKCTRL=y CONFIG_DM_PMIC=y CONFIG_DM_PMIC_BD71837=y diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig index 546be61c6f5..936bde3e061 100644 --- a/configs/imx8mq_evk_defconfig +++ b/configs/imx8mq_evk_defconfig @@ -99,7 +99,7 @@ CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_IMX8M=y CONFIG_POWER_DOMAIN=y -CONFIG_IMX8M_POWER_DOMAIN=y +CONFIG_IMX_GPCV2_POWER_DOMAIN=y CONFIG_DM_PMIC=y CONFIG_SPL_DM_PMIC_PFUZE100=y CONFIG_DM_REGULATOR=y diff --git a/configs/imx8mq_phanbell_defconfig b/configs/imx8mq_phanbell_defconfig index 23d2d3b61a5..92b2e5059a0 100644 --- a/configs/imx8mq_phanbell_defconfig +++ b/configs/imx8mq_phanbell_defconfig @@ -84,7 +84,7 @@ CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_IMX8M=y CONFIG_POWER_DOMAIN=y -CONFIG_IMX8M_POWER_DOMAIN=y +CONFIG_IMX_GPCV2_POWER_DOMAIN=y CONFIG_DM_REGULATOR=y CONFIG_SPL_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y diff --git a/configs/imx8mq_reform2_defconfig b/configs/imx8mq_reform2_defconfig index c904fc677e6..0d0732ac5f1 100644 --- a/configs/imx8mq_reform2_defconfig +++ b/configs/imx8mq_reform2_defconfig @@ -87,7 +87,7 @@ CONFIG_PHY_IMX8MQ_USB=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX8M=y CONFIG_POWER_DOMAIN=y -CONFIG_IMX8M_POWER_DOMAIN=y +CONFIG_IMX_GPCV2_POWER_DOMAIN=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y diff --git a/configs/kontron-osm-s-mx8mp.config b/configs/kontron-osm-s-mx8mp.config index 786fd3e7a6d..25e29622c8f 100644 --- a/configs/kontron-osm-s-mx8mp.config +++ b/configs/kontron-osm-s-mx8mp.config @@ -160,7 +160,7 @@ CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_IMX8M=y CONFIG_POWER_DOMAIN=y -CONFIG_IMX8M_POWER_DOMAIN=y +CONFIG_IMX_GPCV2_POWER_DOMAIN=y CONFIG_IMX8MP_HSIOMIX_BLKCTRL=y CONFIG_DM_PMIC=y CONFIG_DM_PMIC_PCA9450=y diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig index 08803592016..9d98b9eb2b9 100644 --- a/configs/kontron-sl-mx8mm_defconfig +++ b/configs/kontron-sl-mx8mm_defconfig @@ -173,7 +173,7 @@ CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_IMX8M=y CONFIG_POWER_DOMAIN=y -CONFIG_IMX8M_POWER_DOMAIN=y +CONFIG_IMX_GPCV2_POWER_DOMAIN=y CONFIG_DM_PMIC=y CONFIG_DM_PMIC_PCA9450=y CONFIG_SPL_DM_PMIC_PCA9450=y diff --git a/configs/kontron_pitx_imx8m_defconfig b/configs/kontron_pitx_imx8m_defconfig index ee9690c1ca5..8628419d9ed 100644 --- a/configs/kontron_pitx_imx8m_defconfig +++ b/configs/kontron_pitx_imx8m_defconfig @@ -94,7 +94,7 @@ CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_IMX8M=y CONFIG_POWER_DOMAIN=y -CONFIG_IMX8M_POWER_DOMAIN=y +CONFIG_IMX_GPCV2_POWER_DOMAIN=y CONFIG_DM_PMIC=y CONFIG_DM_PMIC_PFUZE100=y CONFIG_SPL_DM_PMIC_PFUZE100=y diff --git a/configs/librem5-devkit_defconfig b/configs/librem5-devkit_defconfig index c422b150d9a..0838f79ef7e 100644 --- a/configs/librem5-devkit_defconfig +++ b/configs/librem5-devkit_defconfig @@ -150,7 +150,7 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX8M=y CONFIG_POWER_LEGACY=y CONFIG_POWER_DOMAIN=y -CONFIG_IMX8M_POWER_DOMAIN=y +CONFIG_IMX_GPCV2_POWER_DOMAIN=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y diff --git a/configs/librem5_defconfig b/configs/librem5_defconfig index e2207683875..48fe4040111 100644 --- a/configs/librem5_defconfig +++ b/configs/librem5_defconfig @@ -120,7 +120,7 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX8M=y CONFIG_POWER_LEGACY=y CONFIG_POWER_DOMAIN=y -CONFIG_IMX8M_POWER_DOMAIN=y +CONFIG_IMX_GPCV2_POWER_DOMAIN=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y diff --git a/configs/phycore-imx8mm_defconfig b/configs/phycore-imx8mm_defconfig index 2be57246add..14aca76e6c2 100644 --- a/configs/phycore-imx8mm_defconfig +++ b/configs/phycore-imx8mm_defconfig @@ -116,7 +116,7 @@ CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_IMX8M=y CONFIG_POWER_DOMAIN=y -CONFIG_IMX8M_POWER_DOMAIN=y +CONFIG_IMX_GPCV2_POWER_DOMAIN=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_DM_RNG=y diff --git a/configs/phycore-imx8mp_defconfig b/configs/phycore-imx8mp_defconfig index 93f19641666..089771b646f 100644 --- a/configs/phycore-imx8mp_defconfig +++ b/configs/phycore-imx8mp_defconfig @@ -141,7 +141,7 @@ CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_IMX8M=y CONFIG_POWER_DOMAIN=y -CONFIG_IMX8M_POWER_DOMAIN=y +CONFIG_IMX_GPCV2_POWER_DOMAIN=y CONFIG_IMX8MP_HSIOMIX_BLKCTRL=y CONFIG_DM_PMIC=y CONFIG_DM_PMIC_PCA9450=y diff --git a/configs/pico-imx8mq_defconfig b/configs/pico-imx8mq_defconfig index fbcfcc6509c..1c546be2ede 100644 --- a/configs/pico-imx8mq_defconfig +++ b/configs/pico-imx8mq_defconfig @@ -85,7 +85,7 @@ CONFIG_PHY_ATHEROS=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX8M=y CONFIG_POWER_DOMAIN=y -CONFIG_IMX8M_POWER_DOMAIN=y +CONFIG_IMX_GPCV2_POWER_DOMAIN=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y diff --git a/configs/toradex-smarc-imx8mp_defconfig b/configs/toradex-smarc-imx8mp_defconfig index 98b6e346a28..76b5b1da019 100644 --- a/configs/toradex-smarc-imx8mp_defconfig +++ b/configs/toradex-smarc-imx8mp_defconfig @@ -146,7 +146,7 @@ CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_IMX8M=y CONFIG_POWER_DOMAIN=y -CONFIG_IMX8M_POWER_DOMAIN=y +CONFIG_IMX_GPCV2_POWER_DOMAIN=y CONFIG_IMX8MP_HSIOMIX_BLKCTRL=y CONFIG_DM_PMIC=y CONFIG_DM_PMIC_PCA9450=y diff --git a/configs/verdin-imx8mm_defconfig b/configs/verdin-imx8mm_defconfig index c4aa0cf10d4..c7397602aae 100644 --- a/configs/verdin-imx8mm_defconfig +++ b/configs/verdin-imx8mm_defconfig @@ -132,7 +132,7 @@ CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_IMX8M=y CONFIG_POWER_DOMAIN=y -CONFIG_IMX8M_POWER_DOMAIN=y +CONFIG_IMX_GPCV2_POWER_DOMAIN=y CONFIG_DM_PMIC=y CONFIG_SPL_DM_PMIC_PCA9450=y CONFIG_DM_REGULATOR=y diff --git a/configs/verdin-imx8mp_defconfig b/configs/verdin-imx8mp_defconfig index e8fab2cad20..3dc644003e1 100644 --- a/configs/verdin-imx8mp_defconfig +++ b/configs/verdin-imx8mp_defconfig @@ -147,7 +147,7 @@ CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_IMX8M=y CONFIG_POWER_DOMAIN=y -CONFIG_IMX8M_POWER_DOMAIN=y +CONFIG_IMX_GPCV2_POWER_DOMAIN=y CONFIG_IMX8MP_HSIOMIX_BLKCTRL=y CONFIG_DM_PMIC=y CONFIG_DM_PMIC_PCA9450=y diff --git a/drivers/power/domain/Kconfig b/drivers/power/domain/Kconfig index 13a661ce04f..40cc30961c0 100644 --- a/drivers/power/domain/Kconfig +++ b/drivers/power/domain/Kconfig @@ -33,6 +33,13 @@ config BCM6328_POWER_DOMAIN Enable support for manipulating BCM6345 power domains via MMIO mapped registers. +config IMX_GPCV2_POWER_DOMAIN + bool "Enable i.MX8M power domain driver" + depends on POWER_DOMAIN && ARCH_IMX8M + select CLK + help + Enable support for manipulating NXP i.MX8M on-SoC power domains. + config IMX8_POWER_DOMAIN bool "Enable i.MX8 power domain driver" depends on ARCH_IMX8 @@ -40,14 +47,6 @@ config IMX8_POWER_DOMAIN Enable support for manipulating NXP i.MX8 on-SoC power domains via IPC requests to the SCU. -config IMX8M_POWER_DOMAIN - bool "Enable i.MX8M power domain driver" - depends on POWER_DOMAIN && ARCH_IMX8M - select CLK - help - Enable support for manipulating NXP i.MX8M on-SoC power domains via - requests to the ATF. - config IMX8MP_HSIOMIX_BLKCTRL bool "Enable i.MX8MP HSIOMIX domain driver" depends on POWER_DOMAIN && IMX8MP diff --git a/drivers/power/domain/Makefile b/drivers/power/domain/Makefile index 3b816ed3bed..1e6bf57aafb 100644 --- a/drivers/power/domain/Makefile +++ b/drivers/power/domain/Makefile @@ -7,8 +7,8 @@ obj-$(CONFIG_$(PHASE_)POWER_DOMAIN) += power-domain-uclass.o obj-$(CONFIG_AGILEX5_PMGR_POWER_DOMAIN) += altr-pmgr-agilex5.o obj-$(CONFIG_APPLE_PMGR_POWER_DOMAIN) += apple-pmgr.o obj-$(CONFIG_BCM6328_POWER_DOMAIN) += bcm6328-power-domain.o +obj-$(CONFIG_IMX_GPCV2_POWER_DOMAIN) += imx-gpcv2-power-domain.o obj-$(CONFIG_IMX8_POWER_DOMAIN) += imx8-power-domain-legacy.o imx8-power-domain.o -obj-$(CONFIG_IMX8M_POWER_DOMAIN) += imx8m-power-domain.o obj-$(CONFIG_IMX8MP_HSIOMIX_BLKCTRL) += imx8mp-hsiomix.o obj-$(CONFIG_IMX8MP_MEDIAMIX_BLKCTRL) += imx8mp-mediamix.o obj-$(CONFIG_MESON_EE_POWER_DOMAIN) += meson-ee-pwrc.o diff --git a/drivers/power/domain/imx8m-power-domain.c b/drivers/power/domain/imx-gpcv2-power-domain.c similarity index 90% rename from drivers/power/domain/imx8m-power-domain.c rename to drivers/power/domain/imx-gpcv2-power-domain.c index a3ef49aa67c..2fc5bf7613e 100644 --- a/drivers/power/domain/imx8m-power-domain.c +++ b/drivers/power/domain/imx-gpcv2-power-domain.c @@ -137,7 +137,7 @@ struct imx_pgc_domain_data { const struct imx_pgc_regs *pgc_regs; }; -struct imx8m_power_domain_plat { +struct imx_gpcv2_power_domain_plat { struct power_domain pd; const struct imx_pgc_domain *domain; const struct imx_pgc_regs *regs; @@ -333,10 +333,10 @@ static const struct imx_pgc_domain_data imx8mp_pgc_domain_data = { }; #endif -static int imx8m_power_domain_on(struct power_domain *power_domain) +static int imx_gpcv2_power_domain_on(struct power_domain *power_domain) { struct udevice *dev = power_domain->dev; - struct imx8m_power_domain_plat *pdata = dev_get_plat(dev); + struct imx_gpcv2_power_domain_plat *pdata = dev_get_plat(dev); const struct imx_pgc_domain *domain = pdata->domain; const struct imx_pgc_regs *regs = pdata->regs; void __iomem *base = pdata->base; @@ -395,10 +395,10 @@ out_clk_disable: return ret; } -static int imx8m_power_domain_off(struct power_domain *power_domain) +static int imx_gpcv2_power_domain_off(struct power_domain *power_domain) { struct udevice *dev = power_domain->dev; - struct imx8m_power_domain_plat *pdata = dev_get_plat(dev); + struct imx_gpcv2_power_domain_plat *pdata = dev_get_plat(dev); const struct imx_pgc_domain *domain = pdata->domain; const struct imx_pgc_regs *regs = pdata->regs; void __iomem *base = pdata->base; @@ -462,15 +462,15 @@ out_clk_disable: return ret; } -static int imx8m_power_domain_of_xlate(struct power_domain *power_domain, - struct ofnode_phandle_args *args) +static int imx_gpcv2_power_domain_of_xlate(struct power_domain *power_domain, + struct ofnode_phandle_args *args) { power_domain->id = 0; return 0; } -static int imx8m_power_domain_bind(struct udevice *dev) +static int imx_gpcv2_power_domain_bind(struct udevice *dev) { ofnode subnode; const char *name; @@ -502,9 +502,9 @@ static int imx8m_power_domain_bind(struct udevice *dev) return 0; } -static int imx8m_power_domain_probe(struct udevice *dev) +static int imx_gpcv2_power_domain_probe(struct udevice *dev) { - struct imx8m_power_domain_plat *pdata = dev_get_plat(dev); + struct imx_gpcv2_power_domain_plat *pdata = dev_get_plat(dev); struct power_domain_plat *plat = dev_get_uclass_plat(dev); int ret; @@ -525,9 +525,9 @@ static int imx8m_power_domain_probe(struct udevice *dev) return 0; } -static int imx8m_power_domain_of_to_plat(struct udevice *dev) +static int imx_gpcv2_power_domain_of_to_plat(struct udevice *dev) { - struct imx8m_power_domain_plat *pdata = dev_get_plat(dev); + struct imx_gpcv2_power_domain_plat *pdata = dev_get_plat(dev); struct imx_pgc_domain_data *domain_data = (struct imx_pgc_domain_data *)dev_get_driver_data(dev); @@ -542,7 +542,7 @@ static int imx8m_power_domain_of_to_plat(struct udevice *dev) return 0; } -static const struct udevice_id imx8m_power_domain_ids[] = { +static const struct udevice_id imx_gpcv2_power_domain_ids[] = { #ifdef CONFIG_IMX8MQ { .compatible = "fsl,imx8mq-gpc", .data = (long)&imx8m_pgc_domain_data }, #endif @@ -558,19 +558,19 @@ static const struct udevice_id imx8m_power_domain_ids[] = { { } }; -static const struct power_domain_ops imx8m_power_domain_ops = { - .on = imx8m_power_domain_on, - .off = imx8m_power_domain_off, - .of_xlate = imx8m_power_domain_of_xlate, +static const struct power_domain_ops imx_gpcv2_power_domain_ops = { + .on = imx_gpcv2_power_domain_on, + .off = imx_gpcv2_power_domain_off, + .of_xlate = imx_gpcv2_power_domain_of_xlate, }; -U_BOOT_DRIVER(imx8m_power_domain) = { - .name = "imx8m_power_domain", +U_BOOT_DRIVER(imx_gpcv2_power_domain) = { + .name = "imx_gpcv2_power_domain", .id = UCLASS_POWER_DOMAIN, - .of_match = imx8m_power_domain_ids, - .bind = imx8m_power_domain_bind, - .probe = imx8m_power_domain_probe, - .of_to_plat = imx8m_power_domain_of_to_plat, - .plat_auto = sizeof(struct imx8m_power_domain_plat), - .ops = &imx8m_power_domain_ops, + .of_match = imx_gpcv2_power_domain_ids, + .bind = imx_gpcv2_power_domain_bind, + .probe = imx_gpcv2_power_domain_probe, + .of_to_plat = imx_gpcv2_power_domain_of_to_plat, + .plat_auto = sizeof(struct imx_gpcv2_power_domain_plat), + .ops = &imx_gpcv2_power_domain_ops, }; -- 2.55.0
