From c0bff9755f12a6de9b15faf1498a096cf699d310 Mon Sep 17 00:00:00 2001
From: Furquan Shaikh <furquan@google.com>
Date: Thu, 30 Apr 2020 19:19:33 -0700
Subject: acpi: Update sata files to be more aligned with rest of acpi files

This change moves sata.h to include/acpi/acpi_sata.h to align with the
rest of the acpi header files in include/acpi.

BUG=b:155428745

Change-Id: I3f97e5c12535a331d7347c0ecad00b07b5f13f37
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/40933
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
---
 src/acpi/sata.c                       |  3 +--
 src/acpi/sata.h                       | 11 -----------
 src/include/acpi/acpi_sata.h          | 11 +++++++++++
 src/southbridge/intel/bd82x6x/sata.c  |  2 +-
 src/southbridge/intel/ibexpeak/sata.c |  2 +-
 5 files changed, 14 insertions(+), 15 deletions(-)
 delete mode 100644 src/acpi/sata.h
 create mode 100644 src/include/acpi/acpi_sata.h

diff --git a/src/acpi/sata.c b/src/acpi/sata.c
index f2f53e6f64..110742e84c 100644
--- a/src/acpi/sata.c
+++ b/src/acpi/sata.c
@@ -1,10 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include "sata.h"
-
 #include <acpi/acpi.h>
 #include <acpi/acpigen.h>
+#include <acpi/acpi_sata.h>
 
 /* e.g.
  * generate_sata_ssdt_ports("\_SB.PCI0.SATA", 0x3);
diff --git a/src/acpi/sata.h b/src/acpi/sata.h
deleted file mode 100644
index 5ca2eac254..0000000000
--- a/src/acpi/sata.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/* This file is part of the coreboot project. */
-
-#ifndef __ACPI_SATA_H__
-#define __ACPI_SATA_H__
-
-#include <stdint.h>
-
-void generate_sata_ssdt_ports(const char *scope, uint32_t enable_map);
-
-#endif
diff --git a/src/include/acpi/acpi_sata.h b/src/include/acpi/acpi_sata.h
new file mode 100644
index 0000000000..5ca2eac254
--- /dev/null
+++ b/src/include/acpi/acpi_sata.h
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/* This file is part of the coreboot project. */
+
+#ifndef __ACPI_SATA_H__
+#define __ACPI_SATA_H__
+
+#include <stdint.h>
+
+void generate_sata_ssdt_ports(const char *scope, uint32_t enable_map);
+
+#endif
diff --git a/src/southbridge/intel/bd82x6x/sata.c b/src/southbridge/intel/bd82x6x/sata.c
index e65fd6ecae..57eb7e75a1 100644
--- a/src/southbridge/intel/bd82x6x/sata.c
+++ b/src/southbridge/intel/bd82x6x/sata.c
@@ -8,7 +8,7 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <option.h>
-#include <acpi/sata.h>
+#include <acpi/acpi_sata.h>
 #include <types.h>
 
 #include "chip.h"
diff --git a/src/southbridge/intel/ibexpeak/sata.c b/src/southbridge/intel/ibexpeak/sata.c
index 11ac078c83..df13989f4a 100644
--- a/src/southbridge/intel/ibexpeak/sata.c
+++ b/src/southbridge/intel/ibexpeak/sata.c
@@ -8,7 +8,7 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <option.h>
-#include <acpi/sata.h>
+#include <acpi/acpi_sata.h>
 #include <types.h>
 
 #include "chip.h"
-- 
cgit v1.2.3