mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-19 21:51:31 +00:00
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>
This commit is contained in:
parent
006e73b9ca
commit
41364f0fbe
5 changed files with 66 additions and 27 deletions
|
@ -26,13 +26,6 @@
|
||||||
|
|
||||||
DECLARE_GLOBAL_DATA_PTR;
|
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
|
#if defined CONFIG_EXYNOS_TMU
|
||||||
/* Boot Time Thermal Analysis for SoC temperature threshold breach */
|
/* Boot Time Thermal Analysis for SoC temperature threshold breach */
|
||||||
static void boot_temp_check(void)
|
static void boot_temp_check(void)
|
||||||
|
@ -144,22 +137,6 @@ int board_early_init_f(void)
|
||||||
}
|
}
|
||||||
#endif
|
#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)
|
#if defined(CONFIG_POWER)
|
||||||
#ifdef CONFIG_POWER_MAX77686
|
#ifdef CONFIG_POWER_MAX77686
|
||||||
static int pmic_reg_update(struct pmic *p, int reg, uint regval)
|
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();
|
stdio_print_current_devices();
|
||||||
|
|
||||||
if (local.cros_ec_err) {
|
if (cros_ec_get_error()) {
|
||||||
/* Force console on */
|
/* Force console on */
|
||||||
gd->flags &= ~GD_FLG_SILENT;
|
gd->flags &= ~GD_FLG_SILENT;
|
||||||
|
|
||||||
printf("cros-ec communications failure %d\n",
|
printf("cros-ec communications failure %d\n",
|
||||||
local.cros_ec_err);
|
cros_ec_get_error());
|
||||||
puts("\nPlease reset with Power+Refresh\n\n");
|
puts("\nPlease reset with Power+Refresh\n\n");
|
||||||
panic("Cannot init cros-ec device");
|
panic("Cannot init cros-ec device");
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -401,7 +378,7 @@ int board_late_init(void)
|
||||||
int arch_early_init_r(void)
|
int arch_early_init_r(void)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_CROS_EC
|
#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__);
|
printf("%s: Failed to init EC\n", __func__);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <cros_ec.h>
|
|
||||||
#include <fdtdec.h>
|
#include <fdtdec.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
|
@ -230,6 +230,7 @@ obj-$(SPD) += ddr_spd.o
|
||||||
obj-$(CONFIG_HWCONFIG) += hwconfig.o
|
obj-$(CONFIG_HWCONFIG) += hwconfig.o
|
||||||
obj-$(CONFIG_BOUNCE_BUFFER) += bouncebuf.o
|
obj-$(CONFIG_BOUNCE_BUFFER) += bouncebuf.o
|
||||||
obj-y += console.o
|
obj-y += console.o
|
||||||
|
obj-$(CONFIG_CROS_EC) += cros_ec.o
|
||||||
obj-y += dlmalloc.o
|
obj-y += dlmalloc.o
|
||||||
obj-y += image.o
|
obj-y += image.o
|
||||||
obj-$(CONFIG_OF_LIBFDT) += image-fdt.o
|
obj-$(CONFIG_OF_LIBFDT) += image-fdt.o
|
||||||
|
|
44
common/cros_ec.c
Normal file
44
common/cros_ec.c
Normal file
|
@ -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;
|
||||||
|
}
|
|
@ -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
|
* @return 0 if ok, -1 on error
|
||||||
*/
|
*/
|
||||||
int cros_ec_get_ldo(struct cros_ec_dev *dev, uint8_t index, uint8_t *state);
|
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
|
#endif
|
||||||
|
|
Loading…
Add table
Reference in a new issue