Skip to content

Commit

Permalink
Blackfin arch: clear EMAC_SYSTAT during IRQ init rather than early he…
Browse files Browse the repository at this point in the history
…ad.S as we dont need it setup that early

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
  • Loading branch information
Mike Frysinger authored and Bryan Wu committed Aug 14, 2008
1 parent c991dd9 commit 95a86b5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 18 deletions.
9 changes: 0 additions & 9 deletions arch/blackfin/mach-bf527/head.S
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
9 changes: 0 additions & 9 deletions arch/blackfin/mach-bf537/head.S
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
5 changes: 5 additions & 0 deletions arch/blackfin/mach-common/ints-priority.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 95a86b5

Please sign in to comment.