Commit c32beba3 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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: default avatarOlof Johansson <olof@lixom.net>
parents 163d65cb 7af2ea3b

arch/arm/mach-mvebu/board-v7.c

+0 −1
Original line number Diff line number Diff line
@@ -136,7 +136,6 @@ static void __init i2c_quirk(void) 


		of_update_property(np, new_compat);

	}

	return;

}



static void __init mvebu_dt_init(void)

arch/arm/mach-mvebu/coherency_ll.S

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ ENDPROC(ll_get_coherency_base) 
 * fabric registers

 */

ENTRY(ll_get_coherency_cpumask)

	mrc	15, 0, r3, cr0, cr0, 5

	mrc	p15, 0, r3, cr0, cr0, 5

	and	r3, r3, #15

	mov	r2, #(1 << 24)

	lsl	r3, r2, r3

arch/arm/mach-mvebu/kirkwood.c

+0 −2
Original line number Diff line number Diff line
@@ -108,8 +108,6 @@ static void __init kirkwood_dt_eth_fixup(void) 
		clk_prepare_enable(clk);



		/* 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);

		if (!pmac)

			goto eth_fixup_no_mem;

arch/arm/mach-mvebu/pm-board.c

+8 −3
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static void mvebu_armada_pm_enter(void __iomem *sdram_reg, u32 srcmd) 
static int __init mvebu_armada_pm_init(void)

{

	struct device_node *np;

	struct device_node *gpio_ctrl_np;

	struct device_node *gpio_ctrl_np = NULL;

	int ret = 0, i;



	if (!of_machine_is_compatible("marvell,axp-gp"))
@@ -126,18 +126,23 @@ static int __init mvebu_armada_pm_init(void) 
			goto out;

		}



		if (gpio_ctrl_np)

			of_node_put(gpio_ctrl_np);

		gpio_ctrl_np = args.np;

		pic_raw_gpios[i] = args.args[0];

	}



	gpio_ctrl = of_iomap(gpio_ctrl_np, 0);

	if (!gpio_ctrl)

		return -ENOMEM;

	if (!gpio_ctrl) {

		ret = -ENOMEM;

		goto out;

	}



	mvebu_pm_suspend_init(mvebu_armada_pm_enter);



out:

	of_node_put(np);

	of_node_put(gpio_ctrl_np);

	return ret;

}

arch/arm/mach-mvebu/pmsu_ll.S

+1 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
ENTRY(armada_38x_scu_power_up)

	mrc     p15, 4, r1, c15, c0	@ get SCU base address

	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

	add	r1, r1, r0

	mov	r0, #0x0
@@ -56,7 +56,6 @@ ENDPROC(armada_38x_cpu_resume) 


/* The following code will be executed from SRAM */

ENTRY(mvebu_boot_wa_start)

mvebu_boot_wa_start:

ARM_BE8(setend	be)

	adr	r0, 1f

	ldr	r0, [r0]		@ load the address of the

CRA Git | Maintained and supported by SUSTech CRA and CCSE