diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-16 22:56:01 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-16 22:56:01 (GMT) |
commit | ea44a160e6dc5d3d7c680ea72dfbabef80343839 (patch) | |
tree | 417cb991a2cf72458aa4d9f71f6e6ed9768a8e4f | |
parent | 1fa185ebcbcefdc5229c783450c9f0439a69f0c1 (diff) | |
parent | 21b30ca5da14613dcf8fd8350ecdb0d5d245e814 (diff) | |
download | linux-ea44a160e6dc5d3d7c680ea72dfbabef80343839.tar.xz |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu fixes from Greg Ungerer:
"Nothing big, only a small collection of minor cleanups/fixes"
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
arch: m68k: 68360: config: Remove unused function
m68knommu: fix irq handler types in 68360/commproc.c
m68k: remove check for CONFIG_BSEIP
-rw-r--r-- | arch/m68k/68360/commproc.c | 8 | ||||
-rw-r--r-- | arch/m68k/68360/config.c | 13 | ||||
-rw-r--r-- | arch/m68k/include/asm/commproc.h | 24 |
3 files changed, 5 insertions, 40 deletions
diff --git a/arch/m68k/68360/commproc.c b/arch/m68k/68360/commproc.c index 315727b..14d7f35 100644 --- a/arch/m68k/68360/commproc.c +++ b/arch/m68k/68360/commproc.c @@ -64,15 +64,15 @@ QUICC *pquicc; /* CPM interrupt vector functions. */ struct cpm_action { - void (*handler)(void *); - void *dev_id; + irq_handler_t handler; + void *dev_id; }; static struct cpm_action cpm_vecs[CPMVEC_NR]; static void cpm_interrupt(int irq, void * dev, struct pt_regs * regs); static void cpm_error_interrupt(void *); /* prototypes: */ -void cpm_install_handler(int vec, void (*handler)(), void *dev_id); +void cpm_install_handler(int vec, irq_handler_t handler, void *dev_id); void m360_cpm_reset(void); @@ -208,7 +208,7 @@ cpm_error_interrupt(void *dev) /* Install a CPM interrupt handler. */ void -cpm_install_handler(int vec, void (*handler)(), void *dev_id) +cpm_install_handler(int vec, irq_handler_t handler, void *dev_id) { request_irq(vec, handler, 0, "timer", dev_id); diff --git a/arch/m68k/68360/config.c b/arch/m68k/68360/config.c index 17ec416..fd1f948 100644 --- a/arch/m68k/68360/config.c +++ b/arch/m68k/68360/config.c @@ -106,19 +106,6 @@ void hw_timer_init(irq_handler_t handler) pquicc->timer_tgcr = tgcr_save; } -int BSP_set_clock_mmss(unsigned long nowtime) -{ -#if 0 - short real_seconds = nowtime % 60, real_minutes = (nowtime / 60) % 60; - - tod->second1 = real_seconds / 10; - tod->second2 = real_seconds % 10; - tod->minute1 = real_minutes / 10; - tod->minute2 = real_minutes % 10; -#endif - return 0; -} - void BSP_reset (void) { local_irq_disable(); diff --git a/arch/m68k/include/asm/commproc.h b/arch/m68k/include/asm/commproc.h index 66a36bd..f41c968 100644 --- a/arch/m68k/include/asm/commproc.h +++ b/arch/m68k/include/asm/commproc.h @@ -480,28 +480,6 @@ typedef struct scc_enet { #define SICR_ENET_CLKRT ((uint)0x0000003d) #endif -#ifdef CONFIG_BSEIP -/* This ENET stuff is for the MPC823 with ethernet on SCC2. - * This is unique to the BSE ip-Engine board. - */ -#define PA_ENET_RXD ((ushort)0x0004) -#define PA_ENET_TXD ((ushort)0x0008) -#define PA_ENET_TCLK ((ushort)0x0100) -#define PA_ENET_RCLK ((ushort)0x0200) -#define PB_ENET_TENA ((uint)0x00002000) -#define PC_ENET_CLSN ((ushort)0x0040) -#define PC_ENET_RENA ((ushort)0x0080) - -/* BSE uses port B and C bits for PHY control also. -*/ -#define PB_BSE_POWERUP ((uint)0x00000004) -#define PB_BSE_FDXDIS ((uint)0x00008000) -#define PC_BSE_LOOPBACK ((ushort)0x0800) - -#define SICR_ENET_MASK ((uint)0x0000ff00) -#define SICR_ENET_CLKRT ((uint)0x00002c00) -#endif - /* SCC Event register as used by Ethernet. */ #define SCCE_ENET_GRA ((ushort)0x0080) /* Graceful stop complete */ @@ -671,7 +649,7 @@ typedef struct scc_trans { /* #define CPMVEC_PIO_PC4 ((ushort)0x01) */ /* #define CPMVEC_ERROR ((ushort)0x00) */ -extern void cpm_install_handler(int vec, void (*handler)(void *), void *dev_id); +extern void cpm_install_handler(int vec, irq_handler_t handler, void *dev_id); /* CPM interrupt configuration vector. */ |