diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2012-11-24 08:08:49 +0400 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2012-11-24 08:08:49 +0400 |
| commit | 56580bb422e5f542da19c057f348dd39634138e7 (patch) | |
| tree | ae02ad21b38d26b1675977a1d19e5da6fb69c52d /arch | |
| parent | 4e76b1b2329b4a19adfacd187bc2920f68126a95 (diff) | |
| parent | 73d9cdca1ced6ab32be363b58699039bd82b062a (diff) | |
| download | linux-56580bb422e5f542da19c057f348dd39634138e7.tar.xz | |
Merge branch 'mvebu-misc-fixes' of git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/armada-370-xp.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/addr-map.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/armada-370-xp.c | 9 |
3 files changed, 6 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi index cb09d0882c3d..cf6c48a09eac 100644 --- a/arch/arm/boot/dts/armada-370-xp.dtsi +++ b/arch/arm/boot/dts/armada-370-xp.dtsi @@ -20,7 +20,7 @@ / { model = "Marvell Armada 370 and XP SoC"; - compatible = "marvell,armada_370_xp"; + compatible = "marvell,armada-370-xp"; cpus { cpu@0 { diff --git a/arch/arm/mach-mvebu/addr-map.c b/arch/arm/mach-mvebu/addr-map.c index 595f6b722a8f..ab9b3bd4fef5 100644 --- a/arch/arm/mach-mvebu/addr-map.c +++ b/arch/arm/mach-mvebu/addr-map.c @@ -78,7 +78,7 @@ armada_cfg_base(const struct orion_addr_map_cfg *cfg, int win) if (win < 8) offset = (win << 4); else - offset = ARMADA_WINDOW_8_PLUS_OFFSET + (win << 3); + offset = ARMADA_WINDOW_8_PLUS_OFFSET + ((win - 8) << 3); return cfg->bridge_virt_base + offset; } diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c index a9cf335c7cb0..7434b5e36197 100644 --- a/arch/arm/mach-mvebu/armada-370-xp.c +++ b/arch/arm/mach-mvebu/armada-370-xp.c @@ -66,13 +66,12 @@ static void __init armada_370_xp_dt_init(void) coherency_init(); } -static const char * const armada_370_xp_dt_board_dt_compat[] = { - "marvell,a370-db", - "marvell,axp-db", +static const char * const armada_370_xp_dt_compat[] = { + "marvell,armada-370-xp", NULL, }; -DT_MACHINE_START(ARMADA_XP_DT, "Marvell Aramada 370/XP (Device Tree)") +DT_MACHINE_START(ARMADA_XP_DT, "Marvell Armada 370/XP (Device Tree)") .smp = smp_ops(armada_xp_smp_ops), .init_machine = armada_370_xp_dt_init, .map_io = armada_370_xp_map_io, @@ -81,5 +80,5 @@ DT_MACHINE_START(ARMADA_XP_DT, "Marvell Aramada 370/XP (Device Tree)") .handle_irq = armada_370_xp_handle_irq, .timer = &armada_370_xp_timer, .restart = mvebu_restart, - .dt_compat = armada_370_xp_dt_board_dt_compat, + .dt_compat = armada_370_xp_dt_compat, MACHINE_END |