public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge tag 'mvebu-arm-5.2-1' of git://git.infradead.org/linux-mvebu into arm/late

Browse source 
mvebu arm for 5.2 (part 1)

 - remove improper error message on kirkwood
 - a couple a clean-up patch generated from automatic tools
 - clean-up in assembly code allowing using LLVM

* tag 'mvebu-arm-5.2-1' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: drop return from void function
  ARM: mvebu: prefix coprocessor operand with p
  ARM: mvebu: drop unnecessary label
  ARM: mvebu: fix a leaked reference by adding missing of_node_put
  ARM: mvebu: kirkwood: remove error message when retrieving mac address

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2019-05-15 23:23:43 -07:00
commit c32beba325
5 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/mach-mvebu/board-v7.c
View file

@ -136,7 +136,6 @@ static void __init i2c_quirk(void)
of_update_property(np, new_compat); of_update_property(np, new_compat);
} }
return;
} }
static void __init mvebu_dt_init(void) static void __init mvebu_dt_init(void)

2
arch/arm/mach-mvebu/coherency_ll.S
View file

@ -66,7 +66,7 @@ ENDPROC(ll_get_coherency_base)
* fabric registers * fabric registers
*/ */
ENTRY(ll_get_coherency_cpumask) ENTRY(ll_get_coherency_cpumask)
mrc 15, 0, r3, cr0, cr0, 5 mrc p15, 0, r3, cr0, cr0, 5
and r3, r3, #15 and r3, r3, #15
mov r2, #(1 << 24) mov r2, #(1 << 24)
lsl r3, r2, r3 lsl r3, r2, r3

2
arch/arm/mach-mvebu/kirkwood.c
View file

@ -108,8 +108,6 @@ static void __init kirkwood_dt_eth_fixup(void)
clk_prepare_enable(clk); clk_prepare_enable(clk);
/* store MAC address register contents in local-mac-address */ /* store MAC address register contents in local-mac-address */
pr_err(FW_INFO "%pOF: local-mac-address is not set\n", np);
pmac = kzalloc(sizeof(*pmac) + 6, GFP_KERNEL); pmac = kzalloc(sizeof(*pmac) + 6, GFP_KERNEL);
if (!pmac) if (!pmac)
goto eth_fixup_no_mem; goto eth_fixup_no_mem;

11
arch/arm/mach-mvebu/pm-board.c
View file

@ -79,7 +79,7 @@ static void mvebu_armada_pm_enter(void __iomem *sdram_reg, u32 srcmd)
static int __init mvebu_armada_pm_init(void) static int __init mvebu_armada_pm_init(void)
{ {
struct device_node *np; struct device_node *np;
struct device_node *gpio_ctrl_np; struct device_node *gpio_ctrl_np = NULL;
int ret = 0, i; int ret = 0, i;
if (!of_machine_is_compatible("marvell,axp-gp")) if (!of_machine_is_compatible("marvell,axp-gp"))
@ -126,18 +126,23 @@ static int __init mvebu_armada_pm_init(void)
goto out; goto out;
} }
if (gpio_ctrl_np)
of_node_put(gpio_ctrl_np);
gpio_ctrl_np = args.np; gpio_ctrl_np = args.np;
pic_raw_gpios[i] = args.args[0]; pic_raw_gpios[i] = args.args[0];
} }
gpio_ctrl = of_iomap(gpio_ctrl_np, 0); gpio_ctrl = of_iomap(gpio_ctrl_np, 0);
if (!gpio_ctrl) if (!gpio_ctrl) {
return -ENOMEM; ret = -ENOMEM;
goto out;
}
mvebu_pm_suspend_init(mvebu_armada_pm_enter); mvebu_pm_suspend_init(mvebu_armada_pm_enter);
out: out:
of_node_put(np); of_node_put(np);
of_node_put(gpio_ctrl_np);
return ret; return ret;
} }

3
arch/arm/mach-mvebu/pmsu_ll.S
View file

@ -16,7 +16,7 @@
ENTRY(armada_38x_scu_power_up) ENTRY(armada_38x_scu_power_up)
mrc p15, 4, r1, c15, c0 @ get SCU base address mrc p15, 4, r1, c15, c0 @ get SCU base address
orr r1, r1, #0x8 @ SCU CPU Power Status Register orr r1, r1, #0x8 @ SCU CPU Power Status Register
mrc 15, 0, r0, cr0, cr0, 5 @ get the CPU ID mrc p15, 0, r0, cr0, cr0, 5 @ get the CPU ID
and r0, r0, #15 and r0, r0, #15
add r1, r1, r0 add r1, r1, r0
mov r0, #0x0 mov r0, #0x0
@ -56,7 +56,6 @@ ENDPROC(armada_38x_cpu_resume)
/* The following code will be executed from SRAM */ /* The following code will be executed from SRAM */
ENTRY(mvebu_boot_wa_start) ENTRY(mvebu_boot_wa_start)
mvebu_boot_wa_start:
ARM_BE8(setend be) ARM_BE8(setend be)
adr r0, 1f adr r0, 1f
ldr r0, [r0] @ load the address of the ldr r0, [r0] @ load the address of the