[PATCH v3 0/3] enable power and clock Kconfig conditionally
This series, updates enabling mutually exclusive power and clock configs for TI SOCs.
Sorry to push clock and power changes in one series, managed by two maintainers. But In my quick grep, I am not able to active PR raise from both trees. So copying maintainers of clock and power for review.
Change log Changes in v3: - Patch 1 and 2: Added reviewed by - Patch 3: Corrected Fixes in commit message link to v2: https://lore.kernel.org/all/20230912130645.1202325-1-u-kumar1@ti.com/
Changes in v2: - Patch 1 and 2) Added conditional support to enable Kconfig - Patch 3 No change link to v1: https://lore.kernel.org/all/20230911111946.749270-1-u-kumar1@ti.com/
Udit Kumar (3): power: domain: ti: Enable single config for power domain clk: ti: Add support to enable configs conditionally config: j7200: remove not needed power config
configs/j7200_evm_r5_defconfig | 1 - drivers/clk/ti/Kconfig | 8 ++++---- drivers/power/domain/Kconfig | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-)
TI SOC has two power domain TI_SCI_POWER_DOMAIN and TI_POWER_DOMAIN. These are mutually exclusive. So adding rule to select one, in case defconfig enabled both.
Suggested-by: Nishanth Menon nm@ti.com Signed-off-by: Udit Kumar u-kumar1@ti.com Reviewed-by: Nishanth Menon nm@ti.com --- drivers/power/domain/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/power/domain/Kconfig b/drivers/power/domain/Kconfig index 411c210756..30c358fb88 100644 --- a/drivers/power/domain/Kconfig +++ b/drivers/power/domain/Kconfig @@ -92,7 +92,7 @@ config TEGRA186_POWER_DOMAIN
config TI_SCI_POWER_DOMAIN bool "Enable the TI SCI-based power domain driver" - depends on POWER_DOMAIN && TI_SCI_PROTOCOL + depends on POWER_DOMAIN && TI_SCI_PROTOCOL && !TI_POWER_DOMAIN help Generic power domain implementation for TI devices implementing the TI SCI protocol.
TI SOC has two clock domains CLK_TI_SCI and CLK_K3. These are mutually exclusive.
Adding conditional check for CLK_TI_SCI and CLK_K3 along with other associated configs options.
Suggested-by: Nishanth Menon nm@ti.com Signed-off-by: Udit Kumar u-kumar1@ti.com Reviewed-by: Nishanth Menon nm@ti.com --- drivers/clk/ti/Kconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/clk/ti/Kconfig b/drivers/clk/ti/Kconfig index fbcdefd889..a21359d6b2 100644 --- a/drivers/clk/ti/Kconfig +++ b/drivers/clk/ti/Kconfig @@ -36,7 +36,7 @@ config CLK_TI_MUX
config CLK_TI_SCI bool "TI System Control Interface (TI SCI) clock driver" - depends on CLK && TI_SCI_PROTOCOL && OF_CONTROL + depends on CLK && TI_SCI_PROTOCOL && OF_CONTROL && !CLK_K3 help This enables the clock driver support over TI System Control Interface available on some new TI's SoCs. If you wish to use clock resources @@ -44,13 +44,13 @@ config CLK_TI_SCI
config CLK_K3_PLL bool "PLL clock support for K3 SoC family of devices" - depends on CLK && LIB_RATIONAL + depends on CLK && LIB_RATIONAL && !CLK_TI_SCI help Enables PLL clock support for K3 SoC family of devices.
config SPL_CLK_K3_PLL bool "PLL clock support for K3 SoC family of devices" - depends on CLK && LIB_RATIONAL && SPL + depends on CLK && LIB_RATIONAL && SPL && !CLK_TI_SCI help Enables PLL clock support for K3 SoC family of devices.
@@ -62,6 +62,6 @@ config CLK_K3
config SPL_CLK_K3 bool "Clock support for K3 SoC family of devices" - depends on CLK && SPL + depends on CLK && SPL && !CLK_TI_SCI help Enables the clock translation layer from DT to device clocks.
For J7200, R5/SPL TI_SCI_POWER_DOMAIN should be disabled as DM is a separate binary like other SOC of J7* family.
Fixes: 02dff65efe70 ("configs: j7200_evm_r5: Add initial support")
Signed-off-by: Udit Kumar u-kumar1@ti.com --- configs/j7200_evm_r5_defconfig | 1 - 1 file changed, 1 deletion(-)
diff --git a/configs/j7200_evm_r5_defconfig b/configs/j7200_evm_r5_defconfig index 6d240b16cb..9e744ba434 100644 --- a/configs/j7200_evm_r5_defconfig +++ b/configs/j7200_evm_r5_defconfig @@ -126,7 +126,6 @@ CONFIG_SPL_PINCTRL=y # CONFIG_SPL_PINCTRL_GENERIC is not set CONFIG_PINCTRL_SINGLE=y CONFIG_POWER_DOMAIN=y -CONFIG_TI_SCI_POWER_DOMAIN=y CONFIG_TI_POWER_DOMAIN=y CONFIG_DM_PMIC=y CONFIG_PMIC_TPS65941=y
On 10:09-20230913, Udit Kumar wrote:
For J7200, R5/SPL TI_SCI_POWER_DOMAIN should be disabled as DM is a separate binary like other SOC of J7* family.
Fixes: 02dff65efe70 ("configs: j7200_evm_r5: Add initial support")
Signed-off-by: Udit Kumar u-kumar1@ti.com
configs/j7200_evm_r5_defconfig | 1 - 1 file changed, 1 deletion(-)
diff --git a/configs/j7200_evm_r5_defconfig b/configs/j7200_evm_r5_defconfig index 6d240b16cb..9e744ba434 100644 --- a/configs/j7200_evm_r5_defconfig +++ b/configs/j7200_evm_r5_defconfig @@ -126,7 +126,6 @@ CONFIG_SPL_PINCTRL=y # CONFIG_SPL_PINCTRL_GENERIC is not set CONFIG_PINCTRL_SINGLE=y CONFIG_POWER_DOMAIN=y -CONFIG_TI_SCI_POWER_DOMAIN=y CONFIG_TI_POWER_DOMAIN=y CONFIG_DM_PMIC=y CONFIG_PMIC_TPS65941=y -- 2.34.1
Reviewed-by: Nishanth Menon nm@ti.com
Hi Tom,
On 9/13/2023 10:09 AM, Udit Kumar wrote:
This series, updates enabling mutually exclusive power and clock configs for TI SOCs.
Sorry to push clock and power changes in one series, managed by two maintainers. But In my quick grep, I am not able to active PR raise from both trees. So copying maintainers of clock and power for review.
Change log Changes in v3:
- Patch 1 and 2: Added reviewed by
- Patch 3: Corrected Fixes in commit message
link to v2: https://lore.kernel.org/all/20230912130645.1202325-1-u-kumar1@ti.com/
Changes in v2:
- Patch 1 and 2) Added conditional support to enable Kconfig
- Patch 3 No change
link to v1: https://lore.kernel.org/all/20230911111946.749270-1-u-kumar1@ti.com/
Udit Kumar (3): power: domain: ti: Enable single config for power domain clk: ti: Add support to enable configs conditionally config: j7200: remove not needed power config
NAK,
One of boot mode (OSPI) is not working with this series on J7200,
Please don't merge this series, Let me fix OSPI boot and re-roll this series
Thanks
Udit
configs/j7200_evm_r5_defconfig | 1 - drivers/clk/ti/Kconfig | 8 ++++---- drivers/power/domain/Kconfig | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-)
participants (3)
-
Kumar, Udit -
Nishanth Menon -
Udit Kumar