icelake: clk defs cleanup, using common cavs defs

Signed-off-by: Marcin Maka <marcin.maka@linux.intel.com>

Author: Marcin Maka

src/platform/icelake/include/platform/clk-map.h

@@ -33,18 +33,24 @@
 
 #include <sof/clk.h>
 
+#define CLK_MAX_CPU_HZ		400000000
+
 static const struct freq_table cpu_freq[] = {
 	{120000000, 120000, 0x0},
-	{400000000, 400000, 0x4}, /* default */
+	{CLK_MAX_CPU_HZ, 400000, 0x4}, /* default */
 };
 
+#define CPU_DEFAULT_IDX		1
+
 /* IMPORTANT: array should be filled in increasing order
  * (regarding to .freq field)
  */
 static const struct freq_table ssp_freq[] = {
 	{ 24576000, 24576, CLOCK_SSP_AUDIO_CARDINAL },
-	{ 38400000, 38400, CLOCK_SSP_XTAL_OSCILLATOR },
+	{ 38400000, 38400, CLOCK_SSP_XTAL_OSCILLATOR }, /* default */
 	{ 96000000, 96000, CLOCK_SSP_PLL_FIXED },
 };
 
+#define SSP_DEFAULT_IDX		1
+
 #endif

src/platform/icelake/include/platform/clk.h

@@ -33,34 +33,6 @@
 #ifndef __PLATFORM_CLOCK__
 #define __PLATFORM_CLOCK__
 
-#include <sof/cpu.h>
-#include <sof/io.h>
-#include <platform/shim.h>
-
-#define CLK_CPU(x)	(x)
-#define CLK_SSP		4
-
-#define CPU_DEFAULT_IDX		1
-#define SSP_DEFAULT_IDX		1
-
-#define CLK_DEFAULT_CPU_HZ	120000000
-#define CLK_MAX_CPU_HZ		400000000
-
-#define NUM_CLOCKS	5
-
-static inline int clock_platform_set_cpu_freq(uint32_t cpu_freq_enc)
-{
-	/* set CPU frequency request for CCU */
-	io_reg_update_bits(SHIM_BASE + SHIM_CLKCTL,
-			   SHIM_CLKCTL_DPCS_MASK(cpu_get_id()),
-			   cpu_freq_enc);
-
-	return 0;
-}
-
-static inline int clock_platform_set_ssp_freq(uint32_t ssp_freq_enc)
-{
-	return 0;
-}
+#include <cavs/clk.h>
 
 #endif

src/platform/intel/cavs/platform.c

@@ -37,6 +37,9 @@
 #include <platform/dma.h>
 #include <platform/dai.h>
 #include <platform/clk.h>
+#if defined(CONFIG_ICELAKE) || defined(CONFIG_SUECREEK)
+#include <platform/clk-map.h>
+#endif
 #include <platform/timer.h>
 #include <platform/interrupt.h>
 #include <platform/idc.h>