ASoC: Intel: ssp-common: relocate header file

Moving ssp-common header file from sound/soc/intel/common directory to
include/sound directory and rename the file. Keep file content
unchanged for tracking purpose.

Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Brent Lu <brent.lu@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://msgid.link/r/20240327162408.63953-3-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc-acpi-intel-ssp-common.h b/include/sound/soc-acpi-intel-ssp-common.h
new file mode 100644 (file)
index 0000000..ff84154
--- /dev/null
+++ b/include/sound/soc-acpi-intel-ssp-common.h
@@ -0,0 +1,73 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright(c) 2023 Intel Corporation.
+ */
+
+#ifndef __SOF_SSP_COMMON_H
+#define __SOF_SSP_COMMON_H
+
+/* Cirrus Logic */
+#define CS35L41_ACPI_HID       "CSC3541"
+#define CS42L42_ACPI_HID       "10134242"
+
+/* Dialog */
+#define DA7219_ACPI_HID                "DLGS7219"
+
+/* Everest */
+#define ES8316_ACPI_HID                "ESSX8316"
+#define ES8326_ACPI_HID                "ESSX8326"
+#define ES8336_ACPI_HID                "ESSX8336"
+
+#define MAX_98357A_ACPI_HID    "MX98357A"
+#define MAX_98360A_ACPI_HID    "MX98360A"
+#define MAX_98373_ACPI_HID     "MX98373"
+#define MAX_98390_ACPI_HID     "MX98390"
+
+/* Nuvoton */
+#define NAU8318_ACPI_HID       "NVTN2012"
+#define NAU8825_ACPI_HID       "10508825"
+
+/* Realtek */
+#define RT1011_ACPI_HID                "10EC1011"
+#define RT1015_ACPI_HID                "10EC1015"
+#define RT1015P_ACPI_HID       "RTL1015"
+#define RT1019P_ACPI_HID       "RTL1019"
+#define RT1308_ACPI_HID                "10EC1308"
+#define RT5650_ACPI_HID                "10EC5650"
+#define RT5682_ACPI_HID                "10EC5682"
+#define RT5682S_ACPI_HID       "RTL5682"
+
+enum sof_ssp_codec {
+       CODEC_NONE,
+
+       /* headphone codec */
+       CODEC_CS42L42,
+       CODEC_DA7219,
+       CODEC_ES8316,
+       CODEC_ES8326,
+       CODEC_ES8336,
+       CODEC_NAU8825,
+       CODEC_RT5650,
+       CODEC_RT5682,
+       CODEC_RT5682S,
+
+       /* speaker amplifier */
+       CODEC_CS35L41,
+       CODEC_MAX98357A,
+       CODEC_MAX98360A,
+       CODEC_MAX98373,
+       CODEC_MAX98390,
+       CODEC_NAU8318,
+       CODEC_RT1011,
+       CODEC_RT1015,
+       CODEC_RT1015P,
+       CODEC_RT1019P,
+       CODEC_RT1308,
+};
+
+enum sof_ssp_codec sof_ssp_detect_codec_type(struct device *dev);
+enum sof_ssp_codec sof_ssp_detect_amp_type(struct device *dev);
+
+const char *sof_ssp_get_codec_name(enum sof_ssp_codec codec_type);
+
+#endif /* __SOF_SSP_COMMON_H */

diff --git a/sound/soc/intel/boards/sof_board_helpers.h b/sound/soc/intel/boards/sof_board_helpers.h
index bd5c48cd0649ba60778d1a332a8f329358789c7a..34ea974c8493dea401bcaf493d5ea71ffab2dd7e 100644 (file)
--- a/sound/soc/intel/boards/sof_board_helpers.h
+++ b/sound/soc/intel/boards/sof_board_helpers.h
@@ -7,8 +7,8 @@
 #define __SOF_INTEL_BOARD_HELPERS_H
 
 #include <sound/soc.h>
+#include <sound/soc-acpi-intel-ssp-common.h>
 #include "sof_hdmi_common.h"
