Patch set updated for coreboot: 6b7b18c kirby: Neutralize wakeup.c and delete the mostly unused exynos5420.h

[Patrick Georgi]

Patrick Georgi ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4412

-gerrit

commit 6b7b18c934feccb79acb6e19811fff84f5626970
Author: Gabe Black 
Date:   Tue Jul 30 22:41:13 2013 -0700

kirby: Neutralize wakeup.c and delete the mostly unused exynos5420.h

The function in wakeup.c isn't applicable on kirby. The only constant in
    exynos5420.h that was used was the speed of the 4th i2c bus. Instead of having
    a whole header file for that one constant used in one place, the constant is
    just moved inline along with the comment it had in the header.

Change-Id: I5ad50c5eeaecbbf7865d76afb31a12d36c3371ee
    Signed-off-by: Gabe Black 
    Reviewed-on: https://gerrit.chromium.org/gerrit/63882
    Commit-Queue: Gabe Black 
    Reviewed-by: Gabe Black 
    Tested-by: Gabe Black 
---
 src/mainboard/google/kirby/exynos5420.h | 34 ---------------------------------
 src/mainboard/google/kirby/mainboard.c  |  2 --
 src/mainboard/google/kirby/romstage.c   |  4 +---
 src/mainboard/google/kirby/wakeup.c     |  4 +---
 4 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/src/mainboard/google/kirby/exynos5420.h b/src/mainboard/google/kirby/exynos5420.h
deleted file mode 100644
index 21b704c..0000000
--- a/src/mainboard/google/kirby/exynos5420.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright 2013 Google Inc.
- *
- * 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; version 2 of the License.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/* I2C */
-#define I2C_0_SPEED 100000
-#define I2C_4_SPEED 1000000	/* 1MHz */
-#define I2C_SLAVE 0
-
-/* Voltages */
-#define VDD_ARM_MV 1300		// 1.3V
-#define VDD_INT_UV 1012500	// 1.0125V
-#define VDD_MIF_MV 1000		// 1.0V
-#define VDD_G3D_MV 1200		// 1.2V
-#define VDD_LDO2_MV 1500	// 1.5V
-#define VDD_LDO3_MV 1800	// 1.8V
-#define VDD_LDO5_MV 1800	// 1.8V
-#define VDD_LDO10_MV 1800	// 1.8V
-
diff --git a/src/mainboard/google/kirby/mainboard.c b/src/mainboard/google/kirby/mainboard.c
index 98e591a..9975202 100644
--- a/src/mainboard/google/kirby/mainboard.c
+++ b/src/mainboard/google/kirby/mainboard.c
@@ -38,8 +38,6 @@
 #include <ec/google/chromeec/ec.h>
 #include <stdlib.h>

-#include "exynos5420.h"
-
 /* convenient shorthand (in MB) */
 #define DRAM_START	(CONFIG_SYS_SDRAM_BASE >> 20)
 #define DRAM_SIZE	CONFIG_DRAM_SIZE_MB
diff --git a/src/mainboard/google/kirby/romstage.c b/src/mainboard/google/kirby/romstage.c
index 255f292..c11f712 100644
--- a/src/mainboard/google/kirby/romstage.c
+++ b/src/mainboard/google/kirby/romstage.c
@@ -40,8 +40,6 @@
 #include <drivers/maxim/max77802/max77802.h>
 #include <device/i2c.h>

-#include "exynos5420.h"
-
 #define MMC0_GPIO_PIN	(58)

struct pmic_write
@@ -89,7 +87,7 @@ static void setup_power(int is_resume)

/* Initialize I2C bus to configure PMIC. */
    exynos_pinmux_i2c4();
-	i2c_init(4, I2C_4_SPEED, 0x00);
+	i2c_init(4, 1000000, 0x00); /* 1MHz */

printk(BIOS_DEBUG, "%s: Setting up PMIC...\n", __func__);

diff --git a/src/mainboard/google/kirby/wakeup.c b/src/mainboard/google/kirby/wakeup.c
index a82b632..43bad6f 100644
--- a/src/mainboard/google/kirby/wakeup.c
+++ b/src/mainboard/google/kirby/wakeup.c
@@ -22,8 +22,6 @@

int wakeup_need_reset(void)
 {
-	/* The "wake up" event is not reliable (known as "bad wakeup") and needs
-	 * reset if GPIO value is high. */
-	return gpio_get_value(GPIO_Y10);
+	return 0;
 }