diff options
author | Rob Herring <robh@kernel.org> | 2014-04-02 00:49:03 -0400 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2014-04-30 01:59:15 -0400 |
commit | 9d0c4dfedd96ee54fc075b16d02f82499c8cc3a6 (patch) | |
tree | bb76a58e00f5aa436c51c1db9841e89ab102d004 /arch/microblaze/kernel/prom.c | |
parent | bba04d965d06abbbe10afd3687742389107e198e (diff) |
of/fdt: update of_get_flat_dt_prop in prep for libfdt
Make of_get_flat_dt_prop arguments compatible with libfdt fdt_getprop
call in preparation to convert FDT code to use libfdt. Make the return
value const and the property length ptr type an int.
Signed-off-by: Rob Herring <robh@kernel.org>
Tested-by: Michal Simek <michal.simek@xilinx.com>
Tested-by: Grant Likely <grant.likely@linaro.org>
Tested-by: Stephen Chivers <schivers@csc.com>
Diffstat (limited to 'arch/microblaze/kernel/prom.c')
-rw-r--r-- | arch/microblaze/kernel/prom.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c index abdfb10e7eca..c76630603058 100644 --- a/arch/microblaze/kernel/prom.c +++ b/arch/microblaze/kernel/prom.c | |||
@@ -43,13 +43,13 @@ | |||
43 | #include <asm/pci-bridge.h> | 43 | #include <asm/pci-bridge.h> |
44 | 44 | ||
45 | #ifdef CONFIG_EARLY_PRINTK | 45 | #ifdef CONFIG_EARLY_PRINTK |
46 | static char *stdout; | 46 | static const char *stdout; |
47 | 47 | ||
48 | static int __init early_init_dt_scan_chosen_serial(unsigned long node, | 48 | static int __init early_init_dt_scan_chosen_serial(unsigned long node, |
49 | const char *uname, int depth, void *data) | 49 | const char *uname, int depth, void *data) |
50 | { | 50 | { |
51 | unsigned long l; | 51 | int l; |
52 | char *p; | 52 | const char *p; |
53 | 53 | ||
54 | pr_debug("%s: depth: %d, uname: %s\n", __func__, depth, uname); | 54 | pr_debug("%s: depth: %d, uname: %s\n", __func__, depth, uname); |
55 | 55 | ||
@@ -80,7 +80,7 @@ static int __init early_init_dt_scan_chosen_serial(unsigned long node, | |||
80 | (strncmp(p, "xlnx,opb-uartlite", 17) == 0) || | 80 | (strncmp(p, "xlnx,opb-uartlite", 17) == 0) || |
81 | (strncmp(p, "xlnx,axi-uartlite", 17) == 0) || | 81 | (strncmp(p, "xlnx,axi-uartlite", 17) == 0) || |
82 | (strncmp(p, "xlnx,mdm", 8) == 0)) { | 82 | (strncmp(p, "xlnx,mdm", 8) == 0)) { |
83 | unsigned int *addrp; | 83 | const unsigned int *addrp; |
84 | 84 | ||
85 | *(u32 *)data = UARTLITE; | 85 | *(u32 *)data = UARTLITE; |
86 | 86 | ||