mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
of: earlycon: Move address translation to of_setup_earlycon()
Cleanup the early DT/earlycon separation; remove the 'addr' parameter from of_setup_earlycon() and get the uart phys addr directly with a new wrapper function, of_flat_dt_translate_addr(). Limit fdt_translate_address() to file scope. Acked-by: Rob Herring <[email protected]> Signed-off-by: Peter Hurley <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
parent
088da2a176
commit
c90fe9c039
5 changed files with 22 additions and 13 deletions
|
|
@ -827,19 +827,13 @@ static int __init early_init_dt_scan_chosen_serial(void)
|
|||
return -ENODEV;
|
||||
|
||||
for (match = __earlycon_table; match < __earlycon_table_end; match++) {
|
||||
u64 addr;
|
||||
|
||||
if (!match->compatible[0])
|
||||
continue;
|
||||
|
||||
if (fdt_node_check_compatible(fdt, offset, match->compatible))
|
||||
continue;
|
||||
|
||||
addr = fdt_translate_address(fdt, offset);
|
||||
if (addr == OF_BAD_ADDR)
|
||||
return -ENXIO;
|
||||
|
||||
of_setup_earlycon(addr, match, offset, options);
|
||||
of_setup_earlycon(match, offset, options);
|
||||
return 0;
|
||||
}
|
||||
return -ENODEV;
|
||||
|
|
|
|||
|
|
@ -161,7 +161,7 @@ static int __init fdt_translate_one(const void *blob, int parent,
|
|||
* that can be mapped to a cpu physical address). This is not really specified
|
||||
* that way, but this is traditionally the way IBM at least do things
|
||||
*/
|
||||
u64 __init fdt_translate_address(const void *blob, int node_offset)
|
||||
static u64 __init fdt_translate_address(const void *blob, int node_offset)
|
||||
{
|
||||
int parent, len;
|
||||
const struct of_bus *bus, *pbus;
|
||||
|
|
@ -239,3 +239,12 @@ u64 __init fdt_translate_address(const void *blob, int node_offset)
|
|||
bail:
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* of_flat_dt_translate_address - translate DT addr into CPU phys addr
|
||||
* @node: node in the flat blob
|
||||
*/
|
||||
u64 __init of_flat_dt_translate_address(unsigned long node)
|
||||
{
|
||||
return fdt_translate_address(initial_boot_params, node);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue