2016-03-18 02:50:11

by Guenter Roeck

[permalink] [raw]
Subject: [PATCH] nios2: Replace fdt_translate_address with of_flat_dt_translate_address

nios2 builds fail with the following build error.

arch/nios2/kernel/prom.c: In function 'early_init_dt_scan_serial':
arch/nios2/kernel/prom.c:100:2: error:
implicit declaration of function 'fdt_translate_address'

Commit c90fe9c0394b ("of: earlycon: Move address translation to
of_setup_earlycon()") replaced fdt_translate_address() with
of_flat_dt_translate_address() but missed updating the nios2 code.

Fixes: c90fe9c0394b ("of: earlycon: Move address translation to of_setup_earlycon()")
Cc: Peter Hurley <[email protected]>
Cc: Rob Herring <[email protected]>
Signed-off-by: Guenter Roeck <[email protected]>
---
arch/nios2/kernel/prom.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/nios2/kernel/prom.c b/arch/nios2/kernel/prom.c
index 718dd197909f..367c5426157b 100644
--- a/arch/nios2/kernel/prom.c
+++ b/arch/nios2/kernel/prom.c
@@ -97,8 +97,7 @@ static int __init early_init_dt_scan_serial(unsigned long node,
return 0;
#endif

- *addr64 = fdt_translate_address((const void *)initial_boot_params,
- node);
+ *addr64 = of_flat_dt_translate_address(node);

return *addr64 == OF_BAD_ADDR ? 0 : 1;
}
--
2.5.0


2016-03-18 03:22:52

by Peter Hurley

[permalink] [raw]
Subject: Re: [PATCH] nios2: Replace fdt_translate_address with of_flat_dt_translate_address

Hi Guenter,

On 03/17/2016 07:49 PM, Guenter Roeck wrote:
> nios2 builds fail with the following build error.
>
> arch/nios2/kernel/prom.c: In function 'early_init_dt_scan_serial':
> arch/nios2/kernel/prom.c:100:2: error:
> implicit declaration of function 'fdt_translate_address'
>
> Commit c90fe9c0394b ("of: earlycon: Move address translation to
> of_setup_earlycon()") replaced fdt_translate_address() with
> of_flat_dt_translate_address() but missed updating the nios2 code.

My bad.
The sad part is I even noted this other user of fdt_translate_address()
in a review of a different patch, and then overlooked it in my own patch. :/

Reviewed-by: Peter Hurley <[email protected]>


> Fixes: c90fe9c0394b ("of: earlycon: Move address translation to of_setup_earlycon()")
> Cc: Peter Hurley <[email protected]>
> Cc: Rob Herring <[email protected]>
> Signed-off-by: Guenter Roeck <[email protected]>
> ---
> arch/nios2/kernel/prom.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/arch/nios2/kernel/prom.c b/arch/nios2/kernel/prom.c
> index 718dd197909f..367c5426157b 100644
> --- a/arch/nios2/kernel/prom.c
> +++ b/arch/nios2/kernel/prom.c
> @@ -97,8 +97,7 @@ static int __init early_init_dt_scan_serial(unsigned long node,
> return 0;
> #endif
>
> - *addr64 = fdt_translate_address((const void *)initial_boot_params,
> - node);
> + *addr64 = of_flat_dt_translate_address(node);
>
> return *addr64 == OF_BAD_ADDR ? 0 : 1;
> }
>

2016-03-18 06:14:04

by Ley Foon Tan

[permalink] [raw]
Subject: Re: [PATCH] nios2: Replace fdt_translate_address with of_flat_dt_translate_address

On Thu, 2016-03-17 at 20:22 -0700, Peter Hurley wrote:
> Hi Guenter,
>
> On 03/17/2016 07:49 PM, Guenter Roeck wrote:
> > nios2 builds fail with the following build error.
> >
> > arch/nios2/kernel/prom.c: In function 'early_init_dt_scan_serial':
> > arch/nios2/kernel/prom.c:100:2: error:
> > implicit declaration of function 'fdt_translate_address'
> >
> > Commit c90fe9c0394b ("of: earlycon: Move address translation to
> > of_setup_earlycon()") replaced fdt_translate_address() with
> > of_flat_dt_translate_address() but missed updating the nios2 code.
>
> My bad.
> The sad part is I even noted this other user of fdt_translate_address()
> in a review of a different patch, and then overlooked it in my own patch. :/
>
> Reviewed-by: Peter Hurley <[email protected]>
>
Hi Peter,

Will you take this patch or you want me to take this?
Thanks.

Regards
Ley Foon

2016-03-18 13:28:33

by Peter Hurley

[permalink] [raw]
Subject: Re: [PATCH] nios2: Replace fdt_translate_address with of_flat_dt_translate_address

On 03/17/2016 10:58 PM, Ley Foon Tan wrote:
> On Thu, 2016-03-17 at 20:22 -0700, Peter Hurley wrote:
>> Hi Guenter,
>>
>> On 03/17/2016 07:49 PM, Guenter Roeck wrote:
>>> nios2 builds fail with the following build error.
>>>
>>> arch/nios2/kernel/prom.c: In function 'early_init_dt_scan_serial':
>>> arch/nios2/kernel/prom.c:100:2: error:
>>> implicit declaration of function 'fdt_translate_address'
>>>
>>> Commit c90fe9c0394b ("of: earlycon: Move address translation to
>>> of_setup_earlycon()") replaced fdt_translate_address() with
>>> of_flat_dt_translate_address() but missed updating the nios2 code.
>>
>> My bad.
>> The sad part is I even noted this other user of fdt_translate_address()
>> in a review of a different patch, and then overlooked it in my own patch. :/
>>
>> Reviewed-by: Peter Hurley <[email protected]>
>>
> Hi Peter,
>
> Will you take this patch or you want me to take this?
> Thanks.

Please take this patch.

Regards,
Peter Hurley