[PATCH 060/108] pmc: Move common registers to the header file

[Simon Glass]

These registers need to be accesses from ACPI code, so move them to the
header file.

Signed-off-by: Simon Glass <s...@chromium.org>
---

 drivers/power/acpi_pmc/acpi-pmc-uclass.c |  9 ---------
 include/power/acpi_pmc.h                 | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/drivers/power/acpi_pmc/acpi-pmc-uclass.c 
b/drivers/power/acpi_pmc/acpi-pmc-uclass.c
index d43de87126..dd2a62f35c 100644
--- a/drivers/power/acpi_pmc/acpi-pmc-uclass.c
+++ b/drivers/power/acpi_pmc/acpi-pmc-uclass.c
@@ -15,15 +15,6 @@
 #include <asm/io.h>
 #include <power/acpi_pmc.h>
 
-enum {
-       PM1_STS         = 0x00,
-       PM1_EN          = 0x02,
-       PM1_CNT         = 0x04,
-
-       GPE0_STS        = 0x20,
-       GPE0_EN         = 0x30,
-};
-
 struct tco_regs {
        u32 tco_rld;
        u32 tco_sts;
diff --git a/include/power/acpi_pmc.h b/include/power/acpi_pmc.h
index 1f50c23f5f..5fbf745136 100644
--- a/include/power/acpi_pmc.h
+++ b/include/power/acpi_pmc.h
@@ -6,10 +6,22 @@
 #ifndef __ACPI_PMC_H
 #define __ACPI_PMC_H
 
+#ifndef __ACPI__
+
 enum {
        GPE0_REG_MAX    = 4,
 };
 
+enum {
+       PM1_STS         = 0x00,
+       PM1_EN          = 0x02,
+       PM1_CNT         = 0x04,
+       PM1_TMR         = 0x08,
+
+       GPE0_STS        = 0x20,
+       GPE0_EN         = 0x30,
+};
+
 /**
  * struct acpi_pmc_upriv - holds common data for the x86 PMC
  *
@@ -182,4 +194,6 @@ void pmc_dump_info(struct udevice *dev);
  */
 int pmc_gpe_init(struct udevice *dev);
 
+#endif /* !__ACPI__ */
+
 #endif
-- 
2.25.0.341.g760bfbb309-goog