3 files changed, 25 insertions, 6 deletions
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi/ec.asl b/src/mainboard/hp/pavilion_m6_1035dx/acpi/ec.asl
index 188515c165..0293a1274a 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi/ec.asl
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi/ec.asl
@@ -3,10 +3,8 @@
  * Subject to the GNU GPL v2, or (at your option) any later version.
  */
 
-/*
- * EC bits specific to the mainboard
- */
-#define EC_SCI_GPE 3
+/* Defines EC bits specific to the mainboard, needed by EC ASL */
+#include "mainboard.h"
 
 /* ACPI code for EC functions */
 #include <ec/compal/ene932/acpi/ec.asl>
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/ec.h b/src/mainboard/hp/pavilion_m6_1035dx/ec.h
index 7eb4d06d2f..61ecc060f8 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/ec.h
+++ b/src/mainboard/hp/pavilion_m6_1035dx/ec.h
@@ -6,8 +6,7 @@
 #ifndef _MAINBOARD_HP_PAVILION_M6_1035DX_EC_H
 #define _MAINBOARD_HP_PAVILION_M6_1035DX_EC_H
 
-#define EC_SMI_GEVENT		23
-#define EC_LID_GEVENT		22
+#include "mainboard.h"
 
 #ifndef __SMM__
 void pavilion_m6_1035dx_ec_init(void);
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/mainboard.h b/src/mainboard/hp/pavilion_m6_1035dx/mainboard.h
new file mode 100644
index 0000000000..1e69cc9134
--- /dev/null
+++ b/src/mainboard/hp/pavilion_m6_1035dx/mainboard.h
@@ -0,0 +1,22 @@
+/*
+ * "The way things are connected" and a few setup options
+ *
+ * Copyright (C) 2014 Alexandru Gagniuc <mr.nuke.me@gmail.com>
+ * Subject to the GNU GPL v2, or (at your option) any later version.
+ */
+
+#ifndef _MAINBOARD_HP_PAVILION_M6_1035DX_MAINBOARD_H
+#define _MAINBOARD_HP_PAVILION_M6_1035DX_MAINBOARD_H
+
+/* What is connected to GEVENT pins */
+#define EC_SCI_GEVENT		3
+#define EC_LID_GEVENT		22
+#define EC_SMI_GEVENT		23
+
+/* Any GEVENT pin can be mapped to any GPE. We try to keep the mapping 1:1, but
+ * we make the distinction between GEVENT pin and SCI.
+ */
+#define EC_SCI_GPE 		EC_SCI_GEVENT
+
+
+#endif /* _MAINBOARD_HP_PAVILION_M6_1035DX_MAINBOARD_H   */