mmc: omap_hsmmc: cleanup omap_hsmmc_set_ios

[people/ms/u-boot.git] / drivers / input / key_matrix.c

diff --git a/drivers/input/key_matrix.c b/drivers/input/key_matrix.c
index 8867e4964e6cb5b7a43c50aacd531e89208dad14..cd5bce361356f899485a3cb9e642227344f278da 100644 (file)
--- a/drivers/input/key_matrix.c
+++ b/drivers/input/key_matrix.c
@@ -8,7 +8,7 @@
  */
 
 #include <common.h>
-#include <fdtdec.h>
+#include <dm.h>
 #include <key_matrix.h>
 #include <malloc.h>
 #include <linux/input.h>
@@ -105,7 +105,7 @@ int key_matrix_decode(struct key_matrix *config, struct key_matrix_key keys[],
  * @param pos           Returns position of map_keycode, if found, else -1
  * @return map  Pointer to allocated map
  */
-static uchar *create_keymap(struct key_matrix *config, u32 *data, int len,
+static uchar *create_keymap(struct key_matrix *config, const u32 *data, int len,
                            int map_keycode, int *pos)
 {
        uchar *map;
@@ -138,33 +138,32 @@ static uchar *create_keymap(struct key_matrix *config, u32 *data, int len,
        return map;
 }
 
-int key_matrix_decode_fdt(struct key_matrix *config, const void *blob, int node)
+int key_matrix_decode_fdt(struct udevice *dev, struct key_matrix *config)
 {
-       const struct fdt_property *prop;
+       const u32 *prop;
        int proplen;
        uchar *plain_keycode;
 
-       prop = fdt_get_property(blob, node, "linux,keymap", &proplen);
+       prop = dev_read_prop(dev, "linux,keymap", &proplen);
        /* Basic keymap is required */
        if (!prop) {
                debug("%s: cannot find keycode-plain map\n", __func__);
                return -1;
        }
 
-       plain_keycode = create_keymap(config, (u32 *)prop->data,
-               proplen, KEY_FN, &config->fn_pos);
+       plain_keycode = create_keymap(config, prop, proplen, KEY_FN,
+                                     &config->fn_pos);
        config->plain_keycode = plain_keycode;
        /* Conversion error -> fail */
        if (!config->plain_keycode)
                return -1;
 
-       prop = fdt_get_property(blob, node, "linux,fn-keymap", &proplen);
+       prop = dev_read_prop(dev, "linux,fn-keymap", &proplen);
        /* fn keymap is optional */
        if (!prop)
                goto done;
 
-       config->fn_keycode = create_keymap(config, (u32 *)prop->data,
-               proplen, -1, NULL);
+       config->fn_keycode = create_keymap(config, prop, proplen, -1, NULL);
        /* Conversion error -> fail */
        if (!config->fn_keycode) {
                free(plain_keycode);