h8300 include update

PATCH New Yoshinori Sato 1 participant 1 message Aug 27, 2003

lore

Share & tools

lore

Yoshinori Sato

author

2003-08-27 16:07 UTC #0 lore raw

PATCH 1/1 h8300 include update

o driver support headers update
o fix warnings

arch/h8300/platform/h8300h/ints.c +4 ~~-12~~

diff -Nru linux-2.6.0-test4/arch/h8300/platform/h8300h/ints.c linux-2.6.0-test4-h8300/arch/h8300/platform/h8300h/ints.c
@@ -32,15 +32,6 @@
 #include <asm/regs306x.h>
 #include <asm/errno.h>
 
-#define EXT_IRQ0 12
-#define EXT_IRQ1 13
-#define EXT_IRQ2 14
-#define EXT_IRQ3 15
-#define EXT_IRQ4 16
-#define EXT_IRQ5 17
-#define EXT_IRQ6 18
-#define EXT_IRQ7 19
-
 /*
  * This structure has only 4 elements for speed reasons
  */

@@ -171,7 +165,7 @@
 		       irq, irq_list[irq]->devname);
 	if (irq >= EXT_IRQ0 && irq <= EXT_IRQ5)
 		*(volatile unsigned char *)IER &= ~(1 << (irq - EXT_IRQ0));
-	if ((irq_list[irq] & 0x80000000) == 0) {
+	if (((unsigned long)irq_list[irq] & 0x80000000) == 0) {
 		kfree(irq_list[irq]);
 		irq_list[irq] = NULL;
 	}

@@ -241,8 +235,9 @@
 {
 }
 
-static void __init enable_kmalloc(void)
+static int __init enable_kmalloc(void)
 {
 	use_kmalloc = 1;
+	return 0;
 }
-__initcall(enable_kmalloc);
+core_initcall(enable_kmalloc);

arch/h8300/platform/h8s/ints.c +1 ~~-18~~

diff -Nru linux-2.6.0-test4/arch/h8300/platform/h8s/ints.c linux-2.6.0-test4-h8300/arch/h8300/platform/h8s/ints.c
@@ -33,23 +33,6 @@
 #include <asm/regs267x.h>
 #include <asm/errno.h>
 
-#define EXT_IRQ0 16
-#define EXT_IRQ1 17
-#define EXT_IRQ2 18
-#define EXT_IRQ3 19
-#define EXT_IRQ4 20
-#define EXT_IRQ5 21
-#define EXT_IRQ6 22
-#define EXT_IRQ7 23
-#define EXT_IRQ8 24
-#define EXT_IRQ9 25
-#define EXT_IRQ10 26
-#define EXT_IRQ11 27
-#define EXT_IRQ12 28
-#define EXT_IRQ13 29
-#define EXT_IRQ14 30
-#define EXT_IRQ15 31
-
 /*
  * This structure has only 4 elements for speed reasons
  */

@@ -307,4 +293,4 @@
 	use_kmalloc = 1;
 	return 0;
 }
-__initcall(enable_kmalloc);
+core_initcall(enable_kmalloc);

include/asm-h8300/aki3068net/ne.h +0 ~~-28~~

diff -Nru linux-2.6.0-test4/include/asm-h8300/aki3068net/ne.h linux-2.6.0-test4-h8300/include/asm-h8300/aki3068net/ne.h
@@ -1,28 +0,0 @@
-/* AE-3068 (aka. aki3068net) RTL8019AS Config */
-
-#ifndef __H8300_AKI3068NET_NE__
-#define __H8300_AKI3068NET_NE__
-
-#define NE2000_ADDR		0x200000
-#define NE2000_IRQ              5
-#define NE2000_IRQ_VECTOR	(12 + NE2000_IRQ)
-#define	NE2000_BYTE		volatile unsigned short
-
-#define IER                     0xfee015
-#define ISR			0xfee016
-#define IRQ_MASK		(1 << NE2000_IRQ)
-
-#define WCRL                    0xfee023
-#define MAR0A                   0xffff20
-#define ETCR0A                  0xffff24
-#define DTCR0A                  0xffff27
-#define MAR0B                   0xffff28
-#define DTCR0B                  0xffff2f
-
-#define H8300_INIT_NE()                  \
-do {                                     \
-	wordlength = 1;                  \
-        outb_p(0x48, ioaddr + EN0_DCFG); \
-} while(0)
-
-#endif

include/asm-h8300/aki3068net/timer_rate.h +0 -9

diff -Nru linux-2.6.0-test4/include/asm-h8300/aki3068net/timer_rate.h linux-2.6.0-test4-h8300/include/asm-h8300/aki3068net/timer_rate.h
@@ -1,9 +0,0 @@
-#ifndef __H8300_AKI3068NET_TIMER_RATE__
-#define __H8300_AKI3068NET_TIMER_RATE__
-
-#include <linux/config.h>
-
-#define H8300_TIMER_COUNT_DATA CONFIG_CPU_CLOCK*10/8192
-#define H8300_TIMER_FREQ CONFIG_CPU_CLOCK*1000/8192
-
-#endif

