[coreboot-gerrit] Patch set updated for coreboot: Intel/amenia: Make the device address more reabale

[Lijian Zhao (lijian.zhao@intel.com)]

Lijian Zhao (lijian.zhao at intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15083

-gerrit

commit 9535e5c6d02158fbc7c64d118710ca07e2de085c
Author: Zhao, Lijian <lijian.zhao at intel.com>
Date:   Wed Mar 16 17:48:06 2016 -0700

    Intel/amenia: Make the device address more reabale
    
    Using central header file to include device addressa and interrupt
    line to avoid confusion.
    
    Change-Id: I9560031d9f6e12c665c8ae12f7028a67b6c8c904
    Signed-off-by: Zhao, Lijian <lijian.zhao at intel.com>
    Signed-off-by: Rohit Ainapure <rohit.m.ainapure at intel.com>
    Reviewed-on: https://chromium.devtools.intel.com/7248
    Tested-by: N, Harshapriya <harshapriya.n at intel.com>
    Reviewed-by: Petrov, Andrey <andrey.petrov at intel.com>
    Reviewed-on: https://chromium.devtools.intel.com/7580
    Reviewed-by: N, Harshapriya <harshapriya.n at intel.com>
    Tested-by: Petrov, Andrey <andrey.petrov at intel.com>
---
 src/mainboard/intel/amenia/acpi/mainboard.asl |  4 ++--
 src/mainboard/intel/amenia/on_board.h         | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/mainboard/intel/amenia/acpi/mainboard.asl b/src/mainboard/intel/amenia/acpi/mainboard.asl
index 09ef9b4..be6e8b3 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.PCI0.I2C4)
 {
@@ -48,7 +48,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 0000000..188746f
--- /dev/null
+++ b/src/mainboard/intel/amenia/on_board.h
@@ -0,0 +1,22 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2016 Intel Corp.
+ * (Written by Lance Zhao <lijian.zhao at 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.
+ */
+
+#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_ */