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

Commit 95a86b5e authored by Mike Frysinger's avatar Mike Frysinger Committed by Bryan Wu
Browse files

Blackfin arch: clear EMAC_SYSTAT during IRQ init rather than early head.S as... 


Blackfin arch: clear EMAC_SYSTAT during IRQ init rather than early head.S as we dont need it setup that early

Signed-off-by: default avatarMike Frysinger <vapier.adi@gmail.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
parent c991dd92

arch/blackfin/mach-bf527/head.S

+0 −9
Original line number Diff line number Diff line
@@ -40,15 +40,6 @@ 
__INIT



ENTRY(_mach_early_start)

#if defined(CONFIG_BF527)

	p0.h = hi(EMAC_SYSTAT);

	p0.l = lo(EMAC_SYSTAT);

	R0.h = 0xFFFF; /* Clear EMAC Interrupt Status bits */

	R0.l = 0xFFFF;

	[P0] = R0;

	SSYNC;

#endif



	/* Initialise UART - when booting from u-boot, the UART is not disabled

	 * so if we dont initalize here, our serial console gets hosed */

	p0.h = hi(UART1_LCR);

arch/blackfin/mach-bf537/head.S

+0 −9
Original line number Diff line number Diff line
@@ -54,15 +54,6 @@ ENTRY(_mach_early_start) 
	W[P0] = R0.L;

	SSYNC;



#if !defined(CONFIG_BF534)

	p0.h = hi(EMAC_SYSTAT);

	p0.l = lo(EMAC_SYSTAT);

	R0.h = 0xFFFF; /* Clear EMAC Interrupt Status bits */

	R0.l = 0xFFFF;

	[P0] = R0;

	SSYNC;

#endif



	/* Initialise UART - when booting from u-boot, the UART is not disabled

	 * so if we dont initalize here, our serial console gets hosed */

	p0.h = hi(BFIN_UART_LCR);

arch/blackfin/mach-common/ints-priority.c

+5 −0
Original line number Diff line number Diff line
@@ -983,6 +983,11 @@ int __init init_arch_irq(void) 


	local_irq_disable();



#if defined(CONFIG_BF527) || defined(CONFIG_BF536) || defined(CONFIG_BF537)

	/* Clear EMAC Interrupt Status bits so we can demux it later */

	bfin_write_EMAC_SYSTAT(-1);

#endif



#ifdef CONFIG_BF54x

# ifdef CONFIG_PINTx_REASSIGN

	pint[0]->assign = CONFIG_PINT0_ASSIGN;