Commit 40b15b28 authored by Deng-Cheng Zhu's avatar Deng-Cheng Zhu Committed by Ralf Baechle
Browse files

MIPS: Remove unused defines in piix4.h 



The PIIX4_ICTLR* and PIIX4_OCW* defines are not used by any other files.
Remove them.

The only file (other than fixup-malta.c which includes piix4.h in patch #1)
containing "#include <asm/mips-boards/piix4.h>" is
arch/mips/mti-malta/malta-int.c whose first version is actually
"1da177e4:arch/mips/mips-boards/malta/malta_int.c". In that version, in
the function get_int(), things in piix4.h are used. But now malta-int.c no
longer needs those stuff.

Signed-off-by: default avatarDeng-Cheng Zhu <dengcheng.zhu@imgtec.com>
Cc: Steven J. Hill <Steven.Hill@imgtec.com>
Reviewed-by: default avatarJames Hogan <james.hogan@imgtec.com>
Reviewed-by: default avatarPaul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/6032/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 70002f76

arch/mips/include/asm/mips-boards/piix4.h

+0 −57
Original line number Diff line number Diff line
@@ -43,61 +43,4 @@ 
#define PIIX4_FUNC1_IDETIM_SECONDARY_HI		0x43

#define   PIIX4_FUNC1_IDETIM_SECONDARY_HI_IDE_DECODE_EN	(1 << 7)



/************************************************************************

 *  IO register offsets

 ************************************************************************/

#define PIIX4_ICTLR1_ICW1	0x20

#define PIIX4_ICTLR1_ICW2	0x21

#define PIIX4_ICTLR1_ICW3	0x21

#define PIIX4_ICTLR1_ICW4	0x21

#define PIIX4_ICTLR2_ICW1	0xa0

#define PIIX4_ICTLR2_ICW2	0xa1

#define PIIX4_ICTLR2_ICW3	0xa1

#define PIIX4_ICTLR2_ICW4	0xa1

#define PIIX4_ICTLR1_OCW1	0x21

#define PIIX4_ICTLR1_OCW2	0x20

#define PIIX4_ICTLR1_OCW3	0x20

#define PIIX4_ICTLR1_OCW4	0x20

#define PIIX4_ICTLR2_OCW1	0xa1

#define PIIX4_ICTLR2_OCW2	0xa0

#define PIIX4_ICTLR2_OCW3	0xa0

#define PIIX4_ICTLR2_OCW4	0xa0





/************************************************************************

 *  Register encodings.

 ************************************************************************/

#define PIIX4_OCW2_NSEOI	(0x1 << 5)

#define PIIX4_OCW2_SEOI		(0x3 << 5)

#define PIIX4_OCW2_RNSEOI	(0x5 << 5)

#define PIIX4_OCW2_RAEOIS	(0x4 << 5)

#define PIIX4_OCW2_RAEOIC	(0x0 << 5)

#define PIIX4_OCW2_RSEOI	(0x7 << 5)

#define PIIX4_OCW2_SP		(0x6 << 5)

#define PIIX4_OCW2_NOP		(0x2 << 5)



#define PIIX4_OCW2_SEL		(0x0 << 3)



#define PIIX4_OCW2_ILS_0	0

#define PIIX4_OCW2_ILS_1	1

#define PIIX4_OCW2_ILS_2	2

#define PIIX4_OCW2_ILS_3	3

#define PIIX4_OCW2_ILS_4	4

#define PIIX4_OCW2_ILS_5	5

#define PIIX4_OCW2_ILS_6	6

#define PIIX4_OCW2_ILS_7	7

#define PIIX4_OCW2_ILS_8	0

#define PIIX4_OCW2_ILS_9	1

#define PIIX4_OCW2_ILS_10	2

#define PIIX4_OCW2_ILS_11	3

#define PIIX4_OCW2_ILS_12	4

#define PIIX4_OCW2_ILS_13	5

#define PIIX4_OCW2_ILS_14	6

#define PIIX4_OCW2_ILS_15	7



#define PIIX4_OCW3_SEL		(0x1 << 3)



#define PIIX4_OCW3_IRR		0x2

#define PIIX4_OCW3_ISR		0x3



#endif /* __ASM_MIPS_BOARDS_PIIX4_H */

arch/mips/mti-malta/malta-int.c

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include <asm/irq_regs.h>

#include <asm/mips-boards/malta.h>

#include <asm/mips-boards/maltaint.h>

#include <asm/mips-boards/piix4.h>

#include <asm/gt64120.h>

#include <asm/mips-boards/generic.h>

#include <asm/mips-boards/msc01_pci.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE