cros_ec: Move EC interface into common library

Add a common library for obtaining access to the Chrome OS EC. This is
used by boards which need to talk to the EC.

Reviewed-by: Vadim Bendebury <vbendeb@google.com>
Tested-by: Vadim Bendebury <vbendeb@google.com>
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index cd873bc56d63b308971554af76b45d8d7f2736e2..38664952593a6e0a854f28ce926757656a809c50 100644 (file)
--- a/board/samsung/common/board.c
+++ b/board/samsung/common/board.c
@@ -26,13 +26,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-struct local_info {
-       struct cros_ec_dev *cros_ec_dev;        /* Pointer to cros_ec device */
-       int cros_ec_err;                        /* Error for cros_ec, 0 if ok */
-};
-
-static struct local_info local;
-
 #if defined CONFIG_EXYNOS_TMU
 /* Boot Time Thermal Analysis for SoC temperature threshold breach */
 static void boot_temp_check(void)
@@ -144,22 +137,6 @@ int board_early_init_f(void)
 }
 #endif
 
-struct cros_ec_dev *board_get_cros_ec_dev(void)
-{
-       return local.cros_ec_dev;
-}
-
-#ifdef CONFIG_CROS_EC
-static int board_init_cros_ec_devices(const void *blob)
-{
-       local.cros_ec_err = cros_ec_init(blob, &local.cros_ec_dev);
-       if (local.cros_ec_err)
-               return -1;  /* Will report in board_late_init() */
-
-       return 0;
-}
-#endif
-
 #if defined(CONFIG_POWER)
 #ifdef CONFIG_POWER_MAX77686
 static int pmic_reg_update(struct pmic *p, int reg, uint regval)
@@ -384,12 +361,12 @@ int board_late_init(void)
 {
        stdio_print_current_devices();
 
-       if (local.cros_ec_err) {
+       if (cros_ec_get_error()) {
                /* Force console on */
                gd->flags &= ~GD_FLG_SILENT;
 
                printf("cros-ec communications failure %d\n",
-                      local.cros_ec_err);
+                      cros_ec_get_error());
                puts("\nPlease reset with Power+Refresh\n\n");
                panic("Cannot init cros-ec device");
                return -1;
@@ -401,7 +378,7 @@ int board_late_init(void)
 int arch_early_init_r(void)
 {
 #ifdef CONFIG_CROS_EC
-       if (board_init_cros_ec_devices(gd->fdt_blob)) {
+       if (cros_ec_board_init()) {
                printf("%s: Failed to init EC\n", __func__);
                return 0;
        }

diff --git a/board/samsung/smdk5250/exynos5-dt.c b/board/samsung/smdk5250/exynos5-dt.c
index 5fb86649360ecf82d9e50561fa87410cf1735096..c83b0341c5905e1dc909736876193ec266f8eeed 100644 (file)
--- a/board/samsung/smdk5250/exynos5-dt.c
+++ b/board/samsung/smdk5250/exynos5-dt.c
@@ -5,7 +5,6 @@
  */
 
 #include <common.h>
-#include <cros_ec.h>
 #include <fdtdec.h>
 #include <asm/io.h>
 #include <errno.h>

diff --git a/common/Makefile b/common/Makefile
index 04e9cdd5ffa1a599676e9130947412b0aeb6759e..e2ff0cb57d64e623c336b3ba5f30e144071b2b7a 100644 (file)
--- a/common/Makefile
+++ b/common/Makefile
@@ -230,6 +230,7 @@ obj-$(SPD) += ddr_spd.o
 obj-$(CONFIG_HWCONFIG) += hwconfig.o
 obj-$(CONFIG_BOUNCE_BUFFER) += bouncebuf.o
 obj-y += console.o
+obj-$(CONFIG_CROS_EC) += cros_ec.o
 obj-y += dlmalloc.o
 obj-y += image.o
 obj-$(CONFIG_OF_LIBFDT) += image-fdt.o

diff --git a/common/cros_ec.c b/common/cros_ec.c
new file mode 100644 (file)
index 0000000..b8ce1b5
--- /dev/null
+++ b/common/cros_ec.c
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ */
+
+#include <common.h>
+#include <cros_ec.h>
+DECLARE_GLOBAL_DATA_PTR;
+
+struct local_info {
+       struct cros_ec_dev *cros_ec_dev;        /* Pointer to cros_ec device */
+       int cros_ec_err;                        /* Error for cros_ec, 0 if ok */
+};
+
+static struct local_info local;
+
+struct cros_ec_dev *board_get_cros_ec_dev(void)
+{
+       return local.cros_ec_dev;
+}
+
+static int board_init_cros_ec_devices(const void *blob)
+{
+       local.cros_ec_err = cros_ec_init(blob, &local.cros_ec_dev);
+       if (local.cros_ec_err)
+               return -1;  /* Will report in board_late_init() */
+
+       return 0;
+}
+
+int cros_ec_board_init(void)
+{
+       return board_init_cros_ec_devices(gd->fdt_blob);
+}
+
+int cros_ec_get_error(void)
+{
+       return local.cros_ec_err;
+}

diff --git a/include/cros_ec.h b/include/cros_ec.h
index 1e89f29eea62b517da43e699b77730e427217827..22eae906050c14e7746a8276f35fc91e025c8c3f 100644 (file)
--- a/include/cros_ec.h
+++ b/include/cros_ec.h
@@ -431,4 +431,22 @@ int cros_ec_set_ldo(struct cros_ec_dev *dev, uint8_t index, uint8_t state);
  * @return 0 if ok, -1 on error
  */
 int cros_ec_get_ldo(struct cros_ec_dev *dev, uint8_t index, uint8_t *state);
+
+/**
+ * Initialize the Chrome OS EC at board initialization time.
+ *
+ * @return 0 if ok, -ve on error
+ */
+int cros_ec_board_init(void);
+
+/**
+ * Get access to the error reported when cros_ec_board_init() was called
+ *
+ * This permits delayed reporting of the EC error if it failed during
+ * early init.
+ *
+ * @return error (0 if there was no error, -ve if there was an error)
+ */
+int cros_ec_get_error(void);
+
 #endif