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

Commit 93173ce2 authored by Stefan Roese's avatar Stefan Roese Committed by Josh Boyer
Browse files

[POWERPC] 4xx: Create common ppc4xx_reset_system() in ppc4xx_soc.c 



This patch creates a common system reset routine for all 40x and 44x
systems. Previously only a 44x routine existed. But since this system
reset via the debug control register is common for 40x and 44x let's
share this code for all those platforms in ppc4xx_soc.c.

This patch also enables CONFIG_4xx_SOC for all 40x and 44x platforms.

Tested on Kilauea (405EX) and Canyonlands (440EX).

Signed-off-by: default avatarStefan Roese <sr@denx.de>
Signed-off-by: default avatarJosh Boyer <jwboyer@linux.vnet.ibm.com>
parent d2477b5c

arch/powerpc/platforms/40x/ep405.c

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <asm/time.h>

#include <asm/uic.h>

#include <asm/pci-bridge.h>

#include <asm/ppc4xx.h>



static struct device_node *bcsr_node;

static void __iomem *bcsr_regs;
@@ -119,5 +120,6 @@ define_machine(ep405) { 
	.progress		= udbg_progress,

	.init_IRQ		= uic_init_tree,

	.get_irq		= uic_get_irq,

	.restart		= ppc4xx_reset_system,

	.calibrate_decr		= generic_calibrate_decr,

};

arch/powerpc/platforms/40x/kilauea.c

+3 −1
Original line number Diff line number Diff line 
/*

 * Kilauea board specific routines

 *

 * Copyright 2007 DENX Software Engineering, Stefan Roese <sr@denx.de>

 * Copyright 2007-2008 DENX Software Engineering, Stefan Roese <sr@denx.de>

 *

 * Based on the Walnut code by

 * Josh Boyer <jwboyer@linux.vnet.ibm.com>
@@ -20,6 +20,7 @@ 
#include <asm/time.h>

#include <asm/uic.h>

#include <asm/pci-bridge.h>

#include <asm/ppc4xx.h>



static __initdata struct of_device_id kilauea_of_bus[] = {

	{ .compatible = "ibm,plb4", },
@@ -54,5 +55,6 @@ define_machine(kilauea) { 
	.progress 			= udbg_progress,

	.init_IRQ 			= uic_init_tree,

	.get_irq 			= uic_get_irq,

	.restart			= ppc4xx_reset_system,

	.calibrate_decr			= generic_calibrate_decr,

};

arch/powerpc/platforms/40x/makalu.c

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <asm/time.h>

#include <asm/uic.h>

#include <asm/pci-bridge.h>

#include <asm/ppc4xx.h>



static __initdata struct of_device_id makalu_of_bus[] = {

	{ .compatible = "ibm,plb4", },
@@ -54,5 +55,6 @@ define_machine(makalu) { 
	.progress 			= udbg_progress,

	.init_IRQ 			= uic_init_tree,

	.get_irq 			= uic_get_irq,

	.restart			= ppc4xx_reset_system,

	.calibrate_decr			= generic_calibrate_decr,

};

arch/powerpc/platforms/40x/virtex.c

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <asm/prom.h>

#include <asm/time.h>

#include <asm/xilinx_intc.h>

#include <asm/ppc4xx.h>



static struct of_device_id xilinx_of_bus_ids[] __initdata = {

	{ .compatible = "xlnx,plb-v46-1.00.a", },
@@ -48,5 +49,6 @@ define_machine(virtex) { 
	.probe			= virtex_probe,

	.init_IRQ		= xilinx_intc_init_tree,

	.get_irq		= xilinx_intc_get_irq,

	.restart		= ppc4xx_reset_system,

	.calibrate_decr		= generic_calibrate_decr,

};

arch/powerpc/platforms/40x/walnut.c

+3 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <asm/time.h>

#include <asm/uic.h>

#include <asm/pci-bridge.h>

#include <asm/ppc4xx.h>



static __initdata struct of_device_id walnut_of_bus[] = {

	{ .compatible = "ibm,plb3", },
@@ -61,5 +62,6 @@ define_machine(walnut) { 
	.progress		= udbg_progress,

	.init_IRQ		= uic_init_tree,

	.get_irq		= uic_get_irq,

	.restart		= ppc4xx_reset_system,

	.calibrate_decr		= generic_calibrate_decr,

};