Re: [U-Boot] [PATCH v3 33/72] cros_ec: Convert to support live tree

[sjg]

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 
---

Changes in v3: None
Changes in v2: None

 drivers/misc/cros_ec.c | 33 ++---
 drivers/misc/cros_ec_sandbox.c | 23 +++
 include/cros_ec.h  |  7 ++-
 include/fdtdec.h   | 13 -
 lib/fdtdec.c   | 32 
 5 files changed, 27 insertions(+), 81 deletions(-)

Applied to u-boot-dm
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

[U-Boot] [PATCH v3 33/72] cros_ec: Convert to support live tree

[Simon Glass]

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 
---

Changes in v3: None
Changes in v2: None

 drivers/misc/cros_ec.c | 33 ++---
 drivers/misc/cros_ec_sandbox.c | 23 +++
 include/cros_ec.h  |  7 ++-
 include/fdtdec.h   | 13 -
 lib/fdtdec.c   | 32 
 5 files changed, 27 insertions(+), 81 deletions(-)

diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c
index e2027ea5d2..feaa5d8567 100644
--- a/drivers/misc/cros_ec.c
+++ b/drivers/misc/cros_ec.c
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #ifdef DEBUG_TRACE
@@ -996,15 +997,12 @@ int cros_ec_get_ldo(struct udevice *dev, uint8_t index, 
uint8_t *state)
 int cros_ec_register(struct udevice *dev)
 {
struct cros_ec_dev *cdev = dev_get_uclass_priv(dev);
-   const void *blob = gd->fdt_blob;
-   int node = dev_of_offset(dev);
char id[MSG_BYTES];
 
cdev->dev = dev;
gpio_request_by_name(dev, "ec-interrupt", 0, >ec_int,
 GPIOD_IS_IN);
-   cdev->optimise_flash_write = fdtdec_get_bool(blob, node,
-"optimise-flash-write");
+   cdev->optimise_flash_write = dev_read_bool(dev, "optimise-flash-write");
 
if (cros_ec_check_version(cdev)) {
debug("%s: Could not detect CROS-EC version\n", __func__);
@@ -1023,28 +1021,26 @@ int cros_ec_register(struct udevice *dev)
return 0;
 }
 
-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)
 {
-   int flash_node;
+   ofnode flash_node, node;
 
-   flash_node = fdt_subnode_offset(blob, node, "flash");
-   if (flash_node < 0) {
+   flash_node = dev_read_subnode(dev, "flash");
+   if (!ofnode_valid(flash_node)) {
debug("Failed to find flash node\n");
return -1;
}
 
-   if (fdtdec_read_fmap_entry(blob, flash_node, "flash",
-  >flash)) {
-   debug("Failed to decode flash node in chrome-ec'\n");
+   if (of_read_fmap_entry(flash_node, "flash", >flash)) {
+   debug("Failed to decode flash node in chrome-ec\n");
return -1;
}
 
-   config->flash_erase_value = fdtdec_get_int(blob, flash_node,
-   "erase-value", -1);
-   for (node = fdt_first_subnode(blob, flash_node); node >= 0;
-node = fdt_next_subnode(blob, node)) {
-   const char *name = fdt_get_name(blob, node, NULL);
+   config->flash_erase_value = ofnode_read_s32_default(flash_node,
+   "erase-value", -1);
+   for (node = ofnode_first_subnode(flash_node); ofnode_valid(node);
+node = ofnode_next_subnode(node)) {
+   const char *name = ofnode_get_name(node);
enum ec_flash_region region;
 
if (0 == strcmp(name, "ro")) {
@@ -1058,8 +1054,7 @@ int cros_ec_decode_ec_flash(const void *blob, int node,
return -1;
}
 
-   if (fdtdec_read_fmap_entry(blob, node, "reg",
-  >region[region])) {
+   if (of_read_fmap_entry(node, "reg", >region[region])) {
debug("Failed to decode flash region in chrome-ec'\n");
return -1;
}
diff --git a/drivers/misc/cros_ec_sandbox.c b/drivers/misc/cros_ec_sandbox.c
index 848c67bc23..c96e26e6b7 100644
--- a/drivers/misc/cros_ec_sandbox.c
+++ b/drivers/misc/cros_ec_sandbox.c
@@ -188,18 +188,16 @@ static int get_image_used(struct ec_state *ec, struct 
fmap_entry *entry)
  * RR=Row CC=Column =Key Code
  *
  * @param ec   Current emulated EC state
- * @param blob Device tree blob containing keyscan information
  * @param node Keyboard node of device tree containing keyscan information
  * @return 0 if ok, -1 on error
  */
-static int keyscan_read_fdt_matrix(struct ec_state *ec, const void *blob,
-  int node)
+static int keyscan_read_fdt_matrix(struct ec_state *ec, ofnode node)
 {
const u32 *cell;
int upto;
int len;
 
-   cell = fdt_getprop(blob, node, "linux,keymap", );
+   cell = ofnode_read_prop(node, "linux,keymap", );
ec->matrix_count = len / 4;
ec->matrix = calloc(ec->matrix_count, sizeof(*ec->matrix));
if (!ec->matrix) {
@@ -516,28 +514,29 @@ int cros_ec_probe(struct udevice *dev)
 {
struct ec_state *ec = dev->priv;
struct cros_ec_dev *cdev = dev->uclass_priv;
-