include/asm-h8300/edosk2674/timer_rate.h +0 -4

diff -Nru linux-2.6.0-test4/include/asm-h8300/edosk2674/timer_rate.h linux-2.6.0-test4-h8300/include/asm-h8300/edosk2674/timer_rate.h
@@ -1,4 +0,0 @@
-#include <linux/config.h>
-
-#define H8300_TIMER_COUNT_DATA CONFIG_CPU_CLOCK*10/8192
-#define H8300_TIMER_FREQ CONFIG_CPU_CLOCK*1000/8192

include/asm-h8300/h8300_smsc.h +20 -0

diff -Nru linux-2.6.0-test4/include/asm-h8300/h8300_smsc.h linux-2.6.0-test4-h8300/include/asm-h8300/h8300_smsc.h
@@ -0,0 +1,20 @@
+/****************************************************************************/
+
+/*
+ *	h8300_smsc.h -- SMSC in H8/300H and H8S Evalution Board.
+ *      
+ *	(C) Copyright 2003, Yoshinori Sato <[email protected]>
+ */
+
+/****************************************************************************/
+#ifndef	h8300smsc_h
+#define	h8300smsc_h
+/****************************************************************************/
+
+/* Such a description is OK ? */
+#define H8300_SMSC_DEFINE
+#include <asm/machine-depend.h>
+#undef  H8300_SMSC_DEFINE
+
+/****************************************************************************/
+#endif	/* h8300smsc_h */

include/asm-h8300/h8max/machine-depend.h +0 ~~-64~~

67 lines not on this page · raw message

include/asm-h8300/h8max/ne.h +0 ~~-97~~

97 lines not on this page · raw message

include/asm-h8300/h8max/timer_rate.h +0 ~~-10~~

diff -Nru linux-2.6.0-test4/include/asm-h8300/h8max/timer_rate.h linux-2.6.0-test4-h8300/include/asm-h8300/h8max/timer_rate.h
@@ -1,10 +0,0 @@
-#ifndef __H8300_H8MAX_TIMER_RATE__
-#define __H8300_H8MAX_TIMER_RATE__
-
-#include <linux/config.h>
-
-#define H8300_TIMER_COUNT_DATA CONFIG_CPU_CLOCK*10/8192
-#define H8300_TIMER_FREQ CONFIG_CPU_CLOCK*1000/8192
-
-#endif
-

include/asm-h8300/ide.h +11 ~~-130~~

156 lines not on this page · raw message

include/asm-h8300/irq.h +25 -1

diff -Nru linux-2.6.0-test4/include/asm-h8300/irq.h linux-2.6.0-test4-h8300/include/asm-h8300/irq.h
@@ -3,11 +3,35 @@
 
 #include <asm/ptrace.h>
 
-#if defined(CONFIG_CPU_H8300H)
+#if defined(__H8300H__)
 #define NR_IRQS 64
+#define EXT_IRQ0 12
+#define EXT_IRQ1 13
+#define EXT_IRQ2 14
+#define EXT_IRQ3 15
+#define EXT_IRQ4 16
+#define EXT_IRQ5 17
+#define EXT_IRQ6 18
+#define EXT_IRQ7 19
 #endif
 #if defined(CONFIG_CPU_H8S)
 #define NR_IRQS 128
+#define EXT_IRQ0 16
+#define EXT_IRQ1 17
+#define EXT_IRQ2 18
+#define EXT_IRQ3 19
+#define EXT_IRQ4 20
+#define EXT_IRQ5 21
+#define EXT_IRQ6 22
+#define EXT_IRQ7 23
+#define EXT_IRQ8 24
+#define EXT_IRQ9 25
+#define EXT_IRQ10 26
+#define EXT_IRQ11 27
+#define EXT_IRQ12 28
+#define EXT_IRQ13 29
+#define EXT_IRQ14 30
+#define EXT_IRQ15 31
 #endif
 
 static __inline__ int irq_canonicalize(int irq)

include/asm-h8300/machine-depend.h +0 ~~-70~~

70 lines not on this page · raw message

include/asm-h8300/pci.h +2 -0

diff -Nru linux-2.6.0-test4/include/asm-h8300/pci.h linux-2.6.0-test4-h8300/include/asm-h8300/pci.h
@@ -19,4 +19,6 @@
 	/* We don't do dynamic PCI IRQ allocation */
 }
 
+#define PCI_DMA_BUS_IS_PHYS	(1)
+
 #endif /* _ASM_H8300_PCI_H */

Signature · 2 lines

Yoshinori Sato
<[email protected]>