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

Commit f25ac0a2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'zynq-cleanup-for-3.11' of git://git.xilinx.com/linux-xlnx into next/cleanup 

From Michal Simek:

arm: Xilinx Zynq cleanup patches for v3.11

This branch contains two fixes:
- Fix zynq smp code
- Do not specify init_irq ptr

* tag 'zynq-cleanup-for-3.11' of git://git.xilinx.com/linux-xlnx

:
  ARM: zynq: Not to rewrite jump code when starting address is 0x0
  ARM: zynq: Remove init_irq declaration in machine description

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f333c13c 88cd4e88

arch/arm/mach-zynq/common.c

+0 −2
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <linux/of.h>

#include <linux/irqchip.h>



#include <asm/mach/arch.h>

#include <asm/mach/map.h>
@@ -106,7 +105,6 @@ static const char * const zynq_dt_match[] = { 
MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform")

	.smp		= smp_ops(zynq_smp_ops),

	.map_io		= zynq_map_io,

	.init_irq	= irqchip_init,

	.init_machine	= zynq_init_machine,

	.init_time	= zynq_timer_init,

	.dt_compat	= zynq_dt_match,

arch/arm/mach-zynq/platsmp.c

+26 −26
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ int __cpuinit zynq_cpun_start(u32 address, int cpu) 
						&zynq_secondary_trampoline;



		zynq_slcr_cpu_stop(cpu);



		if (address) {

			if (__pa(PAGE_OFFSET)) {

				zero = ioremap(0, trampoline_code_size);

				if (!zero) {
@@ -80,7 +80,7 @@ int __cpuinit zynq_cpun_start(u32 address, int cpu) 


			if (__pa(PAGE_OFFSET))

				iounmap(zero);



		}

		zynq_slcr_cpu_start(cpu);



		return 0;