From 2ec9d171bc5ee8c9bba78d9f35d61d2473467f66 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 18 May 2017 20:09:23 -0600 Subject: cros_ec: Convert to support live tree Convert this driver to support the live device tree and remove the old fdtdec support. The keyboard is not yet converted. Signed-off-by: Simon Glass --- include/cros_ec.h | 7 ++----- include/fdtdec.h | 13 ------------- 2 files changed, 2 insertions(+), 18 deletions(-) (limited to 'include') diff --git a/include/cros_ec.h b/include/cros_ec.h index 2bd9f2251f8..771a176eeab 100644 --- a/include/cros_ec.h +++ b/include/cros_ec.h @@ -11,7 +11,6 @@ #include #include -#include #include #include #include @@ -378,12 +377,10 @@ int cros_ec_get_error(void); /** * Returns information from the FDT about the Chrome EC flash * - * @param blob FDT blob to use - * @param node Node offset to read from + * @param dev Device to read from * @param config Structure to use to return information */ -int cros_ec_decode_ec_flash(const void *blob, int node, - struct fdt_cros_ec *config); +int cros_ec_decode_ec_flash(struct udevice *dev, struct fdt_cros_ec *config); /** * Check the current keyboard state, in case recovery mode is requested. diff --git a/include/fdtdec.h b/include/fdtdec.h index f27fb368ad0..eda2ffaf66a 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -815,19 +815,6 @@ const u8 *fdtdec_locate_byte_array(const void *blob, int node, int fdtdec_decode_region(const void *blob, int node, const char *prop_name, fdt_addr_t *basep, fdt_size_t *sizep); -struct fmap_entry; -/** - * Read a flash entry from the fdt - * - * @param blob FDT blob - * @param node Offset of node to read - * @param name Name of node being read - * @param entry Place to put offset and size of this node - * @return 0 if ok, -ve on error - */ -int fdtdec_read_fmap_entry(const void *blob, int node, const char *name, - struct fmap_entry *entry); - /** * Obtain an indexed resource from a device property. * -- cgit v1.3.1