On Wed, Feb 15, 2017 at 05:42:48PM +0100, Uwe Kleine-König wrote:
> Similar to the two previous commits, this gets rid of a of-fixup which
> is strange because the soc init stuff is rerun then when a new dt for
> booting into Linux is loaded. It also only calls mvebu_mbus_add_range if
> we're running on a Kirkwood.
>
> The initcall must be postponed to post-core to ensure
> of_machine_is_compatible is working correctly.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
> ---
> arch/arm/mach-mvebu/kirkwood.c | 13 ++++---------
> 1 file changed, 4 insertions(+), 9 deletions(-)
Applied 6 from 3 patches, thanks
Sascha
>
> diff --git a/arch/arm/mach-mvebu/kirkwood.c b/arch/arm/mach-mvebu/kirkwood.c
> index d5ddf05e3447..36cd2a84a6f5 100644
> --- a/arch/arm/mach-mvebu/kirkwood.c
> +++ b/arch/arm/mach-mvebu/kirkwood.c
> @@ -29,11 +29,13 @@ static void __noreturn kirkwood_restart_soc(struct restart_handler *rst)
> hang();
> }
>
> -static int kirkwood_init_soc(struct device_node *root, void *context)
> +static int kirkwood_init_soc(void)
> {
> if (!of_machine_is_compatible("marvell,kirkwood"))
> return 0;
>
> + mvebu_mbus_add_range("marvell,kirkwood", 0xf0, 0x01,
> + MVEBU_REMAP_INT_REG_BASE);
> restart_handler_register_fn(kirkwood_restart_soc);
>
> barebox_set_model("Marvell Kirkwood");
> @@ -43,11 +45,4 @@ static int kirkwood_init_soc(struct device_node *root, void *context)
>
> return 0;
> }
> -
> -static int kirkwood_register_soc_fixup(void)
> -{
> - mvebu_mbus_add_range("marvell,kirkwood", 0xf0, 0x01,
> - MVEBU_REMAP_INT_REG_BASE);
> - return of_register_fixup(kirkwood_init_soc, NULL);
> -}
> -pure_initcall(kirkwood_register_soc_fixup);
> +postcore_initcall(kirkwood_init_soc);
> --
> 2.11.0
>
>
> _______________________________________________
> barebox mailing list
> barebox@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/barebox
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
