Skip to content

Commit 372f808

Browse files
kv2019ikv2019i
committed
app: boards: intel_adsp: move common PM options to shared defconfig
Move CONFIG_PM_* options that are shared for all Intel DSPs to the shared defconfig file. Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
1 parent 264555a commit 372f808

10 files changed

Lines changed: 20 additions & 47 deletions

‎app/boards/intel_adsp/Kconfig.defconfig‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,26 @@ config INTEL_ADSP_TIMER
112112
default y
113113

114114

115+
# # Zephyr / power settings
116+
# ----------------------------------------
117+
118+
config PM
119+
default y
120+
121+
config PM_DEVICE
122+
default y
123+
124+
config PM_DEVICE_RUNTIME
125+
default y
126+
127+
config PM_DEVICE_SYSTEM_MANAGED
128+
default y
129+
130+
config POWER_DOMAIN
131+
default y
132+
133+
# note: POWER_DOMAIN_INTEL_ADSP will be set based on DT
134+
115135
# Zephyr / logging
116136
# ----------------------------------------
117137

‎app/boards/intel_adsp_ace15_mtpm.conf‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,7 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
7979
# Zephyr / power settings
8080
CONFIG_ADSP_IDLE_CLOCK_GATING=y
8181
CONFIG_ADSP_IMR_CONTEXT_SAVE=n
82-
CONFIG_PM=y
83-
CONFIG_PM_DEVICE=y
84-
CONFIG_PM_DEVICE_RUNTIME=y
85-
CONFIG_PM_DEVICE_SYSTEM_MANAGED=y
86-
CONFIG_PM_DEVICE_POWER_DOMAIN=y
8782
CONFIG_PM_PREWAKEUP_CONV_MODE_CEIL=y
88-
CONFIG_POWER_DOMAIN=y
89-
CONFIG_POWER_DOMAIN_INTEL_ADSP=y
9083

9184
# Zephyr / logging
9285
CONFIG_LOG_BACKEND_ADSP=n

‎app/boards/intel_adsp_ace20_lnl.conf‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,7 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
5858
# Zephyr / power settings
5959
CONFIG_ADSP_IDLE_CLOCK_GATING=y
6060
CONFIG_ADSP_IMR_CONTEXT_SAVE=y
61-
CONFIG_PM=y
62-
CONFIG_PM_DEVICE=y
63-
CONFIG_PM_DEVICE_POWER_DOMAIN=y
64-
CONFIG_PM_DEVICE_RUNTIME=y
65-
CONFIG_PM_DEVICE_SYSTEM_MANAGED=y
6661
CONFIG_PM_PREWAKEUP_CONV_MODE_CEIL=y
67-
CONFIG_POWER_DOMAIN=y
68-
CONFIG_POWER_DOMAIN_INTEL_ADSP=y
6962

7063
# Zephyr / logging
7164
CONFIG_LOG_BACKEND_ADSP=n

‎app/boards/intel_adsp_ace30_ptl.conf‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,7 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
5656

5757
# Zephyr / power settings
5858
CONFIG_ADSP_IMR_CONTEXT_SAVE=y
59-
CONFIG_PM=y
60-
CONFIG_PM_DEVICE=y
61-
CONFIG_PM_DEVICE_RUNTIME=y
62-
CONFIG_PM_DEVICE_POWER_DOMAIN=y
63-
CONFIG_PM_DEVICE_SYSTEM_MANAGED=y
6459
CONFIG_PM_PREWAKEUP_CONV_MODE_CEIL=y
65-
CONFIG_POWER_DOMAIN=y
66-
CONFIG_POWER_DOMAIN_INTEL_ADSP=y
6760

6861
# Zephyr / logging
6962
CONFIG_LOG_BACKEND_ADSP=n

‎app/boards/intel_adsp_ace30_ptl_sim.conf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ CONFIG_INTEL_ADSP_IPC=y
4141

4242

