Menu
▾
▴
linux-mips-commits — CVS Commit Patches
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(165) |
Sep
(240) |
Oct
(424) |
Nov
(526) |
Dec
(293) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(242) |
Feb
(149) |
Mar
(143) |
Apr
(143) |
May
(76) |
Jun
(59) |
Jul
(20) |
Aug
(2) |
Sep
(49) |
Oct
(1) |
Nov
(4) |
Dec
|
| 2003 |
Jan
(1) |
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(3) |
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
(72) |
Jul
(36) |
Aug
(9) |
Sep
(16) |
Oct
(23) |
Nov
(9) |
Dec
(3) |
| 2010 |
Jan
|
Feb
(1) |
Mar
(35) |
Apr
(44) |
May
(56) |
Jun
(71) |
Jul
(41) |
Aug
(41) |
Sep
(22) |
Oct
(3) |
Nov
(1) |
Dec
(1) |
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
(1) |
Nov
(1) |
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
(1) |
Jun
|
Jul
(1) |
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2021 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(1) |
Sep
(25) |
Oct
(105) |
Nov
(15) |
Dec
|
| 2025 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Steve L. <slo...@us...> - 2002-09-17 18:20:05
|
Update of /cvsroot/linux-mips/linux/arch/mips/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv30225/arch/mips/kernel
Modified Files:
setup.c
Log Message:
- consolidate all architectures to use type phys_addr_t for physical
addresses. MIPS-only phys_t is gone, replaced with phys_addr_t.
- remap_page_range() will "fixup" physaddr's for platforms with 64-bit
physaddr support enabled, just as __ioremap() does.
Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/setup.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- setup.c 12 Jul 2002 20:14:26 -0000 1.66
+++ setup.c 17 Sep 2002 18:20:00 -0000 1.67
@@ -685,7 +685,7 @@
start_kernel();
}
-void __init add_memory_region(phys_t start, phys_t size,
+void __init add_memory_region(phys_addr_t start, phys_addr_t size,
long type)
{
int x = boot_mem_map.nr_map;
|
|
From: Steve L. <slo...@us...> - 2002-09-17 18:20:05
|
Update of /cvsroot/linux-mips/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv30225/drivers/video
Modified Files:
epson1356fb.c epson1356fb.h
Log Message:
- consolidate all architectures to use type phys_addr_t for physical
addresses. MIPS-only phys_t is gone, replaced with phys_addr_t.
- remap_page_range() will "fixup" physaddr's for platforms with 64-bit
physaddr support enabled, just as __ioremap() does.
Index: epson1356fb.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/epson1356fb.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- epson1356fb.c 12 Apr 2002 22:58:28 -0000 1.9
+++ epson1356fb.c 17 Sep 2002 18:20:01 -0000 1.10
@@ -215,9 +215,6 @@
static struct e1356fb_fix boot_fix; // boot options
static struct e1356fb_par boot_par; // boot options
-static int e1356_remap_page_range(unsigned long from, phys_t phys_addr, unsigned long size, pgprot_t prot);
-
-
/* -------------------------------------------------------------------------
* Hardware-specific funcions
* ------------------------------------------------------------------------- */
@@ -2078,11 +2075,7 @@
{
struct fb_info_e1356 *info = (struct fb_info_e1356*)fb;
unsigned int len;
-#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32)
- u64 start=0, off;
-#else
- unsigned long start=0, off;
-#endif
+ phys_addr_t start=0, off;
if (vma->vm_pgoff > (~0UL >> PAGE_SHIFT)) {
DPRINTK("invalid vma->vm_pgoff\n");
@@ -2163,17 +2156,10 @@
if (info->fix.mmunalign)
vma->vm_start += 2;
-#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32)
- if (e1356_remap_page_range(vma->vm_start, off,
- vma->vm_end - vma->vm_start,
- vma->vm_page_prot))
- return -EAGAIN;
-#else
if (io_remap_page_range(vma->vm_start, off,
vma->vm_end - vma->vm_start,
vma->vm_page_prot))
return -EAGAIN;
-#endif
info->mmaped = 1;
return 0;
@@ -3060,99 +3046,3 @@
printk("e1356fb: reserving 1024 bytes for the hwcursor at %p\n",
fb_info.membase_virt + fb_info.fb_size);
}
-
-#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32)
-
-/*
- * Return indicates whether a page was freed so caller can adjust rss
- */
-static inline void forget_pte(pte_t page)
-{
- if (!pte_none(page)) {
- printk("forget_pte: old mapping existed!\n");
- BUG();
- }
-}
-
-/*
- * maps a range of physical memory into the requested pages. the old
- * mappings are removed. any references to nonexistent pages results
- * in null mappings (currently treated as "copy-on-access")
- */
-static inline void e1356_remap_pte_range(pte_t * pte, unsigned long address, unsigned long size,
- phys_t phys_addr, pgprot_t prot)
-{
- unsigned long end;
-
- address &= ~PMD_MASK;
- end = address + size;
- if (end > PMD_SIZE)
- end = PMD_SIZE;
- do {
- struct page *page;
- pte_t oldpage;
- oldpage = ptep_get_and_clear(pte);
-
- page = virt_to_page(__va(phys_addr));
- if ((!VALID_PAGE(page)) || PageReserved(page))
- set_pte(pte, mk_pte_phys(phys_addr, prot));
- forget_pte(oldpage);
- address += PAGE_SIZE;
- phys_addr += PAGE_SIZE;
- pte++;
- } while (address && (address < end));
-}
-
-static inline int e1356_remap_pmd_range(struct mm_struct *mm, pmd_t * pmd, unsigned long address, unsigned long size,
- phys_t phys_addr, pgprot_t prot)
-{
- unsigned long end;
-
- address &= ~PGDIR_MASK;
- end = address + size;
- if (end > PGDIR_SIZE)
- end = PGDIR_SIZE;
- phys_addr -= address;
- do {
- pte_t * pte = pte_alloc(mm, pmd, address);
- if (!pte)
- return -ENOMEM;
- e1356_remap_pte_range(pte, address, end - address, address + phys_addr, prot);
- address = (address + PMD_SIZE) & PMD_MASK;
- pmd++;
- } while (address && (address < end));
- return 0;
-}
-
-/* Note: this is only safe if the mm semaphore is held when called. */
-static int e1356_remap_page_range(unsigned long from, phys_t phys_addr, unsigned long size, pgprot_t prot)
-{
- int error = 0;
- pgd_t * dir;
- phys_t beg = from;
- phys_t end = from + size;
- struct mm_struct *mm = current->mm;
-
- phys_addr -= from;
- dir = pgd_offset(mm, from);
- flush_cache_range(mm, beg, end);
- if (from >= end)
- BUG();
-
- spin_lock(&mm->page_table_lock);
- do {
- pmd_t *pmd = pmd_alloc(mm, dir, from);
- error = -ENOMEM;
- if (!pmd)
- break;
- error = e1356_remap_pmd_range(mm, pmd, from, end - from, phys_addr + from, prot);
- if (error)
- break;
- from = (from + PGDIR_SIZE) & PGDIR_MASK;
- dir++;
- } while (from && (from < end));
- spin_unlock(&mm->page_table_lock);
- flush_tlb_range(mm, beg, end);
- return error;
-}
-#endif
Index: epson1356fb.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/epson1356fb.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- epson1356fb.h 2 Apr 2002 22:38:34 -0000 1.7
+++ epson1356fb.h 17 Sep 2002 18:20:01 -0000 1.8
@@ -321,8 +321,8 @@
struct e1356fb_fix {
int system; // the number of a pre-packaged system
- u64 regbase_phys; // phys start address of registers
- u64 membase_phys; // phys start address of fb memory
+ phys_addr_t regbase_phys; // phys start address of registers
+ phys_addr_t membase_phys; // phys start address of fb memory
// Memory parameters
int mem_speed; // speed: 50, 60, 70, or 80 (nsec)
@@ -482,17 +482,6 @@
{
{ // fix
SYS_PB1000,
- /*
- * Note!: these are "pseudo" physical addresses;
- * the SED1356 is not actually mapped here, but rather
- * at the 36-bit address of 0xE 0000 0000. There is an
- * ugly hack in the Au1000 TLB refill handler that will
- * translate pte_t's in the range 0xE000 0000 -->
- * 0xEFFF FFFF to the 36-bit range 0xE 0000 0000 -->
- * 0xE 0FFF FFFF. The long-term solution is to support
- * 36-bit physical addresses in linux-mips32 mm, since
- * the mips32 specification specifically supports this.
- */
0xE00000000, 0xE00200000,
60, MEM_TYPE_EDO_2CAS, 64, MEM_SMR_CBR,
0, 0, // BUSCLK and MCLK are calculated at run-time
@@ -539,17 +528,6 @@
{
{ // fix
SYS_PB1500,
- /*
- * Note!: these are "pseudo" physical addresses;
- * the SED1356 is not actually mapped here, but rather
- * at the 36-bit address of 0xE 0000 0000. There is an
- * ugly hack in the Au1000 TLB refill handler that will
- * translate pte_t's in the range 0xE000 0000 -->
- * 0xEFFF FFFF to the 36-bit range 0xE 0000 0000 -->
- * 0xE 0FFF FFFF. The long-term solution is to support
- * 36-bit physical addresses in linux-mips32 mm, since
- * the mips32 specification specifically supports this.
- */
0xE1B000000, 0xE1B200000,
50, MEM_TYPE_EMBEDDED_SDRAM, 64, MEM_SMR_CBR,
0, 0, // BUSCLK and MCLK are calculated at run-time
|
|
From: Steve L. <slo...@us...> - 2002-09-17 18:20:05
|
Update of /cvsroot/linux-mips/linux/arch/mips/sibyte/swarm
In directory usw-pr-cvs1:/tmp/cvs-serv30225/arch/mips/sibyte/swarm
Modified Files:
memory.c setup.c
Log Message:
- consolidate all architectures to use type phys_addr_t for physical
addresses. MIPS-only phys_t is gone, replaced with phys_addr_t.
- remap_page_range() will "fixup" physaddr's for platforms with 64-bit
physaddr support enabled, just as __ioremap() does.
Index: memory.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/sibyte/swarm/memory.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- memory.c 12 Feb 2002 18:14:19 -0000 1.2
+++ memory.c 17 Sep 2002 18:20:01 -0000 1.3
@@ -22,15 +22,16 @@
#include <linux/config.h>
#include <linux/types.h>
+#include <linux/mm.h>
#include <asm/page.h>
-extern phys_t swarm_mem_region_addrs[];
-extern phys_t swarm_mem_region_sizes[];
+extern phys_addr_t swarm_mem_region_addrs[];
+extern phys_addr_t swarm_mem_region_sizes[];
extern unsigned int swarm_mem_region_count;
int page_is_ram(unsigned long pagenr)
{
- phys_t addr = pagenr << PAGE_SHIFT;
+ phys_addr_t addr = pagenr << PAGE_SHIFT;
#ifdef CONFIG_SWARM_STANDALONE
if (addr < (CONFIG_SIBYTE_SWARM_RAM_SIZE * 1024 * 1024)) {
return 1;
Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/sibyte/swarm/setup.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- setup.c 30 May 2002 20:42:08 -0000 1.12
+++ setup.c 17 Sep 2002 18:20:01 -0000 1.13
@@ -72,8 +72,8 @@
#ifndef CONFIG_SWARM_STANDALONE
-phys_t swarm_mem_region_addrs[CONFIG_SIBYTE_SWARM_MAX_MEM_REGIONS];
-phys_t swarm_mem_region_sizes[CONFIG_SIBYTE_SWARM_MAX_MEM_REGIONS];
+phys_addr_t swarm_mem_region_addrs[CONFIG_SIBYTE_SWARM_MAX_MEM_REGIONS];
+phys_addr_t swarm_mem_region_sizes[CONFIG_SIBYTE_SWARM_MAX_MEM_REGIONS];
unsigned int swarm_mem_region_count;
#endif
|
|
From: Steve L. <slo...@us...> - 2002-09-17 18:20:05
|
Update of /cvsroot/linux-mips/linux/arch/mips64/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv30225/arch/mips64/kernel
Modified Files:
setup.c
Log Message:
- consolidate all architectures to use type phys_addr_t for physical
addresses. MIPS-only phys_t is gone, replaced with phys_addr_t.
- remap_page_range() will "fixup" physaddr's for platforms with 64-bit
physaddr support enabled, just as __ioremap() does.
Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/kernel/setup.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- setup.c 30 May 2002 20:42:10 -0000 1.12
+++ setup.c 17 Sep 2002 18:20:01 -0000 1.13
@@ -499,7 +499,7 @@
start_kernel();
}
-void __init add_memory_region(phys_t start, phys_t size,
+void __init add_memory_region(phys_addr_t start, phys_addr_t size,
long type)
{
int x = boot_mem_map.nr_map;
|
|
From: Steve L. <slo...@us...> - 2002-09-17 18:20:05
|
Update of /cvsroot/linux-mips/linux/arch/mips/mm
In directory usw-pr-cvs1:/tmp/cvs-serv30225/arch/mips/mm
Modified Files:
ioremap.c
Log Message:
- consolidate all architectures to use type phys_addr_t for physical
addresses. MIPS-only phys_t is gone, replaced with phys_addr_t.
- remap_page_range() will "fixup" physaddr's for platforms with 64-bit
physaddr support enabled, just as __ioremap() does.
Index: ioremap.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/mm/ioremap.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ioremap.c 9 Mar 2002 01:38:39 -0000 1.6
+++ ioremap.c 17 Sep 2002 18:20:01 -0000 1.7
@@ -15,9 +15,9 @@
#include <asm/pgalloc.h>
static inline void remap_area_pte(pte_t * pte, unsigned long address,
- phys_t size, phys_t phys_addr, unsigned long flags)
+ phys_addr_t size, phys_addr_t phys_addr, unsigned long flags)
{
- phys_t end;
+ phys_addr_t end;
pgprot_t pgprot = __pgprot(_PAGE_GLOBAL | _PAGE_PRESENT | __READABLE
| __WRITEABLE | flags);
@@ -40,9 +40,9 @@
}
static inline int remap_area_pmd(pmd_t * pmd, unsigned long address,
- phys_t size, phys_t phys_addr, unsigned long flags)
+ phys_addr_t size, phys_addr_t phys_addr, unsigned long flags)
{
- phys_t end;
+ phys_addr_t end;
address &= ~PGDIR_MASK;
end = address + size;
@@ -62,8 +62,8 @@
return 0;
}
-static int remap_area_pages(unsigned long address, phys_t phys_addr,
- phys_t size, unsigned long flags)
+static int remap_area_pages(unsigned long address, phys_addr_t phys_addr,
+ phys_addr_t size, unsigned long flags)
{
int error;
pgd_t * dir;
@@ -97,12 +97,12 @@
* Allow physical addresses to be fixed up to help 36 bit
* peripherals.
*/
-static phys_t def_ioremap_fixup(phys_t phys_addr, phys_t size)
+static phys_addr_t def_ioremap_fixup(phys_addr_t phys_addr, phys_addr_t size)
{
return phys_addr;
}
-phys_t (*__ioremap_fixup)(phys_t phys_addr, phys_t size) = def_ioremap_fixup;
+phys_addr_t (*__ioremap_fixup)(phys_addr_t phys_addr, phys_addr_t size) = def_ioremap_fixup;
/*
* Generic mapping function (not visible outside):
@@ -118,16 +118,16 @@
* caller shouldn't need to know that small detail.
*/
-#define IS_LOW512(addr) (!((phys_t)(addr) & ~0x1fffffffUL) && !((phys_t)addr & 0xFFFFFFFF00000000))
+#define IS_LOW512(addr) (!((phys_addr_t)(addr) & ~0x1fffffffUL) && !((phys_addr_t)addr & 0xFFFFFFFF00000000))
-void * __ioremap(phys_t phys_addr, phys_t size, unsigned long flags)
+void * __ioremap(phys_addr_t phys_addr, phys_addr_t size, unsigned long flags)
{
struct vm_struct * area;
unsigned long offset;
- phys_t last_addr;
+ phys_addr_t last_addr;
void * addr;
- phys_addr = __ioremap_fixup(phys_addr, size);
+ phys_addr = fixup_bigphys_addr(phys_addr, size);
/* Don't allow wraparound or zero size */
last_addr = phys_addr + size - 1;
|
|
From: Steve L. <slo...@us...> - 2002-09-17 18:20:04
|
Update of /cvsroot/linux-mips/linux/include/asm-generic
In directory usw-pr-cvs1:/tmp/cvs-serv30225/include/asm-generic
Added Files:
mmu.h
Log Message:
- consolidate all architectures to use type phys_addr_t for physical
addresses. MIPS-only phys_t is gone, replaced with phys_addr_t.
- remap_page_range() will "fixup" physaddr's for platforms with 64-bit
physaddr support enabled, just as __ioremap() does.
--- NEW FILE: mmu.h ---
#ifndef _ASM_GENERIC_MMU_H
#define _ASM_GENERIC_MMU_H
/*
* Some cpu's (mips, ppc) have 32-bit virtual address space but
* larger (36-bit) physical space. So the include/asm-[*]/mmu.h
* have the option of redefining phys_addr_t. Also, fixup_bigphys_addr
* can be redefined to "convert" a physaddr represented in 32 bits
* to a phys_addr_t. How that's actually done is very platform-
* specific, and is a hack no matter how it's done. It's a stop-gap
* approach until the day the entire kernel deals with physical
* addresses consistently.
*/
typedef unsigned long phys_addr_t;
#define fixup_bigphys_addr(addr, size) do {} while (0)
#endif /* _ASM_GENERIC_MMU_H */
|
|
From: Steve L. <slo...@us...> - 2002-09-17 17:55:31
|
Update of /cvsroot/linux-mips/linux/include/asm-generic In directory usw-pr-cvs1:/tmp/cvs-serv22026/include/asm-generic Log Message: Directory /cvsroot/linux-mips/linux/include/asm-generic added to the repository |
|
From: Steve L. <slo...@us...> - 2002-09-17 17:54:19
|
Update of /cvsroot/linux-mips/linux/mm In directory usw-pr-cvs1:/tmp/cvs-serv21584/mm Log Message: Directory /cvsroot/linux-mips/linux/mm added to the repository |
|
From: Pete P. <pp...@us...> - 2002-08-19 19:07:34
|
Update of /cvsroot/linux-mips/linux/drivers/net In directory usw-pr-cvs1:/tmp/cvs-serv13195/drivers/net Modified Files: au1000_eth.c au1000_eth.h Log Message: LSI docs incorrectly listed the bit positions for speed and duplex. Index: au1000_eth.c =================================================================== RCS file: /cvsroot/linux-mips/linux/drivers/net/au1000_eth.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- au1000_eth.c 12 Aug 2002 16:12:03 -0000 1.11 +++ au1000_eth.c 19 Aug 2002 19:07:27 -0000 1.12 @@ -251,6 +251,8 @@ /* restart auto-negotiation */ mdio_write(dev, phy_addr, 0, 0x3200); + mdelay(1); + /* set up LEDs to correct display */ mdio_write(dev, phy_addr, 17, 0xffc0); Index: au1000_eth.h =================================================================== RCS file: /cvsroot/linux-mips/linux/drivers/net/au1000_eth.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- au1000_eth.h 2 Apr 2002 22:59:39 -0000 1.4 +++ au1000_eth.h 19 Aug 2002 19:07:27 -0000 1.5 @@ -127,9 +127,8 @@ #define MII_STSSUM_SPD 0x0001 /* lsi status register */ - -#define MII_LSI_STAT_FDX 0x0008 -#define MII_LSI_STAT_SPD 0x0010 +#define MII_LSI_STAT_FDX 0x0040 +#define MII_LSI_STAT_SPD 0x0080 /* Auxilliary Control/Status Register */ #define MII_AUX_FDX 0x0001 |
|
From: Pete P. <pp...@us...> - 2002-08-12 16:12:13
|
Update of /cvsroot/linux-mips/linux/drivers/net
In directory usw-pr-cvs1:/tmp/cvs-serv6945/drivers/net
Modified Files:
au1000_eth.c
Log Message:
Deleted one debug printk.
Index: au1000_eth.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/au1000_eth.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- au1000_eth.c 29 Apr 2002 16:43:23 -0000 1.10
+++ au1000_eth.c 12 Aug 2002 16:12:03 -0000 1.11
@@ -1382,7 +1382,6 @@
/* set Speed to 100Mbps, Half Duplex */
/* disable auto negotiation and enable 100MBit Mode */
control = mdio_read(dev, aup->phy_addr, MII_CONTROL);
- printk("read control %x\n", control);
control &= ~(MII_CNTL_AUTO | MII_CNTL_FDX);
control |= MII_CNTL_F100;
mdio_write(dev, aup->phy_addr, MII_CONTROL, control);
|
|
From: Pete P. <pp...@us...> - 2002-07-15 17:24:50
|
Update of /cvsroot/linux-mips/linux/include/asm-mips
In directory usw-pr-cvs1:/tmp/cvs-serv27986/include/asm-mips
Modified Files:
pgtable.h
Log Message:
__pte macro does not do the right thing when pte_t is a 64 bit
type. sys_mprotect is broken due to this, when 36 bit physical address
support is turned on.
Index: pgtable.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/pgtable.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- pgtable.h 21 Apr 2002 20:34:31 -0000 1.17
+++ pgtable.h 15 Jul 2002 17:24:39 -0000 1.18
@@ -332,7 +332,9 @@
static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
{
- return __pte(((pte).pte_low & _PAGE_CHG_MASK) | pgprot_val(newprot));
+ pte.pte_low &= _PAGE_CHG_MASK;
+ pte.pte_low |= pgprot_val(newprot);
+ return pte;
}
/*
|
|
From: Paul M. <le...@us...> - 2002-07-12 20:15:00
|
Update of /cvsroot/linux-mips/linux/arch/mips/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv32248/arch/mips/kernel
Modified Files:
irq.c pci-dma.c pci_auto.c proc.c setup.c
Log Message:
Merge yoichi-san's vr41xx patch. Still some cleanups needed..
Index: irq.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/irq.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- irq.c 30 May 2002 20:42:08 -0000 1.12
+++ irq.c 12 Jul 2002 20:14:26 -0000 1.13
@@ -25,6 +25,8 @@
#include <asm/system.h>
#include <asm/uaccess.h>
+static void register_irq_proc (unsigned int irq);
+
/*
* Controller mappings for all interrupt sources:
*/
Index: pci-dma.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/pci-dma.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pci-dma.c 26 Nov 2001 19:02:22 -0000 1.7
+++ pci-dma.c 12 Jul 2002 20:14:26 -0000 1.8
@@ -30,7 +30,7 @@
memset(ret, 0, size);
#ifdef CONFIG_NONCOHERENT_IO
dma_cache_wback_inv((unsigned long) ret, size);
- ret = KSEG1ADDR(ret);
+ ret = (void *)KSEG1ADDR(ret);
#endif
*dma_handle = virt_to_bus(ret);
}
Index: pci_auto.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/pci_auto.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pci_auto.c 23 Mar 2002 02:16:27 -0000 1.6
+++ pci_auto.c 12 Jul 2002 20:14:26 -0000 1.7
@@ -321,7 +321,6 @@
int sub_bus)
{
u32 temp;
- int cmdstat;
/*
* [jsun] we always bump up baselines a little, so that if there
@@ -437,8 +436,6 @@
pci_devfn, sub_bus);
continue;
} else if ((pci_class >> 16) == PCI_CLASS_BRIDGE_CARDBUS) {
- int iosave, memsave;
-
DBG(" CARDBUS Bridge: primary=%.2x, secondary=%.2x\n",
current_bus, sub_bus + 1);
DBG("PCI Autoconfig: Found CardBus bridge, device %d function %d\n", PCI_SLOT(pci_devfn), PCI_FUNC(pci_devfn));
Index: proc.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/proc.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- proc.c 30 May 2002 22:26:45 -0000 1.19
+++ proc.c 12 Jul 2002 20:14:26 -0000 1.20
@@ -63,12 +63,18 @@
[CPU_AU1500] "Au1500",
[CPU_4KEC] "MIPS 4KEc",
[CPU_4KSC] "MIPS 4KSc",
- [CPU_VR41XX] "NEC Vr41xx",
+ [CPU_VR41XX] "NEC VR41xx",
[CPU_R5500] "R5500",
[CPU_TX49XX] "TX49xx",
[CPU_TX39XX] "TX39xx",
[CPU_RC32300] "RC32300",
- [CPU_20KC] "MIPS 20Kc"
+ [CPU_20KC] "MIPS 20Kc",
+ [CPU_VR4111] "NEC VR4111",
+ [CPU_VR4121] "NEC VR4121",
+ [CPU_VR4122] "NEC VR4122",
+ [CPU_VR4131] "NEC VR4131",
+ [CPU_VR4181] "NEC VR4181",
+ [CPU_VR4181A] "NEC VR4181A"
};
Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/setup.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- setup.c 14 Jun 2002 14:01:52 -0000 1.65
+++ setup.c 12 Jul 2002 20:14:26 -0000 1.66
@@ -243,8 +243,8 @@
static inline void cpu_probe(void)
{
-#ifdef CONFIG_CPU_MIPS32
unsigned long config0 = read_32bit_cp0_register(CP0_CONFIG);
+#ifdef CONFIG_CPU_MIPS32
unsigned long config1;
if (config0 & (1 << 31)) {
@@ -351,14 +351,48 @@
mips_cpu.tlbsize = 48;
break;
case PRID_IMP_VR41XX:
- mips_cpu.cputype = CPU_VR41XX;
+ switch (mips_cpu.processor_id & 0xff) {
+#ifndef CONFIG_VR4181
+ case PRID_REV_VR4111:
+ mips_cpu.cputype = CPU_VR4111;
+ break;
+ case PRID_REV_VR4121:
+ mips_cpu.cputype = CPU_VR4121;
+ break;
+ case PRID_REV_VR4122_REV2_1: /* same as R1.0 and R2.0 */
+ case PRID_REV_VR4122_REV3_0:
+ case PRID_REV_VR4122_REV3_1:
+ mips_cpu.cputype = CPU_VR4122;
+ break;
+ case PRID_REV_VR4131_REV1_2:
+ config0 |= 0x00010000UL;
+ case PRID_REV_VR4131_REV2_0:
+ case PRID_REV_VR4131_REV2_1:
+ config0 &= ~0x00000030UL;
+ config0 |= 0x00400000UL;
+ write_32bit_cp0_register(CP0_CONFIG, config0);
+ case PRID_REV_VR4131_REV2_2:
+ mips_cpu.cputype = CPU_VR4131;
+ mips_cpu.icache.ways = 2;
+ mips_cpu.dcache.ways = 2;
+ break;
+ case PRID_REV_VR4181A_REV1_0:
+ case PRID_REV_VR4181A_REV1_1:
+ mips_cpu.cputype = CPU_VR4181A;
+ break;
+#else
+ case PRID_REV_VR4181:
+ mips_cpu.cputype = CPU_VR4181;
+ break;
+#endif
+ default:
+ printk(KERN_INFO "Unexpected CPU of NEC VR4100 series\n");
+ mips_cpu.cputype = CPU_VR41XX;
+ break;
+ }
mips_cpu.isa_level = MIPS_CPU_ISA_III;
mips_cpu.options = R4K_OPTS;
mips_cpu.tlbsize = 32;
-#ifdef CONFIG_VR4131
- mips_cpu.icache.ways = 2;
- mips_cpu.dcache.ways = 2;
-#endif
break;
case PRID_IMP_R4300:
mips_cpu.cputype = CPU_R4300;
@@ -626,8 +660,6 @@
asmlinkage void __init
init_arch(int argc, char **argv, char **envp, int *prom_vec)
{
- unsigned int s;
-
/* Determine which MIPS variant we are running on. */
cpu_probe();
@@ -997,7 +1029,7 @@
max_low_pfn = MAXMEM_PFN;
#ifndef CONFIG_HIGHMEM
/* Maximum memory usable is what is directly addressable */
- printk(KERN_WARNING "Warning only %ldMB will be used.\n",
+ printk(KERN_WARNING "Warning only %dMB will be used.\n",
MAXMEM>>20);
printk(KERN_WARNING "Use a HIGHMEM enabled kernel.\n");
#endif
|
|
From: Paul M. <le...@us...> - 2002-07-12 20:15:00
|
Update of /cvsroot/linux-mips/linux/arch/mips/configs In directory usw-pr-cvs1:/tmp/cvs-serv32248/arch/mips/configs Modified Files: defconfig-casio-e55 defconfig-eagle defconfig-mpc303 defconfig-workpad Added Files: defconfig-capcella Log Message: Merge yoichi-san's vr41xx patch. Still some cleanups needed.. --- NEW FILE: defconfig-capcella --- # # Automatically generated make config: don't edit # CONFIG_MIPS=y CONFIG_MIPS32=y # # Code maturity level options # CONFIG_EXPERIMENTAL=y # # Loadable module support # CONFIG_MODULES=y # CONFIG_MODVERSIONS is not set CONFIG_KMOD=y # # Machine selection # # CONFIG_ACER_PICA_61 is not set # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_ALGOR_P4032 is not set # CONFIG_BAGET_MIPS is not set # CONFIG_MIPS_COBALT is not set # CONFIG_DECSTATION is not set # CONFIG_MIPS_EV64120 is not set # CONFIG_MIPS_EV96100 is not set # CONFIG_MIPS_IVR is not set # CONFIG_HP_LASERJET is not set # CONFIG_MIPS_ITE8172 is not set # CONFIG_MIPS_ATLAS is not set # CONFIG_MIPS_MAGNUM_4000 is not set # CONFIG_MIPS_MALTA is not set # CONFIG_MOMENCO_OCELOT is not set # CONFIG_DDB5074 is not set # CONFIG_DDB5476 is not set # CONFIG_DDB5477 is not set # CONFIG_NEC_OSPREY is not set # CONFIG_NEC_EAGLE is not set # CONFIG_NEC_KORVA is not set # CONFIG_OLIVETTI_M700 is not set # CONFIG_NINO is not set # CONFIG_PS2 is not set # CONFIG_IDT_79S334 is not set # CONFIG_IDT_79EB355 is not set # CONFIG_CASIO_E15 is not set # CONFIG_CASIO_E55 is not set # CONFIG_CASIO_BE300 is not set # CONFIG_IBM_WORKPAD is not set # CONFIG_NEC_MOBILEPRO is not set # CONFIG_VADEM_CLIO_1000 is not set # CONFIG_VICTOR_MPC303 is not set CONFIG_ZAO_CAPCELLA=y # CONFIG_SGI_IP22 is not set # CONFIG_SIBYTE_SB1250 is not set # CONFIG_SNI_RM200_PCI is not set # CONFIG_TOSHIBA_JMR3927 is not set # CONFIG_MIPS_LXPB20K is not set # CONFIG_HIGHMEM is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set CONFIG_CPU_VR41XX=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_NEW_IRQ=y CONFIG_IRQ_CPU=y CONFIG_NEW_TIME_C=y CONFIG_VR41XX_TIME_C=y CONFIG_NONCOHERENT_IO=y # CONFIG_ISA is not set CONFIG_PCI=y CONFIG_NEW_PCI=y CONFIG_PCI_AUTO=y CONFIG_DUMMY_KEYB=y # CONFIG_SCSI is not set # CONFIG_MIPS_AU1000 is not set # # CPU selection # # CONFIG_CPU_R3000 is not set # CONFIG_CPU_LX45XXX is not set # CONFIG_CPU_TX39XX is not set # CONFIG_CPU_R6000 is not set CONFIG_CPU_VR41XX=y # CONFIG_CPU_R4300 is not set # CONFIG_CPU_R4X00 is not set # CONFIG_CPU_TX49XX is not set # CONFIG_CPU_R5000 is not set # CONFIG_CPU_R5432 is not set # CONFIG_CPU_R5900 is not set # CONFIG_CPU_RM7000 is not set # CONFIG_CPU_SR7100 is not set # CONFIG_CPU_NEVADA is not set # CONFIG_CPU_R10000 is not set # CONFIG_CPU_SB1 is not set # CONFIG_CPU_MIPS32 is not set # CONFIG_CPU_MIPS64 is not set # CONFIG_CPU_RC32300 is not set # CONFIG_CPU_ADVANCED is not set # CONFIG_CPU_HAS_LLSC is not set # CONFIG_CPU_HAS_LLDSCD is not set # CONFIG_CPU_HAS_WB is not set # # General setup # CONFIG_CPU_LITTLE_ENDIAN=y # CONFIG_CPU_R5900_CONTEXT is not set # CONFIG_VR4131_CACHE_FIX is not set CONFIG_NET=y # CONFIG_PCI_NAMES is not set # CONFIG_ISA is not set # CONFIG_EISA is not set # CONFIG_TC is not set # CONFIG_MCA is not set # CONFIG_SBUS is not set # CONFIG_HOTPLUG is not set # CONFIG_PCMCIA is not set # CONFIG_HOTPLUG_PCI is not set CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y CONFIG_KCORE_ELF=y # CONFIG_KCORE_AOUT is not set # CONFIG_BINFMT_AOUT is not set CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_MISC is not set # CONFIG_PM is not set # CONFIG_CPU_FREQ is not set # # Memory Technology Devices (MTD) # # CONFIG_MTD is not set # # Parallel port support # # CONFIG_PARPORT is not set # # Plug and Play configuration # # CONFIG_PNP is not set # CONFIG_ISAPNP is not set # # Block devices # # CONFIG_BLK_DEV_FD is not set # CONFIG_BLK_DEV_XD is not set # CONFIG_PARIDE is not set # CONFIG_BLK_CPQ_DA is not set # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_LOOP is not set # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_RAM is not set # CONFIG_BLK_DEV_INITRD is not set # # Multi-device support (RAID and LVM) # # CONFIG_MD is not set # CONFIG_BLK_DEV_MD is not set # CONFIG_MD_LINEAR is not set # CONFIG_MD_RAID0 is not set # CONFIG_MD_RAID1 is not set # CONFIG_MD_RAID5 is not set # CONFIG_MD_MULTIPATH is not set # CONFIG_BLK_DEV_LVM is not set # # Networking options # CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_NETLINK_DEV=y # CONFIG_NETFILTER is not set # CONFIG_FILTER is not set CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_MULTICAST=y # CONFIG_IP_ADVANCED_ROUTER is not set CONFIG_IP_PNP=y # CONFIG_IP_PNP_DHCP is not set CONFIG_IP_PNP_BOOTP=y # CONFIG_IP_PNP_RARP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE is not set # CONFIG_IP_MROUTE is not set # CONFIG_ARPD is not set # CONFIG_INET_ECN is not set # CONFIG_SYN_COOKIES is not set # CONFIG_IPV6 is not set # CONFIG_KHTTPD is not set # CONFIG_ATM is not set # CONFIG_VLAN_8021Q is not set # # # # CONFIG_IPX is not set # CONFIG_ATALK is not set # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set # CONFIG_LLC is not set # CONFIG_NET_DIVERT is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set # CONFIG_NET_FASTROUTE is not set # CONFIG_NET_HW_FLOWCONTROL is not set # # QoS and/or fair queueing # # CONFIG_NET_SCHED is not set # # Telephony Support # # CONFIG_PHONE is not set # CONFIG_PHONE_IXJ is not set # CONFIG_PHONE_IXJ_PCMCIA is not set # # ATA/IDE/MFM/RLL support # CONFIG_IDE=y # # IDE, ATA and ATAPI Block devices # CONFIG_BLK_DEV_IDE=y # # Please see Documentation/ide.txt for help/info on IDE drives # # CONFIG_BLK_DEV_HD_IDE is not set # CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_IDEDISK=y # CONFIG_IDEDISK_MULTI_MODE is not set # CONFIG_BLK_DEV_IDEDISK_VENDOR is not set # CONFIG_BLK_DEV_IDEDISK_FUJITSU is not set # CONFIG_BLK_DEV_IDEDISK_IBM is not set # CONFIG_BLK_DEV_IDEDISK_MAXTOR is not set # CONFIG_BLK_DEV_IDEDISK_QUANTUM is not set # CONFIG_BLK_DEV_IDEDISK_SEAGATE is not set # CONFIG_BLK_DEV_IDEDISK_WD is not set # CONFIG_BLK_DEV_COMMERIAL is not set # CONFIG_BLK_DEV_TIVO is not set # CONFIG_BLK_DEV_IDECS is not set # CONFIG_BLK_DEV_IDECD is not set # CONFIG_BLK_DEV_IDETAPE is not set # CONFIG_BLK_DEV_IDEFLOPPY is not set # CONFIG_BLK_DEV_IDESCSI is not set # # IDE chipset support/bugfixes # # CONFIG_BLK_DEV_CMD640 is not set # CONFIG_BLK_DEV_CMD640_ENHANCED is not set # CONFIG_BLK_DEV_ISAPNP is not set # CONFIG_BLK_DEV_RZ1000 is not set # CONFIG_BLK_DEV_IDEPCI is not set # CONFIG_IDE_CHIPSETS is not set # CONFIG_IDEDMA_AUTO is not set # CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_IDE_MODES is not set # CONFIG_BLK_DEV_ATARAID is not set # CONFIG_BLK_DEV_ATARAID_PDC is not set # CONFIG_BLK_DEV_ATARAID_HPT is not set # # SCSI support # # CONFIG_SCSI is not set # # I2O device support # # CONFIG_I2O is not set # CONFIG_I2O_PCI is not set # CONFIG_I2O_BLOCK is not set # CONFIG_I2O_LAN is not set # CONFIG_I2O_SCSI is not set # CONFIG_I2O_PROC is not set # # Network device support # CONFIG_NETDEVICES=y # # ARCnet devices # # CONFIG_ARCNET is not set # CONFIG_DUMMY is not set # CONFIG_BONDING is not set # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set # CONFIG_ETHERTAP is not set # # Ethernet (10 or 100Mbit) # CONFIG_NET_ETHERNET=y # CONFIG_SUNLANCE is not set # CONFIG_HAPPYMEAL is not set # CONFIG_SUNBMAC is not set # CONFIG_SUNQE is not set # CONFIG_SUNGEM is not set # CONFIG_NET_VENDOR_3COM is not set # CONFIG_LANCE is not set # CONFIG_NET_VENDOR_SMC is not set # CONFIG_NET_VENDOR_RACAL is not set # CONFIG_HP100 is not set # CONFIG_NET_ISA is not set CONFIG_NET_PCI=y # CONFIG_PCNET32 is not set # CONFIG_ADAPTEC_STARFIRE is not set # CONFIG_APRICOT is not set # CONFIG_CS89x0 is not set # CONFIG_TC35815 is not set # CONFIG_TULIP is not set # CONFIG_DE4X5 is not set # CONFIG_DGRS is not set # CONFIG_DM9102 is not set # CONFIG_EEPRO100 is not set # CONFIG_LNE390 is not set # CONFIG_FEALNX is not set # CONFIG_NATSEMI is not set # CONFIG_NE2K_PCI is not set # CONFIG_NE3210 is not set # CONFIG_ES3210 is not set # CONFIG_8139CP is not set CONFIG_8139TOO=y # CONFIG_8139TOO_PIO is not set # CONFIG_8139TOO_TUNE_TWISTER is not set # CONFIG_8139TOO_8129 is not set # CONFIG_8139_NEW_RX_RESET is not set # CONFIG_SIS900 is not set # CONFIG_EPIC100 is not set # CONFIG_SUNDANCE is not set # CONFIG_TLAN is not set # CONFIG_VIA_RHINE is not set # CONFIG_VIA_RHINE_MMIO is not set # CONFIG_WINBOND_840 is not set # CONFIG_LAN_SAA9730 is not set # CONFIG_NET_POCKET is not set # # Ethernet (1000 Mbit) # # CONFIG_ACENIC is not set # CONFIG_DL2K is not set # CONFIG_MYRI_SBUS is not set # CONFIG_NS83820 is not set # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set # CONFIG_SK98LIN is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set # CONFIG_PLIP is not set # CONFIG_PPP is not set # CONFIG_SLIP is not set # # Wireless LAN (non-hamradio) # # CONFIG_NET_RADIO is not set # # Token Ring devices # # CONFIG_TR is not set # CONFIG_NET_FC is not set # CONFIG_RCPCI is not set # CONFIG_SHAPER is not set # # Wan interfaces # # CONFIG_WAN is not set # # Amateur Radio support # # CONFIG_HAMRADIO is not set # # IrDA (infrared) support # # CONFIG_IRDA is not set # # ISDN subsystem # # CONFIG_ISDN is not set # # Character devices # CONFIG_VT=y # CONFIG_VT_CONSOLE is not set CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_VR41XX_GPIO is not set # CONFIG_TOUCH_PANEL is not set # CONFIG_BUTTONS is not set # CONFIG_ADIF is not set CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 # # I2C support # # CONFIG_I2C is not set # # Mice # # CONFIG_BUSMOUSE is not set # CONFIG_MOUSE is not set # # Joysticks # # CONFIG_INPUT_GAMEPORT is not set # # Input core support is needed for gameports # # # Input core support is needed for joysticks # # CONFIG_QIC02_TAPE is not set # # Watchdog Cards # CONFIG_WATCHDOG=y # CONFIG_WATCHDOG_NOWAYOUT is not set # CONFIG_SOFT_WATCHDOG is not set # CONFIG_WDT is not set # CONFIG_WDTPCI is not set # CONFIG_PCWATCHDOG is not set # CONFIG_ACQUIRE_WDT is not set # CONFIG_ADVANTECH_WDT is not set # CONFIG_EUROTECH_WDT is not set # CONFIG_IB700_WDT is not set # CONFIG_I810_TCO is not set # CONFIG_MIXCOMWD is not set # CONFIG_60XX_WDT is not set # CONFIG_W83877F_WDT is not set # CONFIG_MACHZ_WDT is not set # CONFIG_INDYDOG is not set # CONFIG_VR41XX_WDT is not set # CONFIG_TX4927_WDT is not set # CONFIG_INTEL_RNG is not set # CONFIG_NVRAM is not set # CONFIG_RTC is not set # CONFIG_MIPS_RTC is not set CONFIG_VR41XX_RTC=y # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set # # Ftape, the floppy tape device driver # # CONFIG_FTAPE is not set # CONFIG_AGP is not set # CONFIG_DRM is not set # # Multimedia devices # # CONFIG_VIDEO_DEV is not set # # File systems # # CONFIG_QUOTA is not set CONFIG_AUTOFS_FS=y CONFIG_AUTOFS4_FS=y # CONFIG_REISERFS_FS is not set # CONFIG_REISERFS_CHECK is not set # CONFIG_REISERFS_PROC_INFO is not set # CONFIG_ADFS_FS is not set # CONFIG_ADFS_FS_RW is not set # CONFIG_AFFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EXT3_FS is not set # CONFIG_JBD is not set # CONFIG_JBD_DEBUG is not set # CONFIG_FAT_FS is not set # CONFIG_MSDOS_FS is not set # CONFIG_UMSDOS_FS is not set # CONFIG_VFAT_FS is not set # CONFIG_EFS_FS is not set # CONFIG_JFFS_FS is not set # CONFIG_JFFS2_FS is not set # CONFIG_CRAMFS is not set # CONFIG_TMPFS is not set # CONFIG_RAMFS is not set # CONFIG_ISO9660_FS is not set # CONFIG_JOLIET is not set # CONFIG_ZISOFS is not set # CONFIG_MINIX_FS is not set # CONFIG_VXFS_FS is not set # CONFIG_NTFS_FS is not set # CONFIG_NTFS_RW is not set # CONFIG_HPFS_FS is not set CONFIG_PROC_FS=y # CONFIG_DEVFS_FS is not set # CONFIG_DEVFS_MOUNT is not set # CONFIG_DEVFS_DEBUG is not set CONFIG_DEVPTS_FS=y # CONFIG_QNX4FS_FS is not set # CONFIG_QNX4FS_RW is not set # CONFIG_ROMFS_FS is not set CONFIG_EXT2_FS=y # CONFIG_SYSV_FS is not set # CONFIG_UDF_FS is not set # CONFIG_UDF_RW is not set # CONFIG_UFS_FS is not set # CONFIG_UFS_FS_WRITE is not set # # Network File Systems # # CONFIG_CODA_FS is not set # CONFIG_INTERMEZZO_FS is not set CONFIG_NFS_FS=y # CONFIG_NFS_V3 is not set CONFIG_ROOT_NFS=y CONFIG_NFSD=y # CONFIG_NFSD_V3 is not set CONFIG_SUNRPC=y CONFIG_LOCKD=y # CONFIG_SMB_FS is not set # CONFIG_NCP_FS is not set # CONFIG_NCPFS_PACKET_SIGNING is not set # CONFIG_NCPFS_IOCTL_LOCKING is not set # CONFIG_NCPFS_STRONG is not set # CONFIG_NCPFS_NFS_NS is not set # CONFIG_NCPFS_OS2_NS is not set # CONFIG_NCPFS_SMALLDOS is not set # CONFIG_NCPFS_NLS is not set # CONFIG_NCPFS_EXTRAS is not set # CONFIG_ZISOFS_FS is not set # CONFIG_ZLIB_FS_INFLATE is not set # # Partition Types # CONFIG_PARTITION_ADVANCED=y # CONFIG_ACORN_PARTITION is not set # CONFIG_OSF_PARTITION is not set # CONFIG_AMIGA_PARTITION is not set # CONFIG_ATARI_PARTITION is not set # CONFIG_MAC_PARTITION is not set CONFIG_MSDOS_PARTITION=y # CONFIG_BSD_DISKLABEL is not set # CONFIG_MINIX_SUBPARTITION is not set # CONFIG_SOLARIS_X86_PARTITION is not set # CONFIG_UNIXWARE_DISKLABEL is not set # CONFIG_LDM_PARTITION is not set CONFIG_SGI_PARTITION=y # CONFIG_ULTRIX_PARTITION is not set # CONFIG_SUN_PARTITION is not set # CONFIG_SMB_NLS is not set # CONFIG_NLS is not set # # Console drivers # # CONFIG_VGA_CONSOLE is not set # CONFIG_MDA_CONSOLE is not set # # Frame-buffer support # # CONFIG_FB is not set # # Sound # # CONFIG_SOUND is not set # # USB support # # CONFIG_USB is not set # # USB Controllers # # CONFIG_USB_UHCI is not set # CONFIG_USB_UHCI_ALT is not set # CONFIG_USB_OHCI is not set # # USB Device Class drivers # # CONFIG_USB_AUDIO is not set # CONFIG_USB_BLUETOOTH is not set # # SCSI support is needed for USB Storage # # CONFIG_USB_STORAGE is not set # CONFIG_USB_STORAGE_DEBUG is not set # CONFIG_USB_STORAGE_DATAFAB is not set # CONFIG_USB_STORAGE_FREECOM is not set # CONFIG_USB_STORAGE_ISD200 is not set # CONFIG_USB_STORAGE_DPCM is not set # CONFIG_USB_STORAGE_HP8200e is not set # CONFIG_USB_STORAGE_SDDR09 is not set # CONFIG_USB_STORAGE_JUMPSHOT is not set # CONFIG_USB_ACM is not set # CONFIG_USB_PRINTER is not set # # USB Human Interface Devices (HID) # # # Input core support is needed for USB HID # # # USB Imaging devices # # CONFIG_USB_DC2XX is not set # CONFIG_USB_MDC800 is not set # CONFIG_USB_SCANNER is not set # CONFIG_USB_MICROTEK is not set # CONFIG_USB_HPUSBSCSI is not set # # USB Multimedia devices # # # Video4Linux support is needed for USB Multimedia device support # # # USB Network adaptors # # CONFIG_USB_PEGASUS is not set # CONFIG_USB_KAWETH is not set # CONFIG_USB_CATC is not set # CONFIG_USB_CDCETHER is not set # CONFIG_USB_USBNET is not set # # USB port drivers # # CONFIG_USB_USS720 is not set # # USB Serial Converter support # # CONFIG_USB_SERIAL is not set # CONFIG_USB_SERIAL_GENERIC is not set # CONFIG_USB_SERIAL_BELKIN is not set # CONFIG_USB_SERIAL_WHITEHEAT is not set # CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set # CONFIG_USB_SERIAL_EMPEG is not set # CONFIG_USB_SERIAL_FTDI_SIO is not set # CONFIG_USB_SERIAL_VISOR is not set # CONFIG_USB_SERIAL_IPAQ is not set # CONFIG_USB_SERIAL_IR is not set # CONFIG_USB_SERIAL_EDGEPORT is not set # CONFIG_USB_SERIAL_KEYSPAN_PDA is not set # CONFIG_USB_SERIAL_KEYSPAN is not set # CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set # CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set # CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set # CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set # CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set # CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set # CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set # CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set # CONFIG_USB_SERIAL_MCT_U232 is not set # CONFIG_USB_SERIAL_KLSI is not set # CONFIG_USB_SERIAL_PL2303 is not set # CONFIG_USB_SERIAL_CYBERJACK is not set # CONFIG_USB_SERIAL_XIRCOM is not set # CONFIG_USB_SERIAL_OMNINET is not set # # USB Miscellaneous drivers # # CONFIG_USB_RIO500 is not set # # Input core support # # CONFIG_INPUT is not set # CONFIG_INPUT_KEYBDEV is not set # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_EVDEV is not set # # Kernel hacking # CONFIG_CROSSCOMPILE=y # CONFIG_REMOTE_DEBUG is not set # CONFIG_GDB_CONSOLE is not set # CONFIG_DEBUG is not set # CONFIG_MAGIC_SYSRQ is not set # CONFIG_MIPS_UNCACHED is not set Index: defconfig-casio-e55 =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-casio-e55,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- defconfig-casio-e55 14 Jun 2002 16:35:59 -0000 1.2 +++ defconfig-casio-e55 12 Jul 2002 20:14:26 -0000 1.3 @@ -45,15 +45,16 @@ # CONFIG_OLIVETTI_M700 is not set # CONFIG_NINO is not set # CONFIG_PS2 is not set -# CONFIG_CASIO_BE300 is not set -# CONFIG_CASIO_E15 is not set -# CONFIG_VADEM_CLIO_1000 is not set -# CONFIG_NEC_MOBILEPRO is not set # CONFIG_IDT_79S334 is not set # CONFIG_IDT_79EB355 is not set -# CONFIG_IBM_WORKPAD is not set +# CONFIG_CASIO_E15 is not set CONFIG_CASIO_E55=y +# CONFIG_CASIO_BE300 is not set +# CONFIG_IBM_WORKPAD is not set +# CONFIG_NEC_MOBILEPRO is not set +# CONFIG_VADEM_CLIO_1000 is not set # CONFIG_VICTOR_MPC303 is not set +# CONFIG_ZAO_CAPCELLA is not set # CONFIG_SGI_IP22 is not set # CONFIG_SIBYTE_SB1250 is not set # CONFIG_SNI_RM200_PCI is not set @@ -63,7 +64,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set CONFIG_CPU_VR41XX=y -CONFIG_VR4111=y +CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_NEW_IRQ=y CONFIG_IRQ_CPU=y CONFIG_NEW_TIME_C=y @@ -109,7 +110,6 @@ CONFIG_CPU_LITTLE_ENDIAN=y # CONFIG_CPU_R5900_CONTEXT is not set # CONFIG_VR4131_CACHE_FIX is not set -# CONFIG_VR4122_CLKSPEEDREG_FIX is not set CONFIG_NET=y # CONFIG_PCI is not set CONFIG_EISA=y @@ -358,6 +358,7 @@ CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set +# CONFIG_VR41XX_GPIO is not set # CONFIG_TOUCH_PANEL is not set # CONFIG_BUTTONS is not set # CONFIG_ADIF is not set @@ -414,6 +415,7 @@ # CONFIG_NVRAM is not set # CONFIG_RTC is not set # CONFIG_MIPS_RTC is not set +CONFIG_VR41XX_RTC=y # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set Index: defconfig-eagle =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-eagle,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- defconfig-eagle 14 Jun 2002 16:35:59 -0000 1.15 +++ defconfig-eagle 12 Jul 2002 20:14:26 -0000 1.16 @@ -41,20 +41,21 @@ # CONFIG_DDB5477 is not set # CONFIG_NEC_OSPREY is not set CONFIG_NEC_EAGLE=y -CONFIG_NEC_EAGLE_MEM_SIZE=64 +CONFIG_NEC_EAGLE_MEM_SIZE=32 # CONFIG_NEC_KORVA is not set # CONFIG_OLIVETTI_M700 is not set # CONFIG_NINO is not set # CONFIG_PS2 is not set -# CONFIG_CASIO_BE300 is not set -# CONFIG_CASIO_E15 is not set -# CONFIG_VADEM_CLIO_1000 is not set -# CONFIG_NEC_MOBILEPRO is not set # CONFIG_IDT_79S334 is not set # CONFIG_IDT_79EB355 is not set -# CONFIG_IBM_WORKPAD is not set +# CONFIG_CASIO_E15 is not set # CONFIG_CASIO_E55 is not set +# CONFIG_CASIO_BE300 is not set +# CONFIG_IBM_WORKPAD is not set +# CONFIG_NEC_MOBILEPRO is not set +# CONFIG_VADEM_CLIO_1000 is not set # CONFIG_VICTOR_MPC303 is not set +# CONFIG_ZAO_CAPCELLA is not set # CONFIG_SGI_IP22 is not set # CONFIG_SIBYTE_SB1250 is not set # CONFIG_SNI_RM200_PCI is not set @@ -64,7 +65,6 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set CONFIG_CPU_VR41XX=y -CONFIG_VR4122=y CONFIG_NEW_IRQ=y CONFIG_IRQ_CPU=y CONFIG_NEW_TIME_C=y @@ -111,7 +111,6 @@ CONFIG_CPU_LITTLE_ENDIAN=y # CONFIG_CPU_R5900_CONTEXT is not set # CONFIG_VR4131_CACHE_FIX is not set -CONFIG_VR4122_CLKSPEEDREG_FIX=y CONFIG_NET=y # CONFIG_PCI_NAMES is not set # CONFIG_ISA is not set @@ -136,7 +135,73 @@ # # Memory Technology Devices (MTD) # -# CONFIG_MTD is not set +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_PARTITIONS is not set +# CONFIG_MTD_REDBOOT_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_GEN_PROBE=y +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_NOSWAP=y +# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set +# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set +# CONFIG_MTD_CFI_GEOMETRY is not set +CONFIG_MTD_CFI_INTELEXT=y +# CONFIG_MTD_CFI_AMDSTD is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set +# CONFIG_MTD_AMDSTD is not set +# CONFIG_MTD_SHARP is not set +# CONFIG_MTD_JEDEC is not set + +# +# Mapping drivers for chip access +# +CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_PHYSMAP_START=1c000000 +CONFIG_MTD_PHYSMAP_LEN=2000000 +CONFIG_MTD_PHYSMAP_BUSWIDTH=4 +# CONFIG_MTD_PB1000 is not set +# CONFIG_MTD_PB1500 is not set +# CONFIG_MTD_PB1100 is not set +# CONFIG_MTD_CSTM_MIPS_IXX is not set +# CONFIG_MTD_OCELOT is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_PMC551 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLKMTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC1000 is not set +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOCPROBE is not set + +# +# NAND Flash Device Drivers +# +# CONFIG_MTD_NAND is not set # # Parallel port support @@ -299,8 +364,8 @@ # CONFIG_NE2K_PCI is not set # CONFIG_NE3210 is not set # CONFIG_ES3210 is not set -# CONFIG_8139CP is not set -# CONFIG_8139TOO is not set +CONFIG_8139CP=y +CONFIG_8139TOO=y # CONFIG_8139TOO_PIO is not set # CONFIG_8139TOO_TUNE_TWISTER is not set # CONFIG_8139TOO_8129 is not set @@ -309,7 +374,7 @@ # CONFIG_EPIC100 is not set # CONFIG_SUNDANCE is not set # CONFIG_TLAN is not set -# CONFIG_VIA_RHINE is not set +CONFIG_VIA_RHINE=y # CONFIG_VIA_RHINE_MMIO is not set # CONFIG_WINBOND_840 is not set # CONFIG_LAN_SAA9730 is not set @@ -373,7 +438,7 @@ CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set -# CONFIG_VRC4173 is not set +# CONFIG_VR41XX_GPIO is not set # CONFIG_TOUCH_PANEL is not set # CONFIG_BUTTONS is not set # CONFIG_ADIF is not set @@ -452,6 +517,7 @@ # CONFIG_NVRAM is not set # CONFIG_RTC is not set # CONFIG_MIPS_RTC is not set +CONFIG_VR41XX_RTC=y # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set @@ -598,7 +664,7 @@ # CONFIG_FBCON_MFB is not set # CONFIG_FBCON_CFB2 is not set # CONFIG_FBCON_CFB4 is not set -CONFIG_FBCON_CFB8=y +# CONFIG_FBCON_CFB8 is not set CONFIG_FBCON_CFB16=y # CONFIG_FBCON_CFB24 is not set # CONFIG_FBCON_CFB32 is not set @@ -624,7 +690,30 @@ # # Sound # -# CONFIG_SOUND is not set +CONFIG_SOUND=y +# CONFIG_SOUND_BT878 is not set +# CONFIG_SOUND_CMPCI is not set +CONFIG_SOUND_EMU10K1=y +# CONFIG_MIDI_EMU10K1 is not set +# CONFIG_SOUND_FUSION is not set +# CONFIG_SOUND_CS4281 is not set +# CONFIG_SOUND_ES1370 is not set +# CONFIG_SOUND_ES1371 is not set +# CONFIG_SOUND_ESSSOLO1 is not set +# CONFIG_SOUND_MAESTRO is not set +# CONFIG_SOUND_MAESTRO3 is not set +# CONFIG_SOUND_ICH is not set +# CONFIG_SOUND_RME96XX is not set +# CONFIG_SOUND_SONICVIBES is not set +# CONFIG_SOUND_HAL2 is not set +# CONFIG_SOUND_TRIDENT is not set +# CONFIG_SOUND_MSNDCLAS is not set +# CONFIG_SOUND_MSNDPIN is not set +# CONFIG_SOUND_VIA82CXXX is not set +# CONFIG_MIDI_VIA82CXXX is not set +# CONFIG_SOUND_VR41XX is not set +# CONFIG_SOUND_OSS is not set +# CONFIG_SOUND_TVMIXER is not set # # USB support Index: defconfig-mpc303 =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-mpc303,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- defconfig-mpc303 7 Mar 2002 03:16:53 -0000 1.1 +++ defconfig-mpc303 12 Jul 2002 20:14:26 -0000 1.2 @@ -2,6 +2,7 @@ # Automatically generated make config: don't edit # CONFIG_MIPS=y +CONFIG_MIPS32=y # # Code maturity level options @@ -9,53 +10,61 @@ CONFIG_EXPERIMENTAL=y # +# Loadable module support +# +CONFIG_MODULES=y +# CONFIG_MODVERSIONS is not set +CONFIG_KMOD=y + +# # Machine selection # # CONFIG_ACER_PICA_61 is not set +# CONFIG_MIPS_PB1000 is not set +# CONFIG_MIPS_PB1100 is not set +# CONFIG_MIPS_PB1500 is not set # CONFIG_ALGOR_P4032 is not set # CONFIG_BAGET_MIPS is not set # CONFIG_MIPS_COBALT is not set # CONFIG_DECSTATION is not set -# CONFIG_DDB5074 is not set -# CONFIG_NEC_EAGLE is not set -# CONFIG_NEC_KORVA is not set -# CONFIG_MIPS_EV96100 is not set # CONFIG_MIPS_EV64120 is not set +# CONFIG_MIPS_EV96100 is not set +# CONFIG_MIPS_IVR is not set +# CONFIG_HP_LASERJET is not set +# CONFIG_MIPS_ITE8172 is not set # CONFIG_MIPS_ATLAS is not set +# CONFIG_MIPS_MAGNUM_4000 is not set # CONFIG_MIPS_MALTA is not set +# CONFIG_MOMENCO_OCELOT is not set +# CONFIG_DDB5074 is not set +# CONFIG_DDB5476 is not set +# CONFIG_DDB5477 is not set +# CONFIG_NEC_OSPREY is not set +# CONFIG_NEC_EAGLE is not set +# CONFIG_NEC_KORVA is not set +# CONFIG_OLIVETTI_M700 is not set # CONFIG_NINO is not set -# CONFIG_SIBYTE_SB1250 is not set # CONFIG_PS2 is not set -# CONFIG_CASIO_BE300 is not set -# CONFIG_CASIO_E15 is not set -# CONFIG_VADEM_CLIO_1000 is not set -# CONFIG_NEC_MOBILEPRO is not set # CONFIG_IDT_79S334 is not set # CONFIG_IDT_79EB355 is not set -# CONFIG_IBM_WORKPAD is not set +# CONFIG_CASIO_E15 is not set # CONFIG_CASIO_E55 is not set +# CONFIG_CASIO_BE300 is not set +# CONFIG_IBM_WORKPAD is not set +# CONFIG_NEC_MOBILEPRO is not set +# CONFIG_VADEM_CLIO_1000 is not set CONFIG_VICTOR_MPC303=y -# CONFIG_MIPS_MAGNUM_4000 is not set -# CONFIG_MOMENCO_OCELOT is not set -# CONFIG_DDB5476 is not set -# CONFIG_DDB5477 is not set -# CONFIG_NEC_OSPREY is not set -# CONFIG_OLIVETTI_M700 is not set +# CONFIG_ZAO_CAPCELLA is not set # CONFIG_SGI_IP22 is not set +# CONFIG_SIBYTE_SB1250 is not set # CONFIG_SNI_RM200_PCI is not set -# CONFIG_MIPS_ITE8172 is not set -# CONFIG_MIPS_IVR is not set -# CONFIG_MIPS_PB1000 is not set -# CONFIG_MIPS_PB1500 is not set # CONFIG_TOSHIBA_JMR3927 is not set -# CONFIG_HP_LASERJET is not set +# CONFIG_MIPS_LXPB20K is not set # CONFIG_HIGHMEM is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set -# CONFIG_MCA is not set -# CONFIG_SBUS is not set CONFIG_CPU_VR41XX=y -CONFIG_VR4122=y +CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_NEW_IRQ=y CONFIG_IRQ_CPU=y CONFIG_NEW_TIME_C=y @@ -67,20 +76,13 @@ CONFIG_PCI_AUTO=y CONFIG_DUMMY_KEYB=y # CONFIG_SCSI is not set -# CONFIG_ISA is not set -# CONFIG_EISA is not set - -# -# Loadable module support -# -CONFIG_MODULES=y -# CONFIG_MODVERSIONS is not set -CONFIG_KMOD=y +# CONFIG_MIPS_AU1000 is not set # # CPU selection # # CONFIG_CPU_R3000 is not set +# CONFIG_CPU_LX45XXX is not set # CONFIG_CPU_TX39XX is not set # CONFIG_CPU_R6000 is not set CONFIG_CPU_VR41XX=y @@ -109,20 +111,26 @@ CONFIG_CPU_LITTLE_ENDIAN=y # CONFIG_CPU_R5900_CONTEXT is not set # CONFIG_VR4131_CACHE_FIX is not set -CONFIG_KCORE_ELF=y -CONFIG_ELF_KERNEL=y -# CONFIG_BINFMT_AOUT is not set -CONFIG_BINFMT_ELF=y -# CONFIG_BINFMT_MISC is not set -# CONFIG_CPU_FREQ is not set CONFIG_NET=y # CONFIG_PCI_NAMES is not set +# CONFIG_ISA is not set +# CONFIG_EISA is not set +# CONFIG_TC is not set +# CONFIG_MCA is not set +# CONFIG_SBUS is not set # CONFIG_HOTPLUG is not set # CONFIG_PCMCIA is not set # CONFIG_HOTPLUG_PCI is not set CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y +CONFIG_KCORE_ELF=y +# CONFIG_KCORE_AOUT is not set +# CONFIG_BINFMT_AOUT is not set +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_MISC is not set +# CONFIG_PM is not set +# CONFIG_CPU_FREQ is not set # # Memory Technology Devices (MTD) @@ -135,6 +143,12 @@ # CONFIG_PARPORT is not set # +# Plug and Play configuration +# +# CONFIG_PNP is not set +# CONFIG_ISAPNP is not set + +# # Block devices # # CONFIG_BLK_DEV_FD is not set @@ -304,11 +318,6 @@ # CONFIG_ISDN is not set # -# Old CD-ROM drivers (not SCSI, not IDE) -# -# CONFIG_CD_NO_IDESCSI is not set - -# # Character devices # CONFIG_VT=y @@ -317,7 +326,10 @@ # CONFIG_SERIAL_CONSOLE is not set # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set -# CONFIG_VRC4173 is not set +# CONFIG_VR41XX_GPIO is not set +# CONFIG_TOUCH_PANEL is not set +# CONFIG_BUTTONS is not set +# CONFIG_ADIF is not set CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 @@ -366,6 +378,22 @@ # CONFIG_MACHZ_WDT is not set # CONFIG_INDYDOG is not set # CONFIG_VR41XX_WDT is not set +# CONFIG_TX4927_WDT is not set +# CONFIG_INTEL_RNG is not set +# CONFIG_NVRAM is not set +# CONFIG_RTC is not set +# CONFIG_MIPS_RTC is not set +CONFIG_VR41XX_RTC=y +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set + +# +# Ftape, the floppy tape device driver +# +# CONFIG_FTAPE is not set +# CONFIG_AGP is not set +# CONFIG_DRM is not set # # Multimedia devices @@ -538,6 +566,7 @@ # CONFIG_FB_E1356 is not set # CONFIG_FB_IT8181 is not set # CONFIG_FB_SIMPLE is not set +# CONFIG_FB_HPCSFB is not set # CONFIG_FB_VIRTUAL is not set CONFIG_FBCON_ADVANCED=y # CONFIG_FBCON_MFB is not set Index: defconfig-workpad =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-workpad,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- defconfig-workpad 14 Jun 2002 16:36:00 -0000 1.2 +++ defconfig-workpad 12 Jul 2002 20:14:26 -0000 1.3 @@ -45,16 +45,17 @@ # CONFIG_OLIVETTI_M700 is not set # CONFIG_NINO is not set # CONFIG_PS2 is not set -# CONFIG_CASIO_BE300 is not set -# CONFIG_CASIO_E15 is not set -# CONFIG_VADEM_CLIO_1000 is not set -# CONFIG_NEC_MOBILEPRO is not set # CONFIG_IDT_79S334 is not set # CONFIG_IDT_79EB355 is not set +# CONFIG_CASIO_E15 is not set +# CONFIG_CASIO_E55 is not set +# CONFIG_CASIO_BE300 is not set CONFIG_IBM_WORKPAD=y CONFIG_IBM_WORKPAD_MEM_SIZE=16 -# CONFIG_CASIO_E55 is not set +# CONFIG_NEC_MOBILEPRO is not set +# CONFIG_VADEM_CLIO_1000 is not set # CONFIG_VICTOR_MPC303 is not set +# CONFIG_ZAO_CAPCELLA is not set # CONFIG_SGI_IP22 is not set # CONFIG_SIBYTE_SB1250 is not set # CONFIG_SNI_RM200_PCI is not set @@ -64,7 +65,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set CONFIG_CPU_VR41XX=y -CONFIG_VR4121=y +CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_NEW_IRQ=y CONFIG_IRQ_CPU=y CONFIG_NEW_TIME_C=y @@ -110,7 +111,6 @@ CONFIG_CPU_LITTLE_ENDIAN=y # CONFIG_CPU_R5900_CONTEXT is not set # CONFIG_VR4131_CACHE_FIX is not set -# CONFIG_VR4122_CLKSPEEDREG_FIX is not set CONFIG_NET=y # CONFIG_PCI is not set CONFIG_EISA=y @@ -359,6 +359,7 @@ CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set +# CONFIG_VR41XX_GPIO is not set # CONFIG_TOUCH_PANEL is not set # CONFIG_BUTTONS is not set # CONFIG_ADIF is not set @@ -415,6 +416,7 @@ # CONFIG_NVRAM is not set # CONFIG_RTC is not set # CONFIG_MIPS_RTC is not set +CONFIG_VR41XX_RTC=y # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set |
|
From: Paul M. <le...@us...> - 2002-07-12 20:15:00
|
Update of /cvsroot/linux-mips/linux/arch/mips/lib
In directory usw-pr-cvs1:/tmp/cvs-serv32248/arch/mips/lib
Modified Files:
dump_tlb.c
Log Message:
Merge yoichi-san's vr41xx patch. Still some cleanups needed..
Index: dump_tlb.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/lib/dump_tlb.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- dump_tlb.c 26 Feb 2002 17:34:15 -0000 1.5
+++ dump_tlb.c 12 Jul 2002 20:14:26 -0000 1.6
@@ -32,6 +32,8 @@
case PM_256M: return "256Mb";
#endif
}
+
+ return "unknown";
}
void dump_tlb(int first, int last)
@@ -153,8 +155,8 @@
addr = (unsigned int) address;
printk("Addr == %08x\n", addr);
- printk("task == %08p\n", t);
- printk("task->mm == %08p\n", t->mm);
+ printk("task == %p\n", t);
+ printk("task->mm == %p\n", t->mm);
//printk("tasks->mm.pgd == %08x\n", (unsigned int) t->mm->pgd);
if (addr > KSEG0)
@@ -179,7 +181,7 @@
#ifdef CONFIG_64BIT_PHYS_ADDR
printk("page == %08Lx\n", (unsigned long long) pte_val(page));
#else
- printk("page == %08lx\n", (unsigned int) pte_val(page));
+ printk("page == %08x\n", (unsigned int) pte_val(page));
#endif
val = pte_val(page);
|
|
From: Paul M. <le...@us...> - 2002-07-12 20:14:59
|
Update of /cvsroot/linux-mips/linux/arch/mips
In directory usw-pr-cvs1:/tmp/cvs-serv32248/arch/mips
Modified Files:
Makefile config.in
Log Message:
Merge yoichi-san's vr41xx patch. Still some cleanups needed..
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/Makefile,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- Makefile 14 Jun 2002 14:03:08 -0000 1.51
+++ Makefile 12 Jul 2002 20:14:26 -0000 1.52
@@ -251,7 +251,7 @@
endif
#
-# NEC Eagle board (VR4122)
+# NEC Eagle/Hawk board (VR4122/VR4131)
#
ifdef CONFIG_NEC_EAGLE
SUBDIRS += arch/mips/vr41xx/common \
@@ -277,10 +277,8 @@
#
ifdef CONFIG_IBM_WORKPAD
SUBDIRS += arch/mips/vr41xx/common \
- arch/mips/vr41xx/vr4121/common \
arch/mips/vr41xx/vr4121/workpad
LIBS += arch/mips/vr41xx/common/vr41xx.o \
- arch/mips/vr41xx/vr4121/common/vr4121.o \
arch/mips/vr41xx/vr4121/workpad/workpad.o
LOADADDR += 0x80004000
endif
@@ -290,10 +288,8 @@
#
ifdef CONFIG_CASIO_E55
SUBDIRS += arch/mips/vr41xx/common \
- arch/mips/vr41xx/vr4111/common \
arch/mips/vr41xx/vr4111/casio-e55
LIBS += arch/mips/vr41xx/common/vr41xx.o \
- arch/mips/vr41xx/vr4111/common/vr4111.o \
arch/mips/vr41xx/vr4111/casio-e55/casio-e55.o
LOADADDR += 0x80004000
endif
@@ -306,8 +302,21 @@
arch/mips/vr41xx/vr4122/common \
arch/mips/vr41xx/vr4122/mp-c303
LIBS += arch/mips/vr41xx/common/vr41xx.o \
- arch/mips/vr41xx/vr4122/common/vr4122.o
- arch/mips/vr41xx/vr4122/mp-c303/mp-c303.o
+ arch/mips/vr41xx/vr4122/common/vr4122.o \
+ arch/mips/vr41xx/vr4122/mp-c303/mp-c303.o
+LOADADDR += 0x80004000
+endif
+
+#
+# ZAO Networks Capcella(VR4131)
+#
+ifdef CONFIG_ZAO_CAPCELLA
+SUBDIRS += arch/mips/vr41xx/common \
+ arch/mips/vr41xx/vr4122/common \
+ arch/mips/vr41xx/vr4122/capcella
+LIBS += arch/mips/vr41xx/common/vr41xx.o \
+ arch/mips/vr41xx/vr4122/common/vr4122.o \
+ arch/mips/vr41xx/vr4122/capcella/capcella.o
LOADADDR += 0x80004000
endif
Index: config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/config.in,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- config.in 13 Jun 2002 12:57:33 -0000 1.102
+++ config.in 12 Jul 2002 20:14:26 -0000 1.103
@@ -57,9 +57,9 @@
bool 'Support for NEC DDB Vrc-5476' CONFIG_DDB5476
bool 'Support for NEC DDB Vrc-5477' CONFIG_DDB5477
bool 'Support for NEC Osprey board' CONFIG_NEC_OSPREY
-bool 'Support for NEC Eagle board (EXPERIMENTAL)' CONFIG_NEC_EAGLE
+bool 'Support for NEC Eagle/Hawk board' CONFIG_NEC_EAGLE
if [ "$CONFIG_NEC_EAGLE" = "y" ]; then
- int ' Memory size' CONFIG_NEC_EAGLE_MEM_SIZE 64
+ int ' Memory size' CONFIG_NEC_EAGLE_MEM_SIZE 32
fi
bool 'Support for NEC Korva/Markham board (EXPERIMENTAL)' CONFIG_NEC_KORVA
if [ "$CONFIG_NEC_KORVA" = "y" ]; then
@@ -80,18 +80,19 @@
Model-500/510 CONFIG_NINO_16MB" Model-200
fi
bool 'Support for Sony PlayStation 2' CONFIG_PS2
-bool 'Support for Casio Cassiopeia BE-300 (EXPERIMENTAL)' CONFIG_CASIO_BE300
-bool 'Support for Casio Cassiopeia E15 (EXPERIMENTAL)' CONFIG_CASIO_E15
-bool 'Support for Vadem Clio 1000 (EXPERIMENTAL)' CONFIG_VADEM_CLIO_1000
-bool 'Support for NEC MobilePro 780 PDA (EXPERIMENTAL)' CONFIG_NEC_MOBILEPRO
bool 'Support for IDT 79S334 Evaluation board' CONFIG_IDT_79S334
bool 'Support for IDT 79EB355 Evaluation board' CONFIG_IDT_79EB355
+bool 'Support for CASIO CASSIOPEIA E15 (EXPERIMENTAL)' CONFIG_CASIO_E15
+bool 'Support for CASIO CASSIOPEIA E-55/65 (EXPERIMENTAL)' CONFIG_CASIO_E55
+bool 'Support for CASIO CASSIOPEIA BE-300 (EXPERIMENTAL)' CONFIG_CASIO_BE300
bool 'Support for IBM WorkPad z50 (EXPERIMENTAL)' CONFIG_IBM_WORKPAD
if [ "$CONFIG_IBM_WORKPAD" = "y" ]; then
int ' Memory size' CONFIG_IBM_WORKPAD_MEM_SIZE 16
fi
-bool 'Support for CASIO CASSIOPEIA E-55/65 (EXPERIMENTAL)' CONFIG_CASIO_E55
+bool 'Support for NEC MobilePro 780 PDA (EXPERIMENTAL)' CONFIG_NEC_MOBILEPRO
+bool 'Support for Vadem Clio 1000 (EXPERIMENTAL)' CONFIG_VADEM_CLIO_1000
bool 'Support for Victor MP-C303/304 (EXPERIMENTAL)' CONFIG_VICTOR_MPC303
+bool 'Support for ZAO Networks Capcella (EXPERIMENTAL)' CONFIG_ZAO_CAPCELLA
bool 'Support for SGI IP22 (Indy/Indigo2)' CONFIG_SGI_IP22
dep_bool 'Support for SiByte SB1250 SOC (EXPERIMENTAL)' CONFIG_SIBYTE_SB1250 $CONFIG_EXPERIMENTAL
@@ -351,7 +352,36 @@
fi
if [ "$CONFIG_NEC_EAGLE" = "y" ]; then
define_bool CONFIG_CPU_VR41XX y
- define_bool CONFIG_VR4122 y
+ define_bool CONFIG_NEW_IRQ y
+ define_bool CONFIG_IRQ_CPU y
+ define_bool CONFIG_NEW_TIME_C y
+ define_bool CONFIG_VR41XX_TIME_C y
+ define_bool CONFIG_NONCOHERENT_IO y
+ define_bool CONFIG_ISA n
+ define_bool CONFIG_PCI y
+ define_bool CONFIG_NEW_PCI y
+ define_bool CONFIG_PCI_AUTO y
+ define_bool CONFIG_DUMMY_KEYB y
+ define_bool CONFIG_SCSI n
+fi
+if [ "$CONFIG_VICTOR_MPC303" = "y" ]; then
+ define_bool CONFIG_CPU_VR41XX y
+ define_bool CONFIG_CPU_LITTLE_ENDIAN y
+ define_bool CONFIG_NEW_IRQ y
+ define_bool CONFIG_IRQ_CPU y
+ define_bool CONFIG_NEW_TIME_C y
+ define_bool CONFIG_VR41XX_TIME_C y
+ define_bool CONFIG_NONCOHERENT_IO y
+ define_bool CONFIG_ISA n
+ define_bool CONFIG_PCI y
+ define_bool CONFIG_NEW_PCI y
+ define_bool CONFIG_PCI_AUTO y
+ define_bool CONFIG_DUMMY_KEYB y
+ define_bool CONFIG_SCSI n
+fi
+if [ "$CONFIG_ZAO_CAPCELLA" = "y" ]; then
+ define_bool CONFIG_CPU_VR41XX y
+ define_bool CONFIG_CPU_LITTLE_ENDIAN y
define_bool CONFIG_NEW_IRQ y
define_bool CONFIG_IRQ_CPU y
define_bool CONFIG_NEW_TIME_C y
@@ -392,7 +422,7 @@
fi
if [ "$CONFIG_IBM_WORKPAD" = "y" ]; then
define_bool CONFIG_CPU_VR41XX y
- define_bool CONFIG_VR4121 y
+ define_bool CONFIG_CPU_LITTLE_ENDIAN y
define_bool CONFIG_NEW_IRQ y
define_bool CONFIG_IRQ_CPU y
define_bool CONFIG_NEW_TIME_C y
@@ -422,7 +452,7 @@
fi
if [ "$CONFIG_CASIO_E55" = "y" ]; then
define_bool CONFIG_CPU_VR41XX y
- define_bool CONFIG_VR4111 y
+ define_bool CONFIG_CPU_LITTLE_ENDIAN y
define_bool CONFIG_NEW_IRQ y
define_bool CONFIG_IRQ_CPU y
define_bool CONFIG_NEW_TIME_C y
@@ -457,24 +487,10 @@
define_bool CONFIG_NEW_IRQ y
define_bool CONFIG_IRQ_CPU y
define_bool CONFIG_NEW_TIME_C y
- define_bool CONFIG_ISA y
- define_bool CONFIG_NONCOHERENT_IO y
- define_bool CONFIG_DUMMY_KEYB y
-fi
-if [ "$CONFIG_VICTOR_MPC303" = "y" ]; then
- define_bool CONFIG_CPU_VR41XX y
- define_bool CONFIG_VR4122 y
- define_bool CONFIG_NEW_IRQ y
- define_bool CONFIG_IRQ_CPU y
- define_bool CONFIG_NEW_TIME_C y
define_bool CONFIG_VR41XX_TIME_C y
+ define_bool CONFIG_ISA y
define_bool CONFIG_NONCOHERENT_IO y
- define_bool CONFIG_ISA n
- define_bool CONFIG_PCI y
- define_bool CONFIG_NEW_PCI y
- define_bool CONFIG_PCI_AUTO y
define_bool CONFIG_DUMMY_KEYB y
- define_bool CONFIG_SCSI n
fi
if [ "$CONFIG_NINO" = "y" ]; then
define_bool CONFIG_NEW_IRQ y
@@ -629,8 +645,6 @@
"$CONFIG_NINO" = "y" -o \
"$CONFIG_MIPS_COBALT" = "y" -o \
"$CONFIG_VR4111" = "y" -o \
- "$CONFIG_VR4121" = "y" -o \
- "$CONFIG_VR4122" = "y" -o \
"$CONFIG_NEC_KORVA" = "y" ]; then
define_bool CONFIG_CPU_LITTLE_ENDIAN y
else
@@ -639,7 +653,6 @@
dep_bool ' Enable R5900 specific context' CONFIG_CPU_R5900_CONTEXT $CONFIG_PS2
dep_bool ' Enable Vr4131 cache fixes for early rev processors' CONFIG_VR4131_CACHE_FIX $CONFIG_VR4131
-dep_bool ' Enable VR4122 CLKSPEEDREG bug fixes' CONFIG_VR4122_CLKSPEEDREG_FIX $CONFIG_VR4122
if [ "$CONFIG_TOSHIBA_JMR3927" = "y" ]; then
bool 'DS1742 BRAM/RTC support' CONFIG_RTC_DS1742
|
|
From: Paul M. <le...@us...> - 2002-07-12 20:14:59
|
Update of /cvsroot/linux-mips/linux/arch/mips/mm
In directory usw-pr-cvs1:/tmp/cvs-serv32248/arch/mips/mm
Modified Files:
c-r4k.c fault.c init.c
Log Message:
Merge yoichi-san's vr41xx patch. Still some cleanups needed..
Index: c-r4k.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/mm/c-r4k.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- c-r4k.c 28 May 2002 21:03:31 -0000 1.9
+++ c-r4k.c 12 Jul 2002 20:14:26 -0000 1.10
@@ -1203,6 +1203,12 @@
{
switch (mips_cpu.cputype) {
case CPU_VR41XX:
+ case CPU_VR4111:
+ case CPU_VR4121:
+ case CPU_VR4122:
+ case CPU_VR4131:
+ case CPU_VR4181:
+ case CPU_VR4181A:
icache_size = 1 << (10 + ((config >> 9) & 7));
break;
case CPU_RC32300:
@@ -1222,6 +1228,12 @@
{
switch (mips_cpu.cputype) {
case CPU_VR41XX:
+ case CPU_VR4111:
+ case CPU_VR4121:
+ case CPU_VR4122:
+ case CPU_VR4131:
+ case CPU_VR4181:
+ case CPU_VR4181A:
dcache_size = 1 << (10 + ((config >> 6) & 7));
break;
case CPU_RC32300:
Index: fault.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/mm/fault.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- fault.c 28 Jan 2002 18:30:33 -0000 1.9
+++ fault.c 12 Jul 2002 20:14:26 -0000 1.10
@@ -18,6 +18,7 @@
#include <linux/smp.h>
#include <linux/smp_lock.h>
#include <linux/version.h>
+#include <linux/vt_kern.h>
#include <asm/hardirq.h>
#include <asm/pgalloc.h>
Index: init.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/mm/init.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- init.c 18 Mar 2002 22:48:17 -0000 1.6
+++ init.c 12 Jul 2002 20:14:26 -0000 1.7
@@ -161,6 +161,7 @@
extern char _ftext, _etext, _fdata, _edata;
extern char __init_begin, __init_end;
+#ifdef CONFIG_HIGHMEM
static void __init fixrange_init (unsigned long start, unsigned long end,
pgd_t *pgd_base)
{
@@ -190,12 +191,17 @@
}
}
+#endif /* CONFIG_HIGHMEM */
+
void __init pagetable_init(void)
{
+ pgd_t *pgd_base;
+#ifdef CONFIG_HIGHMEM
unsigned long vaddr;
- pgd_t *pgd, *pgd_base;
+ pgd_t *pgd;
pmd_t *pmd;
pte_t *pte;
+#endif
/* Initialize the entire pgd. */
pgd_init((unsigned long)swapper_pg_dir);
|
Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4122/common
In directory usw-pr-cvs1:/tmp/cvs-serv32248/arch/mips/vr41xx/vr4122/common
Modified Files:
Makefile dbg_io.c pciu.c pciu.h
Removed Files:
bcu.c cmu.c icu.c icu.h siu.c siu.h
Log Message:
Merge yoichi-san's vr41xx patch. Still some cleanups needed..
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4122/common/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 7 Mar 2002 03:16:54 -0000 1.1
+++ Makefile 12 Jul 2002 20:14:28 -0000 1.2
@@ -21,7 +21,6 @@
O_TARGET := vr4122.o
export-objs := vrc4173.o
-obj-y := bcu.o cmu.o icu.o siu.o
obj-$(CONFIG_PCI) += pciu.o
obj-$(CONFIG_VRC4173) += vrc4173.o
Index: dbg_io.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4122/common/dbg_io.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dbg_io.c 7 Mar 2002 03:16:54 -0000 1.1
+++ dbg_io.c 12 Jul 2002 20:14:28 -0000 1.2
@@ -40,7 +40,7 @@
/* [stevel] we use the IT8712 serial port for kgdb */
#define DEBUG_BASE 0xAF000820 /* Vr4122 DSIU base address */
-#define MAX_BAUD 115200
+#define MAX_BAUD 1152000
/* === END OF CONFIG === */
@@ -109,7 +109,7 @@
{
if (!remoteDebugInitialized) {
remoteDebugInitialized = 1;
- debugInit(UART16550_BAUD_115200,
+ debugInit(UART16550_BAUD_38400,
UART16550_DATA_8BIT,
UART16550_PARITY_NONE,
UART16550_STOP_1BIT);
@@ -124,7 +124,7 @@
{
if (!remoteDebugInitialized) {
remoteDebugInitialized = 1;
- debugInit(UART16550_BAUD_115200,
+ debugInit(UART16550_BAUD_38400,
UART16550_DATA_8BIT,
UART16550_PARITY_NONE,
UART16550_STOP_1BIT);
Index: pciu.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4122/common/pciu.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pciu.c 21 Apr 2002 06:44:03 -0000 1.3
+++ pciu.c 12 Jul 2002 20:14:28 -0000 1.4
@@ -44,7 +44,9 @@
#include <linux/types.h>
#include <linux/delay.h>
+#include <asm/cpu.h>
#include <asm/io.h>
+#include <asm/pci_channel.h>
#include <asm/vr41xx.h>
#include "pciu.h"
@@ -191,13 +193,27 @@
vr41xx_pci_write_config_dword
};
-void __init vr41xx_pciu_init(void)
+void __init vr41xx_pciu_init(struct vr41xx_pci_address_map *map)
{
+ struct vr41xx_pci_address_space *s;
+ u32 config;
int n;
+ if (!map)
+ return;
+
/* Disable PCI interrupt */
writew(0, MPCIINTREG);
+ /* Supply VTClock to PCIU */
+ vr41xx_clock_supply(PCIU_CLOCK);
+
+ /*
+ * Sleep for 1us after setting MSKPPCIU bit in CMUCLKMSK
+ * before doing any PCIU access to avoid deadlock on VR4131.
+ */
+ udelay(1);
+
/* Select PCI clock */
if (vr41xx_vtclock < MAX_PCI_CLOCK)
writel(EQUAL_VTCLOCK, PCICLKSELREG);
@@ -211,16 +227,31 @@
/* Supply PCI clock by PCI bus */
vr41xx_clock_supply(PCI_CLOCK);
- /*
- * Sleep for 1us after setting MSKPPCIU bit in CMUCLKMSK
- * before doing any PCIU access to avoid deadlock on VR4131.
+ /*
+ * Set PCI memory & I/O space address conversion registers
+ * for master transaction.
*/
- udelay(1);
-
- /* Set master memory & I/O windows */
- writel(0x100f9010, PCIMMAW1REG);
- writel(0x140fd014, PCIMMAW2REG);
- writel(0x160fd000, PCIMIOAWREG);
+ if (map->mem1 != NULL) {
+ s = map->mem1;
+ config = (s->internal_base & 0xff000000) |
+ ((s->address_mask & 0x7f000000) >> 11) | (1UL << 12) |
+ ((s->pci_base & 0xff000000) >> 24);
+ writel(config, PCIMMAW1REG);
+ }
+ if (map->mem2 != NULL) {
+ s = map->mem2;
+ config = (s->internal_base & 0xff000000) |
+ ((s->address_mask & 0x7f000000) >> 11) | (1UL << 12) |
+ ((s->pci_base & 0xff000000) >> 24);
+ writel(config, PCIMMAW2REG);
+ }
+ if (map->io != NULL) {
+ s = map->io;
+ config = (s->internal_base & 0xff000000) |
+ ((s->address_mask & 0x7f000000) >> 11) | (1UL << 12) |
+ ((s->pci_base & 0xff000000) >> 24);
+ writel(config, PCIMIOAWREG);
+ }
/* Set target memory windows */
writel(0x00081000, PCITAW1REG);
@@ -231,8 +262,13 @@
/* Clear bus error */
n = readl(BUSERRADREG);
- writel(100, PCITRDYVREG);
- pciu_write_config_dword(PCI_CACHE_LINE_SIZE, 0x00008004);
+ if (mips_cpu.cputype == CPU_VR4122) {
+ writel(0UL, PCITRDYVREG);
+ pciu_write_config_dword(PCI_CACHE_LINE_SIZE, 0x0000f804);
+ } else {
+ writel(100UL, PCITRDYVREG);
+ pciu_write_config_dword(PCI_CACHE_LINE_SIZE, 0x00008004);
+ }
writel(CONFIG_DONE, PCIENREG);
pciu_write_config_dword(PCI_COMMAND,
Index: pciu.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4122/common/pciu.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pciu.h 7 Mar 2002 03:16:54 -0000 1.1
+++ pciu.h 12 Jul 2002 20:14:28 -0000 1.2
@@ -107,6 +107,7 @@
#define MAX_PCI_CLOCK 33333333
+#define PCIU_CLOCK 0x0080
#define PCI_CLOCK 0x2000
static inline int pciu_read_config_byte(int where, u8 *val)
--- bcu.c DELETED ---
--- cmu.c DELETED ---
--- icu.c DELETED ---
--- icu.h DELETED ---
--- siu.c DELETED ---
--- siu.h DELETED ---
|
|
From: Paul M. <le...@us...> - 2002-07-12 20:14:33
|
Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4122/mp-c303
In directory usw-pr-cvs1:/tmp/cvs-serv32248/arch/mips/vr41xx/vr4122/mp-c303
Modified Files:
init.c pci_fixup.c setup.c
Log Message:
Merge yoichi-san's vr41xx patch. Still some cleanups needed..
Index: init.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4122/mp-c303/init.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- init.c 7 Mar 2002 03:16:54 -0000 1.1
+++ init.c 12 Jul 2002 20:14:28 -0000 1.2
@@ -1,6 +1,6 @@
/*
* FILE NAME
- * arch/mips/vr41xx/mp-c303/init.c
+ * arch/mips/vr41xx/vr4122/mp-c303/init.c
*
* BRIEF MODULE DESCRIPTION
* Initialisation code for the Victor MP-C303/304.
@@ -43,11 +43,6 @@
if (i < (argc - 1))
strcat(arcs_cmdline, " ");
}
-
-#if defined(CONFIG_SERIAL_CONSOLE)
- /* to use 38400 ttyS0 serial console */
- strcat(arcs_cmdline, " console=ttyS0,38400");
-#endif
mips_machgroup = MACH_GROUP_NEC_VR41XX;
mips_machtype = MACH_VICTOR_MPC303;
Index: pci_fixup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4122/mp-c303/pci_fixup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pci_fixup.c 7 Mar 2002 03:16:54 -0000 1.1
+++ pci_fixup.c 12 Jul 2002 20:14:28 -0000 1.2
@@ -1,6 +1,6 @@
/*
* FILE NAME
- * arch/mips/vr41xx/mp-c303/pci_fixup.c
+ * arch/mips/vr41xx/vr4122/mp-c303/pci_fixup.c
*
* BRIEF MODULE DESCRIPTION
* The Victor MP-C303/304 specific PCI fixups.
@@ -14,38 +14,14 @@
* option) any later version.
*/
#include <linux/config.h>
-
-#ifdef CONFIG_PCI
#include <linux/init.h>
#include <linux/pci.h>
-#include <asm/pci_channel.h>
#include <asm/vr41xx/mp-c303.h>
#ifdef CONFIG_VRC4173
#include <asm/vr41xx/vrc4173.h>
#endif
-static struct resource vr41xx_pci_io_resource = {
- "PCI I/O space",
- VR41XX_PCI_IO_START,
- VR41XX_PCI_IO_END,
- IORESOURCE_IO
-};
-
-static struct resource vr41xx_pci_mem_resource = {
- "PCI memory space",
- VR41XX_PCI_MEM_START,
- VR41XX_PCI_MEM_END,
- IORESOURCE_MEM
-};
-
-extern struct pci_ops vr41xx_pci_ops;
-
-struct pci_channel mips_pci_channels[] = {
- {&vr41xx_pci_ops, &vr41xx_pci_io_resource, &vr41xx_pci_mem_resource, 0, 256},
- {NULL, NULL, NULL, 0, 0}
-};
-
void __init pcibios_fixup_resources(struct pci_dev *dev)
{
}
@@ -66,6 +42,12 @@
switch (slot) {
#ifdef CONFIG_VRC4173
+ case 12:
+ dev->irq = VRC4173_CARDU1_IRQ;
+ break;
+ case 13:
+ dev->irq = VRC4173_CARDU2_IRQ;
+ break;
case 24:
dev->irq = VRC4173_CARDU1_IRQ;
break;
@@ -96,5 +78,3 @@
{
return 0;
}
-
-#endif
Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4122/mp-c303/setup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- setup.c 7 Mar 2002 03:16:54 -0000 1.1
+++ setup.c 12 Jul 2002 20:14:28 -0000 1.2
@@ -1,6 +1,6 @@
/*
* FILE NAME
- * arch/mips/vr41xx/mp-c303/setup.c
+ * arch/mips/vr41xx/vr4122/mp-c303/setup.c
*
* BRIEF MODULE DESCRIPTION
* Setup for the Victor MP-C303/304.
@@ -19,6 +19,7 @@
#include <linux/ide.h>
#include <linux/ioport.h>
+#include <asm/pci_channel.h>
#include <asm/reboot.h>
#include <asm/time.h>
#include <asm/vr41xx/mp-c303.h>
@@ -32,13 +33,60 @@
extern struct ide_ops mpc303_ide_ops;
#endif
+#ifdef CONFIG_PCI
+static struct resource vr41xx_pci_io_resource = {
+ "PCI I/O space",
+ VR41XX_PCI_IO_START,
+ VR41XX_PCI_IO_END,
+ IORESOURCE_IO
+};
+
+static struct resource vr41xx_pci_mem_resource = {
+ "PCI memory space",
+ VR41XX_PCI_MEM_START,
+ VR41XX_PCI_MEM_END,
+ IORESOURCE_MEM
+};
+
+extern struct pci_ops vr41xx_pci_ops;
+
+struct pci_channel mips_pci_channels[] = {
+ {&vr41xx_pci_ops, &vr41xx_pci_io_resource, &vr41xx_pci_mem_resource, 0, 256},
+ {NULL, NULL, NULL, 0, 0}
+};
+
+struct vr41xx_pci_address_space vr41xx_pci_mem1 = {
+ VR41XX_PCI_MEM1_BASE,
+ VR41XX_PCI_MEM1_MASK,
+ IO_MEM1_RESOURCE_START
+};
+
+struct vr41xx_pci_address_space vr41xx_pci_mem2 = {
+ VR41XX_PCI_MEM2_BASE,
+ VR41XX_PCI_MEM2_MASK,
+ IO_MEM2_RESOURCE_START
+};
+
+struct vr41xx_pci_address_space vr41xx_pci_io = {
+ VR41XX_PCI_IO_BASE,
+ VR41XX_PCI_IO_MASK,
+ IO_PORT_RESOURCE_START
+};
+
+static struct vr41xx_pci_address_map pci_address_map = {
+ &vr41xx_pci_mem1,
+ &vr41xx_pci_mem2,
+ &vr41xx_pci_io
+};
+#endif
+
void __init nec_vr41xx_setup(void)
{
set_io_port_base(IO_PORT_BASE);
ioport_resource.start = IO_PORT_RESOURCE_START;
ioport_resource.end = IO_PORT_RESOURCE_END;
- iomem_resource.start = IO_MEM_RESOURCE_START;
- iomem_resource.end = IO_MEM_RESOURCE_END;
+ iomem_resource.start = IO_MEM1_RESOURCE_START;
+ iomem_resource.end = IO_MEM2_RESOURCE_END;
#ifdef CONFIG_BLK_DEV_INITRD
ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0);
@@ -63,10 +111,12 @@
vr41xx_bcu_init();
- vr41xx_siu_init(0, SIU_RS232C, 0);
+ vr41xx_cmu_init(0);
+
+ vr41xx_siu_init(SIU_RS232C, 0);
#ifdef CONFIG_PCI
- vr41xx_pciu_init();
+ vr41xx_pciu_init(&pci_address_map);
#endif
#ifdef CONFIG_VRC4173
|
|
From: Paul M. <le...@us...> - 2002-07-12 20:14:33
|
Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4121/workpad
In directory usw-pr-cvs1:/tmp/cvs-serv32248/arch/mips/vr41xx/vr4121/workpad
Modified Files:
init.c setup.c
Log Message:
Merge yoichi-san's vr41xx patch. Still some cleanups needed..
Index: init.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4121/workpad/init.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- init.c 8 Mar 2002 18:55:45 -0000 1.2
+++ init.c 12 Jul 2002 20:14:28 -0000 1.3
@@ -1,6 +1,6 @@
/*
* FILE NAME
- * arch/mips/vr41xx/workpad/init.c
+ * arch/mips/vr41xx/vr4121/workpad/init.c
*
* BRIEF MODULE DESCRIPTION
* Initialisation code for the IBM WorkPad z50.
@@ -73,6 +73,7 @@
break;
default:
panic("Memory size error");
+ break;
}
}
Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4121/workpad/setup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- setup.c 7 Mar 2002 03:16:54 -0000 1.1
+++ setup.c 12 Jul 2002 20:14:28 -0000 1.2
@@ -1,6 +1,6 @@
/*
* FILE NAME
- * arch/mips/vr41xx/workpad/setup.c
+ * arch/mips/vr41xx/vr4121/workpad/setup.c
*
* BRIEF MODULE DESCRIPTION
* Setup for the IBM WorkPad z50.
@@ -63,5 +63,7 @@
vr41xx_bcu_init();
- vr41xx_siu_init(0, SIU_RS232C, 0);
+ vr41xx_cmu_init(0);
+
+ vr41xx_siu_init(SIU_RS232C, 0);
}
|
|
From: Paul M. <le...@us...> - 2002-07-12 20:14:33
|
Update of /cvsroot/linux-mips/linux/include/asm-mips/vr41xx In directory usw-pr-cvs1:/tmp/cvs-serv32248/include/asm-mips/vr41xx Modified Files: eagle.h mp-c303.h Added Files: capcella.h Log Message: Merge yoichi-san's vr41xx patch. Still some cleanups needed.. --- NEW FILE: capcella.h --- /* * FILE NAME * include/asm-mips/vr41xx/capcella.h * * BRIEF MODULE DESCRIPTION * Include file for ZAO Networks Capcella. * * Copyright 2002 Yoichi Yuasa * yu...@hh... * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the * Free Software Foundation; either version 2 of the License, or (at your * option) any later version. */ #ifndef __ZAO_CAPCELLA_H #define __ZAO_CAPCELLA_H #include <asm/addrspace.h> #include <asm/vr41xx.h> /* * Board specific address mapping */ #define VR41XX_PCI_MEM1_BASE 0x10000000 #define VR41XX_PCI_MEM1_SIZE 0x04000000 #define VR41XX_PCI_MEM1_MASK 0x7c000000 #define VR41XX_PCI_MEM2_BASE 0x14000000 #define VR41XX_PCI_MEM2_SIZE 0x02000000 #define VR41XX_PCI_MEM2_MASK 0x7e000000 #define VR41XX_PCI_IO_BASE 0x16000000 #define VR41XX_PCI_IO_SIZE 0x02000000 #define VR41XX_PCI_IO_MASK 0x7e000000 #define VR41XX_PCI_IO_START 0x01000000 #define VR41XX_PCI_IO_END 0x01ffffff #define VR41XX_PCI_MEM_START 0x12000000 #define VR41XX_PCI_MEM_END 0x15ffffff #define IO_PORT_BASE KSEG1ADDR(VR41XX_PCI_IO_BASE) #define IO_PORT_RESOURCE_START 0 #define IO_PORT_RESOURCE_END VR41XX_PCI_IO_SIZE #define IO_MEM1_RESOURCE_START VR41XX_PCI_MEM1_BASE #define IO_MEM1_RESOURCE_END (VR41XX_PCI_MEM1_BASE + VR41XX_PCI_MEM1_SIZE) #define IO_MEM2_RESOURCE_START VR41XX_PCI_MEM2_BASE #define IO_MEM2_RESOURCE_END (VR41XX_PCI_MEM2_BASE + VR41XX_PCI_MEM2_SIZE) /* * Interrupt Number */ #define RTL8139_1_IRQ GIU_IRQ(4) #define RTL8139_2_IRQ GIU_IRQ(5) #define PC104PLUS_INTA_IRQ GIU_IRQ(2) #define PC104PLUS_INTB_IRQ GIU_IRQ(3) #define PC104PLUS_INTC_IRQ GIU_IRQ(4) #define PC104PLUS_INTD_IRQ GIU_IRQ(5) #endif /* __ZAO_CAPCELLA_H */ Index: eagle.h =================================================================== RCS file: /cvsroot/linux-mips/linux/include/asm-mips/vr41xx/eagle.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- eagle.h 9 Mar 2002 01:50:46 -0000 1.2 +++ eagle.h 12 Jul 2002 20:14:28 -0000 1.3 @@ -39,11 +39,17 @@ /* * Board specific address mapping */ -#define VR41XX_PCI_MEM_BASE 0x10000000 -#define VR41XX_PCI_MEM_SIZE 0x06000000 +#define VR41XX_PCI_MEM1_BASE 0x10000000 +#define VR41XX_PCI_MEM1_SIZE 0x04000000 +#define VR41XX_PCI_MEM1_MASK 0x7c000000 + +#define VR41XX_PCI_MEM2_BASE 0x14000000 +#define VR41XX_PCI_MEM2_SIZE 0x02000000 +#define VR41XX_PCI_MEM2_MASK 0x7e000000 #define VR41XX_PCI_IO_BASE 0x16000000 #define VR41XX_PCI_IO_SIZE 0x02000000 +#define VR41XX_PCI_IO_MASK 0x7e000000 #define VR41XX_PCI_IO_START 0x01000000 #define VR41XX_PCI_IO_END 0x01ffffff @@ -54,16 +60,26 @@ #define IO_PORT_BASE KSEG1ADDR(VR41XX_PCI_IO_BASE) #define IO_PORT_RESOURCE_START 0 #define IO_PORT_RESOURCE_END VR41XX_PCI_IO_SIZE -#define IO_MEM_RESOURCE_START VR41XX_PCI_MEM_BASE -#define IO_MEM_RESOURCE_END (VR41XX_PCI_MEM_BASE + VR41XX_PCI_MEM_SIZE) +#define IO_MEM1_RESOURCE_START VR41XX_PCI_MEM1_BASE +#define IO_MEM1_RESOURCE_END (VR41XX_PCI_MEM1_BASE + VR41XX_PCI_MEM1_SIZE) +#define IO_MEM2_RESOURCE_START VR41XX_PCI_MEM2_BASE +#define IO_MEM2_RESOURCE_END (VR41XX_PCI_MEM2_BASE + VR41XX_PCI_MEM2_SIZE) + +/* + * General-Purpose I/O Pin Number + */ +#define VRC4173_PIN 1 +#define PCISLOT_PIN 4 +#define PCIINT_PIN 5 +#define DCD_PIN 15 /* * Interrupt Number */ -#define VRC4173_IRQ GIUL_IRQ(1) -#define PCISLOT_IRQ GIUL_IRQ(4) -#define PCIINT_IRQ GIUL_IRQ(5) -#define DCD_IRQ GIUL_IRQ(15) +#define VRC4173_IRQ GIU_IRQ(VRC4173_PIN) +#define PCISLOT_IRQ GIU_IRQ(PCISLOT_PIN) +#define PCIINT_IRQ GIU_IRQ(PCIINT_PIN) +#define DCD_IRQ GIU_IRQ(DCD_PIN) #define PCIINT_IRQ_BASE 89 #define CP_INTA_IRQ (PCIINT_IRQ_BASE + 0) Index: mp-c303.h =================================================================== RCS file: /cvsroot/linux-mips/linux/include/asm-mips/vr41xx/mp-c303.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mp-c303.h 9 Mar 2002 01:50:46 -0000 1.2 +++ mp-c303.h 12 Jul 2002 20:14:29 -0000 1.3 @@ -22,11 +22,17 @@ /* * Board specific address mapping */ -#define VR41XX_PCI_MEM_BASE 0x10000000 -#define VR41XX_PCI_MEM_SIZE 0x06000000 +#define VR41XX_PCI_MEM1_BASE 0x10000000 +#define VR41XX_PCI_MEM1_SIZE 0x04000000 +#define VR41XX_PCI_MEM1_MASK 0x7c000000 + +#define VR41XX_PCI_MEM2_BASE 0x14000000 +#define VR41XX_PCI_MEM2_SIZE 0x02000000 +#define VR41XX_PCI_MEM2_MASK 0x7e000000 #define VR41XX_PCI_IO_BASE 0x16000000 #define VR41XX_PCI_IO_SIZE 0x02000000 +#define VR41XX_PCI_IO_MASK 0x7e000000 #define VR41XX_PCI_IO_START 0x01000000 #define VR41XX_PCI_IO_END 0x01ffffff @@ -37,12 +43,14 @@ #define IO_PORT_BASE KSEG1ADDR(VR41XX_PCI_IO_BASE) #define IO_PORT_RESOURCE_START 0 #define IO_PORT_RESOURCE_END VR41XX_PCI_IO_SIZE -#define IO_MEM_RESOURCE_START VR41XX_PCI_MEM_BASE -#define IO_MEM_RESOURCE_END (VR41XX_PCI_MEM_BASE + VR41XX_PCI_MEM_SIZE) +#define IO_MEM1_RESOURCE_START VR41XX_PCI_MEM1_BASE +#define IO_MEM1_RESOURCE_END (VR41XX_PCI_MEM1_BASE + VR41XX_PCI_MEM1_SIZE) +#define IO_MEM2_RESOURCE_START VR41XX_PCI_MEM2_BASE +#define IO_MEM2_RESOURCE_END (VR41XX_PCI_MEM2_BASE + VR41XX_PCI_MEM2_SIZE) /* * Interrupt Number */ -#define VRC4173_IRQ GIUL_IRQ(1) +#define VRC4173_IRQ GIU_IRQ(1) #endif /* __VICTOR_MPC303_H */ |
|
From: Paul M. <le...@us...> - 2002-07-12 20:14:33
|
Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4121/common In directory usw-pr-cvs1:/tmp/cvs-serv32248/arch/mips/vr41xx/vr4121/common Removed Files: Makefile bcu.c cmu.c icu.c icu.h siu.c siu.h Log Message: Merge yoichi-san's vr41xx patch. Still some cleanups needed.. --- Makefile DELETED --- --- bcu.c DELETED --- --- cmu.c DELETED --- --- icu.c DELETED --- --- icu.h DELETED --- --- siu.c DELETED --- --- siu.h DELETED --- |
|
From: Paul M. <le...@us...> - 2002-07-12 20:14:32
|
Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4122/eagle
In directory usw-pr-cvs1:/tmp/cvs-serv32248/arch/mips/vr41xx/vr4122/eagle
Modified Files:
Makefile ide-eagle.c init.c irq.c pci_fixup.c setup.c
Log Message:
Merge yoichi-san's vr41xx patch. Still some cleanups needed..
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4122/eagle/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 7 Mar 2002 03:16:54 -0000 1.1
+++ Makefile 12 Jul 2002 20:14:28 -0000 1.2
@@ -1,5 +1,5 @@
#
-# Makefile for the NEC Eagle specific parts of the kernel
+# Makefile for the NEC Eagle/Hawk specific parts of the kernel
#
# Author: Yoichi Yuasa
# yy...@mv... or so...@mv...
Index: ide-eagle.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4122/eagle/ide-eagle.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ide-eagle.c 7 Mar 2002 03:16:54 -0000 1.1
+++ ide-eagle.c 12 Jul 2002 20:14:28 -0000 1.2
@@ -3,15 +3,20 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * IDE routines for typical pc-like standard configurations for the NEC Eagle board.
+ * IDE routines for typical pc-like standard configurations
+ * for the NEC Eagle/Hawk board.
*
* Copyright (C) 1998, 1999, 2001 by Ralf Baechle
*/
/*
* Changes:
* MontaVista Software Inc. <yy...@mv...> or <so...@mv...>
+ * Fri, 5 Apr 2002
+ * - Added support for NEC Hawk.
+ *
+ * MontaVista Software Inc. <yy...@mv...> or <so...@mv...>
* Fri, 1 Mar 2002
- * - Added NEC Eagle support.
+ * - Added support for NEC Eagle.
*/
#include <linux/sched.h>
#include <linux/ide.h>
Index: init.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4122/eagle/init.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- init.c 7 Mar 2002 03:16:54 -0000 1.1
+++ init.c 12 Jul 2002 20:14:28 -0000 1.2
@@ -1,9 +1,9 @@
/*
* FILE NAME
- * arch/mips/vr41xx/eagle/init.c
+ * arch/mips/vr41xx/vr4122/eagle/init.c
*
* BRIEF MODULE DESCRIPTION
- * Initialisation code for the NEC Eagle board.
+ * Initialisation code for the NEC Eagle/Hawk board.
*
* Author: Yoichi Yuasa
* yy...@mv... or so...@mv...
@@ -33,6 +33,9 @@
/*
* Changes:
* MontaVista Software Inc. <yy...@mv...> or <so...@mv...>
+ * - Added support for NEC Hawk.
+ *
+ * MontaVista Software Inc. <yy...@mv...> or <so...@mv...>
* - New creation, NEC Eagle is supported.
*/
#include <linux/config.h>
@@ -46,7 +49,7 @@
const char *get_system_type(void)
{
- return "NEC Eagle";
+ return "NEC Eagle/Hawk";
}
void __init bus_error_init(void)
@@ -67,11 +70,6 @@
strcat(arcs_cmdline, " ");
}
-#if defined(CONFIG_SERIAL_CONSOLE)
- /* to use 38400 ttyS0 serial console */
- strcat(arcs_cmdline, " console=ttyS0,38400");
-#endif
-
mips_machgroup = MACH_GROUP_NEC_VR41XX;
mips_machtype = MACH_NEC_EAGLE;
@@ -88,6 +86,7 @@
break;
default:
panic("Memory size error");
+ break;
}
}
Index: irq.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4122/eagle/irq.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- irq.c 14 Jun 2002 15:02:15 -0000 1.2
+++ irq.c 12 Jul 2002 20:14:28 -0000 1.3
@@ -1,9 +1,9 @@
/*
* FILE NAME
- * arch/mips/vr41xx/eagle/irq.c
+ * arch/mips/vr41xx/vr4122/eagle/irq.c
*
* BRIEF MODULE DESCRIPTION
- * Interrupt routines for the NEC Eagle board.
+ * Interrupt routines for the NEC Eagle/Hawk board.
*
* Author: Yoichi Yuasa
* yy...@mv... or so...@mv...
@@ -33,6 +33,9 @@
/*
* Changes:
* MontaVista Software Inc. <yy...@mv...> or <so...@mv...>
+ * - Added support for NEC Hawk.
+ *
+ * MontaVista Software Inc. <yy...@mv...> or <so...@mv...>
* - New creation, NEC Eagle is supported.
*/
#include <linux/init.h>
@@ -99,14 +102,26 @@
if (val & (0x01 << i))
return PCIINT_IRQ_BASE + i;
- return -1;
+ return -EINVAL;
}
-void __init eagle_board_irq_init(void)
+void __init eagle_irq_init(void)
{
int i;
writeb(0, NEC_EAGLE_PCIINTMSKREG);
+
+ vr41xx_set_irq_trigger(VRC4173_PIN, TRIGGER_LEVEL, SIGNAL_THROUGH);
+ vr41xx_set_irq_level(VRC4173_PIN, LEVEL_LOW);
+
+ vr41xx_set_irq_trigger(PCISLOT_PIN, TRIGGER_LEVEL, SIGNAL_THROUGH);
+ vr41xx_set_irq_level(PCISLOT_PIN, LEVEL_HIGH);
+
+ vr41xx_set_irq_trigger(PCIINT_PIN, TRIGGER_LEVEL, SIGNAL_THROUGH);
+ vr41xx_set_irq_level(PCIINT_PIN, LEVEL_HIGH);
+
+ vr41xx_set_irq_trigger(DCD_PIN, TRIGGER_EDGE, SIGNAL_HOLD);
+ vr41xx_set_irq_level(DCD_PIN, LEVEL_LOW);
for (i = PCIINT_IRQ_BASE; i <= PCIINT_IRQ_LAST; i++)
irq_desc[i].handler = &pciint_irq_type;
Index: pci_fixup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4122/eagle/pci_fixup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pci_fixup.c 12 Mar 2002 05:23:12 -0000 1.2
+++ pci_fixup.c 12 Jul 2002 20:14:28 -0000 1.3
@@ -1,9 +1,9 @@
/*
* FILE NAME
- * arch/mips/vr41xx/eagle/pci_fixup.c
+ * arch/mips/vr41xx/vr4122/eagle/pci_fixup.c
*
* BRIEF MODULE DESCRIPTION
- * The NEC Eagle Board specific PCI fixups.
+ * The NEC Eagle/Hawk Board specific PCI fixups.
*
* Author: Yoichi Yuasa
* yy...@mv... or so...@mv...
@@ -32,6 +32,10 @@
*/
/*
* Changes:
+ * MontaVista Software Inc. <yy...@mv...> or <so...@mv...>
+ * - Moved mips_pci_channels[] to arch/mips/vr41xx/vr4122/eagle/setup.c.
+ * - Added support for NEC Hawk.
+ *
* Paul Mundt <le...@ch...>
* - Fix empty break statements, remove useless CONFIG_PCI.
*
@@ -42,33 +46,11 @@
#include <linux/init.h>
#include <linux/pci.h>
-#include <asm/pci_channel.h>
#include <asm/vr41xx/eagle.h>
#ifdef CONFIG_VRC4173
#include <asm/vr41xx/vrc4173.h>
#endif
-static struct resource vr41xx_pci_io_resource = {
- "PCI I/O space",
- VR41XX_PCI_IO_START,
- VR41XX_PCI_IO_END,
- IORESOURCE_IO
-};
-
-static struct resource vr41xx_pci_mem_resource = {
- "PCI memory space",
- VR41XX_PCI_MEM_START,
- VR41XX_PCI_MEM_END,
- IORESOURCE_MEM
-};
-
-extern struct pci_ops vr41xx_pci_ops;
-
-struct pci_channel mips_pci_channels[] = {
- {&vr41xx_pci_ops, &vr41xx_pci_io_resource, &vr41xx_pci_mem_resource, 0, 256},
- {NULL, NULL, NULL, 0, 0}
-};
-
void __init pcibios_fixup_resources(struct pci_dev *dev)
{
}
@@ -85,15 +67,11 @@
pci_for_each_dev(dev) {
slot = PCI_SLOT(dev->devfn);
func = PCI_FUNC(dev->devfn);
+ pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
dev->irq = 0;
switch (slot) {
- case 11:
- case 12:
- case 13:
- case 14:
- case 15:
- pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
+ case 8:
switch (pin) {
case 1:
dev->irq = CP_INTA_IRQ;
@@ -109,7 +87,45 @@
break;
}
break;
+ case 9:
+ switch (pin) {
+ case 1:
+ dev->irq = CP_INTD_IRQ;
+ break;
+ case 2:
+ dev->irq = CP_INTA_IRQ;
+ break;
+ case 3:
+ dev->irq = CP_INTB_IRQ;
+ break;
+ case 4:
+ dev->irq = CP_INTC_IRQ;
+ break;
+ }
+ break;
+ case 10:
+ switch (pin) {
+ case 1:
+ dev->irq = CP_INTC_IRQ;
+ break;
+ case 2:
+ dev->irq = CP_INTD_IRQ;
+ break;
+ case 3:
+ dev->irq = CP_INTA_IRQ;
+ break;
+ case 4:
+ dev->irq = CP_INTB_IRQ;
+ break;
+ }
+ break;
#ifdef CONFIG_VRC4173
+ case 12:
+ dev->irq = VRC4173_CARDU1_IRQ;
+ break;
+ case 13:
+ dev->irq = VRC4173_CARDU2_IRQ;
+ break;
case 24:
dev->irq = VRC4173_CARDU1_IRQ;
break;
@@ -148,4 +164,3 @@
{
return 0;
}
-
Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4122/eagle/setup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- setup.c 14 Jun 2002 15:02:15 -0000 1.2
+++ setup.c 12 Jul 2002 20:14:28 -0000 1.3
@@ -1,9 +1,9 @@
/*
* FILE NAME
- * arch/mips/vr41xx/eagle/setup.c
+ * arch/mips/vr41xx/vr4122/eagle/setup.c
*
* BRIEF MODULE DESCRIPTION
- * Setup for the NEC Eagle board.
+ * Setup for the NEC Eagle/Hawk board.
*
* Author: Yoichi Yuasa
* yy...@mv... or so...@mv...
@@ -33,6 +33,10 @@
/*
* Changes:
* MontaVista Software Inc. <yy...@mv...> or <so...@mv...>
+ * - Moved mips_pci_channels[] from arch/mips/vr41xx/vr4122/eagle/setup.c.
+ * - Added support for NEC Hawk.
+ *
+ * MontaVista Software Inc. <yy...@mv...> or <so...@mv...>
* - New creation, NEC Eagle is supported.
*/
#include <linux/config.h>
@@ -41,6 +45,7 @@
#include <linux/ide.h>
#include <linux/ioport.h>
+#include <asm/pci_channel.h>
#include <asm/reboot.h>
#include <asm/time.h>
#include <asm/vr41xx/eagle.h>
@@ -54,13 +59,62 @@
extern struct ide_ops eagle_ide_ops;
#endif
+extern void eagle_irq_init(void);
+
+#ifdef CONFIG_PCI
+static struct resource vr41xx_pci_io_resource = {
+ "PCI I/O space",
+ VR41XX_PCI_IO_START,
+ VR41XX_PCI_IO_END,
+ IORESOURCE_IO
+};
+
+static struct resource vr41xx_pci_mem_resource = {
+ "PCI memory space",
+ VR41XX_PCI_MEM_START,
+ VR41XX_PCI_MEM_END,
+ IORESOURCE_MEM
+};
+
+extern struct pci_ops vr41xx_pci_ops;
+
+struct pci_channel mips_pci_channels[] = {
+ {&vr41xx_pci_ops, &vr41xx_pci_io_resource, &vr41xx_pci_mem_resource, 0, 256},
+ {NULL, NULL, NULL, 0, 0}
+};
+
+struct vr41xx_pci_address_space vr41xx_pci_mem1 = {
+ VR41XX_PCI_MEM1_BASE,
+ VR41XX_PCI_MEM1_MASK,
+ IO_MEM1_RESOURCE_START
+};
+
+struct vr41xx_pci_address_space vr41xx_pci_mem2 = {
+ VR41XX_PCI_MEM2_BASE,
+ VR41XX_PCI_MEM2_MASK,
+ IO_MEM2_RESOURCE_START
+};
+
+struct vr41xx_pci_address_space vr41xx_pci_io = {
+ VR41XX_PCI_IO_BASE,
+ VR41XX_PCI_IO_MASK,
+ IO_PORT_RESOURCE_START
+};
+
+static struct vr41xx_pci_address_map pci_address_map = {
+ &vr41xx_pci_mem1,
+ &vr41xx_pci_mem2,
+ &vr41xx_pci_io
+};
+#endif
+
void __init nec_vr41xx_setup(void)
{
set_io_port_base(IO_PORT_BASE);
ioport_resource.start = IO_PORT_RESOURCE_START;
ioport_resource.end = IO_PORT_RESOURCE_END;
- iomem_resource.start = IO_MEM_RESOURCE_START;
- iomem_resource.end = IO_MEM_RESOURCE_END;
+ iomem_resource.start = IO_MEM1_RESOURCE_START;
+ iomem_resource.end = IO_MEM2_RESOURCE_END;
#ifdef CONFIG_BLK_DEV_INITRD
ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0);
@@ -72,11 +126,11 @@
_machine_halt = vr41xx_halt;
_machine_power_off = vr41xx_power_off;
- board_irq_init = eagle_board_irq_init;
-
board_time_init = vr41xx_time_init;
board_timer_setup = vr41xx_timer_setup;
+ board_irq_init = eagle_irq_init;
+
#ifdef CONFIG_FB
conswitchp = &dummy_con;
#endif
@@ -87,11 +141,13 @@
vr41xx_bcu_init();
- vr41xx_dsiu_init(0);
- vr41xx_siu_init(1, SIU_RS232C, 0);
+ vr41xx_cmu_init(0);
+
+ vr41xx_dsiu_init();
+ vr41xx_siu_init(SIU_RS232C, 0);
#ifdef CONFIG_PCI
- vr41xx_pciu_init();
+ vr41xx_pciu_init(&pci_address_map);
#endif
#ifdef CONFIG_VRC4173
|
|
From: Paul M. <le...@us...> - 2002-07-12 20:14:32
|
Update of /cvsroot/linux-mips/linux/include/asm-mips
In directory usw-pr-cvs1:/tmp/cvs-serv32248/include/asm-mips
Modified Files:
bootinfo.h cpu.h vr41xx.h
Log Message:
Merge yoichi-san's vr41xx patch. Still some cleanups needed..
Index: bootinfo.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/bootinfo.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- bootinfo.h 18 Jun 2002 23:07:27 -0000 1.31
+++ bootinfo.h 12 Jul 2002 20:14:28 -0000 1.32
@@ -171,7 +171,7 @@
* Valid machtype for group NEC_VR41XX
*/
#define MACH_NEC_OSPREY 0 /* Osprey eval board */
-#define MACH_NEC_EAGLE 1 /* NEC Eagle board */
+#define MACH_NEC_EAGLE 1 /* NEC Eagle/Hawk board */
#define MACH_NEC_KORVA 2 /* NEC korva board */
#define MACH_VADEM_CLIO_1000 3 /* Vadem Clio 1000 */
#define MACH_NEC_MOBILEPRO_780 4 /* NEC MobilePro 780 PDA */
@@ -180,6 +180,8 @@
#define MACH_CASIO_E55 7 /* Casio Cassiopeia E-55/65 */
#define MACH_IBM_WORKPAD 8 /* IBM WorkPad z50 */
#define MACH_VICTOR_MPC303 9 /* Victor MP-C303/304 */
+#define MACH_ZAO_CAPCELLA 10 /* ZAO Networks Capcella */
+#define MACH_LASER5_LROUTER 11 /* Laser5 L-Router */
#define CL_SIZE (256)
Index: cpu.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/cpu.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- cpu.h 13 Jun 2002 18:26:04 -0000 1.29
+++ cpu.h 12 Jul 2002 20:14:28 -0000 1.30
@@ -107,6 +107,20 @@
#define PRID_REV_TX3927 0x0040
#define PRID_REV_TX3927B 0x0041
#define PRID_REV_TX4927 0x0022
+#define PRID_REV_VR4111 0x0052
+#define PRID_REV_VR4181 0x0052 /* Same as VR4111 */
+#define PRID_REV_VR4121 0x0060 /* VR4121 0x0060 - 0x006f */
+#define PRID_REV_VR4122_REV1_0 0x0070 /* VR4122 0x70-0x72 */
+#define PRID_REV_VR4122_REV2_0 0x0070
+#define PRID_REV_VR4122_REV2_1 0x0070
+#define PRID_REV_VR4122_REV3_0 0x0071
+#define PRID_REV_VR4122_REV3_1 0x0072
+#define PRID_REV_VR4181A_REV1_0 0x0073 /* VR4181A 0x0073 - 0x007f */
+#define PRID_REV_VR4181A_REV1_1 0x0074
+#define PRID_REV_VR4131_REV1_2 0x0080 /* VR4131 0x80-0x8f */
+#define PRID_REV_VR4131_REV2_0 0x0081
+#define PRID_REV_VR4131_REV2_1 0x0082
+#define PRID_REV_VR4131_REV2_2 0x0083
/*
* FPU implementation/revision register (CP1 control register 0).
@@ -148,7 +162,8 @@
CPU_5KC, CPU_R4310, CPU_SB1, CPU_TX3912, CPU_TX3922, CPU_TX3927,
CPU_AU1000, CPU_4KEC, CPU_4KSC, CPU_VR41XX, CPU_R5500, CPU_TX49XX,
CPU_TX39XX, CPU_AU1500, CPU_R5900, CPU_RC32300, CPU_SR7100,
- CPU_AU1100, CPU_20KC, CPU_LAST
+ CPU_AU1100, CPU_20KC, CPU_VR4111, CPU_VR4121, CPU_VR4122, CPU_VR4131,
+ CPU_VR4181, CPU_VR4181A, CPU_LAST
};
#endif
Index: vr41xx.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/vr41xx.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- vr41xx.h 14 Jun 2002 15:02:16 -0000 1.4
+++ vr41xx.h 12 Jul 2002 20:14:28 -0000 1.5
@@ -50,6 +50,7 @@
/*
* Clock Mask Unit
*/
+extern void vr41xx_cmu_init(u16 mask);
extern void vr41xx_clock_supply(u16 mask);
extern void vr41xx_clock_mask(u16 mask);
@@ -58,23 +59,49 @@
*/
/* GIU Interrupt Numbers */
-#define GIUL_IRQ(x) (40 + (x))
-#define GIUH_IRQ(x) (56 + (x))
+#define GIU_IRQ(x) (40 + (x))
-struct irqcascade {
- int cascade;
- int (*get_irq_number)(int irq);
+extern void (*board_irq_init)(void);
+extern int vr41xx_cascade_irq(unsigned int irq, int (*get_irq_number)(int irq));
+
+/*
+ * Gegeral-Purpose I/O Unit
+ */
+enum {
+ TRIGGER_LEVEL,
+ TRIGGER_EDGE
};
-extern void (*board_irq_init)(void);
-extern void vr41xx_board_irq_init(void);
-extern void vr41xx_cascade_irq(unsigned int irq, int (*get_irq_number)(int irq));
+enum {
+ SIGNAL_THROUGH,
+ SIGNAL_HOLD
+};
+
+extern void vr41xx_set_irq_trigger(u8 pin, u8 trigger, u8 hold);
+
+enum {
+ LEVEL_LOW,
+ LEVEL_HIGH
+};
+
+extern void vr41xx_set_irq_level(u8 pin, u8 level);
+
+enum {
+ PIO_INPUT,
+ PIO_OUTPUT
+};
+
+enum {
+ DATA_LOW,
+ DATA_HIGH
+};
/*
* Serial Interface Unit
*/
-extern void vr41xx_siu_init(int line, int interface, int module);
+extern void vr41xx_siu_init(int interface, int module);
extern void vr41xx_siu_ifselect(int interface, int module);
+extern int vr41xx_serial_ports;
/* SIU interfaces */
enum {
@@ -92,12 +119,24 @@
/*
* Debug Serial Interface Unit
*/
-extern void vr41xx_dsiu_init(int line);
+extern void vr41xx_dsiu_init(void);
/*
* PCI Control Unit
*/
-extern void vr41xx_pciu_init(void);
+struct vr41xx_pci_address_space {
+ u32 internal_base;
+ u32 address_mask;
+ u32 pci_base;
+};
+
+struct vr41xx_pci_address_map {
+ struct vr41xx_pci_address_space *mem1;
+ struct vr41xx_pci_address_space *mem2;
+ struct vr41xx_pci_address_space *io;
+};
+
+extern void vr41xx_pciu_init(struct vr41xx_pci_address_map *map);
/*
* MISC
@@ -110,4 +149,3 @@
extern void vr41xx_power_off(void);
#endif /* __ASM_MIPS_VR41XX_H */
-
|
|
From: Paul M. <le...@us...> - 2002-07-12 20:14:31
|
Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4122/capcella
In directory usw-pr-cvs1:/tmp/cvs-serv32248/arch/mips/vr41xx/vr4122/capcella
Added Files:
Makefile ide-capcella.c init.c pci_fixup.c setup.c
Log Message:
Merge yoichi-san's vr41xx patch. Still some cleanups needed..
--- NEW FILE: Makefile ---
#
# Makefile for the ZAO Networks Capcella specific parts of the kernel
#
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
#
.S.s:
$(CPP) $(AFLAGS) $< -o $@
.S.o:
$(CC) $(AFLAGS) -c $< -o $@
O_TARGET := capcella.o
all: capcella.o
obj-y := init.o setup.o
obj-$(CONFIG_IDE) += ide-capcella.o
obj-$(CONFIG_PCI) += pci_fixup.o
include $(TOPDIR)/Rules.make
--- NEW FILE: ide-capcella.c ---
/*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
* IDE routines for typical pc-like standard configurations
* for the ZAO Networks Capcella.
*
* Copyright (C) 1998, 1999, 2001 by Ralf Baechle
*/
#include <linux/sched.h>
#include <linux/ide.h>
#include <linux/ioport.h>
#include <linux/hdreg.h>
#include <asm/ptrace.h>
#include <asm/hdreg.h>
static int capcella_ide_default_irq(ide_ioreg_t base)
{
switch (base) {
case 0x8300: return 42;
}
return 0;
}
static ide_ioreg_t capcella_ide_default_io_base(int index)
{
switch (index) {
case 0: return 0x8300;
}
return 0;
}
static void capcella_ide_init_hwif_ports(hw_regs_t *hw, ide_ioreg_t data_port,
ide_ioreg_t ctrl_port, int *irq)
{
ide_ioreg_t reg = data_port;
int i;
for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
hw->io_ports[i] = reg;
reg += 1;
}
if (ctrl_port) {
hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port;
} else {
hw->io_ports[IDE_CONTROL_OFFSET] = hw->io_ports[IDE_DATA_OFFSET] + 0x206;
}
if (irq != NULL)
*irq = 0;
hw->io_ports[IDE_IRQ_OFFSET] = 0;
}
static int capcella_ide_request_irq(unsigned int irq,
void (*handler)(int,void *, struct pt_regs *),
unsigned long flags, const char *device,
void *dev_id)
{
return request_irq(irq, handler, flags, device, dev_id);
}
static void capcella_ide_free_irq(unsigned int irq, void *dev_id)
{
free_irq(irq, dev_id);
}
static int capcella_ide_check_region(ide_ioreg_t from, unsigned int extent)
{
return check_region(from, extent);
}
static void capcella_ide_request_region(ide_ioreg_t from, unsigned int extent,
const char *name)
{
request_region(from, extent, name);
}
static void capcella_ide_release_region(ide_ioreg_t from, unsigned int extent)
{
release_region(from, extent);
}
struct ide_ops capcella_ide_ops = {
&capcella_ide_default_irq,
&capcella_ide_default_io_base,
&capcella_ide_init_hwif_ports,
&capcella_ide_request_irq,
&capcella_ide_free_irq,
&capcella_ide_check_region,
&capcella_ide_request_region,
&capcella_ide_release_region
};
--- NEW FILE: init.c ---
/*
* FILE NAME
* arch/mips/vr41xx/vr4122/capcella/init.c
*
* BRIEF MODULE DESCRIPTION
* Initialisation code for the ZAO Networks Capcella.
*
* Copyright 2002 Yoichi Yuasa
* yu...@hh...
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*/
#include <linux/config.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <asm/bootinfo.h>
char arcs_cmdline[CL_SIZE];
const char *get_system_type(void)
{
return "ZAO Networks Capcella";
}
void __init bus_error_init(void)
{
}
void __init prom_init(int argc, char **argv, unsigned long magic, int *prom_vec)
{
int i;
/*
* collect args and prepare cmd_line
*/
for (i = 1; i < argc; i++) {
strcat(arcs_cmdline, argv[i]);
if (i < (argc - 1))
strcat(arcs_cmdline, " ");
}
mips_machgroup = MACH_GROUP_NEC_VR41XX;
mips_machtype = MACH_ZAO_CAPCELLA;
/* Add memory region */
add_memory_region(0, 32 << 20, BOOT_MEM_RAM);
}
void __init prom_free_prom_memory (void)
{
}
--- NEW FILE: pci_fixup.c ---
/*
* FILE NAME
* arch/mips/vr41xx/vr4122/capcella/pci_fixup.c
*
* BRIEF MODULE DESCRIPTION
* The ZAO Networks Capcella specific PCI fixups.
*
* Copyright 2002 Yoichi Yuasa
* yu...@hh...
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*/
#include <linux/config.h>
#include <linux/init.h>
#include <linux/pci.h>
#include <asm/vr41xx/capcella.h>
void __init pcibios_fixup_resources(struct pci_dev *dev)
{
}
void __init pcibios_fixup(void)
{
}
void __init pcibios_fixup_irqs(void)
{
struct pci_dev *dev;
u8 slot, func, pin;
pci_for_each_dev(dev) {
slot = PCI_SLOT(dev->devfn);
func = PCI_FUNC(dev->devfn);
dev->irq = 0;
switch (slot) {
case 11:
dev->irq = RTL8139_1_IRQ;
break;
case 12:
dev->irq = RTL8139_2_IRQ;
break;
case 14:
pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
switch (pin) {
case 1:
dev->irq = PC104PLUS_INTA_IRQ;
break;
case 2:
dev->irq = PC104PLUS_INTB_IRQ;
break;
case 3:
dev->irq = PC104PLUS_INTC_IRQ;
break;
case 4:
dev->irq = PC104PLUS_INTD_IRQ;
break;
}
break;
}
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
}
}
unsigned int pcibios_assign_all_busses(void)
{
return 0;
}
--- NEW FILE: setup.c ---
/*
* FILE NAME
* arch/mips/vr41xx/vr4122/capcella/setup.c
*
* BRIEF MODULE DESCRIPTION
* Setup for the ZAO Networks Capcella.
*
* Copyright 2002 Yoichi Yuasa
* yu...@hh...
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*/
#include <linux/config.h>
#include <linux/init.h>
#include <linux/console.h>
#include <linux/ide.h>
#include <linux/ioport.h>
#include <asm/pci_channel.h>
#include <asm/reboot.h>
#include <asm/time.h>
#include <asm/vr41xx/capcella.h>
#ifdef CONFIG_BLK_DEV_INITRD
extern unsigned long initrd_start, initrd_end;
extern void * __rd_start, * __rd_end;
#endif
#ifdef CONFIG_BLK_DEV_IDE
extern struct ide_ops capcella_ide_ops;
#endif
#ifdef CONFIG_PCI
static struct resource vr41xx_pci_io_resource = {
"PCI I/O space",
VR41XX_PCI_IO_START,
VR41XX_PCI_IO_END,
IORESOURCE_IO
};
static struct resource vr41xx_pci_mem_resource = {
"PCI memory space",
VR41XX_PCI_MEM_START,
VR41XX_PCI_MEM_END,
IORESOURCE_MEM
};
extern struct pci_ops vr41xx_pci_ops;
struct pci_channel mips_pci_channels[] = {
{&vr41xx_pci_ops, &vr41xx_pci_io_resource, &vr41xx_pci_mem_resource, 0, 256},
{NULL, NULL, NULL, 0, 0}
};
struct vr41xx_pci_address_space vr41xx_pci_mem1 = {
VR41XX_PCI_MEM1_BASE,
VR41XX_PCI_MEM1_MASK,
IO_MEM1_RESOURCE_START
};
struct vr41xx_pci_address_space vr41xx_pci_mem2 = {
VR41XX_PCI_MEM2_BASE,
VR41XX_PCI_MEM2_MASK,
IO_MEM2_RESOURCE_START
};
struct vr41xx_pci_address_space vr41xx_pci_io = {
VR41XX_PCI_IO_BASE,
VR41XX_PCI_IO_MASK,
IO_PORT_RESOURCE_START
};
static struct vr41xx_pci_address_map pci_address_map = {
&vr41xx_pci_mem1,
&vr41xx_pci_mem2,
&vr41xx_pci_io
};
#endif
void __init nec_vr41xx_setup(void)
{
set_io_port_base(IO_PORT_BASE);
ioport_resource.start = IO_PORT_RESOURCE_START;
ioport_resource.end = IO_PORT_RESOURCE_END;
iomem_resource.start = IO_MEM1_RESOURCE_START;
iomem_resource.end = IO_MEM2_RESOURCE_END;
#ifdef CONFIG_BLK_DEV_INITRD
ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0);
initrd_start = (unsigned long)&__rd_start;
initrd_end = (unsigned long)&__rd_end;
#endif
_machine_restart = vr41xx_restart;
_machine_halt = vr41xx_halt;
_machine_power_off = vr41xx_power_off;
board_time_init = vr41xx_time_init;
board_timer_setup = vr41xx_timer_setup;
#ifdef CONFIG_FB
conswitchp = &dummy_con;
#endif
#ifdef CONFIG_BLK_DEV_IDE
ide_ops = &capcella_ide_ops;
#endif
vr41xx_bcu_init();
vr41xx_cmu_init(0x0102);
vr41xx_siu_init(SIU_RS232C, 0);
#ifdef CONFIG_PCI
vr41xx_pciu_init(&pci_address_map);
#endif
}
|
|
From: Paul M. <le...@us...> - 2002-07-12 20:14:31
|
Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/mobilepro In directory usw-pr-cvs1:/tmp/cvs-serv32248/arch/mips/vr41xx/vr4111/mobilepro Modified Files: setup.c Log Message: Merge yoichi-san's vr41xx patch. Still some cleanups needed.. Index: setup.c =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/mobilepro/setup.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- setup.c 11 Mar 2002 19:36:43 -0000 1.2 +++ setup.c 12 Jul 2002 20:14:28 -0000 1.3 @@ -29,8 +29,6 @@ extern void vr41xx_restart(char *c); extern void vr4111_hibernate(void); extern void vr4111_wait(void); -extern void vr4111_time_init(void); -extern void vr4111_timer_setup(struct irqaction *irq); extern void vr4111_init_serial(void); void __init bus_error_init(void) @@ -42,8 +40,8 @@ set_io_port_base(VR41XX_PORT_BASE); isa_slot_offset = VR41XX_ISAMEM_BASE; - board_time_init = vr4111_time_init; - board_timer_setup = vr4111_timer_setup; + board_time_init = vr41xx_time_init; + board_timer_setup = vr41xx_timer_setup; _machine_restart = vr41xx_restart; _machine_halt = vr4111_hibernate; |
582 messages has been excluded from this view by a project administrator.
