From: John Jacques <[email protected]> All modifications for Axxia (CONFIG_ACP) have been removed.
Signed-off-by: John Jacques <[email protected]> --- arch/powerpc/sysdev/ppc4xx_soc.c | 71 ---------------------------------------- 1 file changed, 71 deletions(-) diff --git a/arch/powerpc/sysdev/ppc4xx_soc.c b/arch/powerpc/sysdev/ppc4xx_soc.c index a596888..0debcc3 100644 --- a/arch/powerpc/sysdev/ppc4xx_soc.c +++ b/arch/powerpc/sysdev/ppc4xx_soc.c @@ -24,9 +24,6 @@ #include <asm/dcr.h> #include <asm/dcr-regs.h> #include <asm/reg.h> -#ifdef CONFIG_ACP -#include <asm/mpic.h> -#endif static u32 dcrbase_l2c; @@ -193,45 +190,6 @@ static int __init ppc4xx_l2c_probe(void) } arch_initcall(ppc4xx_l2c_probe); -#ifdef CONFIG_ACP - -/* - * Issue a "core" reset. - */ - -void -acp_jump_to_boot_loader(void *input) -{ - mpic_teardown_this_cpu(0); - /* This is only valid in the "core" reset case, so 0x10000000. */ - mtspr(SPRN_DBCR0, mfspr(SPRN_DBCR0) | 0x10000000); - - while (1) - ; /* Just in case the jump fails. */ -} - -/* - * Get all other cores to run "acp_jump_to_boot_loader()" then go - * there as well. - */ - -void -acp_reset_cores(void) -{ - int cpu; - - for_each_possible_cpu(cpu) { - if (cpu != smp_processor_id()) - smp_call_function_single(cpu, acp_jump_to_boot_loader, - NULL, 0); - } - - acp_jump_to_boot_loader(NULL); -} - - -#endif - /* * Apply a system reset. Alternatively a board specific value may be * provided via the "reset-type" property in the cpu node. @@ -256,36 +214,7 @@ void ppc4xx_reset_system(char *cmd) reset_type = prop[0] << 28; } -#ifdef CONFIG_ACP - if (DBCR0_RST_CORE == reset_type) { - acp_reset_cores(); - } else { - /* - In this case, reset_type is either chip or system. - - On the AXM3500 (PVR=0x7ff520c1), writing to DBCR0 - will occasionally stall the system. As a - work-around, write to the system control register. - */ - - u32 pvr_value; - - asm volatile ("mfpvr %0" : "=r"(pvr_value)); - - if (0x7ff520c1 == pvr_value) { - u32 value; - - value = mfdcrx(0xd0a); - value |= 0xab; - mtdcrx(0xd0a, value); - mtdcrx(0xe00, 1); - } else { - mtspr(SPRN_DBCR0, mfspr(SPRN_DBCR0) | reset_type); - } - } -#else mtspr(SPRN_DBCR0, mfspr(SPRN_DBCR0) | reset_type); -#endif while (1) ; /* Just in case the reset doesn't work */ -- 1.8.1.4 -- _______________________________________________ linux-yocto mailing list [email protected] https://lists.yoctoproject.org/listinfo/linux-yocto
