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

Commit 1ee64e48 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'ux500-core-for-arm-soc' of... 

Merge tag 'ux500-core-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/soc

From Linus Walleij:
Core ux500 changes for v3.12:
- Add support for restart using the PRCMU
- Move secondary startup out of INIT section
- set coherent_dma_mask for DMA40

* tag 'ux500-core-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: set coherent_dma_mask for dma40
  ARM: ux500: remove u8500_secondary_startup from INIT section.
  ARM: ux500: add restart support via prcmu
parents fe870ae7 0a429fd1

arch/arm/mach-ux500/board-mop500.c

+4 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
#include <linux/platform_data/dma-ste-dma40.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>



#include "setup.h"

#include "devices.h"
@@ -686,6 +685,7 @@ MACHINE_START(U8500, "ST-Ericsson MOP500 platform") 
	.init_time	= ux500_timer_init,

	.init_machine	= mop500_init_machine,

	.init_late	= ux500_init_late,

	.restart        = ux500_restart,

MACHINE_END



MACHINE_START(U8520, "ST-Ericsson U8520 Platform HREFP520")
@@ -695,6 +695,7 @@ MACHINE_START(U8520, "ST-Ericsson U8520 Platform HREFP520") 
	.init_time	= ux500_timer_init,

	.init_machine	= mop500_init_machine,

	.init_late	= ux500_init_late,

	.restart        = ux500_restart,

MACHINE_END



MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+")
@@ -705,6 +706,7 @@ MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+") 
	.init_time	= ux500_timer_init,

	.init_machine	= hrefv60_init_machine,

	.init_late	= ux500_init_late,

	.restart        = ux500_restart,

MACHINE_END



MACHINE_START(SNOWBALL, "Calao Systems Snowball platform")
@@ -716,4 +718,5 @@ MACHINE_START(SNOWBALL, "Calao Systems Snowball platform") 
	.init_time	= ux500_timer_init,

	.init_machine	= snowball_init_machine,

	.init_late	= NULL,

	.restart        = ux500_restart,

MACHINE_END

arch/arm/mach-ux500/cpu-db8500.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 


#include <asm/pmu.h>

#include <asm/mach/map.h>

#include <asm/mach/arch.h>



#include "setup.h"

#include "devices.h"
@@ -325,6 +324,7 @@ DT_MACHINE_START(U8500_DT, "ST-Ericsson Ux5x0 platform (Device Tree Support)") 
	.init_machine	= u8500_init_machine,

	.init_late	= NULL,

	.dt_compat      = stericsson_dt_platform_compat,

	.restart        = ux500_restart,

MACHINE_END



#endif

arch/arm/mach-ux500/cpu.c

+8 −0
Original line number Diff line number Diff line
@@ -31,6 +31,14 @@ 
#include "db8500-regs.h"

#include "id.h"



void ux500_restart(enum reboot_mode mode, const char *cmd)

{

	local_irq_disable();

	local_fiq_disable();



	prcmu_system_reset(0);

}



/*

 * FIXME: Should we set up the GPIO domain here?

 *

arch/arm/mach-ux500/devices-db8500.c

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ struct stedma40_platform_data dma40_plat_data = { 
struct platform_device u8500_dma40_device = {

	.dev = {

		.platform_data = &dma40_plat_data,

		.coherent_dma_mask = DMA_BIT_MASK(32),

	},

	.name = "dma40",

	.id = 0,

arch/arm/mach-ux500/headsmp.S

+0 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ 
#include <linux/linkage.h>

#include <linux/init.h>



	__INIT



/*

 * U8500 specific entry point for secondary CPUs.

 */