dai: hda: array size and initialization based on platform settings

Defined correct hda dai quantities for cavs plaforms.

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

Author: Marcin Maka

src/platform/apollolake/include/platform/dai.h

@@ -31,6 +31,8 @@
 #ifndef __PLATFORM_DAI_H__
 #define __PLATFORM_DAI_H__
 
+/* APOLLOLAKE */
+
 /* SSP */
 
 /*
@@ -45,6 +47,14 @@
 /** \brief Number of 'extended' SSP ports available */
 #define DAI_NUM_SSP_EXT		2
 
+/* HD/A */
+
+/** \brief Number of HD/A Link Outputs */
+#define DAI_NUM_HDA_OUT		6
+
+/** \brief Number of HD/A Link Inputs */
+#define DAI_NUM_HDA_IN		7
+
 int dai_init(void);
 
 #endif

src/platform/cannonlake/include/platform/dai.h

@@ -31,6 +31,8 @@
 #ifndef __PLATFORM_DAI_H__
 #define __PLATFORM_DAI_H__
 
+/* CANNONLAKE */
+
 /* SSP */
 
 /*
@@ -45,6 +47,14 @@
 /** \brief Number of 'extended' SSP ports available */
 #define DAI_NUM_SSP_EXT		0
 
+/* HD/A */
+
+/** \brief Number of HD/A Link Outputs */
+#define DAI_NUM_HDA_OUT		9
+
+/** \brief Number of HD/A Link Inputs */
+#define DAI_NUM_HDA_IN		7
+
 int dai_init(void);
 
 #endif

src/platform/icelake/include/platform/dai.h

@@ -31,6 +31,8 @@
 #ifndef __PLATFORM_DAI_H__
 #define __PLATFORM_DAI_H__
 
+/* ICELAKE */
+
 /* SSP */
 
 /*
@@ -45,6 +47,14 @@
 /** \brief Number of 'extended' SSP ports available */
 #define DAI_NUM_SSP_EXT		0
 
+/* HD/A */
+
+/** \brief Number of HD/A Link Outputs */
+#define DAI_NUM_HDA_OUT		9
+
+/** \brief Number of HD/A Link Inputs */
+#define DAI_NUM_HDA_IN		7
+
 int dai_init(void);
 
 #endif

src/platform/intel/cavs/dai.c

@@ -205,74 +205,7 @@ static struct dai dmic[2] = {
 
 #endif
 
-/* TODO: numbers to be defined and shared with HD/A dmas */
-static struct dai hda[(6 + 7)] = {
-	{
-		.type = SOF_DAI_INTEL_HDA,
-		.index = 0,
-		.ops = &hda_ops
-	},
-	{
-		.type = SOF_DAI_INTEL_HDA,
-		.index = 1,
-		.ops = &hda_ops
-	},
-	{
-		.type = SOF_DAI_INTEL_HDA,
-		.index = 2,
-		.ops = &hda_ops
-	},
-	{
-		.type = SOF_DAI_INTEL_HDA,
-		.index = 3,
-		.ops = &hda_ops
-	},
-	{
-		.type = SOF_DAI_INTEL_HDA,
-		.index = 4,
-		.ops = &hda_ops
-	},
-	{
-		.type = SOF_DAI_INTEL_HDA,
-		.index = 5,
-		.ops = &hda_ops
-	},
-	{
-		.type = SOF_DAI_INTEL_HDA,
-		.index = 6,
-		.ops = &hda_ops
-	},
-	{
-		.type = SOF_DAI_INTEL_HDA,
-		.index = 7,
-		.ops = &hda_ops
-	},
-	{
-		.type = SOF_DAI_INTEL_HDA,
-		.index = 8,
-		.ops = &hda_ops
-	},
-	{
-		.type = SOF_DAI_INTEL_HDA,
-		.index = 9,
-		.ops = &hda_ops
-	},
-	{
-		.type = SOF_DAI_INTEL_HDA,
-		.index = 10,
-		.ops = &hda_ops
-	},
-	{
-		.type = SOF_DAI_INTEL_HDA,
-		.index = 11,
-		.ops = &hda_ops
-	},
-	{
-		.type = SOF_DAI_INTEL_HDA,
-		.index = 12,
-		.ops = &hda_ops
-	}
-};
+static struct dai hda[(DAI_NUM_HDA_OUT + DAI_NUM_HDA_IN)];
 
 static struct dai_type_info dti[] = {
 	{
@@ -298,6 +231,13 @@ int dai_init(void)
 {
 	int i;
 
+	/* init hd/a, note that size depends on the platform caps */
+	for (i = 0; i < ARRAY_SIZE(hda); i++) {
+		hda[i].type = SOF_DAI_INTEL_HDA;
+		hda[i].index = i;
+		hda[i].ops = &hda_ops;
+	}
+
 	/* init SSP ports */
 	trace_point(TRACE_BOOT_PLATFORM_SSP);
 	for (i = 0; i < DAI_NUM_SSP_BASE + DAI_NUM_SSP_EXT; i++)

src/platform/suecreek/include/platform/dai.h

@@ -31,6 +31,8 @@
 #ifndef __PLATFORM_DAI_H__
 #define __PLATFORM_DAI_H__
 
+/* SUECREEK */
+
 /* SSP */
 
 /*
@@ -45,6 +47,12 @@
 /** \brief Number of 'extended' SSP ports available */
 #define DAI_NUM_SSP_EXT		0
 
+/** \brief Number of HD/A Link Outputs */
+#define DAI_NUM_HDA_OUT		9
+
+/** \brief Number of HD/A Link Inputs */
+#define DAI_NUM_HDA_IN		7
+
 int dai_init(void);
 
 #endif