4343
# Temporary disabled options
44-
CONFIG_PM_DEVICE=y
4544
CONFIG_PM_DEVICE_RUNTIME=n
4645
CONFIG_PM_DEVICE_POWER_DOMAIN=n
4746
CONFIG_PM_PREWAKEUP_CONV_MODE_CEIL=y

‎app/boards/intel_adsp_ace30_wcl.conf‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,7 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
4848

4949
# Zephyr / power settings
5050
CONFIG_ADSP_IMR_CONTEXT_SAVE=y
51-
CONFIG_PM=y
52-
CONFIG_PM_DEVICE=y
53-
CONFIG_PM_DEVICE_RUNTIME=y
54-
CONFIG_PM_DEVICE_POWER_DOMAIN=y
55-
CONFIG_PM_DEVICE_SYSTEM_MANAGED=y
5651
CONFIG_PM_PREWAKEUP_CONV_MODE_CEIL=y
57-
CONFIG_POWER_DOMAIN=y
58-
CONFIG_POWER_DOMAIN_INTEL_ADSP=y
5952

6053
# Zephyr / logging
6154
CONFIG_LOG_BACKEND_ADSP=n

‎app/boards/intel_adsp_ace30_wcl_sim.conf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ CONFIG_SOF_LOG_LEVEL_OFF=y
3737
CONFIG_ZEPHYR_LOG=n
3838

3939
# Temporary disabled options
40-
CONFIG_PM_DEVICE=y
4140
CONFIG_PM_DEVICE_RUNTIME=n
4241
CONFIG_PM_DEVICE_POWER_DOMAIN=n
4342
CONFIG_PM_PREWAKEUP_CONV_MODE_CEIL=y

‎app/boards/intel_adsp_ace40_nvl.conf‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,8 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
4242

4343
# Zephyr / power settings
4444
CONFIG_ADSP_IMR_CONTEXT_SAVE=y
45-
CONFIG_PM=y
46-
CONFIG_PM_DEVICE=y
47-
CONFIG_PM_DEVICE_RUNTIME=y
48-
CONFIG_PM_DEVICE_POWER_DOMAIN=y
49-
CONFIG_PM_DEVICE_SYSTEM_MANAGED=y
5045
CONFIG_PM_POLICY_CUSTOM=y
5146
CONFIG_PM_PREWAKEUP_CONV_MODE_CEIL=y
52-
CONFIG_POWER_DOMAIN=y
53-
CONFIG_POWER_DOMAIN_INTEL_ADSP=y
5447
CONFIG_SRAM_RETENTION_MODE=n
5548

5649
# Zephyr / logging

‎app/boards/intel_adsp_ace40_nvls.conf‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,8 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
4343

4444
# Zephyr / power settings
4545
CONFIG_ADSP_IMR_CONTEXT_SAVE=y
46-
CONFIG_PM=y
47-
CONFIG_PM_DEVICE=y
48-
CONFIG_PM_DEVICE_RUNTIME=y
49-
CONFIG_PM_DEVICE_POWER_DOMAIN=y
50-
CONFIG_PM_DEVICE_SYSTEM_MANAGED=y
5146
CONFIG_PM_POLICY_CUSTOM=y
5247
CONFIG_PM_PREWAKEUP_CONV_MODE_CEIL=y
53-
CONFIG_POWER_DOMAIN=y
54-
CONFIG_POWER_DOMAIN_INTEL_ADSP=y
5548
CONFIG_SRAM_RETENTION_MODE=n
5649

5750
# Zephyr / logging

‎app/boards/intel_adsp_cavs25.conf‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ CONFIG_DMA_INTEL_ADSP_GPDMA_HAS_LLP=y
4545
CONFIG_MM_DRV=y
4646

4747
# Zephyr / power settings
48-
CONFIG_PM=y
49-
CONFIG_PM_DEVICE=y
50-
CONFIG_PM_DEVICE_RUNTIME=y
5148
CONFIG_PM_POLICY_CUSTOM=y
5249

5350
# Zephyr / logging

0 commit comments

Comments
 (0)