Skip to content

Commit

Permalink
ARM: w90x900: add common nuc9xx.h
Browse files Browse the repository at this point in the history
Rather than having separate extern declarations in nuc9*.h, provide
a common header file containing these definitions.

Tested-by: Wan Zongshun <mcuos.com@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King committed Nov 21, 2011
1 parent 3a08322 commit e5bc9e2
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 24 deletions.
2 changes: 2 additions & 0 deletions arch/arm/mach-w90x900/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
#include <mach/hardware.h>
#include <mach/regs-irq.h>

#include "nuc9xx.h"

struct group_irq {
unsigned long gpen;
unsigned int enabled;
Expand Down
9 changes: 1 addition & 8 deletions arch/arm/mach-w90x900/nuc910.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,7 @@
* published by the Free Software Foundation.
*
*/

struct map_desc;
struct sys_timer;

/* core initialisation functions */

extern void nuc900_init_irq(void);
extern struct sys_timer nuc900_timer;
#include "nuc9xx.h"

/* extern file from nuc910.c */

Expand Down
9 changes: 1 addition & 8 deletions arch/arm/mach-w90x900/nuc950.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,7 @@
* published by the Free Software Foundation.
*
*/

struct map_desc;
struct sys_timer;

/* core initialisation functions */

extern void nuc900_init_irq(void);
extern struct sys_timer nuc900_timer;
#include "nuc9xx.h"

/* extern file from nuc950.c */

Expand Down
9 changes: 1 addition & 8 deletions arch/arm/mach-w90x900/nuc960.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,7 @@
* published by the Free Software Foundation.
*
*/

struct map_desc;
struct sys_timer;

/* core initialisation functions */

extern void nuc900_init_irq(void);
extern struct sys_timer nuc900_timer;
#include "nuc9xx.h"

/* extern file from nuc960.c */

Expand Down
23 changes: 23 additions & 0 deletions arch/arm/mach-w90x900/nuc9xx.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
* arch/arm/mach-w90x900/nuc9xx.h
*
* Copied from nuc910.h, which had:
*
* Copyright (c) 2008 Nuvoton corporation
*
* Header file for NUC900 CPU support
*
* Wan ZongShun <mcuos.com@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
*/
struct map_desc;
struct sys_timer;

/* core initialisation functions */

extern void nuc900_init_irq(void);
extern struct sys_timer nuc900_timer;
2 changes: 2 additions & 0 deletions arch/arm/mach-w90x900/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#include <mach/map.h>
#include <mach/regs-timer.h>

#include "nuc9xx.h"

#define RESETINT 0x1f
#define PERIOD (0x01 << 27)
#define ONESHOT (0x00 << 27)
Expand Down

0 comments on commit e5bc9e2

Please sign in to comment.