Skip to content

Commit 8bd2522

Browse files
kv2019ilgirdwood
authored andcommitted
platform: intel: ace: remove all unnecessary clk.h definitions
Strip all unnecessary definitions from Intel ACE clk.h platform code. Only expose the main DSP clock via the SOF clk.h layer, as required by cpu-clk-manager.c. Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
1 parent 4c0b6e8 commit 8bd2522

File tree

5 files changed

+3
-28
lines changed
  • src/platform

5 files changed

+3
-28
lines changed

src/platform/ace30/include/platform/lib/clk.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,8 @@
2626

2727
#define CPU_DEFAULT_IDX CPU_HPRO_FREQ_IDX
2828

29-
#define SSP_DEFAULT_IDX 1
30-
3129
#define NUM_CPU_FREQ 3
3230

33-
#define NUM_SSP_FREQ 3
34-
3531
#define PRIMARY_CORE_BASE_CPS_USAGE 20000
3632
#define SECONDARY_CORE_BASE_CPS_USAGE 10000
3733

src/platform/intel/ace/include/ace/lib/clk.h

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,16 @@
2020

2121
#include <ace/version.h>
2222
#include <sof/lib/cpu.h>
23-
#include <sof/lib/io.h>
24-
#include <sof/lib/memory.h>
25-
#include <stdint.h>
2623

2724
struct sof;
2825

29-
/** \brief Core(s) settings, up to CONFIG_CORE_COUNT */
30-
#define CLK_CPU(x) (x)
31-
32-
/** \brief SSP clock r-t settings are after the core(s) settings */
33-
#define CLK_SSP CONFIG_CORE_COUNT
34-
35-
/* SSP clock run-time data is the last one, so total number is ssp idx +1 */
36-
3726
/** \brief Total number of clocks */
38-
#define NUM_CLOCKS (CLK_SSP + 1)
27+
#define NUM_CLOCKS CONFIG_CORE_COUNT
3928

4029
extern const struct freq_table *cpu_freq;
4130

4231
void platform_clock_init(struct sof *sof);
4332

44-
void platform_clock_on_waiti(void);
45-
void platform_clock_on_wakeup(void);
46-
4733
#endif /* __ACE_LIB_CLK_H__ */
4834

4935
#else

src/platform/intel/ace/platform.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ int platform_init(struct sof *sof)
103103
scheduler_init_edf();
104104

105105
/* init low latency timer domain and scheduler. Any failure is fatal */
106-
sof->platform_timer_domain = zephyr_domain_init(PLATFORM_DEFAULT_CLOCK);
106+
/* clk is ignored on Zephyr so pass 0 */
107+
sof->platform_timer_domain = zephyr_domain_init(0);
107108
ret = scheduler_init_ll(sof->platform_timer_domain);
108109
if (ret < 0)
109110
return ret;

src/platform/lunarlake/include/platform/lib/clk.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,8 @@
2424

2525
#define CPU_DEFAULT_IDX CPU_IPLL_FREQ_IDX
2626

27-
#define SSP_DEFAULT_IDX 1
28-
2927
#define NUM_CPU_FREQ 2
3028

31-
#define NUM_SSP_FREQ 3
32-
3329
#define PRIMARY_CORE_BASE_CPS_USAGE 20000
3430
#define SECONDARY_CORE_BASE_CPS_USAGE 10000
3531

src/platform/meteorlake/include/platform/lib/clk.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,8 @@
2424

2525
#define CPU_DEFAULT_IDX CPU_IPLL_FREQ_IDX
2626

27-
#define SSP_DEFAULT_IDX 1
28-
2927
#define NUM_CPU_FREQ 2
3028

31-
#define NUM_SSP_FREQ 3
32-
3329
#define PRIMARY_CORE_BASE_CPS_USAGE 20000
3430
#define SECONDARY_CORE_BASE_CPS_USAGE 10000
3531

0 commit comments

Comments
 (0)