From 1c6c5836bdecc03a126ed96e2b40aeca086172b7 Mon Sep 17 00:00:00 2001
From: "Zhao, Lijian" <lijian.zhao@intel.com>
Date: Wed, 16 Mar 2016 17:48:06 -0700
Subject: Intel/amenia: Make the device address more readable

Use central header file to include device address and interrupt
line to avoid confusion.

Change-Id: I9560031d9f6e12c665c8ae12f7028a67b6c8c904
Signed-off-by: Zhao, Lijian <lijian.zhao@intel.com>
Signed-off-by: Rohit Ainapure <rohit.m.ainapure@intel.com>
Reviewed-on: https://chromium.devtools.intel.com/7248
Tested-by: N, Harshapriya <harshapriya.n@intel.com>
Reviewed-by: Petrov, Andrey <andrey.petrov@intel.com>
Reviewed-on: https://chromium.devtools.intel.com/7580
Reviewed-by: N, Harshapriya <harshapriya.n@intel.com>
Tested-by: Petrov, Andrey <andrey.petrov@intel.com>
Reviewed-on: https://review.coreboot.org/15083
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
---
 src/mainboard/intel/amenia/acpi/mainboard.asl |  4 ++--
 src/mainboard/intel/amenia/on_board.h         | 27 +++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 src/mainboard/intel/amenia/on_board.h

(limited to 'src/mainboard/intel/amenia')

diff --git a/src/mainboard/intel/amenia/acpi/mainboard.asl b/src/mainboard/intel/amenia/acpi/mainboard.asl
index c83f48f837..a679471cd4 100644
--- a/src/mainboard/intel/amenia/acpi/mainboard.asl
+++ b/src/mainboard/intel/amenia/acpi/mainboard.asl
@@ -14,7 +14,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-#include <soc/gpio_defs.h>
+#include <on_board.h>
 
 Scope (\_SB)
 {
@@ -65,7 +65,7 @@ Scope (\_SB.PCI0.I2C4)
 			)
 			Interrupt (ResourceConsumer, Edge, ActiveLow)
 			{
-				GPIO_18_IRQ
+				TOUCHPAD_INT
 			}
 		})
 
diff --git a/src/mainboard/intel/amenia/on_board.h b/src/mainboard/intel/amenia/on_board.h
new file mode 100644
index 0000000000..ab9bba3a6b
--- /dev/null
+++ b/src/mainboard/intel/amenia/on_board.h
@@ -0,0 +1,27 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2016 Intel Corp.
+ * (Written by Lance Zhao <lijian.zhao@intel.com> for Intel Corp.)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+*/
+
+#ifndef _ON_BOARD_H_
+#define _ON_BOARD_H_
+
+#include <soc/gpio_defs.h>
+
+#define TOUCHPAD_INT		GPIO_18_IRQ
+#define TOUCHSCREEN_INT		GPIO_21_IRQ
+
+
+#endif				/* _ON_BOARD_H_ */
-- 
cgit v1.2.3