sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

mvebu: armada-370-xp: simplify soc init code flow 

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.

The initcall must be postponed to post-core to ensure
of_machine_is_compatible is working correctly.

The call to mvebu_mbus_add_range is moved to drivers/bus/mvebu-mbus.c to
ensure it's registered early enough.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Uwe Kleine-König 2017-02-25 21:40:20 +01:00 committed by Sascha Hauer
parent f3acd214a1
commit 8a5edc9e99
2 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
arch/arm/mach-mvebu/armada-370-xp.c
View File

@ -83,19 +83,7 @@ static void __noreturn armada_370_xp_restart_soc(struct restart_handler *rst)
hang();
}
static int armada_xp_init_soc(struct device_node *root)
{
u32 reg;
/* Enable GBE0, GBE1, LCD and NFC PUP */
reg = readl(ARMADA_XP_PUP_ENABLE);
reg |= GE0_PUP_EN | GE1_PUP_EN | LCD_PUP_EN | NAND_PUP_EN | SPI_PUP_EN;
writel(reg, ARMADA_XP_PUP_ENABLE);
return 0;
}
static int armada_370_xp_init_soc(struct device_node *root, void *context)
static int armada_370_xp_init_soc(void)
{
u32 reg;
@ -116,16 +104,13 @@ static int armada_370_xp_init_soc(struct device_node *root, void *context)
armada_xp_soc_id_fixup();
if (of_machine_is_compatible("marvell,armadaxp"))
armada_xp_init_soc(root);
if (of_machine_is_compatible("marvell,armadaxp")) {
/* Enable GBE0, GBE1, LCD and NFC PUP */
reg = readl(ARMADA_XP_PUP_ENABLE);
reg |= GE0_PUP_EN | GE1_PUP_EN | LCD_PUP_EN | NAND_PUP_EN | SPI_PUP_EN;
writel(reg, ARMADA_XP_PUP_ENABLE);
}
return 0;
}
static int armada_370_xp_register_soc_fixup(void)
{
mvebu_mbus_add_range("marvell,armada-370-xp", 0xf0, 0x01,
MVEBU_REMAP_INT_REG_BASE);
return of_register_fixup(armada_370_xp_init_soc, NULL);
}
pure_initcall(armada_370_xp_register_soc_fixup);
postcore_initcall(armada_370_xp_init_soc);

9
drivers/bus/mvebu-mbus.c
View File

@ -59,6 +59,7 @@
#include <of.h>
#include <of_address.h>
#include <linux/mbus.h>
#include <mach/common.h>
/* DDR target is the same on all platforms */
#define TARGET_DDR 0
@ -810,7 +811,13 @@ static int mvebu_mbus_of_fixup(struct device_node *root, void *context)
return 0;
}
static int mvebu_mbus_fixup_register(void) {
static int mvebu_mbus_fixup_register(void)
{
if (IS_ENABLED(CONFIG_ARCH_ARMADA_370) ||
IS_ENABLED(CONFIG_ARCH_ARMADA_XP))
mvebu_mbus_add_range("marvell,armada-370-xp", 0xf0, 0x01,
MVEBU_REMAP_INT_REG_BASE);
return of_register_fixup(mvebu_mbus_of_fixup, NULL);
}
pure_initcall(mvebu_mbus_fixup_register);