Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9ae0b50 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Jason Cooper
Browse files

ARM: mvebu: Initialize MBus using the DT binding 



Now that the mbus device tree binding has been introduced, we can
switch over to it.

Also, and since the initialization of the mbus driver is quite
fundamental for the system to work properly, this patch adds a BUG()
in case mbus fails to initialize.

Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Tested-by: default avatarAndrew Lunn <andrew@lunn.ch>
Tested-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 994c8c94

arch/arm/mach-mvebu/armada-370-xp.c

+1 −33
Original line number Diff line number Diff line
@@ -34,44 +34,12 @@ static void __init armada_370_xp_map_io(void) 
	debug_ll_io_init();

}



/*

 * This initialization will be replaced by a DT-based

 * initialization once the mvebu-mbus driver gains DT support.

 */



#define ARMADA_370_XP_MBUS_WINS_OFFS   0x20000

#define ARMADA_370_XP_MBUS_WINS_SIZE   0x100

#define ARMADA_370_XP_SDRAM_WINS_OFFS  0x20180

#define ARMADA_370_XP_SDRAM_WINS_SIZE  0x20



static void __init armada_370_xp_mbus_init(void)

{

	char *mbus_soc_name;

	struct device_node *dn;

	const __be32 mbus_wins_offs = cpu_to_be32(ARMADA_370_XP_MBUS_WINS_OFFS);

	const __be32 sdram_wins_offs = cpu_to_be32(ARMADA_370_XP_SDRAM_WINS_OFFS);



	if (of_machine_is_compatible("marvell,armada370"))

		mbus_soc_name = "marvell,armada370-mbus";

	else

		mbus_soc_name = "marvell,armadaxp-mbus";



	dn = of_find_node_by_name(NULL, "internal-regs");

	BUG_ON(!dn);



	mvebu_mbus_init(mbus_soc_name,

			of_translate_address(dn, &mbus_wins_offs),

			ARMADA_370_XP_MBUS_WINS_SIZE,

			of_translate_address(dn, &sdram_wins_offs),

			ARMADA_370_XP_SDRAM_WINS_SIZE);

}



static void __init armada_370_xp_timer_and_clk_init(void)

{

	of_clk_init(NULL);

	armada_370_xp_timer_init();

	coherency_init();

	armada_370_xp_mbus_init();

	BUG_ON(mvebu_mbus_dt_init());

#ifdef CONFIG_CACHE_L2X0

	l2x0_of_init(0, ~0UL);

#endif