Lijian Zhao (lijian.zhao(a)intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15083
-gerrit
commit 03078456f127eed5e9906b761fbaccd47ce0efff
Author: Zhao, Lijian <lijian.zhao(a)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(a)intel.com>
Reviewed-on: https://chromium.devtools.intel.com/7248
Tested-by: N, Harshapriya <harshapriya.n(a)intel.com>
Reviewed-by: Petrov, Andrey <andrey.petrov(a)intel.com>
---
src/mainboard/intel/amenia/acpi/mainboard.asl | 4 ++--
src/mainboard/intel/amenia/on_board.h | 27 +++++++++++++++++++++++++++
2 files changed, 29 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..19d4e6a
--- /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(a)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_ */
Lijian Zhao (lijian.zhao(a)intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15083
-gerrit
commit 0b83b11aba88bb5b9353a67485e3918588a819e9
Author: Zhao, Lijian <lijian.zhao(a)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(a)intel.com>
Signed-off-by: Rohit Ainapure <rohit.m.ainapure(a)intel.com>
Reviewed-on: https://chromium.devtools.intel.com/7248
Tested-by: N, Harshapriya <harshapriya.n(a)intel.com>
Reviewed-by: Petrov, Andrey <andrey.petrov(a)intel.com>
Reviewed-on: https://chromium.devtools.intel.com/7580
Reviewed-by: N, Harshapriya <harshapriya.n(a)intel.com>
Tested-by: Petrov, Andrey <andrey.petrov(a)intel.com>
---
src/mainboard/intel/amenia/acpi/mainboard.asl | 4 ++--
src/mainboard/intel/amenia/on_board.h | 27 +++++++++++++++++++++++++++
2 files changed, 29 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..19d4e6a
--- /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(a)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_ */
the following patch was just integrated into master:
commit 6724b1b6b46f7fbc21d80511177fca6080067d69
Author: Julius Werner <jwerner(a)chromium.org>
Date: Fri Jun 3 17:27:58 2016 -0700
rk3288: Remove duplicate timestamp_init()
Fix bug introduced by merging http://review.coreboot.org/9606 and
http://review.coreboot.org/10740 in the wrong order.
Change-Id: I75dd22cd0cf30c7d91e4fa5171cb482a80eb64ca
Signed-off-by: Julius Werner <jwerner(a)chromium.org>
Reviewed-on: https://review.coreboot.org/15070
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth(a)google.com>
See https://review.coreboot.org/15070 for details.
-gerrit
Julius Werner (jwerner(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15070
-gerrit
commit fd65db880eac14449ff6a046b76b21ba9279b183
Author: Julius Werner <jwerner(a)chromium.org>
Date: Fri Jun 3 17:27:58 2016 -0700
rk3288: Remove duplicate timestamp_init()
Fix bug introduced by merging http://review.coreboot.org/9606 and
http://review.coreboot.org/10740 in the wrong order.
Change-Id: I75dd22cd0cf30c7d91e4fa5171cb482a80eb64ca
Signed-off-by: Julius Werner <jwerner(a)chromium.org>
---
src/soc/rockchip/rk3288/bootblock.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/soc/rockchip/rk3288/bootblock.c b/src/soc/rockchip/rk3288/bootblock.c
index 65ca7a9..02fe9ff 100644
--- a/src/soc/rockchip/rk3288/bootblock.c
+++ b/src/soc/rockchip/rk3288/bootblock.c
@@ -26,8 +26,6 @@
void bootblock_soc_init(void)
{
- timestamp_init(timestamp_get());
-
rkclk_init();
mmu_init();