-#include "../common/sof_ssp_common.h"
 
 /*
  * Common board quirks: from bit 8 to 31, LSB 8 bits reserved for machine

diff --git a/sound/soc/intel/boards/sof_cirrus_common.h b/sound/soc/intel/boards/sof_cirrus_common.h
index 445621466f05c86fae73a09886017101efafda73..1c87637b9ef7b6ab6f65f944851418039047b8cc 100644 (file)
--- a/sound/soc/intel/boards/sof_cirrus_common.h
+++ b/sound/soc/intel/boards/sof_cirrus_common.h
@@ -9,7 +9,7 @@
 #define __SOF_CIRRUS_COMMON_H
 
 #include <sound/soc.h>
-#include "../common/sof_ssp_common.h"
+#include <sound/soc-acpi-intel-ssp-common.h>
 
 /*
  * Cirrus Logic CS35L41/CS35L53

diff --git a/sound/soc/intel/boards/sof_maxim_common.h b/sound/soc/intel/boards/sof_maxim_common.h
index 63054bcd287bd4288110acb2a2a86ac5235b50f8..8886f985de68b5a71f17140ab042e15447b7583c 100644 (file)
--- a/sound/soc/intel/boards/sof_maxim_common.h
+++ b/sound/soc/intel/boards/sof_maxim_common.h
@@ -11,7 +11,7 @@
 #define __SOF_MAXIM_COMMON_H
 
 #include <sound/soc.h>
-#include "../common/sof_ssp_common.h"
+#include <sound/soc-acpi-intel-ssp-common.h>
 
 /*
  * Maxim MAX98373

diff --git a/sound/soc/intel/boards/sof_nuvoton_common.h b/sound/soc/intel/boards/sof_nuvoton_common.h
index af2e58b1d393b9fb7aec2c752d957bbed4b2a59b..8a0f283260e741c008f290596f63a292f457fd16 100644 (file)
--- a/sound/soc/intel/boards/sof_nuvoton_common.h
+++ b/sound/soc/intel/boards/sof_nuvoton_common.h
@@ -9,7 +9,7 @@
 #define __SOF_NUVOTON_COMMON_H
 
 #include <sound/soc.h>
-#include "../common/sof_ssp_common.h"
+#include <sound/soc-acpi-intel-ssp-common.h>
 
 /*
  * Nuvoton NAU8318

diff --git a/sound/soc/intel/boards/sof_realtek_common.h b/sound/soc/intel/boards/sof_realtek_common.h
index 99b23d96521a2bfeda12e73817ec8b9837aea32d..289e85b616602bdbc2551d03a792aca0a6b66dfc 100644 (file)
--- a/sound/soc/intel/boards/sof_realtek_common.h
+++ b/sound/soc/intel/boards/sof_realtek_common.h
@@ -11,7 +11,7 @@
 #define __SOF_REALTEK_COMMON_H
 
 #include <sound/soc.h>
-#include "../common/sof_ssp_common.h"
+#include <sound/soc-acpi-intel-ssp-common.h>
 
 /*
  * Realtek ALC1011

diff --git a/sound/soc/intel/common/soc-acpi-intel-ssp-common.c b/sound/soc/intel/common/soc-acpi-intel-ssp-common.c
index 96072790e9c0f96e3e6f261adab8f0b3b8569f31..37758f4e3f32d6af3e9916af6e72d4933d5e0210 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-ssp-common.c
+++ b/sound/soc/intel/common/soc-acpi-intel-ssp-common.c
@@ -4,7 +4,7 @@
 
 #include <linux/device.h>
 #include <sound/soc-acpi.h>
-#include "sof_ssp_common.h"
+#include <sound/soc-acpi-intel-ssp-common.h>
 
 /*
  * Codec probe function

diff --git a/sound/soc/intel/common/sof_ssp_common.h b/sound/soc/intel/common/sof_ssp_common.h
deleted file mode 100644 (file)
index ff84154..0000000
--- a/sound/soc/intel/common/sof_ssp_common.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright(c) 2023 Intel Corporation.
- */
-
-#ifndef __SOF_SSP_COMMON_H
-#define __SOF_SSP_COMMON_H
-
-/* Cirrus Logic */
-#define CS35L41_ACPI_HID       "CSC3541"
-#define CS42L42_ACPI_HID       "10134242"
-
-/* Dialog */
-#define DA7219_ACPI_HID                "DLGS7219"
-
-/* Everest */
-#define ES8316_ACPI_HID                "ESSX8316"
-#define ES8326_ACPI_HID                "ESSX8326"
-#define ES8336_ACPI_HID                "ESSX8336"
-
-#define MAX_98357A_ACPI_HID    "MX98357A"
-#define MAX_98360A_ACPI_HID    "MX98360A"
-#define MAX_98373_ACPI_HID     "MX98373"
-#define MAX_98390_ACPI_HID     "MX98390"
-
-/* Nuvoton */
-#define NAU8318_ACPI_HID       "NVTN2012"
-#define NAU8825_ACPI_HID       "10508825"
-
-/* Realtek */
-#define RT1011_ACPI_HID                "10EC1011"
-#define RT1015_ACPI_HID                "10EC1015"
-#define RT1015P_ACPI_HID       "RTL1015"
-#define RT1019P_ACPI_HID       "RTL1019"
-#define RT1308_ACPI_HID                "10EC1308"
-#define RT5650_ACPI_HID                "10EC5650"
-#define RT5682_ACPI_HID                "10EC5682"
-#define RT5682S_ACPI_HID       "RTL5682"
-
-enum sof_ssp_codec {
-       CODEC_NONE,
-
-       /* headphone codec */
-       CODEC_CS42L42,
-       CODEC_DA7219,
-       CODEC_ES8316,
-       CODEC_ES8326,
-       CODEC_ES8336,
-       CODEC_NAU8825,
-       CODEC_RT5650,
-       CODEC_RT5682,
-       CODEC_RT5682S,
-
-       /* speaker amplifier */
-       CODEC_CS35L41,
-       CODEC_MAX98357A,
-       CODEC_MAX98360A,
-       CODEC_MAX98373,
-       CODEC_MAX98390,
-       CODEC_NAU8318,
-       CODEC_RT1011,
-       CODEC_RT1015,
-       CODEC_RT1015P,
-       CODEC_RT1019P,
-       CODEC_RT1308,
-};
-
-enum sof_ssp_codec sof_ssp_detect_codec_type(struct device *dev);
-enum sof_ssp_codec sof_ssp_detect_amp_type(struct device *dev);
-
-const char *sof_ssp_get_codec_name(enum sof_ssp_codec codec_type);
-
-#endif /* __SOF_SSP_COMMON_H */