X-Git-Url: https://repo.jachan.dev/J-u-boot.git/blobdiff_plain/1fba907f9a8d178eee960294ecffc8ee8bc6b00d..e7f7e2e1e22fd719a8810ba488a9451635b13d1b:/common/cros_ec.c diff --git a/common/cros_ec.c b/common/cros_ec.c index bb299bccfff..249d1f19411 100644 --- a/common/cros_ec.c +++ b/common/cros_ec.c @@ -12,21 +12,10 @@ #include #include #include +#include -DECLARE_GLOBAL_DATA_PTR; - -#ifndef CONFIG_DM_CROS_EC -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; -#endif - -struct cros_ec_dev *board_get_cros_ec_dev(void) +struct udevice *board_get_cros_ec_dev(void) { -#ifdef CONFIG_DM_CROS_EC struct udevice *dev; int ret; @@ -35,40 +24,5 @@ struct cros_ec_dev *board_get_cros_ec_dev(void) debug("%s: Error %d\n", __func__, ret); return NULL; } - return dev->uclass_priv; -#else - return local.cros_ec_dev; -#endif -} - -static int board_init_cros_ec_devices(const void *blob) -{ -#ifndef CONFIG_DM_CROS_EC - 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() */ -#endif - - return 0; -} - -int cros_ec_board_init(void) -{ - return board_init_cros_ec_devices(gd->fdt_blob); -} - -int cros_ec_get_error(void) -{ -#ifdef CONFIG_DM_CROS_EC - struct udevice *dev; - int ret; - - ret = uclass_get_device(UCLASS_CROS_EC, 0, &dev); - if (ret && ret != -ENODEV) - return ret; - - return 0; -#else - return local.cros_ec_err; -#endif + return dev; }