/target/linux/generic-2.4/patches/000-linux_mips.patch
Patch | 18282 lines | 17606 code | 676 blank | 0 comment | 0 complexity | 4c5ad5e342013da98ffdacadb207c8c7 MD5 | raw file
Possible License(s): GPL-2.0
- --- a/arch/mips/au1000/common/au1xxx_irqmap.c
- +++ b/arch/mips/au1000/common/au1xxx_irqmap.c
- @@ -172,14 +172,14 @@ au1xxx_irq_map_t au1xxx_ic0_map[] = {
- { AU1550_PSC1_INT, INTC_INT_HIGH_LEVEL, 0},
- { AU1550_PSC2_INT, INTC_INT_HIGH_LEVEL, 0},
- { AU1550_PSC3_INT, INTC_INT_HIGH_LEVEL, 0},
- - { AU1550_TOY_INT, INTC_INT_RISE_EDGE, 0 },
- - { AU1550_TOY_MATCH0_INT, INTC_INT_RISE_EDGE, 0 },
- - { AU1550_TOY_MATCH1_INT, INTC_INT_RISE_EDGE, 0 },
- - { AU1550_TOY_MATCH2_INT, INTC_INT_RISE_EDGE, 1 },
- - { AU1550_RTC_INT, INTC_INT_RISE_EDGE, 0 },
- - { AU1550_RTC_MATCH0_INT, INTC_INT_RISE_EDGE, 0 },
- - { AU1550_RTC_MATCH1_INT, INTC_INT_RISE_EDGE, 0 },
- - { AU1550_RTC_MATCH2_INT, INTC_INT_RISE_EDGE, 0 },
- + { AU1000_TOY_INT, INTC_INT_RISE_EDGE, 0 },
- + { AU1000_TOY_MATCH0_INT, INTC_INT_RISE_EDGE, 0 },
- + { AU1000_TOY_MATCH1_INT, INTC_INT_RISE_EDGE, 0 },
- + { AU1000_TOY_MATCH2_INT, INTC_INT_RISE_EDGE, 1 },
- + { AU1000_RTC_INT, INTC_INT_RISE_EDGE, 0 },
- + { AU1000_RTC_MATCH0_INT, INTC_INT_RISE_EDGE, 0 },
- + { AU1000_RTC_MATCH1_INT, INTC_INT_RISE_EDGE, 0 },
- + { AU1000_RTC_MATCH2_INT, INTC_INT_RISE_EDGE, 0 },
- { AU1550_NAND_INT, INTC_INT_RISE_EDGE, 0},
- { AU1550_USB_DEV_REQ_INT, INTC_INT_HIGH_LEVEL, 0 },
- { AU1550_USB_DEV_SUS_INT, INTC_INT_RISE_EDGE, 0 },
- @@ -200,14 +200,14 @@ au1xxx_irq_map_t au1xxx_ic0_map[] = {
- { AU1200_PSC1_INT, INTC_INT_HIGH_LEVEL, 0},
- { AU1200_AES_INT, INTC_INT_HIGH_LEVEL, 0},
- { AU1200_CAMERA_INT, INTC_INT_HIGH_LEVEL, 0},
- - { AU1200_TOY_INT, INTC_INT_RISE_EDGE, 0 },
- - { AU1200_TOY_MATCH0_INT, INTC_INT_RISE_EDGE, 0 },
- - { AU1200_TOY_MATCH1_INT, INTC_INT_RISE_EDGE, 0 },
- - { AU1200_TOY_MATCH2_INT, INTC_INT_RISE_EDGE, 1 },
- - { AU1200_RTC_INT, INTC_INT_RISE_EDGE, 0 },
- - { AU1200_RTC_MATCH0_INT, INTC_INT_RISE_EDGE, 0 },
- - { AU1200_RTC_MATCH1_INT, INTC_INT_RISE_EDGE, 0 },
- - { AU1200_RTC_MATCH2_INT, INTC_INT_RISE_EDGE, 0 },
- + { AU1000_TOY_INT, INTC_INT_RISE_EDGE, 0 },
- + { AU1000_TOY_MATCH0_INT, INTC_INT_RISE_EDGE, 0 },
- + { AU1000_TOY_MATCH1_INT, INTC_INT_RISE_EDGE, 0 },
- + { AU1000_TOY_MATCH2_INT, INTC_INT_RISE_EDGE, 1 },
- + { AU1000_RTC_INT, INTC_INT_RISE_EDGE, 0 },
- + { AU1000_RTC_MATCH0_INT, INTC_INT_RISE_EDGE, 0 },
- + { AU1000_RTC_MATCH1_INT, INTC_INT_RISE_EDGE, 0 },
- + { AU1000_RTC_MATCH2_INT, INTC_INT_RISE_EDGE, 0 },
- { AU1200_NAND_INT, INTC_INT_RISE_EDGE, 0},
- { AU1200_USB_INT, INTC_INT_HIGH_LEVEL, 0 },
- { AU1200_LCD_INT, INTC_INT_HIGH_LEVEL, 0},
- --- a/arch/mips/au1000/common/cputable.c
- +++ b/arch/mips/au1000/common/cputable.c
- @@ -39,7 +39,8 @@ struct cpu_spec cpu_specs[] = {
- { 0xffffffff, 0x02030203, "Au1100 BD", 0, 1 },
- { 0xffffffff, 0x02030204, "Au1100 BE", 0, 1 },
- { 0xffffffff, 0x03030200, "Au1550 AA", 0, 1 },
- - { 0xffffffff, 0x04030200, "Au1200 AA", 0, 1 },
- + { 0xffffffff, 0x04030200, "Au1200 AB", 0, 0 },
- + { 0xffffffff, 0x04030201, "Au1200 AC", 0, 0 },
- { 0x00000000, 0x00000000, "Unknown Au1xxx", 1, 0 },
- };
-
- --- a/arch/mips/au1000/common/dbdma.c
- +++ b/arch/mips/au1000/common/dbdma.c
- @@ -41,6 +41,8 @@
- #include <asm/au1xxx_dbdma.h>
- #include <asm/system.h>
-
- +#include <linux/module.h>
- +
- #if defined(CONFIG_SOC_AU1550) || defined(CONFIG_SOC_AU1200)
-
- /*
- @@ -60,37 +62,10 @@ static spinlock_t au1xxx_dbdma_spin_lock
- */
- #define ALIGN_ADDR(x, a) ((((u32)(x)) + (a-1)) & ~(a-1))
-
- -static volatile dbdma_global_t *dbdma_gptr = (dbdma_global_t *)DDMA_GLOBAL_BASE;
- -static int dbdma_initialized;
- +static dbdma_global_t *dbdma_gptr = (dbdma_global_t *)DDMA_GLOBAL_BASE;
- +static int dbdma_initialized=0;
- static void au1xxx_dbdma_init(void);
-
- -typedef struct dbdma_device_table {
- - u32 dev_id;
- - u32 dev_flags;
- - u32 dev_tsize;
- - u32 dev_devwidth;
- - u32 dev_physaddr; /* If FIFO */
- - u32 dev_intlevel;
- - u32 dev_intpolarity;
- -} dbdev_tab_t;
- -
- -typedef struct dbdma_chan_config {
- - u32 chan_flags;
- - u32 chan_index;
- - dbdev_tab_t *chan_src;
- - dbdev_tab_t *chan_dest;
- - au1x_dma_chan_t *chan_ptr;
- - au1x_ddma_desc_t *chan_desc_base;
- - au1x_ddma_desc_t *get_ptr, *put_ptr, *cur_ptr;
- - void *chan_callparam;
- - void (*chan_callback)(int, void *, struct pt_regs *);
- -} chan_tab_t;
- -
- -#define DEV_FLAGS_INUSE (1 << 0)
- -#define DEV_FLAGS_ANYUSE (1 << 1)
- -#define DEV_FLAGS_OUT (1 << 2)
- -#define DEV_FLAGS_IN (1 << 3)
- -
- static dbdev_tab_t dbdev_tab[] = {
- #ifdef CONFIG_SOC_AU1550
- /* UARTS */
- @@ -156,13 +131,13 @@ static dbdev_tab_t dbdev_tab[] = {
- { DSCR_CMD0_MAE_BOTH, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 },
- { DSCR_CMD0_LCD, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 },
-
- - { DSCR_CMD0_SDMS_TX0, DEV_FLAGS_OUT, 0, 0, 0x00000000, 0, 0 },
- - { DSCR_CMD0_SDMS_RX0, DEV_FLAGS_IN, 0, 0, 0x00000000, 0, 0 },
- - { DSCR_CMD0_SDMS_TX1, DEV_FLAGS_OUT, 0, 0, 0x00000000, 0, 0 },
- - { DSCR_CMD0_SDMS_RX1, DEV_FLAGS_IN, 0, 0, 0x00000000, 0, 0 },
- + { DSCR_CMD0_SDMS_TX0, DEV_FLAGS_OUT, 4, 8, 0x10600000, 0, 0 },
- + { DSCR_CMD0_SDMS_RX0, DEV_FLAGS_IN, 4, 8, 0x10600004, 0, 0 },
- + { DSCR_CMD0_SDMS_TX1, DEV_FLAGS_OUT, 4, 8, 0x10680000, 0, 0 },
- + { DSCR_CMD0_SDMS_RX1, DEV_FLAGS_IN, 4, 8, 0x10680004, 0, 0 },
-
- - { DSCR_CMD0_AES_TX, DEV_FLAGS_OUT, 0, 0, 0x00000000, 0, 0 },
- - { DSCR_CMD0_AES_RX, DEV_FLAGS_IN, 0, 0, 0x00000000, 0, 0 },
- + { DSCR_CMD0_AES_RX, DEV_FLAGS_IN , 4, 32, 0x10300008, 0, 0 },
- + { DSCR_CMD0_AES_TX, DEV_FLAGS_OUT, 4, 32, 0x10300004, 0, 0 },
-
- { DSCR_CMD0_PSC0_TX, DEV_FLAGS_OUT, 0, 0, 0x11a0001c, 0, 0 },
- { DSCR_CMD0_PSC0_RX, DEV_FLAGS_IN, 0, 0, 0x11a0001c, 0, 0 },
- @@ -172,9 +147,9 @@ static dbdev_tab_t dbdev_tab[] = {
- { DSCR_CMD0_PSC1_RX, DEV_FLAGS_IN, 0, 0, 0x11b0001c, 0, 0 },
- { DSCR_CMD0_PSC1_SYNC, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 },
-
- - { DSCR_CMD0_CIM_RXA, DEV_FLAGS_IN, 0, 0, 0x00000000, 0, 0 },
- - { DSCR_CMD0_CIM_RXB, DEV_FLAGS_IN, 0, 0, 0x00000000, 0, 0 },
- - { DSCR_CMD0_CIM_RXC, DEV_FLAGS_IN, 0, 0, 0x00000000, 0, 0 },
- + { DSCR_CMD0_CIM_RXA, DEV_FLAGS_IN, 0, 32, 0x14004020, 0, 0 },
- + { DSCR_CMD0_CIM_RXB, DEV_FLAGS_IN, 0, 32, 0x14004040, 0, 0 },
- + { DSCR_CMD0_CIM_RXC, DEV_FLAGS_IN, 0, 32, 0x14004060, 0, 0 },
- { DSCR_CMD0_CIM_SYNC, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 },
-
- { DSCR_CMD0_NAND_FLASH, DEV_FLAGS_IN, 0, 0, 0x00000000, 0, 0 },
- @@ -183,6 +158,24 @@ static dbdev_tab_t dbdev_tab[] = {
-
- { DSCR_CMD0_THROTTLE, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 },
- { DSCR_CMD0_ALWAYS, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 },
- +
- + /* Provide 16 user definable device types */
- + { 0, 0, 0, 0, 0, 0, 0 },
- + { 0, 0, 0, 0, 0, 0, 0 },
- + { 0, 0, 0, 0, 0, 0, 0 },
- + { 0, 0, 0, 0, 0, 0, 0 },
- + { 0, 0, 0, 0, 0, 0, 0 },
- + { 0, 0, 0, 0, 0, 0, 0 },
- + { 0, 0, 0, 0, 0, 0, 0 },
- + { 0, 0, 0, 0, 0, 0, 0 },
- + { 0, 0, 0, 0, 0, 0, 0 },
- + { 0, 0, 0, 0, 0, 0, 0 },
- + { 0, 0, 0, 0, 0, 0, 0 },
- + { 0, 0, 0, 0, 0, 0, 0 },
- + { 0, 0, 0, 0, 0, 0, 0 },
- + { 0, 0, 0, 0, 0, 0, 0 },
- + { 0, 0, 0, 0, 0, 0, 0 },
- + { 0, 0, 0, 0, 0, 0, 0 },
- };
-
- #define DBDEV_TAB_SIZE (sizeof(dbdev_tab) / sizeof(dbdev_tab_t))
- @@ -202,6 +195,30 @@ find_dbdev_id (u32 id)
- return NULL;
- }
-
- +u32
- +au1xxx_ddma_add_device(dbdev_tab_t *dev)
- +{
- + u32 ret = 0;
- + dbdev_tab_t *p=NULL;
- + static u16 new_id=0x1000;
- +
- + p = find_dbdev_id(0);
- + if ( NULL != p )
- + {
- + memcpy(p, dev, sizeof(dbdev_tab_t));
- + p->dev_id = DSCR_DEV2CUSTOM_ID(new_id,dev->dev_id);
- + ret = p->dev_id;
- + new_id++;
- +#if 0
- + printk("add_device: id:%x flags:%x padd:%x\n",
- + p->dev_id, p->dev_flags, p->dev_physaddr );
- +#endif
- + }
- +
- + return ret;
- +}
- +EXPORT_SYMBOL(au1xxx_ddma_add_device);
- +
- /* Allocate a channel and return a non-zero descriptor if successful.
- */
- u32
- @@ -214,7 +231,7 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 d
- int i;
- dbdev_tab_t *stp, *dtp;
- chan_tab_t *ctp;
- - volatile au1x_dma_chan_t *cp;
- + au1x_dma_chan_t *cp;
-
- /* We do the intialization on the first channel allocation.
- * We have to wait because of the interrupt handler initialization
- @@ -224,9 +241,6 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 d
- au1xxx_dbdma_init();
- dbdma_initialized = 1;
-
- - if ((srcid > DSCR_NDEV_IDS) || (destid > DSCR_NDEV_IDS))
- - return 0;
- -
- if ((stp = find_dbdev_id(srcid)) == NULL) return 0;
- if ((dtp = find_dbdev_id(destid)) == NULL) return 0;
-
- @@ -268,9 +282,9 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 d
- /* If kmalloc fails, it is caught below same
- * as a channel not available.
- */
- - ctp = (chan_tab_t *)kmalloc(sizeof(chan_tab_t), GFP_KERNEL);
- + ctp = (chan_tab_t *)
- + kmalloc(sizeof(chan_tab_t), GFP_KERNEL);
- chan_tab_ptr[i] = ctp;
- - ctp->chan_index = chan = i;
- break;
- }
- }
- @@ -278,10 +292,11 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 d
-
- if (ctp != NULL) {
- memset(ctp, 0, sizeof(chan_tab_t));
- + ctp->chan_index = chan = i;
- dcp = DDMA_CHANNEL_BASE;
- dcp += (0x0100 * chan);
- ctp->chan_ptr = (au1x_dma_chan_t *)dcp;
- - cp = (volatile au1x_dma_chan_t *)dcp;
- + cp = (au1x_dma_chan_t *)dcp;
- ctp->chan_src = stp;
- ctp->chan_dest = dtp;
- ctp->chan_callback = callback;
- @@ -298,6 +313,9 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 d
- i |= DDMA_CFG_DED;
- if (dtp->dev_intpolarity)
- i |= DDMA_CFG_DP;
- + if ((stp->dev_flags & DEV_FLAGS_SYNC) ||
- + (dtp->dev_flags & DEV_FLAGS_SYNC))
- + i |= DDMA_CFG_SYNC;
- cp->ddma_cfg = i;
- au_sync();
-
- @@ -308,14 +326,14 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 d
- rv = (u32)(&chan_tab_ptr[chan]);
- }
- else {
- - /* Release devices.
- - */
- + /* Release devices */
- stp->dev_flags &= ~DEV_FLAGS_INUSE;
- dtp->dev_flags &= ~DEV_FLAGS_INUSE;
- }
- }
- return rv;
- }
- +EXPORT_SYMBOL(au1xxx_dbdma_chan_alloc);
-
- /* Set the device width if source or destination is a FIFO.
- * Should be 8, 16, or 32 bits.
- @@ -343,6 +361,7 @@ au1xxx_dbdma_set_devwidth(u32 chanid, in
-
- return rv;
- }
- +EXPORT_SYMBOL(au1xxx_dbdma_set_devwidth);
-
- /* Allocate a descriptor ring, initializing as much as possible.
- */
- @@ -369,7 +388,8 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int
- * and if we try that first we are likely to not waste larger
- * slabs of memory.
- */
- - desc_base = (u32)kmalloc(entries * sizeof(au1x_ddma_desc_t), GFP_KERNEL);
- + desc_base = (u32)kmalloc(entries * sizeof(au1x_ddma_desc_t),
- + GFP_KERNEL|GFP_DMA);
- if (desc_base == 0)
- return 0;
-
- @@ -380,7 +400,7 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int
- kfree((const void *)desc_base);
- i = entries * sizeof(au1x_ddma_desc_t);
- i += (sizeof(au1x_ddma_desc_t) - 1);
- - if ((desc_base = (u32)kmalloc(i, GFP_KERNEL)) == 0)
- + if ((desc_base = (u32)kmalloc(i, GFP_KERNEL|GFP_DMA)) == 0)
- return 0;
-
- desc_base = ALIGN_ADDR(desc_base, sizeof(au1x_ddma_desc_t));
- @@ -460,9 +480,14 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int
- /* If source input is fifo, set static address.
- */
- if (stp->dev_flags & DEV_FLAGS_IN) {
- - src0 = stp->dev_physaddr;
- - src1 |= DSCR_SRC1_SAM(DSCR_xAM_STATIC);
- + if ( stp->dev_flags & DEV_FLAGS_BURSTABLE )
- + src1 |= DSCR_SRC1_SAM(DSCR_xAM_BURST);
- + else
- + src1 |= DSCR_SRC1_SAM(DSCR_xAM_STATIC);
- +
- }
- + if (stp->dev_physaddr)
- + src0 = stp->dev_physaddr;
-
- /* Set up dest1. For now, assume no stride and increment.
- * A channel attribute update can change this later.
- @@ -486,10 +511,18 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int
- /* If destination output is fifo, set static address.
- */
- if (dtp->dev_flags & DEV_FLAGS_OUT) {
- - dest0 = dtp->dev_physaddr;
- + if ( dtp->dev_flags & DEV_FLAGS_BURSTABLE )
- + dest1 |= DSCR_DEST1_DAM(DSCR_xAM_BURST);
- + else
- dest1 |= DSCR_DEST1_DAM(DSCR_xAM_STATIC);
- }
- + if (dtp->dev_physaddr)
- + dest0 = dtp->dev_physaddr;
-
- +#if 0
- + printk("did:%x sid:%x cmd0:%x cmd1:%x source0:%x source1:%x dest0:%x dest1:%x\n",
- + dtp->dev_id, stp->dev_id, cmd0, cmd1, src0, src1, dest0, dest1 );
- +#endif
- for (i=0; i<entries; i++) {
- dp->dscr_cmd0 = cmd0;
- dp->dscr_cmd1 = cmd1;
- @@ -498,6 +531,7 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int
- dp->dscr_dest0 = dest0;
- dp->dscr_dest1 = dest1;
- dp->dscr_stat = 0;
- + dp->sw_context = dp->sw_status = 0;
- dp->dscr_nxtptr = DSCR_NXTPTR(virt_to_phys(dp + 1));
- dp++;
- }
- @@ -510,13 +544,14 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int
-
- return (u32)(ctp->chan_desc_base);
- }
- +EXPORT_SYMBOL(au1xxx_dbdma_ring_alloc);
-
- /* Put a source buffer into the DMA ring.
- * This updates the source pointer and byte count. Normally used
- * for memory to fifo transfers.
- */
- u32
- -au1xxx_dbdma_put_source(u32 chanid, void *buf, int nbytes)
- +_au1xxx_dbdma_put_source(u32 chanid, void *buf, int nbytes, u32 flags)
- {
- chan_tab_t *ctp;
- au1x_ddma_desc_t *dp;
- @@ -543,24 +578,40 @@ au1xxx_dbdma_put_source(u32 chanid, void
- */
- dp->dscr_source0 = virt_to_phys(buf);
- dp->dscr_cmd1 = nbytes;
- - dp->dscr_cmd0 |= DSCR_CMD0_V; /* Let it rip */
- - ctp->chan_ptr->ddma_dbell = 0xffffffff; /* Make it go */
- -
- + /* Check flags */
- + if (flags & DDMA_FLAGS_IE)
- + dp->dscr_cmd0 |= DSCR_CMD0_IE;
- + if (flags & DDMA_FLAGS_NOIE)
- + dp->dscr_cmd0 &= ~DSCR_CMD0_IE;
- /* Get next descriptor pointer.
- */
- ctp->put_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));
-
- + /*
- + * There is an errata on the Au1200/Au1550 parts that could result
- + * in "stale" data being DMA'd. It has to do with the snoop logic on
- + * the dache eviction buffer. NONCOHERENT_IO is on by default for
- + * these parts. If it is fixedin the future, these dma_cache_inv will
- + * just be nothing more than empty macros. See io.h.
- + * */
- + dma_cache_wback_inv(buf,nbytes);
- + dp->dscr_cmd0 |= DSCR_CMD0_V; /* Let it rip */
- + au_sync();
- + dma_cache_wback_inv(dp, sizeof(dp));
- + ctp->chan_ptr->ddma_dbell = 0;
- +
- /* return something not zero.
- */
- return nbytes;
- }
- +EXPORT_SYMBOL(_au1xxx_dbdma_put_source);
-
- /* Put a destination buffer into the DMA ring.
- * This updates the destination pointer and byte count. Normally used
- * to place an empty buffer into the ring for fifo to memory transfers.
- */
- u32
- -au1xxx_dbdma_put_dest(u32 chanid, void *buf, int nbytes)
- +_au1xxx_dbdma_put_dest(u32 chanid, void *buf, int nbytes, u32 flags)
- {
- chan_tab_t *ctp;
- au1x_ddma_desc_t *dp;
- @@ -582,11 +633,33 @@ au1xxx_dbdma_put_dest(u32 chanid, void *
- if (dp->dscr_cmd0 & DSCR_CMD0_V)
- return 0;
-
- - /* Load up buffer address and byte count.
- - */
- + /* Load up buffer address and byte count */
- +
- + /* Check flags */
- + if (flags & DDMA_FLAGS_IE)
- + dp->dscr_cmd0 |= DSCR_CMD0_IE;
- + if (flags & DDMA_FLAGS_NOIE)
- + dp->dscr_cmd0 &= ~DSCR_CMD0_IE;
- +
- dp->dscr_dest0 = virt_to_phys(buf);
- dp->dscr_cmd1 = nbytes;
- +#if 0
- + printk("cmd0:%x cmd1:%x source0:%x source1:%x dest0:%x dest1:%x\n",
- + dp->dscr_cmd0, dp->dscr_cmd1, dp->dscr_source0,
- + dp->dscr_source1, dp->dscr_dest0, dp->dscr_dest1 );
- +#endif
- + /*
- + * There is an errata on the Au1200/Au1550 parts that could result in
- + * "stale" data being DMA'd. It has to do with the snoop logic on the
- + * dache eviction buffer. NONCOHERENT_IO is on by default for these
- + * parts. If it is fixedin the future, these dma_cache_inv will just
- + * be nothing more than empty macros. See io.h.
- + * */
- + dma_cache_inv(buf,nbytes);
- dp->dscr_cmd0 |= DSCR_CMD0_V; /* Let it rip */
- + au_sync();
- + dma_cache_wback_inv(dp, sizeof(dp));
- + ctp->chan_ptr->ddma_dbell = 0;
-
- /* Get next descriptor pointer.
- */
- @@ -596,6 +669,7 @@ au1xxx_dbdma_put_dest(u32 chanid, void *
- */
- return nbytes;
- }
- +EXPORT_SYMBOL(_au1xxx_dbdma_put_dest);
-
- /* Get a destination buffer into the DMA ring.
- * Normally used to get a full buffer from the ring during fifo
- @@ -645,7 +719,7 @@ void
- au1xxx_dbdma_stop(u32 chanid)
- {
- chan_tab_t *ctp;
- - volatile au1x_dma_chan_t *cp;
- + au1x_dma_chan_t *cp;
- int halt_timeout = 0;
-
- ctp = *((chan_tab_t **)chanid);
- @@ -665,6 +739,7 @@ au1xxx_dbdma_stop(u32 chanid)
- cp->ddma_stat |= (DDMA_STAT_DB | DDMA_STAT_V);
- au_sync();
- }
- +EXPORT_SYMBOL(au1xxx_dbdma_stop);
-
- /* Start using the current descriptor pointer. If the dbdma encounters
- * a not valid descriptor, it will stop. In this case, we can just
- @@ -674,17 +749,17 @@ void
- au1xxx_dbdma_start(u32 chanid)
- {
- chan_tab_t *ctp;
- - volatile au1x_dma_chan_t *cp;
- + au1x_dma_chan_t *cp;
-
- ctp = *((chan_tab_t **)chanid);
- -
- cp = ctp->chan_ptr;
- cp->ddma_desptr = virt_to_phys(ctp->cur_ptr);
- cp->ddma_cfg |= DDMA_CFG_EN; /* Enable channel */
- au_sync();
- - cp->ddma_dbell = 0xffffffff; /* Make it go */
- + cp->ddma_dbell = 0;
- au_sync();
- }
- +EXPORT_SYMBOL(au1xxx_dbdma_start);
-
- void
- au1xxx_dbdma_reset(u32 chanid)
- @@ -703,15 +778,21 @@ au1xxx_dbdma_reset(u32 chanid)
-
- do {
- dp->dscr_cmd0 &= ~DSCR_CMD0_V;
- + /* reset our SW status -- this is used to determine
- + * if a descriptor is in use by upper level SW. Since
- + * posting can reset 'V' bit.
- + */
- + dp->sw_status = 0;
- dp = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));
- } while (dp != ctp->chan_desc_base);
- }
- +EXPORT_SYMBOL(au1xxx_dbdma_reset);
-
- u32
- au1xxx_get_dma_residue(u32 chanid)
- {
- chan_tab_t *ctp;
- - volatile au1x_dma_chan_t *cp;
- + au1x_dma_chan_t *cp;
- u32 rv;
-
- ctp = *((chan_tab_t **)chanid);
- @@ -746,15 +827,16 @@ au1xxx_dbdma_chan_free(u32 chanid)
-
- kfree(ctp);
- }
- +EXPORT_SYMBOL(au1xxx_dbdma_chan_free);
-
- static void
- dbdma_interrupt(int irq, void *dev_id, struct pt_regs *regs)
- {
- - u32 intstat;
- + u32 intstat, flags;
- u32 chan_index;
- chan_tab_t *ctp;
- au1x_ddma_desc_t *dp;
- - volatile au1x_dma_chan_t *cp;
- + au1x_dma_chan_t *cp;
-
- intstat = dbdma_gptr->ddma_intstat;
- au_sync();
- @@ -773,18 +855,26 @@ dbdma_interrupt(int irq, void *dev_id, s
- (ctp->chan_callback)(irq, ctp->chan_callparam, regs);
-
- ctp->cur_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));
- -
- }
-
- -static void
- -au1xxx_dbdma_init(void)
- +static void au1xxx_dbdma_init(void)
- {
- + int irq_nr;
- +
- dbdma_gptr->ddma_config = 0;
- dbdma_gptr->ddma_throttle = 0;
- dbdma_gptr->ddma_inten = 0xffff;
- au_sync();
-
- - if (request_irq(AU1550_DDMA_INT, dbdma_interrupt, SA_INTERRUPT,
- +#if defined(CONFIG_SOC_AU1550)
- + irq_nr = AU1550_DDMA_INT;
- +#elif defined(CONFIG_SOC_AU1200)
- + irq_nr = AU1200_DDMA_INT;
- +#else
- + #error Unknown Au1x00 SOC
- +#endif
- +
- + if (request_irq(irq_nr, dbdma_interrupt, SA_INTERRUPT,
- "Au1xxx dbdma", (void *)dbdma_gptr))
- printk("Can't get 1550 dbdma irq");
- }
- @@ -795,7 +885,8 @@ au1xxx_dbdma_dump(u32 chanid)
- chan_tab_t *ctp;
- au1x_ddma_desc_t *dp;
- dbdev_tab_t *stp, *dtp;
- - volatile au1x_dma_chan_t *cp;
- + au1x_dma_chan_t *cp;
- + u32 i = 0;
-
- ctp = *((chan_tab_t **)chanid);
- stp = ctp->chan_src;
- @@ -820,15 +911,64 @@ au1xxx_dbdma_dump(u32 chanid)
- dp = ctp->chan_desc_base;
-
- do {
- - printk("dp %08x, cmd0 %08x, cmd1 %08x\n",
- - (u32)dp, dp->dscr_cmd0, dp->dscr_cmd1);
- - printk("src0 %08x, src1 %08x, dest0 %08x\n",
- - dp->dscr_source0, dp->dscr_source1, dp->dscr_dest0);
- - printk("dest1 %08x, stat %08x, nxtptr %08x\n",
- - dp->dscr_dest1, dp->dscr_stat, dp->dscr_nxtptr);
- + printk("Dp[%d]= %08x, cmd0 %08x, cmd1 %08x\n",
- + i++, (u32)dp, dp->dscr_cmd0, dp->dscr_cmd1);
- + printk("src0 %08x, src1 %08x, dest0 %08x, dest1 %08x\n",
- + dp->dscr_source0, dp->dscr_source1, dp->dscr_dest0, dp->dscr_dest1);
- + printk("stat %08x, nxtptr %08x\n",
- + dp->dscr_stat, dp->dscr_nxtptr);
- dp = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));
- } while (dp != ctp->chan_desc_base);
- }
-
- +/* Put a descriptor into the DMA ring.
- + * This updates the source/destination pointers and byte count.
- + */
- +u32
- +au1xxx_dbdma_put_dscr(u32 chanid, au1x_ddma_desc_t *dscr )
- +{
- + chan_tab_t *ctp;
- + au1x_ddma_desc_t *dp;
- + u32 nbytes=0;
- +
- + /* I guess we could check this to be within the
- + * range of the table......
- + */
- + ctp = *((chan_tab_t **)chanid);
- +
- + /* We should have multiple callers for a particular channel,
- + * an interrupt doesn't affect this pointer nor the descriptor,
- + * so no locking should be needed.
- + */
- + dp = ctp->put_ptr;
- +
- + /* If the descriptor is valid, we are way ahead of the DMA
- + * engine, so just return an error condition.
- + */
- + if (dp->dscr_cmd0 & DSCR_CMD0_V)
- + return 0;
- +
- + /* Load up buffer addresses and byte count.
- + */
- + dp->dscr_dest0 = dscr->dscr_dest0;
- + dp->dscr_source0 = dscr->dscr_source0;
- + dp->dscr_dest1 = dscr->dscr_dest1;
- + dp->dscr_source1 = dscr->dscr_source1;
- + dp->dscr_cmd1 = dscr->dscr_cmd1;
- + nbytes = dscr->dscr_cmd1;
- + /* Allow the caller to specifiy if an interrupt is generated */
- + dp->dscr_cmd0 &= ~DSCR_CMD0_IE;
- + dp->dscr_cmd0 |= dscr->dscr_cmd0 | DSCR_CMD0_V;
- + ctp->chan_ptr->ddma_dbell = 0;
- +
- + /* Get next descriptor pointer.
- + */
- + ctp->put_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));
- +
- + /* return something not zero.
- + */
- + return nbytes;
- +}
- +
- #endif /* defined(CONFIG_SOC_AU1550) || defined(CONFIG_SOC_AU1200) */
-
- --- /dev/null
- +++ b/arch/mips/au1000/common/gpio.c
- @@ -0,0 +1,118 @@
- +/*
- + * 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.
- + *
- + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- + * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- + *
- + * You should have received a copy of the GNU General Public License along
- + * with this program; if not, write to the Free Software Foundation, Inc.,
- + * 675 Mass Ave, Cambridge, MA 02139, USA.
- + */
- +
- +#include <asm/au1000.h>
- +#include <asm/au1xxx_gpio.h>
- +
- +#define gpio1 sys
- +#if !defined(CONFIG_SOC_AU1000)
- +static AU1X00_GPIO2 * const gpio2 = (AU1X00_GPIO2 *)GPIO2_BASE;
- +
- +#define GPIO2_OUTPUT_ENABLE_MASK 0x00010000
- +
- +int au1xxx_gpio2_read(int signal)
- +{
- + signal -= 200;
- +/* gpio2->dir &= ~(0x01 << signal); //Set GPIO to input */
- + return ((gpio2->pinstate >> signal) & 0x01);
- +}
- +
- +void au1xxx_gpio2_write(int signal, int value)
- +{
- + signal -= 200;
- +
- + gpio2->output = (GPIO2_OUTPUT_ENABLE_MASK << signal) |
- + (value << signal);
- +}
- +
- +void au1xxx_gpio2_tristate(int signal)
- +{
- + signal -= 200;
- + gpio2->dir &= ~(0x01 << signal); /* Set GPIO to input */
- +}
- +#endif
- +
- +int au1xxx_gpio1_read(int signal)
- +{
- +/* gpio1->trioutclr |= (0x01 << signal); */
- + return ((gpio1->pinstaterd >> signal) & 0x01);
- +}
- +
- +void au1xxx_gpio1_write(int signal, int value)
- +{
- + if(value)
- + gpio1->outputset = (0x01 << signal);
- + else
- + gpio1->outputclr = (0x01 << signal); /* Output a Zero */
- +}
- +
- +void au1xxx_gpio1_tristate(int signal)
- +{
- + gpio1->trioutclr = (0x01 << signal); /* Tristate signal */
- +}
- +
- +
- +int au1xxx_gpio_read(int signal)
- +{
- + if(signal >= 200)
- +#if defined(CONFIG_SOC_AU1000)
- + return 0;
- +#else
- + return au1xxx_gpio2_read(signal);
- +#endif
- + else
- + return au1xxx_gpio1_read(signal);
- +}
- +
- +void au1xxx_gpio_write(int signal, int value)
- +{
- + if(signal >= 200)
- +#if defined(CONFIG_SOC_AU1000)
- + ;
- +#else
- + au1xxx_gpio2_write(signal, value);
- +#endif
- + else
- + au1xxx_gpio1_write(signal, value);
- +}
- +
- +void au1xxx_gpio_tristate(int signal)
- +{
- + if(signal >= 200)
- +#if defined(CONFIG_SOC_AU1000)
- + ;
- +#else
- + au1xxx_gpio2_tristate(signal);
- +#endif
- + else
- + au1xxx_gpio1_tristate(signal);
- +}
- +
- +void au1xxx_gpio1_set_inputs(void)
- +{
- + gpio1->pininputen = 0;
- +}
- +
- +EXPORT_SYMBOL(au1xxx_gpio1_set_inputs);
- +EXPORT_SYMBOL(au1xxx_gpio_tristate);
- +EXPORT_SYMBOL(au1xxx_gpio_write);
- +EXPORT_SYMBOL(au1xxx_gpio_read);
- --- a/arch/mips/au1000/common/irq.c
- +++ b/arch/mips/au1000/common/irq.c
- @@ -303,8 +303,30 @@ static struct hw_interrupt_type level_ir
- };
-
- #ifdef CONFIG_PM
- -void startup_match20_interrupt(void)
- +void startup_match20_interrupt(void (*handler)(int, void *, struct pt_regs *))
- {
- + static struct irqaction action;
- + /* This is a big problem.... since we didn't use request_irq
- + when kernel/irq.c calls probe_irq_xxx this interrupt will
- + be probed for usage. This will end up disabling the device :(
- +
- + Give it a bogus "action" pointer -- this will keep it from
- + getting auto-probed!
- +
- + By setting the status to match that of request_irq() we
- + can avoid it. --cgray
- + */
- + action.dev_id = handler;
- + action.flags = 0;
- + action.mask = 0;
- + action.name = "Au1xxx TOY";
- + action.handler = handler;
- + action.next = NULL;
- +
- + irq_desc[AU1000_TOY_MATCH2_INT].action = &action;
- + irq_desc[AU1000_TOY_MATCH2_INT].status
- + &= ~(IRQ_DISABLED | IRQ_AUTODETECT | IRQ_WAITING | IRQ_INPROGRESS);
- +
- local_enable_irq(AU1000_TOY_MATCH2_INT);
- }
- #endif
- @@ -508,6 +530,7 @@ void intc0_req0_irqdispatch(struct pt_re
-
- if (!intc0_req0) return;
-
- +#ifdef AU1000_USB_DEV_REQ_INT
- /*
- * Because of the tight timing of SETUP token to reply
- * transactions, the USB devices-side packet complete
- @@ -518,6 +541,7 @@ void intc0_req0_irqdispatch(struct pt_re
- do_IRQ(AU1000_USB_DEV_REQ_INT, regs);
- return;
- }
- +#endif
-
- irq = au_ffs(intc0_req0) - 1;
- intc0_req0 &= ~(1<<irq);
- @@ -536,17 +560,7 @@ void intc0_req1_irqdispatch(struct pt_re
-
- irq = au_ffs(intc0_req1) - 1;
- intc0_req1 &= ~(1<<irq);
- -#ifdef CONFIG_PM
- - if (irq == AU1000_TOY_MATCH2_INT) {
- - mask_and_ack_rise_edge_irq(irq);
- - counter0_irq(irq, NULL, regs);
- - local_enable_irq(irq);
- - }
- - else
- -#endif
- - {
- - do_IRQ(irq, regs);
- - }
- + do_IRQ(irq, regs);
- }
-
-
- --- a/arch/mips/au1000/common/Makefile
- +++ b/arch/mips/au1000/common/Makefile
- @@ -19,9 +19,9 @@ O_TARGET := au1000.o
- export-objs = prom.o clocks.o power.o usbdev.o
-
- obj-y := prom.o int-handler.o irq.o puts.o time.o reset.o cputable.o \
- - au1xxx_irqmap.o clocks.o power.o setup.o sleeper.o dma.o dbdma.o
- + au1xxx_irqmap.o clocks.o power.o setup.o sleeper.o dma.o dbdma.o gpio.o
-
- -export-objs += dma.o dbdma.o
- +export-objs += dma.o dbdma.o gpio.o
-
- obj-$(CONFIG_AU1X00_USB_DEVICE) += usbdev.o
- obj-$(CONFIG_KGDB) += dbg_io.o
- --- a/arch/mips/au1000/common/pci_fixup.c
- +++ b/arch/mips/au1000/common/pci_fixup.c
- @@ -75,9 +75,13 @@ void __init pcibios_fixup(void)
-
- #ifdef CONFIG_NONCOHERENT_IO
- /*
- - * Set the NC bit in controller for pre-AC silicon
- + * Set the NC bit in controller for Au1500 pre-AC silicon
- */
- - au_writel( 1<<16 | au_readl(Au1500_PCI_CFG), Au1500_PCI_CFG);
- + u32 prid = read_c0_prid();
- + if ( (prid & 0xFF000000) == 0x01000000 && prid < 0x01030202) {
- + au_writel( 1<<16 | au_readl(Au1500_PCI_CFG), Au1500_PCI_CFG);
- + printk("Non-coherent PCI accesses enabled\n");
- + }
- printk("Non-coherent PCI accesses enabled\n");
- #endif
-
- --- a/arch/mips/au1000/common/pci_ops.c
- +++ b/arch/mips/au1000/common/pci_ops.c
- @@ -162,6 +162,7 @@ unsigned long last_entryLo0, last_entryL
- static int config_access(unsigned char access_type, struct pci_dev *dev,
- unsigned char where, u32 * data)
- {
- + int error = PCIBIOS_SUCCESSFUL;
- #if defined( CONFIG_SOC_AU1500 ) || defined( CONFIG_SOC_AU1550 )
- unsigned char bus = dev->bus->number;
- unsigned int dev_fn = dev->devfn;
- @@ -170,7 +171,6 @@ static int config_access(unsigned char a
- unsigned long offset, status;
- unsigned long cfg_base;
- unsigned long flags;
- - int error = PCIBIOS_SUCCESSFUL;
- unsigned long entryLo0, entryLo1;
-
- if (device > 19) {
- @@ -205,9 +205,8 @@ static int config_access(unsigned char a
- last_entryLo0 = last_entryLo1 = 0xffffffff;
- }
-
- - /* Since the Au1xxx doesn't do the idsel timing exactly to spec,
- - * many board vendors implement their own off-chip idsel, so call
- - * it now. If it doesn't succeed, may as well bail out at this point.
- + /* Allow board vendors to implement their own off-chip idsel.
- + * If it doesn't succeed, may as well bail out at this point.
- */
- if (board_pci_idsel) {
- if (board_pci_idsel(device, 1) == 0) {
- @@ -271,8 +270,11 @@ static int config_access(unsigned char a
- }
-
- local_irq_restore(flags);
- - return error;
- +#else
- + /* Fake out Config space access with no responder */
- + *data = 0xFFFFFFFF;
- #endif
- + return error;
- }
- #endif
-
- --- a/arch/mips/au1000/common/power.c
- +++ b/arch/mips/au1000/common/power.c
- @@ -50,7 +50,6 @@
-
- static void calibrate_delay(void);
-
- -extern void set_au1x00_speed(unsigned int new_freq);
- extern unsigned int get_au1x00_speed(void);
- extern unsigned long get_au1x00_uart_baud_base(void);
- extern void set_au1x00_uart_baud_base(unsigned long new_baud_base);
- @@ -116,6 +115,7 @@ save_core_regs(void)
- sleep_uart0_clkdiv = au_readl(UART0_ADDR + UART_CLK);
- sleep_uart0_enable = au_readl(UART0_ADDR + UART_MOD_CNTRL);
-
- +#ifndef CONFIG_SOC_AU1200
- /* Shutdown USB host/device.
- */
- sleep_usbhost_enable = au_readl(USB_HOST_CONFIG);
- @@ -127,6 +127,7 @@ save_core_regs(void)
-
- sleep_usbdev_enable = au_readl(USBD_ENABLE);
- au_writel(0, USBD_ENABLE); au_sync();
- +#endif
-
- /* Save interrupt controller state.
- */
- @@ -212,14 +213,12 @@ void wakeup_from_suspend(void)
- int au_sleep(void)
- {
- unsigned long wakeup, flags;
- - extern void save_and_sleep(void);
- + extern unsigned int save_and_sleep(void);
-
- spin_lock_irqsave(&pm_lock,flags);
-
- save_core_regs();
-
- - flush_cache_all();
- -
- /** The code below is all system dependent and we should probably
- ** have a function call out of here to set this up. You need
- ** to configure the GPIO or timer interrupts that will bring
- @@ -227,27 +226,26 @@ int au_sleep(void)
- ** For testing, the TOY counter wakeup is useful.
- **/
-
- -#if 0
- +#if 1
- au_writel(au_readl(SYS_PINSTATERD) & ~(1 << 11), SYS_PINSTATERD);
-
- /* gpio 6 can cause a wake up event */
- wakeup = au_readl(SYS_WAKEMSK);
- wakeup &= ~(1 << 8); /* turn off match20 wakeup */
- - wakeup |= 1 << 6; /* turn on gpio 6 wakeup */
- + wakeup = 1 << 5; /* turn on gpio 6 wakeup */
- #else
- - /* For testing, allow match20 to wake us up.
- - */
- + /* For testing, allow match20 to wake us up. */
- #ifdef SLEEP_TEST_TIMEOUT
- wakeup_counter0_set(sleep_ticks);
- #endif
- wakeup = 1 << 8; /* turn on match20 wakeup */
- wakeup = 0;
- #endif
- - au_writel(1, SYS_WAKESRC); /* clear cause */
- + au_writel(0, SYS_WAKESRC); /* clear cause */
- au_sync();
- au_writel(wakeup, SYS_WAKEMSK);
- au_sync();
- -
- + DPRINTK("Entering sleep!\n");
- save_and_sleep();
-
- /* after a wakeup, the cpu vectors back to 0x1fc00000 so
- @@ -255,6 +253,7 @@ int au_sleep(void)
- */
- restore_core_regs();
- spin_unlock_irqrestore(&pm_lock, flags);
- + DPRINTK("Leaving sleep!\n");
- return 0;
- }
-
- @@ -285,7 +284,6 @@ static int pm_do_sleep(ctl_table * ctl,
-
- if (retval)
- return retval;
- -
- au_sleep();
- retval = pm_send_all(PM_RESUME, (void *) 0);
- }
- @@ -296,7 +294,6 @@ static int pm_do_suspend(ctl_table * ctl
- void *buffer, size_t * len)
- {
- int retval = 0;
- - void au1k_wait(void);
-
- if (!write) {
- *len = 0;
- @@ -305,119 +302,9 @@ static int pm_do_suspend(ctl_table * ctl
- if (retval)
- return retval;
- suspend_mode = 1;
- - au1k_wait();
- - retval = pm_send_all(PM_RESUME, (void *) 0);
- - }
- - return retval;
- -}
-
- -
- -static int pm_do_freq(ctl_table * ctl, int write, struct file *file,
- - void *buffer, size_t * len)
- -{
- - int retval = 0, i;
- - unsigned long val, pll;
- -#define TMPBUFLEN 64
- -#define MAX_CPU_FREQ 396
- - char buf[TMPBUFLEN], *p;
- - unsigned long flags, intc0_mask, intc1_mask;
- - unsigned long old_baud_base, old_cpu_freq, baud_rate, old_clk,
- - old_refresh;
- - unsigned long new_baud_base, new_cpu_freq, new_clk, new_refresh;
- -
- - spin_lock_irqsave(&pm_lock, flags);
- - if (!write) {
- - *len = 0;
- - } else {
- - /* Parse the new frequency */
- - if (*len > TMPBUFLEN - 1) {
- - spin_unlock_irqrestore(&pm_lock, flags);
- - return -EFAULT;
- - }
- - if (copy_from_user(buf, buffer, *len)) {
- - spin_unlock_irqrestore(&pm_lock, flags);
- - return -EFAULT;
- - }
- - buf[*len] = 0;
- - p = buf;
- - val = simple_strtoul(p, &p, 0);
- - if (val > MAX_CPU_FREQ) {
- - spin_unlock_irqrestore(&pm_lock, flags);
- - return -EFAULT;
- - }
- -
- - pll = val / 12;
- - if ((pll > 33) || (pll < 7)) { /* 396 MHz max, 84 MHz min */
- - /* revisit this for higher speed cpus */
- - spin_unlock_irqrestore(&pm_lock, flags);
- - return -EFAULT;
- - }
- -
- - old_baud_base = get_au1x00_uart_baud_base();
- - old_cpu_freq = get_au1x00_speed();
- -
- - new_cpu_freq = pll * 12 * 1000000;
- - new_baud_base = (new_cpu_freq / (2 * ((int)(au_readl(SYS_POWERCTRL)&0x03) + 2) * 16));
- - set_au1x00_speed(new_cpu_freq);
- - set_au1x00_uart_baud_base(new_baud_base);
- -
- - old_refresh = au_readl(MEM_SDREFCFG) & 0x1ffffff;
- - new_refresh =
- - ((old_refresh * new_cpu_freq) /
- - old_cpu_freq) | (au_readl(MEM_SDREFCFG) & ~0x1ffffff);
- -
- - au_writel(pll, SYS_CPUPLL);
- - au_sync_delay(1);
- - au_writel(new_refresh, MEM_SDREFCFG);
- - au_sync_delay(1);
- -
- - for (i = 0; i < 4; i++) {
- - if (au_readl
- - (UART_BASE + UART_MOD_CNTRL +
- - i * 0x00100000) == 3) {
- - old_clk =
- - au_readl(UART_BASE + UART_CLK +
- - i * 0x00100000);
- - // baud_rate = baud_base/clk
- - baud_rate = old_baud_base / old_clk;
- - /* we won't get an exact baud rate and the error
- - * could be significant enough that our new
- - * calculation will result in a clock that will
- - * give us a baud rate that's too far off from
- - * what we really want.
- - */
- - if (baud_rate > 100000)
- - baud_rate = 115200;
- - else if (baud_rate > 50000)
- - baud_rate = 57600;
- - else if (baud_rate > 30000)
- - baud_rate = 38400;
- - else if (baud_rate > 17000)
- - baud_rate = 19200;
- - else
- - (baud_rate = 9600);
- - // new_clk = new_baud_base/baud_rate
- - new_clk = new_baud_base / baud_rate;
- - au_writel(new_clk,
- - UART_BASE + UART_CLK +
- - i * 0x00100000);
- - au_sync_delay(10);
- - }
- - }
- + retval = pm_send_all(PM_RESUME, (void *) 0);
- }
- -
- -
- - /* We don't want _any_ interrupts other than
- - * match20. Otherwise our calibrate_delay()
- - * calculation will be off, potentially a lot.
- - */
- - intc0_mask = save_local_and_disable(0);
- - intc1_mask = save_local_and_disable(1);
- - local_enable_irq(AU1000_TOY_MATCH2_INT);
- - spin_unlock_irqrestore(&pm_lock, flags);
- - calibrate_delay();
- - restore_local_and_enable(0, intc0_mask);
- - restore_local_and_enable(1, intc1_mask);
- return retval;
- }
-
- @@ -425,7 +312,6 @@ static int pm_do_freq(ctl_table * ctl, i
- static struct ctl_table pm_table[] = {
- {ACPI_S1_SLP_TYP, "suspend", NULL, 0, 0600, NULL, &pm_do_suspend},
- {ACPI_SLEEP, "sleep", NULL, 0, 0600, NULL, &pm_do_sleep},
- - {CTL_ACPI, "freq", NULL, 0, 0600, NULL, &pm_do_freq},
- {0}
- };
-
- --- a/arch/mips/au1000/common/reset.c
- +++ b/arch/mips/au1000/common/reset.c
- @@ -37,8 +37,6 @@
- #include <asm/system.h>
- #include <asm/au1000.h>
-
- -extern int au_sleep(void);
- -
- void au1000_restart(char *command)
- {
- /* Set all integrated peripherals to disabled states */
- @@ -144,6 +142,26 @@ void au1000_restart(char *command)
- au_writel(0x00, 0xb1900064); /* sys_auxpll */
- au_writel(0x00, 0xb1900100); /* sys_pininputen */
- break;
- + case 0x04000000: /* Au1200 */
- + au_writel(0x00, 0xb400300c); /* ddma */
- + au_writel(0x00, 0xb1a00004); /* psc 0 */
- + au_writel(0x00, 0xb1b00004); /* psc 1 */
- + au_writel(0x00d02000, 0xb4020004); /* ehci, ohci, udc, otg */
- + au_writel(0x00, 0xb5000004); /* lcd */
- + au_writel(0x00, 0xb060000c); /* sd0 */
- + au_writel(0x00, 0xb068000c); /* sd1 */
- + au_writel(0x00, 0xb1100100); /* swcnt */
- + au_writel(0x00, 0xb0300000); /* aes */
- + au_writel(0x00, 0xb4004000); /* cim */
- + au_writel(0x00, 0xb1100100); /* uart0_enable */
- + au_writel(0x00, 0xb1200100); /* uart1_enable */
- + au_writel(0x00, 0xb1900020); /* sys_freqctrl0 */
- + au_writel(0x00, 0xb1900024); /* sys_freqctrl1 */
- + au_writel(0x00, 0xb1900028); /* sys_clksrc */
- + au_writel(0x10, 0xb1900060); /* sys_cpupll */
- + au_writel(0x00, 0xb1900064); /* sys_auxpll */
- + au_writel(0x00, 0xb1900100); /* sys_pininputen */
- + break;
-
- default:
- break;
- @@ -163,32 +181,23 @@ void au1000_restart(char *command)
-
- void au1000_halt(void)
- {
- -#if defined(CONFIG_MIPS_PB1550)
- - /* power off system */
- - printk("\n** Powering off Pb1550\n");
- - au_writew(au_readw(0xAF00001C) | (3<<14), 0xAF00001C);
- - au_sync();
- - while(1); /* should not get here */
- -#endif
- - printk(KERN_NOTICE "\n** You can safely turn off the power\n");
- -#ifdef CONFIG_MIPS_MIRAGE
- - au_writel((1 << 26) | (1 << 10), GPIO2_OUTPUT);
- -#endif
- -#ifdef CONFIG_PM
- - au_sleep();
- -
- - /* should not get here */
- - printk(KERN_ERR "Unable to put cpu in sleep mode\n");
- - while(1);
- -#else
- - while (1)
- + /* Use WAIT in a low-power infinite spin loop */
- + while (1) {
- __asm__(".set\tmips3\n\t"
- "wait\n\t"
- ".set\tmips0");
- -#endif
- + }
- }
-
- void au1000_power_off(void)
- {
- + extern void board_power_off (void);
- +
- + printk(KERN_NOTICE "\n** You can safely turn off the power\n");
- +
- + /* Give board a chance to power-off */
- + board_power_off();
- +
- + /* If board can't power-off, spin forever */
- au1000_halt();
- }
- --- a/arch/mips/au1000/common/setup.c
- +++ b/arch/mips/au1000/common/setup.c
- @@ -174,6 +174,40 @@ void __init au1x00_setup(void)
- initrd_end = (unsigned long)&__rd_end;
- #endif
-
- +#if defined(CONFIG_SOC_AU1200)
- +#ifdef CONFIG_USB_EHCI_HCD
- + if ((argptr = strstr(argptr, "usb_ehci=")) == NULL) {
- + char usb_args[80];
- + argptr = prom_getcmdline();
- + memset(usb_args, 0, sizeof(usb_args));
- + sprintf(usb_args, " usb_ehci=base:0x%x,len:0x%x,irq:%d",
- + USB_EHCI_BASE, USB_EHCI_LEN, AU1000_USB_HOST_INT);
- + strcat(argptr, usb_args);
- + }
- +#ifdef CONFIG_USB_AMD5536UDC
- + /* enable EHC + OHC + UDC clocks, memory and bus mastering */
- +/* au_writel( 0x00DF207F, USB_MSR_BASE + 4); */
- + au_writel( 0xC0DF207F, USB_MSR_BASE + 4); // incl. prefetch
- +#else
- + /* enable EHC + OHC clocks, memory and bus mastering */
- +/* au_writel( 0x00DB200F, USB_MSR_BASE + 4); */
- + au_writel( 0xC0DB200F, USB_MSR_BASE + 4); /* incl. prefetch */
- +#endif
- + udelay(1000);
- +
- +#else /* CONFIG_USB_EHCI_HCD */
- +
- +#ifdef CONFIG_USB_AMD5536UDC
- +#ifndef CONFIG_USB_OHCI
- + /* enable UDC clocks, memory and bus mastering */
- +/* au_writel( 0x00DC2070, USB_MSR_BASE + 4); */
- + au_writel( 0xC0DC2070, USB_MSR_BASE + 4); // incl. prefetch
- + udelay(1000);
- +#endif
- +#endif
- +#endif /* CONFIG_USB_EHCI_HCD */
- +#endif /* CONFIG_SOC_AU1200 */
- +
- #if defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE)
- #ifdef CONFIG_USB_OHCI
- if ((argptr = strstr(argptr, "usb_ohci=")) == NULL) {
- @@ -187,19 +221,38 @@ void __init au1x00_setup(void)
- #endif
-
- #ifdef CONFIG_USB_OHCI
- - // enable host controller and wait for reset done
- +#if defined(CONFIG_SOC_AU1200)
- +#ifndef CONFIG_USB_EHCI_HCD
- +#ifdef CONFIG_USB_AMD5536UDC
- + /* enable OHC + UDC clocks, memory and bus mastering */
- +/* au_writel( 0x00DD2073, USB_MSR_BASE + 4); */
- + au_writel( 0xC0DD2073, USB_MSR_BASE + 4); // incl. prefetch
- +#else
- + /* enable OHC clocks, memory and bus mastering */
- + au_writel( 0x00D12003, USB_MSR_BASE + 4);
- +#endif
- + udelay(1000);
- +printk("DEBUG: Reading Au1200 USB2 reg 0x%x\n", au_readl(USB_MSR_BASE + 4));
- +#endif
- +#else
- + /* Au1000, Au1500, Au1100, Au1550 */
- + /* enable host controller and wait for reset done */
- au_writel(0x08, USB_HOST_CONFIG);
- udelay(1000);
- au_writel(0x0E, USB_HOST_CONFIG);
- udelay(1000);
- - au_readl(USB_HOST_CONFIG); // throw away first read
- + au_readl(USB_HOST_CONFIG); /* throw away first read */
- while (!(au_readl(USB_HOST_CONFIG) & 0x10))
- au_readl(USB_HOST_CONFIG);
- +#endif /* CONFIG_SOC_AU1200 */
- #endif
- -#endif // defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE)
- +#else
- +
- +#endif /* defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE) */
- +
-
- #ifdef CONFIG_FB
- - // Needed if PCI video card in use
- + /* Needed if PCI video card in use */
- conswitchp = &dummy_con;
- #endif
-
- @@ -209,8 +262,7 @@ void __init au1x00_setup(void)
- #endif
-
- #ifdef CONFIG_BLK_DEV_IDE
- - /* Board setup takes precedence for unique devices.
- - */
- + /* Board setup takes precedence for unique devices. */
- if ((ide_ops == NULL) || (ide_ops == &no_ide_ops))
- ide_ops = &std_ide_ops;
- #endif
- --- a/arch/mips/au1000/common/sleeper.S
- +++ b/arch/mips/au1000/common/sleeper.S
- @@ -15,17 +15,48 @@
- #include <asm/addrspace.h>
- #include <asm/regdef.h>
- #include <asm/stackframe.h>
- +#include <asm/au1000.h>
- +
- +/*
- + * Note: This file is *not* conditional on CONFIG_PM since Alchemy sleep
- + * need not be tied to any particular power management scheme.
- + */
- +
- + .extern ___flush_cache_all
-
- .text
- - .set macro
- - .set noat
- .align 5
-
- -/* Save all of the processor general registers and go to sleep.
- - * A wakeup condition will get us back here to restore the registers.
- +/*
- + * Save the processor general registers and go to sleep. A wakeup
- + * condition will get us back here to restore the registers.
- */
- -LEAF(save_and_sleep)
-
- +/* still need to fix alignment issues here */
- +save_and_sleep_frmsz = 48
- +NESTED(save_and_sleep, save_and_sleep_frmsz, ra)
- + .set noreorder
- + .set nomacro
- + .set noat
- + subu sp, save_and_sleep_frmsz
- + sw ra, save_and_sleep_frmsz-4(sp)
- + sw s0, save_and_sleep_frmsz-8(sp)
- + sw s1, save_and_sleep_frmsz-12(sp)
- + sw s2, save_and_sleep_frmsz-16(sp)
- + sw s3, save_and_sleep_frmsz-20(sp)
- + sw s4, save_and_sleep_frmsz-24(sp)
- + sw s5, save_and_sleep_frmsz-28(sp)
- + sw s6, save_and_sleep_frmsz-32(sp)
- + sw s7, save_and_sleep_frmsz-36(sp)
- + sw s8, save_and_sleep_frmsz-40(sp)
- + sw gp, save_and_sleep_frmsz-44(sp)
- +
- + /* We only need to save the registers that the calling function
- + * hasn't saved for us. 0 is always zero. 8 - 15, 24 and 25 are
- + * temporaries and can be used without saving. 26 and 27 are reserved
- + * for interrupt/trap handling and expected to change. 29 is the
- + * stack pointer which is handled as a special case here.
- + */
- subu sp, PT_SIZE
- sw $1, PT_R1(sp)
- sw $2, PT_R2(sp)
- @@ -34,14 +65,6 @@ LEAF(save_and_sleep)
- sw $5, PT_R5(sp)
- sw $6, PT_R6(sp)
- sw $7, PT_R7(sp)
- - sw $8, PT_R8(sp)
- - sw $9, PT_R9(sp)
- - sw $10, PT_R10(sp)
- - sw $11, PT_R11(sp)
- - sw $12, PT_R12(sp)
- - sw $13, PT_R13(sp)
- - sw $14, PT_R14(sp)
- - sw $15, PT_R15(sp)
- sw $16, PT_R16(sp)
- sw $17, PT_R17(sp)
- sw $18, PT_R18(sp)
- @@ -50,32 +73,47 @@ LEAF(save_and_sleep)
- sw $21, PT_R21(sp)
- sw $22, PT_R22(sp)
- sw $23, PT_R23(sp)
- - sw $24, PT_R24(sp)
- - sw $25, PT_R25(sp)
- - sw $26, PT_R26(sp)
- - sw $27, PT_R27(sp)
- sw $28, PT_R28(sp)
- - sw $29, PT_R29(sp)
- sw $30, PT_R30(sp)
- sw $31, PT_R31(sp)
- +#define PT_C0STATUS PT_LO
- +#define PT_CONTEXT PT_HI
- +#define PT_PAGEMASK PT_EPC
- +#define PT_CONFIG PT_BVADDR
- mfc0 k0, CP0_STATUS
- - sw k0, 0x20(sp)
- + sw k0, PT_C0STATUS(sp) // 0x20
- mfc0 k0, CP0_CONTEXT
- - sw k0, 0x1c(sp)
- + sw k0, PT_CONTEXT(sp) // 0x1c
- mfc0 k0, CP0_PAGEMASK
- - sw k0, 0x18(sp)
- + sw k0, PT_PAGEMASK(sp) // 0x18
- mfc0 k0, CP0_CONFIG
- - sw k0, 0x14(sp)
- + sw k0, PT_CONFIG(sp) // 0x14
- +
- + .set macro
- + .set at
- +
- + li t0, SYS_SLPPWR
- + sw zero, 0(t0) /* Get the processor ready to sleep */
- + sync
-
- /* Now set up the scratch registers so the boot rom will
- * return to this point upon wakeup.
- + * sys_scratch0 : SP
- + * sys_scratch1 : RA
- + */
- + li t0, SYS_SCRATCH0
- + li t1, SYS_SCRATCH1
- + sw sp, 0(t0)
- + la k0, resume_from_sleep
- + sw k0, 0(t1)
- +
- +/*
- + * Flush DCACHE to make sure context is in memory
- */
- - la k0, 1f
- - lui k1, 0xb190
- - ori k1, 0x18
- - sw sp, 0(k1)
- - ori k1, 0x1c
- - sw k0, 0(k1)
- + la t1,___flush_cache_all /* _flush_cache_all is a function pointer */
- + lw t0,0(t1)
- + jal t0
- + nop
-
- /* Put SDRAM into self refresh. Preload instructions into cache,
- * issue a precharge, then auto refresh, then sleep commands to it.
- @@ -88,30 +126,65 @@ LEAF(save_and_sleep)
- cache 0x14, 96(t0)
- .set mips0
-
- + /* Put SDRAM to sleep */
- sdsleep:
- - lui k0, 0xb400
- - sw zero, 0x001c(k0) /* Precharge */
- - sw zero, 0x0020(k0) /* Auto refresh */
- - sw zero, 0x0030(k0) /* SDRAM sleep */
- + li a0, MEM_PHYS_ADDR
- + or a0, a0, 0xA0000000
- +#if defined(CONFIG_SOC_AU1000) || defined(CONFIG_SOC_AU1100) || defined(CONFIG_SOC_AU1500)
- + lw k0, MEM_SDMODE0(a0)
- + sw zero, MEM_SDPRECMD(a0) /* Precharge */
- + sw zero, MEM_SDAUTOREF(a0) /* Auto Refresh */
- + sw zero, MEM_SDSLEEP(a0) /* Sleep */
- sync
- -
- - lui k1, 0xb190
- - sw zero, 0x0078(k1) /* get ready to sleep */
- +#endif
- +#if defined(CONFIG_SOC_AU1550) || defined(CONFIG_SOC_AU1200)
- + sw zero, MEM_SDPRECMD(a0) /* Precharge */
- + sw zero, MEM_SDSREF(a0)
- +
- + #lw t0, MEM_SDSTAT(a0)
- + #and t0, t0, 0x01000000
- + li t0, 0x01000000
- +refresh_not_set:
- + lw t1, MEM_SDSTAT(a0)
- + and t2, t1, t0
- + beq zero, t2, refresh_not_set
- + nop
- +
- + li t0, ~0x30000000
- + lw t1, MEM_SDCONFIGA(a0)
- + and t1, t0, t1
- + sw t1, MEM_SDCONFIGA(a0)
- sync
- - sw zero, 0x007c(k1) /* Put processor to sleep */
- +#endif
- +
- + li t0, SYS_SLEEP
- + sw zero, 0(t0) /* Put processor to sleep */
- sync
- + nop
- + nop
- + nop
- + nop
- + nop
- + nop
- + nop
- + nop
- +
-
- /* This is where we return upon wakeup.
- * Reload all of the registers and return.
- */
- -1: nop
- - lw k0, 0x20(sp)
- +resume_from_sleep:
- + nop
- + .set nomacro
- + .set noat
- +
- + lw k0, PT_C0STATUS(sp) // 0x20
- mtc0 k0, CP0_STATUS
- - lw k0, 0x1c(sp)
- + lw k0, PT_CONTEXT(sp) // 0x1c
- mtc0 k0, CP0_CONTEXT
- - lw k0, 0x18(sp)
- + lw k0, PT_PAGEMASK(sp) // 0x18
- mtc0 k0, CP0_PAGEMASK
- - lw k0, 0x14(sp)
- + lw k0, PT_CONFIG(sp) // 0x14
- mtc0 k0, CP0_CONFIG
- lw $1, PT_R1(sp)
- lw $2, PT_R2(sp)
- @@ -120,14 +193,6 @@ sdsleep:
- lw $5, PT_R5(sp)
- lw $6, PT_R6(sp)
- lw $7, PT_R7(sp)
- - lw $8, PT_R8(sp)
- - lw $9, PT_R9(sp)
- - lw $10, PT_R10(sp)
- - lw $11, PT_R11(sp)
- - lw $12, PT_R12(sp)
- - lw $13, PT_R13(sp)
- - lw $14, PT_R14(sp)
- - lw $15, PT_R15(sp)
- lw $16, PT_R16(sp)
- lw $17, PT_R17(sp)
- lw $18, PT_R18(sp)
- @@ -136,15 +201,36 @@ sdsleep:
- lw $21, PT_R21(sp)
- lw $22, PT_R22(sp)
- lw $23, PT_R23(sp)
- - lw $24, PT_R24(sp)
- - lw $25, PT_R25(sp)
- - lw $26, PT_R26(sp)
- - lw $27, PT_R27(sp)
- lw $28, PT_R28(sp)
- - lw $29, PT_R29(sp)
- lw $30, PT_R30(sp)
- lw $31, PT_R31(sp)
- +
- + .set macro
- + .set at
- +
- + /* clear the wake source, but save it as the return value of the function */
- + li t0, SYS_WAKESRC
- + lw v0, 0(t0)
- + sw v0, PT_R2(sp)
- + sw zero, 0(t0)
- +
- addiu sp, PT_SIZE
-
- + lw gp, save_and_sleep_frmsz-44(sp)
- + lw s8, save_and_sleep_frmsz-40(sp)
- + lw s7, save_and_sleep_frmsz-36(sp)
- + lw s6, save_and_sleep_frmsz-32(sp)
- + lw s5, save_and_sleep_frmsz-28(sp)
- + lw s4, save_and_sleep_frmsz-24(sp)
- + lw s3, save_and_sleep_frmsz-20(sp)
- + lw s2, save_and_sleep_frmsz-16(sp)
- + lw s1, save_and_sleep_frmsz-12(sp)
- + lw s0, save_and_sleep_frmsz-8(sp)
- + lw ra, save_and_sleep_frmsz-4(sp)
- +
- + addu sp, save_and_sleep_frmsz
- jr ra
- + nop
- + .set reorder
- END(save_and_sleep)
- +
- --- a/arch/mips/au1000/common/time.c
- +++ b/arch/mips/au1000/common/time.c
- @@ -50,7 +50,6 @@
- #include <linux/mc146818rtc.h>
- #include <linux/timex.h>
-
- -extern void startup_match20_interrupt(void);
- extern void do_softirq(void);
- extern volatile unsigned long wall_jiffies;
- unsigned long missed_heart_beats = 0;
- @@ -59,14 +58,14 @@ static unsigned long r4k_offset; /* Amou
- static unsigned long r4k_cur; /* What counter should be at next timer irq */
- extern rwlock_t xtime_lock;
- int no_au1xxx_32khz;
- -void (*au1k_wait_ptr)(void);
- +extern int allow_au1k_wait; /* default off for CP0 Counter */
-
- /* Cycle counter value at the previous timer interrupt.. */
- static unsigned int timerhi = 0, timerlo = 0;
-
- #ifdef CONFIG_PM
- #define MATCH20_INC 328
- -extern void startup_match20_interrupt(void);
- +extern void startup_match20_interrupt(void (*handler)(int, void *, struct pt_regs *));
- static unsigned long last_pc0, last_match20;
- #endif
-
- @@ -385,7 +384,6 @@ void __init au1xxx_timer_setup(void)
- {
- unsigned int est_freq;
- extern unsigned long (*do_gettimeoffset)(void);
- - extern void au1k_wait(void);
-
- printk("calculating r4koff... ");
- r4k_offset = cal_r4koff();
- @@ -437,9 +435,6 @@ void __init au1xxx_timer_setup(void)
- au_writel(0, SYS_TOYWRITE);
- while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C0S);
-
- - au_writel(au_readl(SYS_WAKEMSK) | (1<<8), SYS_WAKEMSK);
- - au_writel(~0, SYS_WAKESRC);
- - au_sync();
- while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_M20);
-
- /* setup match20 to interrupt once every 10ms */
- @@ -447,13 +442,13 @@ void __init au1xxx_timer_setup(void)
- au_writel(last_match20 + MATCH20_INC, SYS_TOYMATCH2);
- au_sync();
- while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_M20);
- - startup_match20_interrupt();
- + startup_match20_interrupt(counter0_irq);
-
- do_gettimeoffset = do_fast_pm_gettimeoffset;
-
- /* We can use the real 'wait' instruction.
- */
- - au1k_wait_ptr = au1k_wait;
- + allow_au1k_wait = 1;
- }
-
- #else
- --- a/arch/mips/au1000/db1x00/board_setup.c
- +++ b/arch/mips/au1000/db1x00/board_setup.c
- @@ -46,10 +46,22 @@
- #include <asm/au1000.h>
- #include <asm/db1x00.h>
-
- -extern struct rtc_ops no_rtc_ops;
- +#if defined(CONFIG_BLK_DEV_IDE_AU1XXX) && defined(CONFIG_MIPS_DB1550)
- +#include <asm/au1xxx_dbdma.h>
- +extern struct ide_ops *ide_ops;
- +extern struct ide_ops au1xxx_ide_ops;
- +extern u32 au1xxx_ide_virtbase;
- +extern u64 au1xxx_ide_physbase;
- +extern int au1xxx_ide_irq;
- +
- +/* Ddma */
- +chan_tab_t *ide_read_ch, *ide_write_ch;
- +u32 au1xxx_ide_ddma_enable = 0, switch4ddma = 1; // PIO+ddma
- +
- +dbdev_tab_t new_dbdev_tab_element = { DSCR_CMD0_THROTTLE, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 };
- +#endif /* end CONFIG_BLK_DEV_IDE_AU1XXX */
-
- -/* not correct for db1550 */
- -static BCSR * const bcsr = (BCSR *)0xAE000000;
- +extern struct rtc_ops no_rtc_ops;
-
- void board_reset (void)
- {
- @@ -57,6 +69,13 @@ void board_reset (void)
- au_writel(0x00000000, 0xAE00001C);
- }
-
- +void board_power_off (void)
- +{
- +#ifdef CONFIG_MIPS_MIRAGE
- + au_writel((1 << 26) | (1 << 10), GPIO2_OUTPUT);
- +#endif
- +}
- +
- void __init board_setup(void)
- {
- u32 pin_func;
- @@ -108,8 +127,42 @@ void __init board_setup(void)
- au_writel(0x02000200, GPIO2_OUTPUT);
- #endif
-
- +#if defined(CONFIG_AU1XXX_SMC91111)
- +#define CPLD_CONTROL (0xAF00000C)
- + {
- + extern uint32_t au1xxx_smc91111_base;
- + extern unsigned int au1xxx_smc91111_irq;
- + extern int au1xxx_smc91111_nowait;
- +
- + au1xxx_smc91111_base = 0xAC000300;
- + au1xxx_smc91111_irq = AU1000_GPIO_8;
- + au1xxx_smc91111_nowait = 1;
- +
- + /* set up the Static Bus timing - only 396Mhz */
- + bcsr->resets |= 0x7;
- + au_writel(0x00010003, MEM_STCFG0);
- + au_writel(0x000c00c0, MEM_STCFG2);
- + au_writel(0x85E1900D, MEM_STTIME2);
- + }
- +#endif /* end CONFIG_SMC91111 */
- au_sync();
-
- +#if defined(CONFIG_BLK_DEV_IDE_AU1XXX) && defined(CONFIG_MIPS_DB1550)
- + /*
- + * Iniz IDE parameters
- + */
- + ide_ops = &au1xxx_ide_ops;
- + au1xxx_ide_irq = DAUGHTER_CARD_IRQ;
- + au1xxx_ide_physbase = AU1XXX_ATA_PHYS_ADDR;
- + au1xxx_ide_virtbase = KSEG1ADDR(AU1XXX_ATA_PHYS_ADDR);
- +
- + /*
- + * change PIO or PIO+Ddma
- + * check the GPIO-6 pin condition. db1550:s6_dot
- + */
- + switch4ddma = (au_readl(SYS_PINSTATERD) & (1 << 6)) ? 1 : 0;
- +#endif
- +
- #ifdef CONFIG_MIPS_DB1000
- printk("AMD Alchemy Au1000/Db1000 Board\n");
- #endif
- --- a/arch/mips/au1000/db1x00/irqmap.c
- +++ b/arch/mips/au1000/db1x00/irqmap.c
- @@ -53,6 +53,7 @@ au1xxx_irq_map_t au1xxx_irq_map[] = {
- #ifdef CONFIG_MIPS_DB1550
- { AU1000_GPIO_3, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card 0 IRQ#
- { AU1000_GPIO_5, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card 1 IRQ#
- + { AU1000_GPIO_8, INTC_INT_LOW_LEVEL, 0 }, // Daughtercard IRQ#
- #else
- { AU1000_GPIO_0, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card 0 Fully_Interted#
- { AU1000_GPIO_1, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card 0 STSCHG#
- --- a/arch/mips/au1000/db1x00/Makefile
- +++ b/arch/mips/au1000/db1x00/Makefile
- @@ -17,4 +17,11 @@ O_TARGET := db1x00.o
- obj-y := init.o board_setup.o irqmap.o
- obj-$(CONFIG_WM97XX_COMODULE) += mirage_ts.o
-
- +ifdef CONFIG_MIPS_DB1100
- +ifdef CONFIG_MMC
- +obj-y += mmc_support.o
- +export-objs += mmc_support.o
- +endif
- +endif
- +
- include $(TOPDIR)/Rules.make
- --- /dev/null
- +++ b/arch/mips/au1000/db1x00/mmc_support.c
- @@ -0,0 +1,126 @@
- +/*
- + * BRIEF MODULE DESCRIPTION
- + *
- + * MMC support routines for DB1100.
- + *
- + *
- + * Copyright (c) 2003-2004 Embedded Edge, LLC.
- + * Author: Embedded Edge, LLC.
- + * Contact: dan@embeddededge.com
- + *
- + * 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.
- + *
- + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- + * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- + *
- + * You should have received a copy of the GNU General Public License along
- + * with this program; if not, write to the Free Software Foundation, Inc.,
- + * 675 Mass Ave, Cambridge, MA 02139, USA.
- + *
- + */
- +
- +
- +#include <linux/config.h>
- +#include <linux/kernel.h>
- +#include <linux/module.h>
- +#include <linux/init.h>
- +
- +#include <asm/irq.h>
- +#include <asm/au1000.h>
- +#include <asm/au1100_mmc.h>
- +#include <asm/db1x00.h>
- +
- +
- +/* SD/MMC controller support functions */
- +
- +/*
- + * Detect card.
- + */
- +void mmc_card_inserted(int _n_, int *_res_)
- +{
- + u32 gpios = au_readl(SYS_PINSTATERD);
- + u32 emptybit = (_n_) ? (1<<20) : (1<<19);
- + *_res_ = ((gpios & emptybit) == 0);
- +}
- +
- +/*
- + * Check card write protection.
- + */
- +void mmc_card_writable(int _n_, int *_res_)
- +{
- + BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR;
- + unsigned long mmc_wp, board_specific;
- +
- + if (_n_) {
- + mmc_wp = BCSR_BOARD_SD1_WP;
- + } else {
- + mmc_wp = BCSR_BOARD_SD0_WP;
- + }
- +
- + board_specific = au_readl((unsigned long)(&bcsr->specific));
- +
- + if (!(board_specific & mmc_wp)) {/* low means card writable */
- + *_res_ = 1;
- + } else {
- + *_res_ = 0;
- + }
- +}
- +
- +/*
- + * Apply power to card slot.
- + */
- +void mmc_power_on(int _n_)
- +{
- + BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR;
- + unsigned long mmc_pwr, board_specific;
- +
- + if (_n_) {
- + mmc_pwr = BCSR_BOARD_SD1_PWR;
- + } else {
- + mmc_pwr = BCSR_BOARD_SD0_PWR;
- + }
- +
- + board_specific = au_readl((unsigned long)(&bcsr->specific));
- + board_specific |= mmc_pwr;
- +
- + au_writel(board_specific, (int)(&bcsr->specific));
- + au_sync_delay(1);
- +}
- +
- +/*
- + * Remove power from card slot.
- + */
- +void mmc_power_off(int _n_)
- +{
- + BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR;
- + unsigned long mmc_pwr, board_specific;
- +
- + if (_n_) {
- + mmc_pwr = BCSR_BOARD_SD1_PWR;
- + } else {
- + mmc_pwr = BCSR_BOARD_SD0_PWR;
- + }
- +
- + board_specific = au_readl((unsigned long)(&bcsr->specific));
- + board_specific &= ~mmc_pwr;
- +
- + au_writel(board_specific, (int)(&bcsr->specific));
- + au_sync_delay(1);
- +}
- +
- +EXPORT_SYMBOL(mmc_card_inserted);
- +EXPORT_SYMBOL(mmc_card_writable);
- +EXPORT_SYMBOL(mmc_power_on);
- +EXPORT_SYMBOL(mmc_power_off);
- +
- --- /dev/null
- +++ b/arch/mips/au1000/ficmmp/au1200_ibutton.c
- @@ -0,0 +1,270 @@
- +/* ----------------------------------------------------------------------
- + * mtwilson_keys.c
- + *
- + * Copyright (C) 2003 Intrinsyc Software Inc.
- + *
- + * Intel Personal Media Player buttons
- + *
- + * This program is free software; you can redistribute it and/or modify
- + * it under the terms of the GNU General Public License version 2 as
- + * published by the Free Software Foundation.
- + *
- + * May 02, 2003 : Initial version [FB]
- + *
- + ------------------------------------------------------------------------*/
- +
- +#include <linux/config.h>
- +#include <linux/module.h>
- +#include <linux/kernel.h>
- +#include <linux/init.h>
- +#include <linux/fs.h>
- +#include <linux/sched.h>
- +#include <linux/miscdevice.h>
- +#include <linux/errno.h>
- +#include <linux/poll.h>
- +#include <linux/delay.h>
- +#include <linux/input.h>
- +
- +#include <asm/au1000.h>
- +#include <asm/uaccess.h>
- +#include <asm/au1xxx_gpio.h>
- +#include <asm/irq.h>
- +#include <asm/keyboard.h>
- +#include <linux/time.h>
- +
- +#define DRIVER_VERSION "V1.0"
- +#define DRIVER_AUTHOR "FIC"
- +#define DRIVER_DESC "FIC Travis Media Player Button Driver"
- +#define DRIVER_NAME "Au1200Button"
- +
- +#define BUTTON_MAIN (1<<1)
- +#define BUTTON_SELECT (1<<6)
- +#define BUTTON_GUIDE (1<<12)
- +#define BUTTON_DOWN (1<<17)
- +#define BUTTON_LEFT (1<<19)
- +#define BUTTON_RIGHT (1<<26)
- +#define BUTTON_UP (1<<28)
- +
- +#define BUTTON_MASK (\
- + BUTTON_MAIN \
- + | BUTTON_SELECT \
- + | BUTTON_GUIDE \
- + | BUTTON_DOWN \
- + | BUTTON_LEFT \
- + | BUTTON_RIGHT \
- + | BUTTON_UP \
- + )
- +
- +#define BUTTON_INVERT (\
- + BUTTON_MAIN \
- + | 0 \
- + | BUTTON_GUIDE \
- + | 0 \
- + | 0 \
- + | 0 \
- + | 0 \
- + )
- +
- +char button_map[32]={0,KEY_S,0,0,0,0,KEY_ENTER,0,0,0,0,0,KEY_G,0,0,0,0,KEY_DOWN,0,KEY_LEFT,0,0,0,0,0,0,KEY_RIGHT,0,KEY_UP,0,0,0};
- +//char button_map[32]={0,0,0,0,0,0,KEY_ENTER,0,0,0,0,0,KEY_G,0,0,0,0,KEY_DOWN,0,KEY_LEFT,0,0,0,0,0,0,KEY_RIGHT,0,KEY_UP,0,0,0};
- +
- +//char button_map[32]={0,KEY_TAB,0,0,0,0,KEY_M,0,0,0,0,0,KEY_S,0,0,0,0,KEY_DOWN,0,KEY_LEFT,0,0,0,0,0,0,KEY_RIGHT,0,KEY_UP,0,0,0};
- +//char button_map[32]={0,0,0,0,0,0,KEY_M,0,0,0,0,0,KEY_S,0,0,0,0,KEY_DOWN,0,KEY_LEFT,0,0,0,0,0,0,KEY_RIGHT,0,KEY_UP,0,0,0};
- +
- +#define BUTTON_COUNT (sizeof (button_map) / sizeof (button_map[0]))
- +
- +struct input_dev dev;
- +struct timeval cur_tv;
- +
- +static unsigned int old_tv_usec = 0;
- +
- +static unsigned int read_button_state(void)
- +{
- + unsigned int state;
- +
- + state = au_readl(SYS_PINSTATERD) & BUTTON_MASK; /* get gpio status */
- +
- + state ^= BUTTON_INVERT; /* invert main & guide button */
- +
- + /* printk("au1200_ibutton.c: button state [0x%X]\r\n",state); */
- + return state;
- +}
- +
- +//This function returns 0 if the allowed microseconds have elapsed since the last call to ths function, otherwise it returns 1 to indicate a bounce condition
- +static unsigned int bounce()
- +{
- +
- + unsigned int elapsed_time;
- +
- + do_gettimeofday (&cur_tv);
- +
- + if (!old_tv_usec) {
- + old_tv_usec = cur_tv.tv_usec;
- + return 0;
- + }
- +
- + if(cur_tv.tv_usec > old_tv_usec) {
- + /* If there hasn't been rollover */
- + elapsed_time = ((cur_tv.tv_usec - old_tv_usec));
- + }
- + else {
- + /* Accounting for rollover */
- + elapsed_time = ((1000000 - old_tv_usec + cur_tv.tv_usec));
- + }
- +
- + if (elapsed_time > 250000) {
- + old_tv_usec = 0; /* reset the bounce time */
- + return 0;
- + }
- +
- + return 1;
- +}
- +
- +/* button interrupt handler */
- +static void button_interrupt(int irq, void *dev, struct pt_regs *regs)
- +{
- +
- + unsigned int i,bit_mask, key_choice;
- + u32 button_state;
- +
- + /* Report state to upper level */
- +
- + button_state = read_button_state() & BUTTON_MASK; /* get new gpio status */
- +
- + /* Return if this is a repeated (bouncing) event */
- + if(bounce())
- + return;
- +
- + /* we want to make keystrokes */
- + for( i=0; i< BUTTON_COUNT; i++) {
- + bit_mask = 1<<i;
- + if (button_state & bit_mask) {
- + key_choice = button_map[i];
- + /* toggle key down */
- + input_report_key(dev, key_choice, 1);
- + /* toggle key up */
- + input_report_key(dev, key_choice, 0);
- + printk("ibutton gpio %d stat %x scan code %d\r\n",
- + i, button_state, key_choice);
- + /* Only report the first key event; it doesn't make
- + * sense for two keys to be pressed at the same time,
- + * and causes problems with the directional keys
- + * return;
- + */
- + }
- + }
- +}
- +
- +static int
- +button_translate(unsigned char scancode, unsigned char *keycode, char raw_mode)
- +{
- + static int prev_scancode;
- +
- + printk( "ibutton.c: translate: scancode=%x raw_mode=%x\n",
- + scancode, raw_mode);
- +
- + if (scancode == 0xe0 || scancode == 0xe1) {
- + prev_scancode = scancode;
- + return 0;
- + }
- +
- + if (scancode == 0x00 || scancode == 0xff) {
- + prev_scancode = 0;
- + return 0;
- + }
- +
- + *keycode = scancode;
- +
- + return 1;
- +}
- +
- +/* init button hardware */
- +static int button_hw_init(void)
- +{
- + unsigned int ipinfunc=0;
- +
- + printk("au1200_ibutton.c: Initializing buttons hardware\n");
- +
- + // initialize GPIO pin function assignments
- +
- + ipinfunc = au_readl(SYS_PINFUNC);
- +
- + ipinfunc &= ~(SYS_PINFUNC_DMA | SYS_PINFUNC_S0A | SYS_PINFUNC_S0B);
- + au_writel( ipinfunc ,SYS_PINFUNC);
- +
- + ipinfunc |= (SYS_PINFUNC_S0C);
- + au_writel( ipinfunc ,SYS_PINFUNC);
- +
- + return 0;
- +}
- +
- +/* button driver init */
- +static int __init button_init(void)
- +{
- + int ret, i;
- + unsigned int flag=0;
- +
- + printk("au1200_ibutton.c: button_init()\r\n");
- +
- + button_hw_init();
- +
- + /* register all button irq handler */
- +
- + for(i=0; i< sizeof(button_map)/sizeof(button_map[0]); i++)
- + {
- + /* register irq <-- gpio 1 ,6 ,12 , 17 ,19 , 26 ,28 */
- + if(button_map[i] != 0)
- + {
- + ret = request_irq(AU1000_GPIO_0 + i ,
- + &button_interrupt , SA_INTERRUPT ,
- + DRIVER_NAME , &dev);
- + if(ret) flag |= 1<<i;
- + }
- + }
- +
- + printk("au1200_ibutton.c: request_irq,ret:0x%x\r\n",ret);
- +
- + if (ret) {
- + printk("au1200_ibutton.c: request_irq:%X failed\r\n",flag);
- + return ret;
- + }
- +
- + dev.name = DRIVER_NAME;
- + dev.evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
- +
- + for (i=0;i<sizeof(button_map)/sizeof(button_map[0]);i++)
- + {
- + dev.keybit[LONG(button_map[i])] |= BIT(button_map[i]);
- + }
- +
- + input_register_device(&dev);
- +
- + /* ready to receive interrupts */
- +
- + return 0;
- +}
- +
- +/* button driver exit */
- +static void __exit button_exit(void)
- +{
- + int i;
- +
- + for(i=0;i<sizeof(button_map)/sizeof(button_map[0]);i++)
- + {
- + if(button_map[i] != 0)
- + {
- + free_irq( AU1000_GPIO_0 + i, &dev);
- + }
- + }
- +
- + input_unregister_device(&dev);
- +
- + printk("au1200_ibutton.c: button_exit()\r\n");
- +}
- +
- +module_init(button_init);
- +module_exit(button_exit);
- +
- +MODULE_AUTHOR( DRIVER_AUTHOR );
- +MODULE_DESCRIPTION( DRIVER_DESC );
- +MODULE_LICENSE("GPL");
- --- /dev/null
- +++ b/arch/mips/au1000/ficmmp/au1xxx_dock.c
- @@ -0,0 +1,261 @@
- +/*
- + * Copyright (C) 2003 Metrowerks, All Rights Reserved.
- + *
- + * This program is free software; you can redistribute it and/or modify
- + * it under the terms of the GNU General Public License version 2 as
- + * published by the Free Software Foundation.
- + */
- +
- +#include <linux/config.h>
- +#include <linux/module.h>
- +#include <linux/init.h>
- +#include <linux/fs.h>
- +#include <linux/sched.h>
- +#include <linux/miscdevice.h>
- +#include <linux/errno.h>
- +#include <linux/poll.h>
- +#include <asm/au1000.h>
- +#include <asm/uaccess.h>
- +#include <asm/au1xxx_gpio.h>
- +
- +
- +#if defined(CONFIG_MIPS_FICMMP)
- + #define DOCK_GPIO 215
- +#else
- + #error Unsupported Au1xxx Platform
- +#endif
- +
- +#define MAKE_FLAG 0x20
- +
- +#undef DEBUG
- +
- +#define DEBUG 0
- +//#define DEBUG 1
- +
- +#if DEBUG
- +#define DPRINTK(format, args...) printk(__FUNCTION__ ": " format, ## args)
- +#else
- +#define DPRINTK(format, args...) do { } while (0)
- +#endif
- +
- +/* Please note that this driver is based on a timer and is not interrupt
- + * driven. If you are going to make use of this driver, you will need to have
- + * your application open the dock listing from the /dev directory first.
- + */
- +
- +struct au1xxx_dock {
- + struct fasync_struct *fasync;
- + wait_queue_head_t read_wait;
- + int open_count;
- + unsigned int debounce;
- + unsigned int current;
- + unsigned int last;
- +};
- +
- +static struct au1xxx_dock dock_info;
- +
- +
- +static void dock_timer_periodic(void *data);
- +
- +static struct tq_struct dock_task = {
- + routine: dock_timer_periodic,
- + data: NULL
- +};
- +
- +static int cleanup_flag = 0;
- +static DECLARE_WAIT_QUEUE_HEAD(cleanup_wait_queue);
- +
- +
- +static unsigned int read_dock_state(void)
- +{
- + u32 state;
- +
- + state = au1xxx_gpio_read(DOCK_GPIO);
- +
- + /* printk( "Current Dock State: %d\n", state ); */
- +
- + return state;
- +}
- +
- +
- +static void dock_timer_periodic(void *data)
- +{
- + struct au1xxx_dock *dock = (struct au1xxx_dock *)data;
- + unsigned long dock_state;
- +
- + /* If cleanup wants us to die */
- + if (cleanup_flag) {
- + /* now cleanup_module can return */
- + wake_up(&cleanup_wait_queue);
- + } else {
- + /* put ourselves back in the task queue */
- + queue_task(&dock_task, &tq_timer);
- + }
- +
- + /* read current dock */
- + dock_state = read_dock_state();
- +
- + /* if dock states hasn't changed */
- + /* save time and be done. */
- + if (dock_state == dock->current) {
- + return;
- + }
- +
- + if (dock_state == dock->debounce) {
- + dock->current = dock_state;
- + } else {
- + dock->debounce = dock_state;
- + }
- + if (dock->current != dock->last) {
- + if (waitqueue_active(&dock->read_wait)) {
- + wake_up_interruptible(&dock->read_wait);
- + }
- + }
- +}
- +
- +
- +static ssize_t au1xxx_dock_read(struct file *filp, char *buffer, size_t count, loff_t *ppos)
- +{
- + struct au1xxx_dock *dock = filp->private_data;
- + char event[3];
- + int last;
- + int cur;
- + int err;
- +
- +try_again:
- +
- + while (dock->current == dock->last) {
- + if (filp->f_flags & O_NONBLOCK) {
- + return -EAGAIN;
- + }
- + interruptible_sleep_on(&dock->read_wait);
- + if (signal_pending(current)) {
- + return -ERESTARTSYS;
- + }
- + }
- +
- + cur = dock->current;
- + last = dock->last;
- +
- + if(cur != last)
- + {
- + event[0] = cur ? 'D' : 'U';
- + event[1] = '\r';
- + event[2] = '\n';
- + }
- + else
- + goto try_again;
- +
- + dock->last = cur;
- + err = copy_to_user(buffer, &event, 3);
- + if (err) {
- + return err;
- + }
- +
- + return 3;
- +}
- +
- +
- +static int au1xxx_dock_open(struct inode *inode, struct file *filp)
- +{
- + struct au1xxx_dock *dock = &dock_info;
- +
- + MOD_INC_USE_COUNT;
- +
- + filp->private_data = dock;
- +
- + if (dock->open_count++ == 0) {
- + dock_task.data = dock;
- + cleanup_flag = 0;
- + queue_task(&dock_task, &tq_timer);
- + }
- +
- + return 0;
- +}
- +
- +
- +static unsigned int au1xxx_dock_poll(struct file *filp, poll_table *wait)
- +{
- + struct au1xxx_dock *dock = filp->private_data;
- + int ret = 0;
- +
- + DPRINTK("start\n");
- + poll_wait(filp, &dock->read_wait, wait);
- + if (dock->current != dock->last) {
- + ret = POLLIN | POLLRDNORM;
- + }
- + return ret;
- +}
- +
- +
- +static int au1xxx_dock_release(struct inode *inode, struct file *filp)
- +{
- + struct au1xxx_dock *dock = filp->private_data;
- +
- + DPRINTK("start\n");
- +
- + if (--dock->open_count == 0) {
- + cleanup_flag = 1;
- + sleep_on(&cleanup_wait_queue);
- + }
- + MOD_DEC_USE_COUNT;
- +
- + return 0;
- +}
- +
- +
- +
- +static struct file_operations au1xxx_dock_fops = {
- + owner: THIS_MODULE,
- + read: au1xxx_dock_read,
- + poll: au1xxx_dock_poll,
- + open: au1xxx_dock_open,
- + release: au1xxx_dock_release,
- +};
- +
- +/*
- + * The au1xxx dock is a misc device:
- + * Major 10 char
- + * Minor 22 /dev/dock
- + *
- + * This is /dev/misc/dock if devfs is used.
- + */
- +
- +static struct miscdevice au1xxx_dock_dev = {
- + minor: 23,
- + name: "dock",
- + fops: &au1xxx_dock_fops,
- +};
- +
- +static int __init au1xxx_dock_init(void)
- +{
- + struct au1xxx_dock *dock = &dock_info;
- + int ret;
- +
- + DPRINTK("Initializing dock driver\n");
- + dock->open_count = 0;
- + cleanup_flag = 0;
- + init_waitqueue_head(&dock->read_wait);
- +
- +
- + /* yamon configures GPIO pins for the dock
- + * no initialization needed
- + */
- +
- + ret = misc_register(&au1xxx_dock_dev);
- +
- + DPRINTK("dock driver fully initialized.\n");
- +
- + return ret;
- +}
- +
- +
- +static void __exit au1xxx_dock_exit(void)
- +{
- + DPRINTK("unloading dock driver\n");
- + misc_deregister(&au1xxx_dock_dev);
- +}
- +
- +
- +module_init(au1xxx_dock_init);
- +module_exit(au1xxx_dock_exit);
- --- /dev/null
- +++ b/arch/mips/au1000/ficmmp/board_setup.c
- @@ -0,0 +1,226 @@
- +/*
- + *
- + * BRIEF MODULE DESCRIPTION
- + * Alchemy Pb1200 board setup.
- + *
- + * 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.
- + *
- + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- + * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- + *
- + * You should have received a copy of the GNU General Public License along
- + * with this program; if not, write to the Free Software Foundation, Inc.,
- + * 675 Mass Ave, Cambridge, MA 02139, USA.
- + */
- +#include <linux/config.h>
- +#include <linux/init.h>
- +#include <linux/sched.h>
- +#include <linux/ioport.h>
- +#include <linux/mm.h>
- +#include <linux/console.h>
- +#include <linux/mc146818rtc.h>
- +#include <linux/delay.h>
- +#include <linux/ide.h>
- +
- +#if defined(CONFIG_BLK_DEV_IDE_AU1XXX)
- +#include <linux/ide.h>
- +#endif
- +
- +#include <asm/cpu.h>
- +#include <asm/bootinfo.h>
- +#include <asm/irq.h>
- +#include <asm/keyboard.h>
- +#include <asm/mipsregs.h>
- +#include <asm/reboot.h>
- +#include <asm/pgtable.h>
- +#include <asm/au1000.h>
- +#include <asm/ficmmp.h>
- +#include <asm/au1xxx_dbdma.h>
- +#include <asm/au1xxx_gpio.h>
- +
- +extern struct rtc_ops no_rtc_ops;
- +
- +/* value currently in the board configuration register */
- +u16 ficmmp_config = 0;
- +
- +#if defined(CONFIG_BLK_DEV_IDE_AU1XXX)
- +extern struct ide_ops *ide_ops;
- +extern struct ide_ops au1xxx_ide_ops;
- +extern u32 au1xxx_ide_virtbase;
- +extern u64 au1xxx_ide_physbase;
- +extern int au1xxx_ide_irq;
- +
- +u32 led_base_addr;
- +/* Ddma */
- +chan_tab_t *ide_read_ch, *ide_write_ch;
- +u32 au1xxx_ide_ddma_enable = 0, switch4ddma = 1; // PIO+ddma
- +
- +dbdev_tab_t new_dbdev_tab_element = { DSCR_CMD0_THROTTLE, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 };
- +#endif /* end CONFIG_BLK_DEV_IDE_AU1XXX */
- +
- +void board_reset (void)
- +{
- + au_writel(0, 0xAD80001C);
- +}
- +
- +void board_power_off (void)
- +{
- +}
- +
- +void __init board_setup(void)
- +{
- + char *argptr = NULL;
- + u32 pin_func;
- + rtc_ops = &no_rtc_ops;
- +
- + ficmmp_config_init(); //Initialize FIC control register
- +
- +#if 0
- + /* Enable PSC1 SYNC for AC97. Normaly done in audio driver,
- + * but it is board specific code, so put it here.
- + */
- + pin_func = au_readl(SYS_PINFUNC);
- + au_sync();
- + pin_func |= SYS_PF_MUST_BE_SET | SYS_PF_PSC1_S1;
- + au_writel(pin_func, SYS_PINFUNC);
- +
- + au_writel(0, (u32)bcsr|0x10); /* turn off pcmcia power */
- + au_sync();
- +#endif
- +
- +#if defined( CONFIG_I2C_ALGO_AU1550 )
- + {
- + u32 freq0, clksrc;
- +
- + /* Select SMBUS in CPLD */
- + /* bcsr->resets &= ~(BCSR_RESETS_PCS0MUX); */
- +
- + pin_func = au_readl(SYS_PINFUNC);
- + au_sync();
- + pin_func &= ~(3<<17 | 1<<4);
- + /* Set GPIOs correctly */
- + pin_func |= 2<<17;
- + au_writel(pin_func, SYS_PINFUNC);
- + au_sync();
- +
- + /* The i2c driver depends on 50Mhz clock */
- + freq0 = au_readl(SYS_FREQCTRL0);
- + au_sync();
- + freq0 &= ~(SYS_FC_FRDIV1_MASK | SYS_FC_FS1 | SYS_FC_FE1);
- + freq0 |= (3<<SYS_FC_FRDIV1_BIT);
- + /* 396Mhz / (3+1)*2 == 49.5Mhz */
- + au_writel(freq0, SYS_FREQCTRL0);
- + au_sync();
- + freq0 |= SYS_FC_FE1;
- + au_writel(freq0, SYS_FREQCTRL0);
- + au_sync();
- +
- + clksrc = au_readl(SYS_CLKSRC);
- + au_sync();
- + clksrc &= ~0x01f00000;
- + /* bit 22 is EXTCLK0 for PSC0 */
- + clksrc |= (0x3 << 22);
- + au_writel(clksrc, SYS_CLKSRC);
- + au_sync();
- + }
- +#endif
- +
- +#ifdef CONFIG_FB_AU1200
- + argptr = prom_getcmdline();
- + strcat(argptr, " video=au1200fb:");
- +#endif
- +
- +#if defined(CONFIG_BLK_DEV_IDE_AU1XXX)
- + /*
- + * Iniz IDE parameters
- + */
- + ide_ops = &au1xxx_ide_ops;
- + au1xxx_ide_irq = FICMMP_IDE_INT;
- + au1xxx_ide_physbase = AU1XXX_ATA_PHYS_ADDR;
- + au1xxx_ide_virtbase = KSEG1ADDR(AU1XXX_ATA_PHYS_ADDR);
- + switch4ddma = 0;
- + /*
- + ide_ops = &au1xxx_ide_ops;
- + au1xxx_ide_irq = FICMMP_IDE_INT;
- + au1xxx_ide_base = KSEG1ADDR(AU1XXX_ATA_BASE);
- + */
- + au1xxx_gpio_write(9, 1);
- + printk("B4001010: %X\n", *((u32*)0xB4001010));
- + printk("B4001014: %X\n", *((u32*)0xB4001014));
- + printk("B4001018: %X\n", *((u32*)0xB4001018));
- + printk("B1900100: %X\n", *((u32*)0xB1900100));
- +
- +#if 0
- + ficmmp_config_clear(FICMMP_CONFIG_IDERST);
- + mdelay(100);
- + ficmmp_config_set(FICMMP_CONFIG_IDERST);
- + mdelay(100);
- +#endif
- + /*
- + * change PIO or PIO+Ddma
- + * check the GPIO-5 pin condition. pb1200:s18_dot
- + */
- +/* switch4ddma = 0; //(au_readl(SYS_PINSTATERD) & (1 << 5)) ? 1 : 0; */
- +#endif
- +
- + /* The Pb1200 development board uses external MUX for PSC0 to
- + support SMB/SPI. bcsr->resets bit 12: 0=SMB 1=SPI
- + */
- +#if defined(CONFIG_AU1550_PSC_SPI) && defined(CONFIG_I2C_ALGO_AU1550)
- + #error I2C and SPI are mutually exclusive. Both are physically connected to PSC0.\
- + Refer to Pb1200 documentation.
- +#elif defined( CONFIG_AU1550_PSC_SPI )
- + //bcsr->resets |= BCSR_RESETS_PCS0MUX;
- +#elif defined( CONFIG_I2C_ALGO_AU1550 )
- + //bcsr->resets &= (~BCSR_RESETS_PCS0MUX);
- +#endif
- + au_sync();
- +
- + printk("FIC Multimedia Player Board\n");
- + au1xxx_gpio_tristate(5);
- + printk("B1900100: %X\n", *((volatile u32*)0xB1900100));
- + printk("B190002C: %X\n", *((volatile u32*)0xB190002C));
- +}
- +
- +int
- +board_au1200fb_panel (void)
- +{
- + au1xxx_gpio_tristate(6);
- +
- + if (au1xxx_gpio_read(12) == 0)
- + return 9; /* FS453_640x480 (Composite/S-Video) */
- + else
- + return 7; /* Sharp 320x240 TFT */
- +}
- +
- +int
- +board_au1200fb_panel_init (void)
- +{
- + /*Enable data buffers*/
- + ficmmp_config_clear(FICMMP_CONFIG_LCMDATAOUT);
- + /*Take LCD out of reset*/
- + ficmmp_config_set(FICMMP_CONFIG_LCMPWREN | FICMMP_CONFIG_LCMEN);
- + return 0;
- +}
- +
- +int
- +board_au1200fb_panel_shutdown (void)
- +{
- + /*Disable data buffers*/
- + ficmmp_config_set(FICMMP_CONFIG_LCMDATAOUT);
- + /*Put LCD in reset, remove power*/
- + ficmmp_config_clear(FICMMP_CONFIG_LCMEN | FICMMP_CONFIG_LCMPWREN);
- + return 0;
- +}
- +
- --- /dev/null
- +++ b/arch/mips/au1000/ficmmp/init.c
- @@ -0,0 +1,76 @@
- +/*
- + *
- + * BRIEF MODULE DESCRIPTION
- + * PB1200 board setup
- + *
- + * 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.
- + *
- + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- + * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- + *
- + * You should have received a copy of the GNU General Public License along
- + * with this program; if not, write to the Free Software Foundation, Inc.,
- + * 675 Mass Ave, Cambridge, MA 02139, USA.
- + */
- +
- +#include <linux/init.h>
- +#include <linux/mm.h>
- +#include <linux/sched.h>
- +#include <linux/bootmem.h>
- +#include <asm/addrspace.h>
- +#include <asm/bootinfo.h>
- +#include <linux/config.h>
- +#include <linux/string.h>
- +#include <linux/kernel.h>
- +#include <linux/sched.h>
- +
- +int prom_argc;
- +char **prom_argv, **prom_envp;
- +extern void __init prom_init_cmdline(void);
- +extern char *prom_getenv(char *envname);
- +
- +const char *get_system_type(void)
- +{
- + return "FIC Multimedia Player (Au1200)";
- +}
- +
- +u32 mae_memsize = 0;
- +
- +int __init prom_init(int argc, char **argv, char **envp, int *prom_vec)
- +{
- + unsigned char *memsize_str;
- + unsigned long memsize;
- +
- + prom_argc = argc;
- + prom_argv = argv;
- + prom_envp = envp;
- +
- + mips_machgroup = MACH_GROUP_ALCHEMY;
- + mips_machtype = MACH_PB1000; /* set the platform # */
- + prom_init_cmdline();
- +
- + memsize_str = prom_getenv("memsize");
- + if (!memsize_str) {
- + memsize = 0x08000000;
- + } else {
- + memsize = simple_strtol(memsize_str, NULL, 0);
- + }
- +
- + /* reserved 32MB for MAE driver */
- + memsize -= (32 * 1024 * 1024);
- + add_memory_region(0, memsize, BOOT_MEM_RAM);
- + mae_memsize = memsize; /* for drivers/char/au1xxx_mae.c */
- + return 0;
- +}
- +
- --- /dev/null
- +++ b/arch/mips/au1000/ficmmp/irqmap.c
- @@ -0,0 +1,61 @@
- +/*
- + * BRIEF MODULE DESCRIPTION
- + * Au1xxx irq map table
- + *
- + * 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.
- + *
- + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- + * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- + *
- + * You should have received a copy of the GNU General Public License along
- + * with this program; if not, write to the Free Software Foundation, Inc.,
- + * 675 Mass Ave, Cambridge, MA 02139, USA.
- + */
- +#include <linux/errno.h>
- +#include <linux/init.h>
- +#include <linux/irq.h>
- +#include <linux/kernel_stat.h>
- +#include <linux/module.h>
- +#include <linux/signal.h>
- +#include <linux/sched.h>
- +#include <linux/types.h>
- +#include <linux/interrupt.h>
- +#include <linux/ioport.h>
- +#include <linux/timex.h>
- +#include <linux/slab.h>
- +#include <linux/random.h>
- +#include <linux/delay.h>
- +
- +#include <asm/bitops.h>
- +#include <asm/bootinfo.h>
- +#include <asm/io.h>
- +#include <asm/mipsregs.h>
- +#include <asm/system.h>
- +#include <asm/au1000.h>
- +#include <asm/ficmmp.h>
- +
- +au1xxx_irq_map_t au1xxx_irq_map[] = {
- + { FICMMP_IDE_INT, INTC_INT_HIGH_LEVEL, 0 },
- + { AU1XXX_SMC91111_IRQ, INTC_INT_HIGH_LEVEL, 0 },
- + { AU1000_GPIO_1 , INTC_INT_FALL_EDGE, 0 }, // main button
- + { AU1000_GPIO_6 , INTC_INT_RISE_EDGE, 0 }, // select button
- + { AU1000_GPIO_12, INTC_INT_FALL_EDGE, 0 }, // guide button
- + { AU1000_GPIO_17, INTC_INT_RISE_EDGE, 0 }, // down button
- + { AU1000_GPIO_19, INTC_INT_RISE_EDGE, 0 }, // left button
- + { AU1000_GPIO_26, INTC_INT_RISE_EDGE, 0 }, // right button
- + { AU1000_GPIO_28, INTC_INT_RISE_EDGE, 0 }, // up button
- +};
- +
- +int au1xxx_nr_irqs = sizeof(au1xxx_irq_map)/sizeof(au1xxx_irq_map_t);
- +
- --- /dev/null
- +++ b/arch/mips/au1000/ficmmp/Makefile
- @@ -0,0 +1,25 @@
- +#
- +# Copyright 2000 MontaVista Software Inc.
- +# Author: MontaVista Software, Inc.
- +# ppopov@mvista.com or source@mvista.com
- +#
- +# Makefile for the Alchemy Semiconductor FIC board.
- +#
- +# 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).
- +#
- +
- +USE_STANDARD_AS_RULE := true
- +
- +O_TARGET := ficmmp.o
- +
- +obj-y := init.o board_setup.o irqmap.o au1200_ibutton.o au1xxx_dock.o
- +
- +ifdef CONFIG_MMC
- +obj-y += mmc_support.o
- +export-objs +=mmc_support.o
- +endif
- +
- +
- +include $(TOPDIR)/Rules.make
- --- a/arch/mips/au1000/hydrogen3/board_setup.c
- +++ b/arch/mips/au1000/hydrogen3/board_setup.c
- @@ -51,12 +51,19 @@ void board_reset (void)
- {
- }
-
- +void board_power_off (void)
- +{
- +}
- +
- void __init board_setup(void)
- {
- u32 pin_func;
-
- rtc_ops = &no_rtc_ops;
-
- + /* Set GPIO14 high to make CD/DAT1 high for MMC to work */
- + au_writel(1<<14, SYS_OUTPUTSET);
- +
- #ifdef CONFIG_AU1X00_USB_DEVICE
- // 2nd USB port is USB device
- pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x8000);
- --- /dev/null
- +++ b/arch/mips/au1000/hydrogen3/buttons.c
- @@ -0,0 +1,308 @@
- +/*
- + * Copyright (C) 2003 Metrowerks, All Rights Reserved.
- + *
- + * This program is free software; you can redistribute it and/or modify
- + * it under the terms of the GNU General Public License version 2 as
- + * published by the Free Software Foundation.
- + */
- +
- +#include <linux/config.h>
- +#include <linux/module.h>
- +#include <linux/init.h>
- +#include <linux/fs.h>
- +#include <linux/sched.h>
- +#include <linux/miscdevice.h>
- +#include <linux/errno.h>
- +#include <linux/poll.h>
- +#include <asm/au1000.h>
- +#include <asm/uaccess.h>
- +
- +#define BUTTON_SELECT (1<<1)
- +#define BUTTON_1 (1<<2)
- +#define BUTTON_2 (1<<3)
- +#define BUTTON_ONOFF (1<<6)
- +#define BUTTON_3 (1<<7)
- +#define BUTTON_4 (1<<8)
- +#define BUTTON_LEFT (1<<9)
- +#define BUTTON_DOWN (1<<10)
- +#define BUTTON_RIGHT (1<<11)
- +#define BUTTON_UP (1<<12)
- +
- +#define BUTTON_MASK (\
- + BUTTON_SELECT \
- + | BUTTON_1 \
- + | BUTTON_2 \
- + | BUTTON_ONOFF \
- + | BUTTON_3 \
- + | BUTTON_4 \
- + | BUTTON_LEFT \
- + | BUTTON_DOWN \
- + | BUTTON_RIGHT \
- + | BUTTON_UP \
- + )
- +
- +#define BUTTON_INVERT (\
- + BUTTON_SELECT \
- + | BUTTON_1 \
- + | BUTTON_2 \
- + | BUTTON_3 \
- + | BUTTON_4 \
- + | BUTTON_LEFT \
- + | BUTTON_DOWN \
- + | BUTTON_RIGHT \
- + | BUTTON_UP \
- + )
- +
- +
- +
- +#define MAKE_FLAG 0x20
- +
- +#undef DEBUG
- +
- +#define DEBUG 0
- +//#define DEBUG 1
- +
- +#if DEBUG
- +#define DPRINTK(format, args...) printk(__FUNCTION__ ": " format, ## args)
- +#else
- +#define DPRINTK(format, args...) do { } while (0)
- +#endif
- +
- +/* Please note that this driver is based on a timer and is not interrupt
- + * driven. If you are going to make use of this driver, you will need to have
- + * your application open the buttons listing from the /dev directory first.
- + */
- +
- +struct hydrogen3_buttons {
- + struct fasync_struct *fasync;
- + wait_queue_head_t read_wait;
- + int open_count;
- + unsigned int debounce;
- + unsigned int current;
- + unsigned int last;
- +};
- +
- +static struct hydrogen3_buttons buttons_info;
- +
- +
- +static void button_timer_periodic(void *data);
- +
- +static struct tq_struct button_task = {
- + routine: button_timer_periodic,
- + data: NULL
- +};
- +
- +static int cleanup_flag = 0;
- +static DECLARE_WAIT_QUEUE_HEAD(cleanup_wait_queue);
- +
- +
- +static unsigned int read_button_state(void)
- +{
- + unsigned long state;
- +
- + state = inl(SYS_PINSTATERD) & BUTTON_MASK;
- + state ^= BUTTON_INVERT;
- +
- + DPRINTK( "Current Button State: %d\n", state );
- +
- + return state;
- +}
- +
- +
- +static void button_timer_periodic(void *data)
- +{
- + struct hydrogen3_buttons *buttons = (struct hydrogen3_buttons *)data;
- + unsigned long button_state;
- +
- + // If cleanup wants us to die
- + if (cleanup_flag) {
- + wake_up(&cleanup_wait_queue); // now cleanup_module can return
- + } else {
- + queue_task(&button_task, &tq_timer); // put ourselves back in the task queue
- + }
- +
- + // read current buttons
- + button_state = read_button_state();
- +
- + // if no buttons are down and nothing to do then
- + // save time and be done.
- + if ((button_state == 0) && (buttons->current == 0)) {
- + return;
- + }
- +
- + if (button_state == buttons->debounce) {
- + buttons->current = button_state;
- + } else {
- + buttons->debounce = button_state;
- + }
- +// printk("0x%04x\n", button_state);
- + if (buttons->current != buttons->last) {
- + if (waitqueue_active(&buttons->read_wait)) {
- + wake_up_interruptible(&buttons->read_wait);
- + }
- + }
- +}
- +
- +
- +static ssize_t hydrogen3_buttons_read(struct file *filp, char *buffer, size_t count, loff_t *ppos)
- +{
- + struct hydrogen3_buttons *buttons = filp->private_data;
- + char events[16];
- + int index;
- + int last;
- + int cur;
- + int bit;
- + int bit_mask;
- + int err;
- +
- + DPRINTK("start\n");
- +
- +try_again:
- +
- + while (buttons->current == buttons->last) {
- + if (filp->f_flags & O_NONBLOCK) {
- + return -EAGAIN;
- + }
- + interruptible_sleep_on(&buttons->read_wait);
- + if (signal_pending(current)) {
- + return -ERESTARTSYS;
- + }
- + }
- +
- + cur = buttons->current;
- + last = buttons->last;
- +
- + index = 0;
- + bit_mask = 1;
- + for (bit = 0; (bit < 16) && count; bit++) {
- + if ((cur ^ last) & bit_mask) {
- + if (cur & bit_mask) {
- + events[index] = (bit | MAKE_FLAG) + 'A';
- + last |= bit_mask;
- + } else {
- + events[index] = bit + 'A';
- + last &= ~bit_mask;
- + }
- + index++;
- + count--;
- + }
- + bit_mask <<= 1;
- + }
- + buttons->last = last;
- +
- + if (index == 0) {
- + goto try_again;
- + }
- +
- + err = copy_to_user(buffer, events, index);
- + if (err) {
- + return err;
- + }
- +
- + return index;
- +}
- +
- +
- +static int hydrogen3_buttons_open(struct inode *inode, struct file *filp)
- +{
- + struct hydrogen3_buttons *buttons = &buttons_info;
- +
- + DPRINTK("start\n");
- + MOD_INC_USE_COUNT;
- +
- + filp->private_data = buttons;
- +
- + if (buttons->open_count++ == 0) {
- + button_task.data = buttons;
- + cleanup_flag = 0;
- + queue_task(&button_task, &tq_timer);
- + }
- +
- + return 0;
- +}
- +
- +
- +static unsigned int hydrogen3_buttons_poll(struct file *filp, poll_table *wait)
- +{
- + struct hydrogen3_buttons *buttons = filp->private_data;
- + int ret = 0;
- +
- + DPRINTK("start\n");
- + poll_wait(filp, &buttons->read_wait, wait);
- + if (buttons->current != buttons->last) {
- + ret = POLLIN | POLLRDNORM;
- + }
- + return ret;
- +}
- +
- +
- +static int hydrogen3_buttons_release(struct inode *inode, struct file *filp)
- +{
- + struct hydrogen3_buttons *buttons = filp->private_data;
- +
- + DPRINTK("start\n");
- +
- + if (--buttons->open_count == 0) {
- + cleanup_flag = 1;
- + sleep_on(&cleanup_wait_queue);
- + }
- + MOD_DEC_USE_COUNT;
- +
- + return 0;
- +}
- +
- +
- +
- +static struct file_operations hydrogen3_buttons_fops = {
- + owner: THIS_MODULE,
- + read: hydrogen3_buttons_read,
- + poll: hydrogen3_buttons_poll,
- + open: hydrogen3_buttons_open,
- + release: hydrogen3_buttons_release,
- +};
- +
- +/*
- + * The hydrogen3 buttons is a misc device:
- + * Major 10 char
- + * Minor 22 /dev/buttons
- + *
- + * This is /dev/misc/buttons if devfs is used.
- + */
- +
- +static struct miscdevice hydrogen3_buttons_dev = {
- + minor: 22,
- + name: "buttons",
- + fops: &hydrogen3_buttons_fops,
- +};
- +
- +static int __init hydrogen3_buttons_init(void)
- +{
- + struct hydrogen3_buttons *buttons = &buttons_info;
- + int ret;
- +
- + DPRINTK("Initializing buttons driver\n");
- + buttons->open_count = 0;
- + cleanup_flag = 0;
- + init_waitqueue_head(&buttons->read_wait);
- +
- +
- + // yamon configures GPIO pins for the buttons
- + // no initialization needed
- +
- + ret = misc_register(&hydrogen3_buttons_dev);
- +
- + DPRINTK("Buttons driver fully initialized.\n");
- +
- + return ret;
- +}
- +
- +
- +static void __exit hydrogen3_buttons_exit(void)
- +{
- + DPRINTK("unloading buttons driver\n");
- + misc_deregister(&hydrogen3_buttons_dev);
- +}
- +
- +
- +module_init(hydrogen3_buttons_init);
- +module_exit(hydrogen3_buttons_exit);
- --- a/arch/mips/au1000/hydrogen3/Makefile
- +++ b/arch/mips/au1000/hydrogen3/Makefile
- @@ -14,6 +14,11 @@ USE_STANDARD_AS_RULE := true
-
- O_TARGET := hydrogen3.o
-
- -obj-y := init.o board_setup.o irqmap.o
- +obj-y := init.o board_setup.o irqmap.o buttons.o
- +
- +ifdef CONFIG_MMC
- +obj-y += mmc_support.o
- +export-objs +=mmc_support.o
- +endif
-
- include $(TOPDIR)/Rules.make
- --- /dev/null
- +++ b/arch/mips/au1000/hydrogen3/mmc_support.c
- @@ -0,0 +1,89 @@
- +/*
- + * BRIEF MODULE DESCRIPTION
- + *
- + * MMC support routines for Hydrogen3.
- + *
- + *
- + * Copyright (c) 2003-2004 Embedded Edge, LLC.
- + * Author: Embedded Edge, LLC.
- + * Contact: dan@embeddededge.com
- + *
- + * 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.
- + *
- + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- + * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- + *
- + * You should have received a copy of the GNU General Public License along
- + * with this program; if not, write to the Free Software Foundation, Inc.,
- + * 675 Mass Ave, Cambridge, MA 02139, USA.
- + *
- + */
- +
- +
- +#include <linux/config.h>
- +#include <linux/kernel.h>
- +#include <linux/module.h>
- +#include <linux/init.h>
- +
- +#include <asm/irq.h>
- +#include <asm/au1000.h>
- +#include <asm/au1100_mmc.h>
- +
- +#define GPIO_17_WP 0x20000
- +
- +/* SD/MMC controller support functions */
- +
- +/*
- + * Detect card.
- + */
- +void mmc_card_inserted(int _n_, int *_res_)
- +{
- + u32 gpios = au_readl(SYS_PINSTATERD);
- + u32 emptybit = (1<<16);
- + *_res_ = ((gpios & emptybit) == 0);
- +}
- +
- +/*
- + * Check card write protection.
- + */
- +void mmc_card_writable(int _n_, int *_res_)
- +{
- + unsigned long mmc_wp, board_specific;
- + board_specific = au_readl(SYS_OUTPUTSET);
- + mmc_wp=GPIO_17_WP;
- + if (!(board_specific & mmc_wp)) {/* low means card writable */
- + *_res_ = 1;
- + } else {
- + *_res_ = 0;
- + }
- +}
- +/*
- + * Apply power to card slot.
- + */
- +void mmc_power_on(int _n_)
- +{
- +}
- +
- +/*
- + * Remove power from card slot.
- + */
- +void mmc_power_off(int _n_)
- +{
- +}
- +
- +EXPORT_SYMBOL(mmc_card_inserted);
- +EXPORT_SYMBOL(mmc_card_writable);
- +EXPORT_SYMBOL(mmc_power_on);
- +EXPORT_SYMBOL(mmc_power_off);
- +
- --- a/arch/mips/au1000/mtx-1/board_setup.c
- +++ b/arch/mips/au1000/mtx-1/board_setup.c
- @@ -48,6 +48,12 @@
-
- extern struct rtc_ops no_rtc_ops;
-
- +void board_reset (void)
- +{
- + /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */
- + au_writel(0x00000000, 0xAE00001C);
- +}
- +
- void __init board_setup(void)
- {
- rtc_ops = &no_rtc_ops;
- --- a/arch/mips/au1000/mtx-1/irqmap.c
- +++ b/arch/mips/au1000/mtx-1/irqmap.c
- @@ -72,10 +72,10 @@ au1xxx_pci_irqmap(struct pci_dev *dev, u
- * A B C D
- */
- {
- - {INTA, INTB, INTC, INTD}, /* IDSEL 0 */
- - {INTA, INTB, INTC, INTD}, /* IDSEL 1 */
- - {INTA, INTB, INTC, INTD}, /* IDSEL 2 */
- - {INTA, INTB, INTC, INTD}, /* IDSEL 3 */
- + {INTA, INTB, INTX, INTX}, /* IDSEL 0 */
- + {INTB, INTA, INTX, INTX}, /* IDSEL 1 */
- + {INTC, INTD, INTX, INTX}, /* IDSEL 2 */
- + {INTD, INTC, INTX, INTX}, /* IDSEL 3 */
- };
- const long min_idsel = 0, max_idsel = 3, irqs_per_slot = 4;
- return PCI_IRQ_TABLE_LOOKUP;
- --- a/arch/mips/au1000/pb1000/board_setup.c
- +++ b/arch/mips/au1000/pb1000/board_setup.c
- @@ -58,6 +58,10 @@ void board_reset (void)
- {
- }
-
- +void board_power_off (void)
- +{
- +}
- +
- void __init board_setup(void)
- {
- u32 pin_func, static_cfg0;
- --- a/arch/mips/au1000/pb1100/board_setup.c
- +++ b/arch/mips/au1000/pb1100/board_setup.c
- @@ -62,6 +62,10 @@ void board_reset (void)
- au_writel(0x00000000, 0xAE00001C);
- }
-
- +void board_power_off (void)
- +{
- +}
- +
- void __init board_setup(void)
- {
- u32 pin_func;
- --- a/arch/mips/au1000/pb1100/Makefile
- +++ b/arch/mips/au1000/pb1100/Makefile
- @@ -16,4 +16,10 @@ O_TARGET := pb1100.o
-
- obj-y := init.o board_setup.o irqmap.o
-
- +
- +ifdef CONFIG_MMC
- +obj-y += mmc_support.o
- +export-objs += mmc_support.o
- +endif
- +
- include $(TOPDIR)/Rules.make
- --- /dev/null
- +++ b/arch/mips/au1000/pb1100/mmc_support.c
- @@ -0,0 +1,126 @@
- +/*
- + * BRIEF MODULE DESCRIPTION
- + *
- + * MMC support routines for PB1100.
- + *
- + *
- + * Copyright (c) 2003-2004 Embedded Edge, LLC.
- + * Author: Embedded Edge, LLC.
- + * Contact: dan@embeddededge.com
- + *
- + * 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.
- + *
- + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- + * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- + *
- + * You should have received a copy of the GNU General Public License along
- + * with this program; if not, write to the Free Software Foundation, Inc.,
- + * 675 Mass Ave, Cambridge, MA 02139, USA.
- + *
- + */
- +
- +
- +#include <linux/config.h>
- +#include <linux/kernel.h>
- +#include <linux/module.h>
- +#include <linux/init.h>
- +
- +#include <asm/irq.h>
- +#include <asm/au1000.h>
- +#include <asm/au1100_mmc.h>
- +#include <asm/pb1100.h>
- +
- +
- +/* SD/MMC controller support functions */
- +
- +/*
- + * Detect card.
- + */
- +void mmc_card_inserted(int _n_, int *_res_)
- +{
- + u32 gpios = au_readl(SYS_PINSTATERD);
- + u32 emptybit = (_n_) ? (1<<15) : (1<<14);
- + *_res_ = ((gpios & emptybit) == 0);
- +}
- +
- +/*
- + * Check card write protection.
- + */
- +void mmc_card_writable(int _n_, int *_res_)
- +{
- + BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR;
- + unsigned long mmc_wp, board_specific;
- +
- + if (_n_) {
- + mmc_wp = BCSR_PCMCIA_SD1_WP;
- + } else {
- + mmc_wp = BCSR_PCMCIA_SD0_WP;
- + }
- +
- + board_specific = au_readl((unsigned long)(&bcsr->pcmcia));
- +
- + if (!(board_specific & mmc_wp)) {/* low means card writable */
- + *_res_ = 1;
- + } else {
- + *_res_ = 0;
- + }
- +}
- +
- +/*
- + * Apply power to card slot.
- + */
- +void mmc_power_on(int _n_)
- +{
- + BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR;
- + unsigned long mmc_pwr, board_specific;
- +
- + if (_n_) {
- + mmc_pwr = BCSR_PCMCIA_SD1_PWR;
- + } else {
- + mmc_pwr = BCSR_PCMCIA_SD0_PWR;
- + }
- +
- + board_specific = au_readl((unsigned long)(&bcsr->pcmcia));
- + board_specific |= mmc_pwr;
- +
- + au_writel(board_specific, (int)(&bcsr->pcmcia));
- + au_sync_delay(1);
- +}
- +
- +/*
- + * Remove power from card slot.
- + */
- +void mmc_power_off(int _n_)
- +{
- + BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR;
- + unsigned long mmc_pwr, board_specific;
- +
- + if (_n_) {
- + mmc_pwr = BCSR_PCMCIA_SD1_PWR;
- + } else {
- + mmc_pwr = BCSR_PCMCIA_SD0_PWR;
- + }
- +
- + board_specific = au_readl((unsigned long)(&bcsr->pcmcia));
- + board_specific &= ~mmc_pwr;
- +
- + au_writel(board_specific, (int)(&bcsr->pcmcia));
- + au_sync_delay(1);
- +}
- +
- +EXPORT_SYMBOL(mmc_card_inserted);
- +EXPORT_SYMBOL(mmc_card_writable);
- +EXPORT_SYMBOL(mmc_power_on);
- +EXPORT_SYMBOL(mmc_power_off);
- +
- --- /dev/null
- +++ b/arch/mips/au1000/pb1200/board_setup.c
- @@ -0,0 +1,221 @@
- +/*
- + *
- + * BRIEF MODULE DESCRIPTION
- + * Alchemy Pb1200 board setup.
- + *
- + * 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.
- + *
- + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- + * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- + *
- + * You should have received a copy of the GNU General Public License along
- + * with this program; if not, write to the Free Software Foundation, Inc.,
- + * 675 Mass Ave, Cambridge, MA 02139, USA.
- + */
- +#include <linux/config.h>
- +#include <linux/init.h>
- +#include <linux/sched.h>
- +#include <linux/ioport.h>
- +#include <linux/mm.h>
- +#include <linux/console.h>
- +#include <linux/mc146818rtc.h>
- +#include <linux/delay.h>
- +
- +#if defined(CONFIG_BLK_DEV_IDE_AU1XXX)
- +#include <linux/ide.h>
- +#endif
- +
- +#include <asm/cpu.h>
- +#include <asm/bootinfo.h>
- +#include <asm/irq.h>
- +#include <asm/keyboard.h>
- +#include <asm/mipsregs.h>
- +#include <asm/reboot.h>
- +#include <asm/pgtable.h>
- +#include <asm/au1000.h>
- +#include <asm/au1xxx_dbdma.h>
- +
- +#ifdef CONFIG_MIPS_PB1200
- +#include <asm/pb1200.h>
- +#endif
- +
- +#ifdef CONFIG_MIPS_DB1200
- +#include <asm/db1200.h>
- +#define PB1200_ETH_INT DB1200_ETH_INT
- +#define PB1200_IDE_INT DB1200_IDE_INT
- +#endif
- +
- +extern struct rtc_ops no_rtc_ops;
- +
- +extern void _board_init_irq(void);
- +extern void (*board_init_irq)(void);
- +
- +#ifdef CONFIG_BLK_DEV_IDE_AU1XXX
- +extern struct ide_ops *ide_ops;
- +extern struct ide_ops au1xxx_ide_ops;
- +extern u32 au1xxx_ide_virtbase;
- +extern u64 au1xxx_ide_physbase;
- +extern int au1xxx_ide_irq;
- +
- +u32 led_base_addr;
- +/* Ddma */
- +chan_tab_t *ide_read_ch, *ide_write_ch;
- +u32 au1xxx_ide_ddma_enable = 0, switch4ddma = 1; // PIO+ddma
- +
- +dbdev_tab_t new_dbdev_tab_element = { DSCR_CMD0_THROTTLE, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 };
- +#endif /* end CONFIG_BLK_DEV_IDE_AU1XXX */
- +
- +void board_reset (void)
- +{
- + bcsr->resets = 0;
- +}
- +
- +void board_power_off (void)
- +{
- + bcsr->resets = 0xC000;
- +}
- +
- +void __init board_setup(void)
- +{
- + char *argptr = NULL;
- + u32 pin_func;
- + rtc_ops = &no_rtc_ops;
- +
- +#if 0
- + /* Enable PSC1 SYNC for AC97. Normaly done in audio driver,
- + * but it is board specific code, so put it here.
- + */
- + pin_func = au_readl(SYS_PINFUNC);
- + au_sync();
- + pin_func |= SYS_PF_MUST_BE_SET | SYS_PF_PSC1_S1;
- + au_writel(pin_func, SYS_PINFUNC);
- +
- + au_writel(0, (u32)bcsr|0x10); /* turn off pcmcia power */
- + au_sync();
- +#endif
- +
- +#if defined( CONFIG_I2C_ALGO_AU1550 )
- + {
- + u32 freq0, clksrc;
- +
- + /* Select SMBUS in CPLD */
- + bcsr->resets &= ~(BCSR_RESETS_PCS0MUX);
- +
- + pin_func = au_readl(SYS_PINFUNC);
- + au_sync();
- + pin_func &= ~(3<<17 | 1<<4);
- + /* Set GPIOs correctly */
- + pin_func |= 2<<17;
- + au_writel(pin_func, SYS_PINFUNC);
- + au_sync();
- +
- + /* The i2c driver depends on 50Mhz clock */
- + freq0 = au_readl(SYS_FREQCTRL0);
- + au_sync();
- + freq0 &= ~(SYS_FC_FRDIV1_MASK | SYS_FC_FS1 | SYS_FC_FE1);
- + freq0 |= (3<<SYS_FC_FRDIV1_BIT);
- + /* 396Mhz / (3+1)*2 == 49.5Mhz */
- + au_writel(freq0, SYS_FREQCTRL0);
- + au_sync();
- + freq0 |= SYS_FC_FE1;
- + au_writel(freq0, SYS_FREQCTRL0);
- + au_sync();
- +
- + clksrc = au_readl(SYS_CLKSRC);
- + au_sync();
- + clksrc &= ~0x01f00000;
- + /* bit 22 is EXTCLK0 for PSC0 */
- + clksrc |= (0x3 << 22);
- + au_writel(clksrc, SYS_CLKSRC);
- + au_sync();
- + }
- +#endif
- +
- +#ifdef CONFIG_FB_AU1200
- + argptr = prom_getcmdline();
- + strcat(argptr, " video=au1200fb:");
- +#endif
- +
- +#if defined(CONFIG_BLK_DEV_IDE_AU1XXX)
- + /*
- + * Iniz IDE parameters
- + */
- + ide_ops = &au1xxx_ide_ops;
- + au1xxx_ide_irq = PB1200_IDE_INT;
- + au1xxx_ide_physbase = AU1XXX_ATA_PHYS_ADDR;
- + au1xxx_ide_virtbase = KSEG1ADDR(AU1XXX_ATA_PHYS_ADDR);
- + /*
- + * change PIO or PIO+Ddma
- + * check the GPIO-5 pin condition. pb1200:s18_dot */
- + switch4ddma = (au_readl(SYS_PINSTATERD) & (1 << 5)) ? 1 : 0;
- +#endif
- +
- + /* The Pb1200 development board uses external MUX for PSC0 to
- + support SMB/SPI. bcsr->resets bit 12: 0=SMB 1=SPI
- + */
- +#if defined(CONFIG_AU1550_PSC_SPI) && defined(CONFIG_I2C_ALGO_AU1550)
- + #error I2C and SPI are mutually exclusive. Both are physically connected to PSC0.\
- + Refer to Pb1200/Db1200 documentation.
- +#elif defined( CONFIG_AU1550_PSC_SPI )
- + bcsr->resets |= BCSR_RESETS_PCS0MUX;
- +#elif defined( CONFIG_I2C_ALGO_AU1550 )
- + bcsr->resets &= (~BCSR_RESETS_PCS0MUX);
- +#endif
- + au_sync();
- +
- +#ifdef CONFIG_MIPS_PB1200
- + printk("AMD Alchemy Pb1200 Board\n");
- +#endif
- +#ifdef CONFIG_MIPS_DB1200
- + printk("AMD Alchemy Db1200 Board\n");
- +#endif
- +
- + /* Setup Pb1200 External Interrupt Controller */
- + {
- + extern void (*board_init_irq)(void);
- + extern void _board_init_irq(void);
- + board_init_irq = _board_init_irq;
- + }
- +}
- +
- +int
- +board_au1200fb_panel (void)
- +{
- + BCSR *bcsr = (BCSR *)BCSR_KSEG1_ADDR;
- + int p;
- +
- + p = bcsr->switches;
- + p >>= 8;
- + p &= 0x0F;
- + return p;
- +}
- +
- +int
- +board_au1200fb_panel_init (void)
- +{
- + /* Apply power */
- + BCSR *bcsr = (BCSR *)BCSR_KSEG1_ADDR;
- + bcsr->board |= (BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD | BCSR_BOARD_LCDBL);
- + return 0;
- +}
- +
- +int
- +board_au1200fb_panel_shutdown (void)
- +{
- + /* Remove power */
- + BCSR *bcsr = (BCSR *)BCSR_KSEG1_ADDR;
- + bcsr->board &= ~(BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD | BCSR_BOARD_LCDBL);
- + return 0;
- +}
- +
- --- /dev/null
- +++ b/arch/mips/au1000/pb1200/init.c
- @@ -0,0 +1,72 @@
- +/*
- + *
- + * BRIEF MODULE DESCRIPTION
- + * PB1200 board setup
- + *
- + * 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.
- + *
- + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- + * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- + *
- + * You should have received a copy of the GNU General Public License along
- + * with this program; if not, write to the Free Software Foundation, Inc.,
- + * 675 Mass Ave, Cambridge, MA 02139, USA.
- + */
- +
- +#include <linux/init.h>
- +#include <linux/mm.h>
- +#include <linux/sched.h>
- +#include <linux/bootmem.h>
- +#include <asm/addrspace.h>
- +#include <asm/bootinfo.h>
- +#include <linux/config.h>
- +#include <linux/string.h>
- +#include <linux/kernel.h>
- +#include <linux/sched.h>
- +
- +int prom_argc;
- +char **prom_argv, **prom_envp;
- +extern void __init prom_init_cmdline(void);
- +extern char *prom_getenv(char *envname);
- +
- +const char *get_system_type(void)
- +{
- + return "AMD Alchemy Au1200/Pb1200";
- +}
- +
- +u32 mae_memsize = 0;
- +
- +int __init prom_init(int argc, char **argv, char **envp, int *prom_vec)
- +{
- + unsigned char *memsize_str;
- + unsigned long memsize;
- +
- + prom_argc = argc;
- + prom_argv = argv;
- + prom_envp = envp;
- +
- + mips_machgroup = MACH_GROUP_ALCHEMY;
- + mips_machtype = MACH_PB1000; /* set the platform # */
- + prom_init_cmdline();
- +
- + memsize_str = prom_getenv("memsize");
- + if (!memsize_str) {
- + memsize = 0x08000000;
- + } else {
- + memsize = simple_strtol(memsize_str, NULL, 0);
- + }
- + add_memory_region(0, memsize, BOOT_MEM_RAM);
- + return 0;
- +}
- +
- --- /dev/null
- +++ b/arch/mips/au1000/pb1200/irqmap.c
- @@ -0,0 +1,180 @@
- +/*
- + * BRIEF MODULE DESCRIPTION
- + * Au1xxx irq map table
- + *
- + * 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.
- + *
- + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- + * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- + *
- + * You should have received a copy of the GNU General Public License along
- + * with this program; if not, write to the Free Software Foundation, Inc.,
- + * 675 Mass Ave, Cambridge, MA 02139, USA.
- + */
- +#include <linux/errno.h>
- +#include <linux/init.h>
- +#include <linux/irq.h>
- +#include <linux/kernel_stat.h>
- +#include <linux/module.h>
- +#include <linux/signal.h>
- +#include <linux/sched.h>
- +#include <linux/types.h>
- +#include <linux/interrupt.h>
- +#include <linux/ioport.h>
- +#include <linux/timex.h>
- +#include <linux/slab.h>
- +#include <linux/random.h>
- +#include <linux/delay.h>
- +
- +#include <asm/bitops.h>
- +#include <asm/bootinfo.h>
- +#include <asm/io.h>
- +#include <asm/mipsregs.h>
- +#include <asm/system.h>
- +#include <asm/au1000.h>
- +
- +#ifdef CONFIG_MIPS_PB1200
- +#include <asm/pb1200.h>
- +#endif
- +
- +#ifdef CONFIG_MIPS_DB1200
- +#include <asm/db1200.h>
- +#define PB1200_INT_BEGIN DB1200_INT_BEGIN
- +#define PB1200_INT_END DB1200_INT_END
- +#endif
- +
- +au1xxx_irq_map_t au1xxx_irq_map[] = {
- + { AU1000_GPIO_7, INTC_INT_LOW_LEVEL, 0 }, // This is exteranl interrupt cascade
- +};
- +
- +int au1xxx_nr_irqs = sizeof(au1xxx_irq_map)/sizeof(au1xxx_irq_map_t);
- +
- +/*
- + * Support for External interrupts on the PbAu1200 Development platform.
- + */
- +static volatile int pb1200_cascade_en=0;
- +
- +void pb1200_cascade_handler( int irq, void *dev_id, struct pt_regs *regs)
- +{
- + unsigned short bisr = bcsr->int_status;
- + int extirq_nr = 0;
- +
- + /* Clear all the edge interrupts. This has no effect on level */
- + bcsr->int_status = bisr;
- + for( ; bisr; bisr &= (bisr-1) )
- + {
- + extirq_nr = (PB1200_INT_BEGIN-1) + au_ffs(bisr);
- + /* Ack and dispatch IRQ */
- + do_IRQ(extirq_nr,regs);
- + }
- +}
- +
- +inline void pb1200_enable_irq(unsigned int irq_nr)
- +{
- + bcsr->intset_mask = 1<<(irq_nr - PB1200_INT_BEGIN);
- + bcsr->intset = 1<<(irq_nr - PB1200_INT_BEGIN);
- +}
- +
- +inline void pb1200_disable_irq(unsigned int irq_nr)
- +{
- + bcsr->intclr_mask = 1<<(irq_nr - PB1200_INT_BEGIN);
- + bcsr->intclr = 1<<(irq_nr - PB1200_INT_BEGIN);
- +}
- +
- +static unsigned int pb1200_startup_irq( unsigned int irq_nr )
- +{
- + if (++pb1200_cascade_en == 1)
- + {
- + request_irq(AU1000_GPIO_7, &pb1200_cascade_handler,
- + 0, "Pb1200 Cascade", &pb1200_cascade_handler );
- +#ifdef CONFIG_MIPS_PB1200
- + /* We have a problem with CPLD rev3. Enable a workaround */
- + if( ((bcsr->whoami & BCSR_WHOAMI_CPLD)>>4) <= 3)
- + {
- + printk("\nWARNING!!!\n");
- + printk("\nWARNING!!!\n");
- + printk("\nWARNING!!!\n");
- + printk("\nWARNING!!!\n");
- + printk("\nWARNING!!!\n");
- + printk("\nWARNING!!!\n");
- + printk("Pb1200 must be at CPLD rev4. Please have Pb1200\n");
- + printk("updated to latest revision. This software will not\n");
- + printk("work on anything less than CPLD rev4\n");
- + printk("\nWARNING!!!\n");
- + printk("\nWARNING!!!\n");
- + printk("\nWARNING!!!\n");
- + printk("\nWARNING!!!\n");
- + printk("\nWARNING!!!\n");
- + printk("\nWARNING!!!\n");
- + while(1);
- + }
- +#endif
- + }
- + pb1200_enable_irq(irq_nr);
- + return 0;
- +}
- +
- +static void pb1200_shutdown_irq( unsigned int irq_nr )
- +{
- + pb1200_disable_irq(irq_nr);
- + if (--pb1200_cascade_en == 0)
- + {
- + free_irq(AU1000_GPIO_7,&pb1200_cascade_handler );
- + }
- + return;
- +}
- +
- +static inline void pb1200_mask_and_ack_irq(unsigned int irq_nr)
- +{
- + pb1200_disable_irq( irq_nr );
- +}
- +
- +static void pb1200_end_irq(unsigned int irq_nr)
- +{
- + if (!(irq_desc[irq_nr].status & (IRQ_DISABLED|IRQ_INPROGRESS))) {
- + pb1200_enable_irq(irq_nr);
- + }
- +}
- +
- +static struct hw_interrupt_type external_irq_type =
- +{
- +#ifdef CONFIG_MIPS_PB1200
- + "Pb1200 Ext",
- +#endif
- +#ifdef CONFIG_MIPS_DB1200
- + "Db1200 Ext",
- +#endif
- + pb1200_startup_irq,
- + pb1200_shutdown_irq,
- + pb1200_enable_irq,
- + pb1200_disable_irq,
- + pb1200_mask_and_ack_irq,
- + pb1200_end_irq,
- + NULL
- +};
- +
- +void _board_init_irq(void)
- +{
- + int irq_nr;
- +
- + for (irq_nr = PB1200_INT_BEGIN; irq_nr <= PB1200_INT_END; irq_nr++)
- + {
- + irq_desc[irq_nr].handler = &external_irq_type;
- + pb1200_disable_irq(irq_nr);
- + }
- +
- + /* GPIO_7 can not be hooked here, so it is hooked upon first
- + request of any source attached to the cascade */
- +}
- +
- --- /dev/null
- +++ b/arch/mips/au1000/pb1200/Makefile
- @@ -0,0 +1,25 @@
- +#
- +# Copyright 2000 MontaVista Software Inc.
- +# Author: MontaVista Software, Inc.
- +# ppopov@mvista.com or source@mvista.com
- +#
- +# Makefile for the Alchemy Semiconductor PB1000 board.
- +#
- +# 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).
- +#
- +
- +USE_STANDARD_AS_RULE := true
- +
- +O_TARGET := pb1200.o
- +
- +obj-y := init.o board_setup.o irqmap.o
- +
- +ifdef CONFIG_MMC
- +obj-y += mmc_support.o
- +export-objs +=mmc_support.o
- +endif
- +
- +
- +include $(TOPDIR)/Rules.make
- --- /dev/null
- +++ b/arch/mips/au1000/pb1200/mmc_support.c
- @@ -0,0 +1,141 @@
- +/*
- + * BRIEF MODULE DESCRIPTION
- + *
- + * MMC support routines for PB1200.
- + *
- + *
- + * Copyright (c) 2003-2004 Embedded Edge, LLC.
- + * Author: Embedded Edge, LLC.
- + * Contact: dan@embeddededge.com
- + *
- + * 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.
- + *
- + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- + * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- + *
- + * You should have received a copy of the GNU General Public License along
- + * with this program; if not, write to the Free Software Foundation, Inc.,
- + * 675 Mass Ave, Cambridge, MA 02139, USA.
- + *
- + */
- +
- +
- +#include <linux/config.h>
- +#include <linux/kernel.h>
- +#include <linux/module.h>
- +#include <linux/init.h>
- +
- +#include <asm/irq.h>
- +#include <asm/au1000.h>
- +#include <asm/au1100_mmc.h>
- +
- +#ifdef CONFIG_MIPS_PB1200
- +#include <asm/pb1200.h>
- +#endif
- +
- +#ifdef CONFIG_MIPS_DB1200
- +/* NOTE: DB1200 only has SD0 pinned out and usable */
- +#include <asm/db1200.h>
- +#endif
- +
- +/* SD/MMC controller support functions */
- +
- +/*
- + * Detect card.
- + */
- +void mmc_card_inserted(int socket, int *result)
- +{
- + u16 mask;
- +
- + if (socket)
- +#ifdef CONFIG_MIPS_DB1200
- + mask = 0;
- +#else
- + mask = BCSR_INT_SD1INSERT;
- +#endif
- + else
- + mask = BCSR_INT_SD0INSERT;
- +
- + *result = ((bcsr->sig_status & mask) != 0);
- +}
- +
- +/*
- + * Check card write protection.
- + */
- +void mmc_card_writable(int socket, int *result)
- +{
- + u16 mask;
- +
- + if (socket)
- +#ifdef CONFIG_MIPS_DB1200
- + mask = 0;
- +#else
- + mask = BCSR_STATUS_SD1WP;
- +#endif
- + else
- + mask = BCSR_STATUS_SD0WP;
- +
- + /* low means card writable */
- + if (!(bcsr->status & mask)) {
- + *result = 1;
- + } else {
- + *result = 0;
- + }
- +}
- +
- +/*
- + * Apply power to card slot.
- + */
- +void mmc_power_on(int socket)
- +{
- + u16 mask;
- +
- + if (socket)
- +#ifdef CONFIG_MIPS_DB1200
- + mask = 0;
- +#else
- + mask = BCSR_BOARD_SD1PWR;
- +#endif
- + else
- + mask = BCSR_BOARD_SD0PWR;
- +
- + bcsr->board |= mask;
- + au_sync_delay(1);
- +}
- +
- +/*
- + * Remove power from card slot.
- + */
- +void mmc_power_off(int socket)
- +{
- + u16 mask;
- +
- + if (socket)
- +#ifdef CONFIG_MIPS_DB1200
- + mask = 0;
- +#else
- + mask = BCSR_BOARD_SD1PWR;
- +#endif
- + else
- + mask = BCSR_BOARD_SD0PWR;
- +
- + bcsr->board &= ~mask;
- + au_sync_delay(1);
- +}
- +
- +EXPORT_SYMBOL(mmc_card_inserted);
- +EXPORT_SYMBOL(mmc_card_writable);
- +EXPORT_SYMBOL(mmc_power_on);
- +EXPORT_SYMBOL(mmc_power_off);
- +
- --- a/arch/mips/au1000/pb1500/board_setup.c
- +++ b/arch/mips/au1000/pb1500/board_setup.c
- @@ -62,6 +62,10 @@ void board_reset (void)
- au_writel(0x00000000, 0xAE00001C);
- }
-
- +void board_power_off (void)
- +{
- +}
- +
- void __init board_setup(void)
- {
- u32 pin_func;
- --- a/arch/mips/au1000/pb1550/board_setup.c
- +++ b/arch/mips/au1000/pb1550/board_setup.c
- @@ -48,12 +48,31 @@
-
- extern struct rtc_ops no_rtc_ops;
-
- +#if defined(CONFIG_BLK_DEV_IDE_AU1XXX)
- +extern struct ide_ops *ide_ops;
- +extern struct ide_ops au1xxx_ide_ops;
- +extern u32 au1xxx_ide_virtbase;
- +extern u64 au1xxx_ide_physbase;
- +extern unsigned int au1xxx_ide_irq;
- +
- +u32 au1xxx_ide_ddma_enable = 0, switch4ddma = 1; // PIO+ddma
- +#endif /* end CONFIG_BLK_DEV_IDE_AU1XXX */
- +
- void board_reset (void)
- {
- /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */
- au_writew(au_readw(0xAF00001C) & ~(1<<15), 0xAF00001C);
- }
-
- +void board_power_off (void)
- +{
- + /* power off system */
- + printk("\n** Powering off Pb1550\n");
- + au_writew(au_readw(0xAF00001C) | (3<<14), 0xAF00001C);
- + au_sync();
- + while(1); /* should not get here */
- +}
- +
- void __init board_setup(void)
- {
- u32 pin_func;
- @@ -78,5 +97,36 @@ void __init board_setup(void)
- au_writel(0, (u32)bcsr|0x10); /* turn off pcmcia power */
- au_sync();
-
- +#if defined(CONFIG_AU1XXX_SMC91111)
- +#if defined(CONFIG_BLK_DEV_IDE_AU1XXX)
- +#error "Resource conflict occured. Disable either Ethernet or IDE daughter card."
- +#else
- +#define CPLD_CONTROL (0xAF00000C)
- + {
- + /* set up the Static Bus timing */
- + /* only 396Mhz */
- + /* reset the DC */
- + au_writew(au_readw(CPLD_CONTROL) | 0x0f, CPLD_CONTROL);
- + au_writel(0x00010003, MEM_STCFG0);
- + au_writel(0x000c00c0, MEM_STCFG2);
- + au_writel(0x85E1900D, MEM_STTIME2);
- + }
- +#endif
- +#endif /* end CONFIG_SMC91111 */
- +
- +#if defined(CONFIG_BLK_DEV_IDE_AU1XXX)
- + /*
- + * Iniz IDE parameters
- + */
- + ide_ops = &au1xxx_ide_ops;
- + au1xxx_ide_irq = DAUGHTER_CARD_IRQ;;
- + au1xxx_ide_physbase = AU1XXX_ATA_PHYS_ADDR;
- + au1xxx_ide_virtbase = KSEG1ADDR(AU1XXX_ATA_PHYS_ADDR);
- + /*
- + * change PIO or PIO+Ddma
- + * check the GPIO-6 pin condition. pb1550:s15_dot
- + */
- + switch4ddma = (au_readl(SYS_PINSTATERD) & (1 << 6)) ? 1 : 0;
- +#endif
- printk("AMD Alchemy Pb1550 Board\n");
- }
- --- a/arch/mips/au1000/pb1550/irqmap.c
- +++ b/arch/mips/au1000/pb1550/irqmap.c
- @@ -50,6 +50,9 @@
- au1xxx_irq_map_t au1xxx_irq_map[] = {
- { AU1000_GPIO_0, INTC_INT_LOW_LEVEL, 0 },
- { AU1000_GPIO_1, INTC_INT_LOW_LEVEL, 0 },
- +#ifdef CONFIG_AU1XXX_SMC91111
- + { AU1000_GPIO_3, INTC_INT_LOW_LEVEL, 0 },
- +#endif
- };
-
- int au1xxx_nr_irqs = sizeof(au1xxx_irq_map)/sizeof(au1xxx_irq_map_t);
- --- a/arch/mips/config-shared.in
- +++ b/arch/mips/config-shared.in
- @@ -21,16 +21,19 @@ mainmenu_option next_comment
- comment 'Machine selection'
- dep_bool 'Support for Acer PICA 1 chipset (EXPERIMENTAL)' CONFIG_ACER_PICA_61 $CONFIG_EXPERIMENTAL
- dep_bool 'Support for Alchemy Bosporus board' CONFIG_MIPS_BOSPORUS $CONFIG_MIPS32
- +dep_bool 'Support for FIC Multimedia Player board' CONFIG_MIPS_FICMMP $CONFIG_MIPS32
- dep_bool 'Support for Alchemy Mirage board' CONFIG_MIPS_MIRAGE $CONFIG_MIPS32
- dep_bool 'Support for Alchemy Db1000 board' CONFIG_MIPS_DB1000 $CONFIG_MIPS32
- dep_bool 'Support for Alchemy Db1100 board' CONFIG_MIPS_DB1100 $CONFIG_MIPS32
- dep_bool 'Support for Alchemy Db1500 board' CONFIG_MIPS_DB1500 $CONFIG_MIPS32
- dep_bool 'Support for Alchemy Db1550 board' CONFIG_MIPS_DB1550 $CONFIG_MIPS32
- +dep_bool 'Support for Alchemy Db1200 board' CONFIG_MIPS_DB1200 $CONFIG_MIPS32
- dep_bool 'Support for Alchemy PB1000 board' CONFIG_MIPS_PB1000 $CONFIG_MIPS32
- dep_bool 'Support for Alchemy PB1100 board' CONFIG_MIPS_PB1100 $CONFIG_MIPS32
- dep_bool 'Support for Alchemy PB1500 board' CONFIG_MIPS_PB1500 $CONFIG_MIPS32
- -dep_bool 'Support for Alchemy Hydrogen3 board' CONFIG_MIPS_HYDROGEN3 $CONFIG_MIPS32
- dep_bool 'Support for Alchemy PB1550 board' CONFIG_MIPS_PB1550 $CONFIG_MIPS32
- +dep_bool 'Support for Alchemy PB1200 board' CONFIG_MIPS_PB1200 $CONFIG_MIPS32
- +dep_bool 'Support for Alchemy Hydrogen3 board' CONFIG_MIPS_HYDROGEN3 $CONFIG_MIPS32
- dep_bool 'Support for MyCable XXS1500 board' CONFIG_MIPS_XXS1500 $CONFIG_MIPS32
- dep_bool 'Support for 4G Systems MTX-1 board' CONFIG_MIPS_MTX1 $CONFIG_MIPS32
- dep_bool 'Support for Cogent CSB250 board' CONFIG_COGENT_CSB250 $CONFIG_MIPS32
- @@ -249,6 +252,12 @@ if [ "$CONFIG_MIPS_MIRAGE" = "y" ]; then
- define_bool CONFIG_PC_KEYB y
- define_bool CONFIG_NONCOHERENT_IO y
- fi
- +if [ "$CONFIG_MIPS_FICMMP" = "y" ]; then
- + define_bool CONFIG_SOC_AU1X00 y
- + define_bool CONFIG_SOC_AU1200 y
- + define_bool CONFIG_NONCOHERENT_IO y
- + define_bool CONFIG_PC_KEYB y
- +fi
- if [ "$CONFIG_MIPS_BOSPORUS" = "y" ]; then
- define_bool CONFIG_SOC_AU1X00 y
- define_bool CONFIG_SOC_AU1500 y
- @@ -263,6 +272,12 @@ if [ "$CONFIG_MIPS_PB1000" = "y" ]; then
- define_bool CONFIG_SWAP_IO_SPACE_W y
- define_bool CONFIG_SWAP_IO_SPACE_L y
- fi
- +if [ "$CONFIG_MIPS_PB1500" = "y" ]; then
- + define_bool CONFIG_SOC_AU1X00 y
- + define_bool CONFIG_SOC_AU1500 y
- + define_bool CONFIG_NONCOHERENT_IO y
- + define_bool CONFIG_PC_KEYB y
- +fi
- if [ "$CONFIG_MIPS_PB1100" = "y" ]; then
- define_bool CONFIG_SOC_AU1X00 y
- define_bool CONFIG_SOC_AU1100 y
- @@ -271,9 +286,15 @@ if [ "$CONFIG_MIPS_PB1100" = "y" ]; then
- define_bool CONFIG_SWAP_IO_SPACE_W y
- define_bool CONFIG_SWAP_IO_SPACE_L y
- fi
- -if [ "$CONFIG_MIPS_PB1500" = "y" ]; then
- +if [ "$CONFIG_MIPS_PB1550" = "y" ]; then
- define_bool CONFIG_SOC_AU1X00 y
- - define_bool CONFIG_SOC_AU1500 y
- + define_bool CONFIG_SOC_AU1550 y
- + define_bool CONFIG_NONCOHERENT_IO n
- + define_bool CONFIG_PC_KEYB y
- +fi
- +if [ "$CONFIG_MIPS_PB1200" = "y" ]; then
- + define_bool CONFIG_SOC_AU1X00 y
- + define_bool CONFIG_SOC_AU1200 y
- define_bool CONFIG_NONCOHERENT_IO y
- define_bool CONFIG_PC_KEYB y
- fi
- @@ -290,18 +311,24 @@ if [ "$CONFIG_MIPS_DB1500" = "y" ]; then
- define_bool CONFIG_NONCOHERENT_IO y
- define_bool CONFIG_PC_KEYB y
- fi
- +if [ "$CONFIG_MIPS_DB1100" = "y" ]; then
- + define_bool CONFIG_SOC_AU1X00 y
- + define_bool CONFIG_SOC_AU1100 y
- + define_bool CONFIG_NONCOHERENT_IO y
- + define_bool CONFIG_PC_KEYB y
- + define_bool CONFIG_SWAP_IO_SPACE y
- +fi
- if [ "$CONFIG_MIPS_DB1550" = "y" ]; then
- define_bool CONFIG_SOC_AU1X00 y
- define_bool CONFIG_SOC_AU1550 y
- define_bool CONFIG_NONCOHERENT_IO y
- define_bool CONFIG_PC_KEYB y
- fi
- -if [ "$CONFIG_MIPS_DB1100" = "y" ]; then
- +if [ "$CONFIG_MIPS_DB1200" = "y" ]; then
- define_bool CONFIG_SOC_AU1X00 y
- - define_bool CONFIG_SOC_AU1100 y
- + define_bool CONFIG_SOC_AU1200 y
- define_bool CONFIG_NONCOHERENT_IO y
- define_bool CONFIG_PC_KEYB y
- - define_bool CONFIG_SWAP_IO_SPACE y
- fi
- if [ "$CONFIG_MIPS_HYDROGEN3" = "y" ]; then
- define_bool CONFIG_SOC_AU1X00 y
- @@ -327,12 +354,6 @@ if [ "$CONFIG_COGENT_CSB250" = "y" ]; th
- define_bool CONFIG_NONCOHERENT_IO y
- define_bool CONFIG_PC_KEYB y
- fi
- -if [ "$CONFIG_MIPS_PB1550" = "y" ]; then
- - define_bool CONFIG_SOC_AU1X00 y
- - define_bool CONFIG_SOC_AU1550 y
- - define_bool CONFIG_NONCOHERENT_IO n
- - define_bool CONFIG_PC_KEYB y
- -fi
- if [ "$CONFIG_MIPS_COBALT" = "y" ]; then
- define_bool CONFIG_BOOT_ELF32 y
- define_bool CONFIG_COBALT_LCD y
- @@ -729,6 +750,13 @@ if [ "$CONFIG_ACER_PICA_61" = "y" -o \
- "$CONFIG_MIPS_PB1000" = "y" -o \
- "$CONFIG_MIPS_PB1100" = "y" -o \
- "$CONFIG_MIPS_PB1500" = "y" -o \
- + "$CONFIG_MIPS_PB1550" = "y" -o \
- + "$CONFIG_MIPS_PB1200" = "y" -o \
- + "$CONFIG_MIPS_DB1000" = "y" -o \
- + "$CONFIG_MIPS_DB1100" = "y" -o \
- + "$CONFIG_MIPS_DB1500" = "y" -o \
- + "$CONFIG_MIPS_DB1550" = "y" -o \
- + "$CONFIG_MIPS_DB1200" = "y" -o \
- "$CONFIG_NEC_OSPREY" = "y" -o \
- "$CONFIG_NEC_EAGLE" = "y" -o \
- "$CONFIG_NINO" = "y" -o \
- --- a/arch/mips/defconfig
- +++ b/arch/mips/defconfig
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -235,11 +235,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -319,9 +314,11 @@ CONFIG_SGIWD93_SCSI=y
- # CONFIG_SCSI_MEGARAID is not set
- # CONFIG_SCSI_MEGARAID2 is not set
- # CONFIG_SCSI_SATA is not set
- +# CONFIG_SCSI_SATA_AHCI is not set
- # CONFIG_SCSI_SATA_SVW is not set
- # CONFIG_SCSI_ATA_PIIX is not set
- # CONFIG_SCSI_SATA_NV is not set
- +# CONFIG_SCSI_SATA_QSTOR is not set
- # CONFIG_SCSI_SATA_PROMISE is not set
- # CONFIG_SCSI_SATA_SX4 is not set
- # CONFIG_SCSI_SATA_SIL is not set
- @@ -465,7 +462,6 @@ CONFIG_VT_CONSOLE=y
- # CONFIG_SERIAL is not set
- # CONFIG_SERIAL_EXTENDED is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips/defconfig-atlas
- +++ b/arch/mips/defconfig-atlas
- @@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -235,11 +235,6 @@ CONFIG_IP_PNP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -317,9 +312,11 @@ CONFIG_SD_EXTRA_DEVS=40
- # CONFIG_SCSI_MEGARAID is not set
- # CONFIG_SCSI_MEGARAID2 is not set
- # CONFIG_SCSI_SATA is not set
- +# CONFIG_SCSI_SATA_AHCI is not set
- # CONFIG_SCSI_SATA_SVW is not set
- # CONFIG_SCSI_ATA_PIIX is not set
- # CONFIG_SCSI_SATA_NV is not set
- +# CONFIG_SCSI_SATA_QSTOR is not set
- # CONFIG_SCSI_SATA_PROMISE is not set
- # CONFIG_SCSI_SATA_SX4 is not set
- # CONFIG_SCSI_SATA_SIL is not set
- @@ -528,7 +525,6 @@ CONFIG_SERIAL=y
- CONFIG_SERIAL_CONSOLE=y
- # CONFIG_SERIAL_EXTENDED is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips/defconfig-bosporus
- +++ b/arch/mips/defconfig-bosporus
- @@ -30,8 +30,8 @@ CONFIG_MIPS_BOSPORUS=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -208,9 +208,7 @@ CONFIG_MTD_CFI_AMDSTD=y
- CONFIG_MTD_BOSPORUS=y
- # CONFIG_MTD_XXS1500 is not set
- # CONFIG_MTD_MTX1 is not set
- -# CONFIG_MTD_DB1X00 is not set
- # CONFIG_MTD_PB1550 is not set
- -# CONFIG_MTD_HYDROGEN3 is not set
- # CONFIG_MTD_MIRAGE is not set
- # CONFIG_MTD_CSTM_MIPS_IXX is not set
- # CONFIG_MTD_OCELOT is not set
- @@ -229,7 +227,6 @@ CONFIG_MTD_BOSPORUS=y
- #
- # 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
- @@ -373,11 +370,6 @@ CONFIG_IP_NF_MANGLE=m
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -457,9 +449,11 @@ CONFIG_SCSI_CONSTANTS=y
- # CONFIG_SCSI_MEGARAID is not set
- # CONFIG_SCSI_MEGARAID2 is not set
- # CONFIG_SCSI_SATA is not set
- +# CONFIG_SCSI_SATA_AHCI is not set
- # CONFIG_SCSI_SATA_SVW is not set
- # CONFIG_SCSI_ATA_PIIX is not set
- # CONFIG_SCSI_SATA_NV is not set
- +# CONFIG_SCSI_SATA_QSTOR is not set
- # CONFIG_SCSI_SATA_PROMISE is not set
- # CONFIG_SCSI_SATA_SX4 is not set
- # CONFIG_SCSI_SATA_SIL is not set
- @@ -681,7 +675,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
- # CONFIG_AU1X00_USB_TTY is not set
- # CONFIG_AU1X00_USB_RAW is not set
- # CONFIG_TXX927_SERIAL is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips/defconfig-capcella
- +++ b/arch/mips/defconfig-capcella
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -228,11 +228,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -472,7 +467,6 @@ CONFIG_SERIAL=y
- CONFIG_SERIAL_CONSOLE=y
- # CONFIG_SERIAL_EXTENDED is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- # CONFIG_VR41XX_KIU is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
- --- a/arch/mips/defconfig-cobalt
- +++ b/arch/mips/defconfig-cobalt
- @@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -222,11 +222,6 @@ CONFIG_INET=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -505,7 +500,6 @@ CONFIG_SERIAL=y
- CONFIG_SERIAL_CONSOLE=y
- # CONFIG_SERIAL_EXTENDED is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=16
-
- --- a/arch/mips/defconfig-csb250
- +++ b/arch/mips/defconfig-csb250
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- CONFIG_COGENT_CSB250=y
- @@ -268,11 +268,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -556,7 +551,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
- # CONFIG_AU1X00_USB_TTY is not set
- # CONFIG_AU1X00_USB_RAW is not set
- # CONFIG_TXX927_SERIAL is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips/defconfig-db1000
- +++ b/arch/mips/defconfig-db1000
- @@ -30,8 +30,8 @@ CONFIG_MIPS_DB1000=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -214,11 +214,7 @@ CONFIG_MTD_CFI_AMDSTD=y
- # CONFIG_MTD_BOSPORUS is not set
- # CONFIG_MTD_XXS1500 is not set
- # CONFIG_MTD_MTX1 is not set
- -CONFIG_MTD_DB1X00=y
- -CONFIG_MTD_DB1X00_BOOT=y
- -CONFIG_MTD_DB1X00_USER=y
- # CONFIG_MTD_PB1550 is not set
- -# CONFIG_MTD_HYDROGEN3 is not set
- # CONFIG_MTD_MIRAGE is not set
- # CONFIG_MTD_CSTM_MIPS_IXX is not set
- # CONFIG_MTD_OCELOT is not set
- @@ -237,7 +233,6 @@ CONFIG_MTD_DB1X00_USER=y
- #
- # 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
- @@ -342,11 +337,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -636,7 +626,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
- # CONFIG_AU1X00_USB_TTY is not set
- # CONFIG_AU1X00_USB_RAW is not set
- # CONFIG_TXX927_SERIAL is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips/defconfig-db1100
- +++ b/arch/mips/defconfig-db1100
- @@ -30,8 +30,8 @@ CONFIG_MIPS_DB1100=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -214,11 +214,7 @@ CONFIG_MTD_CFI_AMDSTD=y
- # CONFIG_MTD_BOSPORUS is not set
- # CONFIG_MTD_XXS1500 is not set
- # CONFIG_MTD_MTX1 is not set
- -CONFIG_MTD_DB1X00=y
- -# CONFIG_MTD_DB1X00_BOOT is not set
- -CONFIG_MTD_DB1X00_USER=y
- # CONFIG_MTD_PB1550 is not set
- -# CONFIG_MTD_HYDROGEN3 is not set
- # CONFIG_MTD_MIRAGE is not set
- # CONFIG_MTD_CSTM_MIPS_IXX is not set
- # CONFIG_MTD_OCELOT is not set
- @@ -237,7 +233,6 @@ CONFIG_MTD_DB1X00_USER=y
- #
- # 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
- @@ -342,11 +337,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -636,7 +626,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
- # CONFIG_AU1X00_USB_TTY is not set
- # CONFIG_AU1X00_USB_RAW is not set
- # CONFIG_TXX927_SERIAL is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- @@ -884,6 +873,7 @@ CONFIG_DUMMY_CONSOLE=y
- # CONFIG_FB_PM2 is not set
- # CONFIG_FB_PM3 is not set
- # CONFIG_FB_CYBER2000 is not set
- +CONFIG_FB_AU1100=y
- # CONFIG_FB_MATROX is not set
- # CONFIG_FB_ATY is not set
- # CONFIG_FB_RADEON is not set
- @@ -895,7 +885,6 @@ CONFIG_DUMMY_CONSOLE=y
- # CONFIG_FB_VOODOO1 is not set
- # CONFIG_FB_TRIDENT is not set
- # CONFIG_FB_E1356 is not set
- -CONFIG_FB_AU1100=y
- # CONFIG_FB_IT8181 is not set
- # CONFIG_FB_VIRTUAL is not set
- CONFIG_FBCON_ADVANCED=y
- --- /dev/null
- +++ b/arch/mips/defconfig-db1200
- @@ -0,0 +1,1032 @@
- +#
- +# Automatically generated make config: don't edit
- +#
- +CONFIG_MIPS=y
- +CONFIG_MIPS32=y
- +# CONFIG_MIPS64 is not set
- +
- +#
- +# 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_BOSPORUS is not set
- +# CONFIG_MIPS_MIRAGE is not set
- +# CONFIG_MIPS_DB1000 is not set
- +# CONFIG_MIPS_DB1100 is not set
- +# CONFIG_MIPS_DB1500 is not set
- +# CONFIG_MIPS_DB1550 is not set
- +# CONFIG_MIPS_PB1000 is not set
- +# CONFIG_MIPS_PB1100 is not set
- +# CONFIG_MIPS_PB1500 is not set
- +# CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- +# CONFIG_MIPS_XXS1500 is not set
- +# CONFIG_MIPS_MTX1 is not set
- +# CONFIG_COGENT_CSB250 is not set
- +# CONFIG_BAGET_MIPS is not set
- +# CONFIG_CASIO_E55 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_IBM_WORKPAD is not set
- +# CONFIG_LASAT 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_MIPS_SEAD is not set
- +# CONFIG_MOMENCO_OCELOT is not set
- +# CONFIG_MOMENCO_OCELOT_G is not set
- +# CONFIG_MOMENCO_OCELOT_C is not set
- +# CONFIG_MOMENCO_JAGUAR_ATX is not set
- +# CONFIG_PMC_BIG_SUR is not set
- +# CONFIG_PMC_STRETCH is not set
- +# CONFIG_PMC_YOSEMITE 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_OLIVETTI_M700 is not set
- +# CONFIG_NINO is not set
- +# CONFIG_SGI_IP22 is not set
- +# CONFIG_SGI_IP27 is not set
- +# CONFIG_SIBYTE_SB1xxx_SOC is not set
- +# CONFIG_SNI_RM200_PCI is not set
- +# CONFIG_TANBAC_TB0226 is not set
- +# CONFIG_TANBAC_TB0229 is not set
- +# CONFIG_TOSHIBA_JMR3927 is not set
- +# CONFIG_TOSHIBA_RBTX4927 is not set
- +# CONFIG_VICTOR_MPC30X is not set
- +# CONFIG_ZAO_CAPCELLA is not set
- +# CONFIG_HIGHMEM is not set
- +CONFIG_RWSEM_GENERIC_SPINLOCK=y
- +# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
- +# CONFIG_MIPS_AU1000 is not set
- +
- +#
- +# CPU selection
- +#
- +CONFIG_CPU_MIPS32=y
- +# CONFIG_CPU_MIPS64 is not set
- +# CONFIG_CPU_R3000 is not set
- +# CONFIG_CPU_TX39XX is not set
- +# CONFIG_CPU_VR41XX is not set
- +# 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_R6000 is not set
- +# CONFIG_CPU_NEVADA is not set
- +# CONFIG_CPU_R8000 is not set
- +# CONFIG_CPU_R10000 is not set
- +# CONFIG_CPU_RM7000 is not set
- +# CONFIG_CPU_RM9000 is not set
- +# CONFIG_CPU_SB1 is not set
- +CONFIG_PAGE_SIZE_4KB=y
- +# CONFIG_PAGE_SIZE_16KB is not set
- +# CONFIG_PAGE_SIZE_64KB is not set
- +CONFIG_CPU_HAS_PREFETCH=y
- +# CONFIG_VTAG_ICACHE is not set
- +CONFIG_64BIT_PHYS_ADDR=y
- +# CONFIG_CPU_ADVANCED is not set
- +CONFIG_CPU_HAS_LLSC=y
- +# CONFIG_CPU_HAS_LLDSCD is not set
- +# CONFIG_CPU_HAS_WB is not set
- +CONFIG_CPU_HAS_SYNC=y
- +
- +#
- +# General setup
- +#
- +CONFIG_CPU_LITTLE_ENDIAN=y
- +# CONFIG_BUILD_ELF64 is not set
- +CONFIG_NET=y
- +CONFIG_PCI=y
- +CONFIG_PCI_NEW=y
- +CONFIG_PCI_AUTO=y
- +# CONFIG_PCI_NAMES is not set
- +# CONFIG_ISA is not set
- +# CONFIG_TC is not set
- +# CONFIG_MCA is not set
- +# CONFIG_SBUS is not set
- +CONFIG_HOTPLUG=y
- +
- +#
- +# PCMCIA/CardBus support
- +#
- +CONFIG_PCMCIA=m
- +# CONFIG_CARDBUS is not set
- +# CONFIG_TCIC is not set
- +# CONFIG_I82092 is not set
- +# CONFIG_I82365 is not set
- +
- +#
- +# PCI Hotplug Support
- +#
- +# CONFIG_HOTPLUG_PCI is not set
- +# CONFIG_HOTPLUG_PCI_COMPAQ is not set
- +# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
- +# CONFIG_HOTPLUG_PCI_SHPC is not set
- +# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set
- +# CONFIG_HOTPLUG_PCI_PCIE is not set
- +# CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE 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_MIPS32_COMPAT is not set
- +# CONFIG_MIPS32_O32 is not set
- +# CONFIG_MIPS32_N32 is not set
- +# CONFIG_BINFMT_ELF32 is not set
- +# CONFIG_BINFMT_MISC is not set
- +# CONFIG_OOM_KILLER is not set
- +CONFIG_CMDLINE_BOOL=y
- +CONFIG_CMDLINE="mem=96M"
- +
- +#
- +# 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_CISS_SCSI_TAPE is not set
- +# CONFIG_CISS_MONITOR_THREAD is not set
- +# CONFIG_BLK_DEV_DAC960 is not set
- +# CONFIG_BLK_DEV_UMEM is not set
- +# CONFIG_BLK_DEV_SX8 is not set
- +CONFIG_BLK_DEV_LOOP=y
- +# CONFIG_BLK_DEV_NBD is not set
- +# CONFIG_BLK_DEV_RAM is not set
- +# CONFIG_BLK_DEV_INITRD is not set
- +# CONFIG_BLK_STATS 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 is not set
- +# CONFIG_NETLINK_DEV is not set
- +CONFIG_NETFILTER=y
- +# CONFIG_NETFILTER_DEBUG is not set
- +CONFIG_FILTER=y
- +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
- +
- +#
- +# IP: Netfilter Configuration
- +#
- +# CONFIG_IP_NF_CONNTRACK is not set
- +# CONFIG_IP_NF_QUEUE is not set
- +# CONFIG_IP_NF_IPTABLES is not set
- +# CONFIG_IP_NF_ARPTABLES is not set
- +# CONFIG_IP_NF_COMPAT_IPCHAINS is not set
- +# CONFIG_IP_NF_COMPAT_IPFWADM is not set
- +
- +#
- +# IP: Virtual Server Configuration
- +#
- +# CONFIG_IP_VS is not set
- +# CONFIG_IPV6 is not set
- +# CONFIG_KHTTPD is not set
- +
- +#
- +# SCTP Configuration (EXPERIMENTAL)
- +#
- +# CONFIG_IP_SCTP 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
- +
- +#
- +# Network testing
- +#
- +# CONFIG_NET_PKTGEN 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_IDE_SATA is not set
- +CONFIG_BLK_DEV_IDEDISK=y
- +CONFIG_IDEDISK_MULTI_MODE=y
- +CONFIG_IDEDISK_STROKE=y
- +CONFIG_BLK_DEV_IDECS=m
- +# CONFIG_BLK_DEV_DELKIN 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
- +# CONFIG_IDE_TASK_IOCTL 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_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_ATARAID is not set
- +# CONFIG_BLK_DEV_ATARAID_PDC is not set
- +# CONFIG_BLK_DEV_ATARAID_HPT is not set
- +# CONFIG_BLK_DEV_ATARAID_MEDLEY is not set
- +# CONFIG_BLK_DEV_ATARAID_SII is not set
- +
- +#
- +# SCSI support
- +#
- +CONFIG_SCSI=y
- +
- +#
- +# SCSI support type (disk, tape, CD-ROM)
- +#
- +CONFIG_BLK_DEV_SD=y
- +CONFIG_SD_EXTRA_DEVS=40
- +CONFIG_CHR_DEV_ST=y
- +# CONFIG_CHR_DEV_OSST is not set
- +CONFIG_BLK_DEV_SR=y
- +# CONFIG_BLK_DEV_SR_VENDOR is not set
- +CONFIG_SR_EXTRA_DEVS=2
- +# CONFIG_CHR_DEV_SG is not set
- +
- +#
- +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
- +#
- +# CONFIG_SCSI_DEBUG_QUEUES is not set
- +# CONFIG_SCSI_MULTI_LUN is not set
- +CONFIG_SCSI_CONSTANTS=y
- +# CONFIG_SCSI_LOGGING is not set
- +
- +#
- +# SCSI low-level drivers
- +#
- +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
- +# CONFIG_SCSI_7000FASST is not set
- +# CONFIG_SCSI_ACARD is not set
- +# CONFIG_SCSI_AHA152X is not set
- +# CONFIG_SCSI_AHA1542 is not set
- +# CONFIG_SCSI_AHA1740 is not set
- +# CONFIG_SCSI_AACRAID is not set
- +# CONFIG_SCSI_AIC7XXX is not set
- +# CONFIG_SCSI_AIC79XX is not set
- +# CONFIG_SCSI_AIC7XXX_OLD is not set
- +# CONFIG_SCSI_DPT_I2O is not set
- +# CONFIG_SCSI_ADVANSYS is not set
- +# CONFIG_SCSI_IN2000 is not set
- +# CONFIG_SCSI_AM53C974 is not set
- +# CONFIG_SCSI_MEGARAID is not set
- +# CONFIG_SCSI_MEGARAID2 is not set
- +# CONFIG_SCSI_SATA is not set
- +# CONFIG_SCSI_SATA_AHCI is not set
- +# CONFIG_SCSI_SATA_SVW is not set
- +# CONFIG_SCSI_ATA_PIIX is not set
- +# CONFIG_SCSI_SATA_NV is not set
- +# CONFIG_SCSI_SATA_QSTOR is not set
- +# CONFIG_SCSI_SATA_PROMISE is not set
- +# CONFIG_SCSI_SATA_SX4 is not set
- +# CONFIG_SCSI_SATA_SIL is not set
- +# CONFIG_SCSI_SATA_SIS is not set
- +# CONFIG_SCSI_SATA_ULI is not set
- +# CONFIG_SCSI_SATA_VIA is not set
- +# CONFIG_SCSI_SATA_VITESSE is not set
- +# CONFIG_SCSI_BUSLOGIC is not set
- +# CONFIG_SCSI_CPQFCTS is not set
- +# CONFIG_SCSI_DMX3191D is not set
- +# CONFIG_SCSI_DTC3280 is not set
- +# CONFIG_SCSI_EATA is not set
- +# CONFIG_SCSI_EATA_DMA is not set
- +# CONFIG_SCSI_EATA_PIO is not set
- +# CONFIG_SCSI_FUTURE_DOMAIN is not set
- +# CONFIG_SCSI_GDTH is not set
- +# CONFIG_SCSI_GENERIC_NCR5380 is not set
- +# CONFIG_SCSI_INITIO is not set
- +# CONFIG_SCSI_INIA100 is not set
- +# CONFIG_SCSI_NCR53C406A is not set
- +# CONFIG_SCSI_NCR53C7xx is not set
- +# CONFIG_SCSI_SYM53C8XX_2 is not set
- +# CONFIG_SCSI_NCR53C8XX is not set
- +# CONFIG_SCSI_SYM53C8XX is not set
- +# CONFIG_SCSI_PAS16 is not set
- +# CONFIG_SCSI_PCI2000 is not set
- +# CONFIG_SCSI_PCI2220I is not set
- +# CONFIG_SCSI_PSI240I is not set
- +# CONFIG_SCSI_QLOGIC_FAS is not set
- +# CONFIG_SCSI_QLOGIC_ISP is not set
- +# CONFIG_SCSI_QLOGIC_FC is not set
- +# CONFIG_SCSI_QLOGIC_1280 is not set
- +# CONFIG_SCSI_SIM710 is not set
- +# CONFIG_SCSI_SYM53C416 is not set
- +# CONFIG_SCSI_DC390T is not set
- +# CONFIG_SCSI_T128 is not set
- +# CONFIG_SCSI_U14_34F is not set
- +# CONFIG_SCSI_NSP32 is not set
- +# CONFIG_SCSI_DEBUG is not set
- +
- +#
- +# PCMCIA SCSI adapter support
- +#
- +# CONFIG_SCSI_PCMCIA is not set
- +
- +#
- +# Fusion MPT device support
- +#
- +# CONFIG_FUSION is not set
- +# CONFIG_FUSION_BOOT is not set
- +# CONFIG_FUSION_ISENSE is not set
- +# CONFIG_FUSION_CTL is not set
- +# CONFIG_FUSION_LAN is not set
- +
- +#
- +# IEEE 1394 (FireWire) support (EXPERIMENTAL)
- +#
- +# CONFIG_IEEE1394 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 is not set
- +# CONFIG_NET_POCKET is not set
- +
- +#
- +# Ethernet (1000 Mbit)
- +#
- +# CONFIG_ACENIC is not set
- +# CONFIG_DL2K is not set
- +# CONFIG_E1000 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_R8169 is not set
- +# CONFIG_SK98LIN is not set
- +# CONFIG_TIGON3 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
- +
- +#
- +# PCMCIA network device support
- +#
- +# CONFIG_NET_PCMCIA 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
- +
- +#
- +# Input core support
- +#
- +CONFIG_INPUT=y
- +CONFIG_INPUT_KEYBDEV=y
- +CONFIG_INPUT_MOUSEDEV=y
- +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
- +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
- +# CONFIG_INPUT_JOYDEV is not set
- +CONFIG_INPUT_EVDEV=y
- +# CONFIG_INPUT_UINPUT is not set
- +
- +#
- +# Character devices
- +#
- +CONFIG_VT=y
- +# CONFIG_VT_CONSOLE is not set
- +# CONFIG_SERIAL is not set
- +# CONFIG_SERIAL_EXTENDED is not set
- +CONFIG_SERIAL_NONSTANDARD=y
- +# CONFIG_COMPUTONE is not set
- +# CONFIG_ROCKETPORT is not set
- +# CONFIG_CYCLADES is not set
- +# CONFIG_DIGIEPCA is not set
- +# CONFIG_DIGI is not set
- +# CONFIG_ESPSERIAL is not set
- +# CONFIG_MOXA_INTELLIO is not set
- +# CONFIG_MOXA_SMARTIO is not set
- +# CONFIG_ISI is not set
- +# CONFIG_SYNCLINK is not set
- +# CONFIG_SYNCLINKMP is not set
- +# CONFIG_N_HDLC is not set
- +# CONFIG_RISCOM8 is not set
- +# CONFIG_SPECIALIX is not set
- +# CONFIG_SX is not set
- +# CONFIG_RIO is not set
- +# CONFIG_STALDRV is not set
- +# CONFIG_SERIAL_TX3912 is not set
- +# CONFIG_SERIAL_TX3912_CONSOLE is not set
- +# CONFIG_SERIAL_TXX9 is not set
- +# CONFIG_SERIAL_TXX9_CONSOLE is not set
- +# CONFIG_TXX927_SERIAL 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
- +# CONFIG_INPUT_NS558 is not set
- +# CONFIG_INPUT_LIGHTNING is not set
- +# CONFIG_INPUT_PCIGAME is not set
- +# CONFIG_INPUT_CS461X is not set
- +# CONFIG_INPUT_EMU10K1 is not set
- +# CONFIG_INPUT_SERIO is not set
- +# CONFIG_INPUT_SERPORT is not set
- +
- +#
- +# Joysticks
- +#
- +# CONFIG_INPUT_ANALOG is not set
- +# CONFIG_INPUT_A3D is not set
- +# CONFIG_INPUT_ADI is not set
- +# CONFIG_INPUT_COBRA is not set
- +# CONFIG_INPUT_GF2K is not set
- +# CONFIG_INPUT_GRIP is not set
- +# CONFIG_INPUT_INTERACT is not set
- +# CONFIG_INPUT_TMDC is not set
- +# CONFIG_INPUT_SIDEWINDER is not set
- +# CONFIG_INPUT_IFORCE_USB is not set
- +# CONFIG_INPUT_IFORCE_232 is not set
- +# CONFIG_INPUT_WARRIOR is not set
- +# CONFIG_INPUT_MAGELLAN is not set
- +# CONFIG_INPUT_SPACEORB is not set
- +# CONFIG_INPUT_SPACEBALL is not set
- +# CONFIG_INPUT_STINGER is not set
- +# CONFIG_INPUT_DB9 is not set
- +# CONFIG_INPUT_GAMECON is not set
- +# CONFIG_INPUT_TURBOGRAFX is not set
- +# CONFIG_QIC02_TAPE is not set
- +# CONFIG_IPMI_HANDLER is not set
- +# CONFIG_IPMI_PANIC_EVENT is not set
- +# CONFIG_IPMI_DEVICE_INTERFACE is not set
- +# CONFIG_IPMI_KCS is not set
- +# CONFIG_IPMI_WATCHDOG is not set
- +
- +#
- +# Watchdog Cards
- +#
- +# CONFIG_WATCHDOG is not set
- +# CONFIG_SCx200 is not set
- +# CONFIG_SCx200_GPIO is not set
- +# CONFIG_AMD_PM768 is not set
- +# CONFIG_NVRAM is not set
- +# CONFIG_RTC is not set
- +# 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
- +
- +#
- +# Direct Rendering Manager (XFree86 DRI support)
- +#
- +# CONFIG_DRM is not set
- +
- +#
- +# PCMCIA character devices
- +#
- +# CONFIG_PCMCIA_SERIAL_CS is not set
- +# CONFIG_SYNCLINK_CS is not set
- +
- +#
- +# File systems
- +#
- +# CONFIG_QUOTA is not set
- +# CONFIG_QFMT_V2 is not set
- +CONFIG_AUTOFS_FS=y
- +# CONFIG_AUTOFS4_FS is not set
- +# 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_HFSPLUS_FS is not set
- +# CONFIG_BEFS_FS is not set
- +# CONFIG_BEFS_DEBUG is not set
- +# CONFIG_BFS_FS is not set
- +CONFIG_EXT3_FS=y
- +CONFIG_JBD=y
- +# CONFIG_JBD_DEBUG is not set
- +CONFIG_FAT_FS=y
- +CONFIG_MSDOS_FS=y
- +# CONFIG_UMSDOS_FS is not set
- +CONFIG_VFAT_FS=y
- +# 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=y
- +CONFIG_RAMFS=y
- +# CONFIG_ISO9660_FS is not set
- +# CONFIG_JOLIET is not set
- +# CONFIG_ZISOFS is not set
- +# CONFIG_JFS_FS is not set
- +# CONFIG_JFS_DEBUG is not set
- +# CONFIG_JFS_STATISTICS 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
- +# CONFIG_XFS_FS is not set
- +# CONFIG_XFS_QUOTA is not set
- +# CONFIG_XFS_RT is not set
- +# CONFIG_XFS_TRACE is not set
- +# CONFIG_XFS_DEBUG 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=y
- +# CONFIG_NFS_DIRECTIO is not set
- +CONFIG_ROOT_NFS=y
- +# CONFIG_NFSD is not set
- +# CONFIG_NFSD_V3 is not set
- +# CONFIG_NFSD_TCP is not set
- +CONFIG_SUNRPC=y
- +CONFIG_LOCKD=y
- +CONFIG_LOCKD_V4=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
- +
- +#
- +# Partition Types
- +#
- +# CONFIG_PARTITION_ADVANCED is not set
- +CONFIG_MSDOS_PARTITION=y
- +# CONFIG_SMB_NLS is not set
- +CONFIG_NLS=y
- +
- +#
- +# Native Language Support
- +#
- +CONFIG_NLS_DEFAULT="iso8859-1"
- +# CONFIG_NLS_CODEPAGE_437 is not set
- +# CONFIG_NLS_CODEPAGE_737 is not set
- +# CONFIG_NLS_CODEPAGE_775 is not set
- +# CONFIG_NLS_CODEPAGE_850 is not set
- +# CONFIG_NLS_CODEPAGE_852 is not set
- +# CONFIG_NLS_CODEPAGE_855 is not set
- +# CONFIG_NLS_CODEPAGE_857 is not set
- +# CONFIG_NLS_CODEPAGE_860 is not set
- +# CONFIG_NLS_CODEPAGE_861 is not set
- +# CONFIG_NLS_CODEPAGE_862 is not set
- +# CONFIG_NLS_CODEPAGE_863 is not set
- +# CONFIG_NLS_CODEPAGE_864 is not set
- +# CONFIG_NLS_CODEPAGE_865 is not set
- +# CONFIG_NLS_CODEPAGE_866 is not set
- +# CONFIG_NLS_CODEPAGE_869 is not set
- +# CONFIG_NLS_CODEPAGE_936 is not set
- +# CONFIG_NLS_CODEPAGE_950 is not set
- +# CONFIG_NLS_CODEPAGE_932 is not set
- +# CONFIG_NLS_CODEPAGE_949 is not set
- +# CONFIG_NLS_CODEPAGE_874 is not set
- +# CONFIG_NLS_ISO8859_8 is not set
- +# CONFIG_NLS_CODEPAGE_1250 is not set
- +# CONFIG_NLS_CODEPAGE_1251 is not set
- +# CONFIG_NLS_ISO8859_1 is not set
- +# CONFIG_NLS_ISO8859_2 is not set
- +# CONFIG_NLS_ISO8859_3 is not set
- +# CONFIG_NLS_ISO8859_4 is not set
- +# CONFIG_NLS_ISO8859_5 is not set
- +# CONFIG_NLS_ISO8859_6 is not set
- +# CONFIG_NLS_ISO8859_7 is not set
- +# CONFIG_NLS_ISO8859_9 is not set
- +# CONFIG_NLS_ISO8859_13 is not set
- +# CONFIG_NLS_ISO8859_14 is not set
- +# CONFIG_NLS_ISO8859_15 is not set
- +# CONFIG_NLS_KOI8_R is not set
- +# CONFIG_NLS_KOI8_U is not set
- +# CONFIG_NLS_UTF8 is not set
- +
- +#
- +# Multimedia devices
- +#
- +# CONFIG_VIDEO_DEV is not set
- +
- +#
- +# Console drivers
- +#
- +# CONFIG_VGA_CONSOLE is not set
- +# CONFIG_MDA_CONSOLE is not set
- +
- +#
- +# Frame-buffer support
- +#
- +CONFIG_FB=y
- +CONFIG_DUMMY_CONSOLE=y
- +# CONFIG_FB_RIVA is not set
- +# CONFIG_FB_CLGEN is not set
- +# CONFIG_FB_PM2 is not set
- +# CONFIG_FB_PM3 is not set
- +# CONFIG_FB_CYBER2000 is not set
- +# CONFIG_FB_MATROX is not set
- +# CONFIG_FB_ATY is not set
- +# CONFIG_FB_RADEON is not set
- +# CONFIG_FB_ATY128 is not set
- +# CONFIG_FB_INTEL is not set
- +# CONFIG_FB_SIS is not set
- +# CONFIG_FB_NEOMAGIC is not set
- +# CONFIG_FB_3DFX is not set
- +# CONFIG_FB_VOODOO1 is not set
- +# CONFIG_FB_TRIDENT is not set
- +# CONFIG_FB_E1356 is not set
- +# CONFIG_FB_IT8181 is not set
- +# CONFIG_FB_VIRTUAL is not set
- +CONFIG_FBCON_ADVANCED=y
- +# CONFIG_FBCON_MFB is not set
- +# CONFIG_FBCON_CFB2 is not set
- +# CONFIG_FBCON_CFB4 is not set
- +# CONFIG_FBCON_CFB8 is not set
- +CONFIG_FBCON_CFB16=y
- +# CONFIG_FBCON_CFB24 is not set
- +CONFIG_FBCON_CFB32=y
- +# CONFIG_FBCON_AFB is not set
- +# CONFIG_FBCON_ILBM is not set
- +# CONFIG_FBCON_IPLAN2P2 is not set
- +# CONFIG_FBCON_IPLAN2P4 is not set
- +# CONFIG_FBCON_IPLAN2P8 is not set
- +# CONFIG_FBCON_MAC is not set
- +# CONFIG_FBCON_VGA_PLANES is not set
- +# CONFIG_FBCON_VGA is not set
- +# CONFIG_FBCON_HGA is not set
- +# CONFIG_FBCON_FONTWIDTH8_ONLY is not set
- +CONFIG_FBCON_FONTS=y
- +CONFIG_FONT_8x8=y
- +CONFIG_FONT_8x16=y
- +# CONFIG_FONT_SUN8x16 is not set
- +# CONFIG_FONT_SUN12x22 is not set
- +# CONFIG_FONT_6x11 is not set
- +# CONFIG_FONT_PEARL_8x8 is not set
- +# CONFIG_FONT_ACORN_8x8 is not set
- +
- +#
- +# Sound
- +#
- +CONFIG_SOUND=y
- +# CONFIG_SOUND_ALI5455 is not set
- +# CONFIG_SOUND_BT878 is not set
- +# CONFIG_SOUND_CMPCI is not set
- +# CONFIG_SOUND_EMU10K1 is not set
- +# 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_FORTE is not set
- +# CONFIG_SOUND_ICH is not set
- +# CONFIG_SOUND_RME96XX is not set
- +# CONFIG_SOUND_SONICVIBES 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_OSS is not set
- +# CONFIG_SOUND_TVMIXER is not set
- +# CONFIG_SOUND_AD1980 is not set
- +# CONFIG_SOUND_WM97XX is not set
- +
- +#
- +# USB support
- +#
- +CONFIG_USB=y
- +# CONFIG_USB_DEBUG is not set
- +
- +#
- +# Miscellaneous USB options
- +#
- +CONFIG_USB_DEVICEFS=y
- +# CONFIG_USB_BANDWIDTH is not set
- +
- +#
- +# USB Host Controller Drivers
- +#
- +# CONFIG_USB_EHCI_HCD is not set
- +# CONFIG_USB_UHCI is not set
- +# CONFIG_USB_UHCI_ALT is not set
- +CONFIG_USB_OHCI=y
- +
- +#
- +# USB Device Class drivers
- +#
- +# CONFIG_USB_AUDIO is not set
- +# CONFIG_USB_EMI26 is not set
- +# CONFIG_USB_BLUETOOTH is not set
- +# CONFIG_USB_MIDI is not set
- +CONFIG_USB_STORAGE=y
- +# 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_SDDR55 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)
- +#
- +CONFIG_USB_HID=y
- +CONFIG_USB_HIDINPUT=y
- +CONFIG_USB_HIDDEV=y
- +# CONFIG_USB_AIPTEK is not set
- +# CONFIG_USB_WACOM is not set
- +# CONFIG_USB_KBTAB is not set
- +# CONFIG_USB_POWERMATE is not set
- +
- +#
- +# 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_RTL8150 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
- +
- +#
- +# USB Miscellaneous drivers
- +#
- +# CONFIG_USB_RIO500 is not set
- +# CONFIG_USB_AUERSWALD is not set
- +# CONFIG_USB_TIGL is not set
- +# CONFIG_USB_BRLVGER is not set
- +# CONFIG_USB_LCD is not set
- +
- +#
- +# Support for USB gadgets
- +#
- +# CONFIG_USB_GADGET is not set
- +
- +#
- +# Bluetooth support
- +#
- +# CONFIG_BLUEZ is not set
- +
- +#
- +# Kernel hacking
- +#
- +CONFIG_CROSSCOMPILE=y
- +# CONFIG_RUNTIME_DEBUG is not set
- +# CONFIG_KGDB is not set
- +# CONFIG_GDB_CONSOLE is not set
- +# CONFIG_DEBUG_INFO is not set
- +# CONFIG_MAGIC_SYSRQ is not set
- +# CONFIG_MIPS_UNCACHED is not set
- +CONFIG_LOG_BUF_SHIFT=0
- +
- +#
- +# Cryptographic options
- +#
- +# CONFIG_CRYPTO is not set
- +
- +#
- +# Library routines
- +#
- +# CONFIG_CRC32 is not set
- +CONFIG_ZLIB_INFLATE=m
- +CONFIG_ZLIB_DEFLATE=m
- +# CONFIG_FW_LOADER is not set
- --- a/arch/mips/defconfig-db1500
- +++ b/arch/mips/defconfig-db1500
- @@ -30,8 +30,8 @@ CONFIG_MIPS_DB1500=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -267,11 +267,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -555,7 +550,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
- # CONFIG_AU1X00_USB_TTY is not set
- # CONFIG_AU1X00_USB_RAW is not set
- # CONFIG_TXX927_SERIAL is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips/defconfig-db1550
- +++ b/arch/mips/defconfig-db1550
- @@ -30,8 +30,8 @@ CONFIG_MIPS_DB1550=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -213,11 +213,9 @@ CONFIG_MTD_CFI_AMDSTD=y
- # CONFIG_MTD_BOSPORUS is not set
- # CONFIG_MTD_XXS1500 is not set
- # CONFIG_MTD_MTX1 is not set
- -# CONFIG_MTD_DB1X00 is not set
- CONFIG_MTD_PB1550=y
- CONFIG_MTD_PB1550_BOOT=y
- CONFIG_MTD_PB1550_USER=y
- -# CONFIG_MTD_HYDROGEN3 is not set
- # CONFIG_MTD_MIRAGE is not set
- # CONFIG_MTD_CSTM_MIPS_IXX is not set
- # CONFIG_MTD_OCELOT is not set
- @@ -236,7 +234,6 @@ CONFIG_MTD_PB1550_USER=y
- #
- # 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
- @@ -343,11 +340,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -633,7 +625,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
- # CONFIG_AU1X00_USB_TTY is not set
- # CONFIG_AU1X00_USB_RAW is not set
- # CONFIG_TXX927_SERIAL is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips/defconfig-ddb5476
- +++ b/arch/mips/defconfig-ddb5476
- @@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -226,11 +226,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -517,7 +512,6 @@ CONFIG_SERIAL=y
- CONFIG_SERIAL_CONSOLE=y
- # CONFIG_SERIAL_EXTENDED is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips/defconfig-ddb5477
- +++ b/arch/mips/defconfig-ddb5477
- @@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -226,11 +226,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -434,7 +429,6 @@ CONFIG_SERIAL=y
- CONFIG_SERIAL_CONSOLE=y
- # CONFIG_SERIAL_EXTENDED is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips/defconfig-decstation
- +++ b/arch/mips/defconfig-decstation
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -223,11 +223,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -306,9 +301,11 @@ CONFIG_SCSI_DECNCR=y
- # CONFIG_SCSI_MEGARAID is not set
- # CONFIG_SCSI_MEGARAID2 is not set
- # CONFIG_SCSI_SATA is not set
- +# CONFIG_SCSI_SATA_AHCI is not set
- # CONFIG_SCSI_SATA_SVW is not set
- # CONFIG_SCSI_ATA_PIIX is not set
- # CONFIG_SCSI_SATA_NV is not set
- +# CONFIG_SCSI_SATA_QSTOR is not set
- # CONFIG_SCSI_SATA_PROMISE is not set
- # CONFIG_SCSI_SATA_SX4 is not set
- # CONFIG_SCSI_SATA_SIL is not set
- @@ -477,7 +474,6 @@ CONFIG_SERIAL_DEC=y
- CONFIG_SERIAL_DEC_CONSOLE=y
- CONFIG_DZ=y
- CONFIG_ZS=y
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips/defconfig-e55
- +++ b/arch/mips/defconfig-e55
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -222,11 +222,6 @@ CONFIG_IP_MULTICAST=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -426,7 +421,6 @@ CONFIG_SERIAL_MANY_PORTS=y
- # CONFIG_SERIAL_MULTIPORT is not set
- # CONFIG_HUB6 is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- # CONFIG_VR41XX_KIU is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
- --- a/arch/mips/defconfig-eagle
- +++ b/arch/mips/defconfig-eagle
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -208,8 +208,8 @@ CONFIG_MTD_CFI_INTELEXT=y
- # Mapping drivers for chip access
- #
- CONFIG_MTD_PHYSMAP=y
- -CONFIG_MTD_PHYSMAP_START=1c000000
- -CONFIG_MTD_PHYSMAP_LEN=2000000
- +CONFIG_MTD_PHYSMAP_START=0x1c000000
- +CONFIG_MTD_PHYSMAP_LEN=0x2000000
- CONFIG_MTD_PHYSMAP_BUSWIDTH=4
- # CONFIG_MTD_PB1000 is not set
- # CONFIG_MTD_PB1500 is not set
- @@ -217,9 +217,7 @@ CONFIG_MTD_PHYSMAP_BUSWIDTH=4
- # CONFIG_MTD_BOSPORUS is not set
- # CONFIG_MTD_XXS1500 is not set
- # CONFIG_MTD_MTX1 is not set
- -# CONFIG_MTD_DB1X00 is not set
- # CONFIG_MTD_PB1550 is not set
- -# CONFIG_MTD_HYDROGEN3 is not set
- # CONFIG_MTD_MIRAGE is not set
- # CONFIG_MTD_CSTM_MIPS_IXX is not set
- # CONFIG_MTD_OCELOT is not set
- @@ -238,7 +236,6 @@ CONFIG_MTD_PHYSMAP_BUSWIDTH=4
- #
- # 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
- @@ -327,11 +324,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -587,7 +579,6 @@ CONFIG_SERIAL=y
- CONFIG_SERIAL_CONSOLE=y
- # CONFIG_SERIAL_EXTENDED is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- # CONFIG_VR41XX_KIU is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
- --- a/arch/mips/defconfig-ev64120
- +++ b/arch/mips/defconfig-ev64120
- @@ -30,8 +30,8 @@ CONFIG_MODULES=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -230,11 +230,6 @@ CONFIG_IP_PNP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -443,7 +438,6 @@ CONFIG_SERIAL=y
- # CONFIG_SERIAL_CONSOLE is not set
- # CONFIG_SERIAL_EXTENDED is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips/defconfig-ev96100
- +++ b/arch/mips/defconfig-ev96100
- @@ -30,8 +30,8 @@ CONFIG_MODULES=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -232,11 +232,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -441,7 +436,6 @@ CONFIG_SERIAL=y
- CONFIG_SERIAL_CONSOLE=y
- # CONFIG_SERIAL_EXTENDED is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- /dev/null
- +++ b/arch/mips/defconfig-ficmmp
- @@ -0,0 +1,862 @@
- +#
- +# Automatically generated make config: don't edit
- +#
- +CONFIG_MIPS=y
- +CONFIG_MIPS32=y
- +# CONFIG_MIPS64 is not set
- +
- +#
- +# 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_BOSPORUS is not set
- +# CONFIG_MIPS_MIRAGE is not set
- +# CONFIG_MIPS_DB1000 is not set
- +# CONFIG_MIPS_DB1100 is not set
- +# CONFIG_MIPS_DB1500 is not set
- +# CONFIG_MIPS_DB1550 is not set
- +# CONFIG_MIPS_PB1000 is not set
- +# CONFIG_MIPS_PB1100 is not set
- +# CONFIG_MIPS_PB1500 is not set
- +# CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- +# CONFIG_MIPS_XXS1500 is not set
- +# CONFIG_MIPS_MTX1 is not set
- +# CONFIG_COGENT_CSB250 is not set
- +# CONFIG_BAGET_MIPS is not set
- +# CONFIG_CASIO_E55 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_IBM_WORKPAD is not set
- +# CONFIG_LASAT 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_MIPS_SEAD is not set
- +# CONFIG_MOMENCO_OCELOT is not set
- +# CONFIG_MOMENCO_OCELOT_G is not set
- +# CONFIG_MOMENCO_OCELOT_C is not set
- +# CONFIG_MOMENCO_JAGUAR_ATX is not set
- +# CONFIG_PMC_BIG_SUR is not set
- +# CONFIG_PMC_STRETCH is not set
- +# CONFIG_PMC_YOSEMITE 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_OLIVETTI_M700 is not set
- +# CONFIG_NINO is not set
- +# CONFIG_SGI_IP22 is not set
- +# CONFIG_SGI_IP27 is not set
- +# CONFIG_SIBYTE_SB1xxx_SOC is not set
- +# CONFIG_SNI_RM200_PCI is not set
- +# CONFIG_TANBAC_TB0226 is not set
- +# CONFIG_TANBAC_TB0229 is not set
- +# CONFIG_TOSHIBA_JMR3927 is not set
- +# CONFIG_TOSHIBA_RBTX4927 is not set
- +# CONFIG_VICTOR_MPC30X is not set
- +# CONFIG_ZAO_CAPCELLA is not set
- +# CONFIG_HIGHMEM is not set
- +CONFIG_RWSEM_GENERIC_SPINLOCK=y
- +# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
- +# CONFIG_MIPS_AU1000 is not set
- +
- +#
- +# CPU selection
- +#
- +CONFIG_CPU_MIPS32=y
- +# CONFIG_CPU_MIPS64 is not set
- +# CONFIG_CPU_R3000 is not set
- +# CONFIG_CPU_TX39XX is not set
- +# CONFIG_CPU_VR41XX is not set
- +# 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_R6000 is not set
- +# CONFIG_CPU_NEVADA is not set
- +# CONFIG_CPU_R8000 is not set
- +# CONFIG_CPU_R10000 is not set
- +# CONFIG_CPU_RM7000 is not set
- +# CONFIG_CPU_RM9000 is not set
- +# CONFIG_CPU_SB1 is not set
- +CONFIG_PAGE_SIZE_4KB=y
- +# CONFIG_PAGE_SIZE_16KB is not set
- +# CONFIG_PAGE_SIZE_64KB is not set
- +CONFIG_CPU_HAS_PREFETCH=y
- +# CONFIG_VTAG_ICACHE is not set
- +CONFIG_64BIT_PHYS_ADDR=y
- +# CONFIG_CPU_ADVANCED is not set
- +CONFIG_CPU_HAS_LLSC=y
- +# CONFIG_CPU_HAS_LLDSCD is not set
- +# CONFIG_CPU_HAS_WB is not set
- +CONFIG_CPU_HAS_SYNC=y
- +
- +#
- +# General setup
- +#
- +CONFIG_CPU_LITTLE_ENDIAN=y
- +# CONFIG_BUILD_ELF64 is not set
- +CONFIG_NET=y
- +# CONFIG_PCI is not set
- +# CONFIG_PCI_NEW is not set
- +CONFIG_PCI_AUTO=y
- +# CONFIG_ISA 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_MIPS32_COMPAT is not set
- +# CONFIG_MIPS32_O32 is not set
- +# CONFIG_MIPS32_N32 is not set
- +# CONFIG_BINFMT_ELF32 is not set
- +# CONFIG_BINFMT_MISC is not set
- +# CONFIG_OOM_KILLER is not set
- +CONFIG_CMDLINE_BOOL=y
- +CONFIG_CMDLINE="ide3=dma mem=96M root=/dev/hda2 rootflags=data=journal"
- +
- +#
- +# 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_CISS_SCSI_TAPE is not set
- +# CONFIG_CISS_MONITOR_THREAD is not set
- +# CONFIG_BLK_DEV_DAC960 is not set
- +# CONFIG_BLK_DEV_UMEM is not set
- +# CONFIG_BLK_DEV_SX8 is not set
- +CONFIG_BLK_DEV_LOOP=y
- +# CONFIG_BLK_DEV_NBD is not set
- +# CONFIG_BLK_DEV_RAM is not set
- +# CONFIG_BLK_DEV_INITRD is not set
- +# CONFIG_BLK_STATS 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 is not set
- +# CONFIG_NETLINK_DEV is not set
- +CONFIG_NETFILTER=y
- +# CONFIG_NETFILTER_DEBUG is not set
- +CONFIG_FILTER=y
- +CONFIG_UNIX=y
- +CONFIG_INET=y
- +CONFIG_IP_MULTICAST=y
- +# CONFIG_IP_ADVANCED_ROUTER is not set
- +# CONFIG_IP_PNP 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
- +
- +#
- +# IP: Netfilter Configuration
- +#
- +# CONFIG_IP_NF_CONNTRACK is not set
- +# CONFIG_IP_NF_QUEUE is not set
- +# CONFIG_IP_NF_IPTABLES is not set
- +# CONFIG_IP_NF_ARPTABLES is not set
- +# CONFIG_IP_NF_COMPAT_IPCHAINS is not set
- +# CONFIG_IP_NF_COMPAT_IPFWADM is not set
- +
- +#
- +# IP: Virtual Server Configuration
- +#
- +# CONFIG_IP_VS is not set
- +# CONFIG_IPV6 is not set
- +# CONFIG_KHTTPD is not set
- +
- +#
- +# SCTP Configuration (EXPERIMENTAL)
- +#
- +# CONFIG_IP_SCTP 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
- +
- +#
- +# Network testing
- +#
- +# CONFIG_NET_PKTGEN 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=y
- +CONFIG_BLK_DEV_HD=y
- +# CONFIG_BLK_DEV_IDE_SATA is not set
- +CONFIG_BLK_DEV_IDEDISK=y
- +CONFIG_IDEDISK_MULTI_MODE=y
- +CONFIG_IDEDISK_STROKE=y
- +# CONFIG_BLK_DEV_IDECS is not set
- +# CONFIG_BLK_DEV_DELKIN 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
- +# CONFIG_IDE_TASK_IOCTL 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_IDE_CHIPSETS is not set
- +# CONFIG_IDEDMA_AUTO is not set
- +# CONFIG_DMA_NONPCI 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
- +# CONFIG_BLK_DEV_ATARAID_MEDLEY is not set
- +# CONFIG_BLK_DEV_ATARAID_SII is not set
- +
- +#
- +# SCSI support
- +#
- +CONFIG_SCSI=y
- +
- +#
- +# SCSI support type (disk, tape, CD-ROM)
- +#
- +CONFIG_BLK_DEV_SD=y
- +CONFIG_SD_EXTRA_DEVS=40
- +CONFIG_CHR_DEV_ST=y
- +# CONFIG_CHR_DEV_OSST is not set
- +CONFIG_BLK_DEV_SR=y
- +# CONFIG_BLK_DEV_SR_VENDOR is not set
- +CONFIG_SR_EXTRA_DEVS=2
- +# CONFIG_CHR_DEV_SG is not set
- +
- +#
- +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
- +#
- +# CONFIG_SCSI_DEBUG_QUEUES is not set
- +# CONFIG_SCSI_MULTI_LUN is not set
- +CONFIG_SCSI_CONSTANTS=y
- +# CONFIG_SCSI_LOGGING is not set
- +
- +#
- +# SCSI low-level drivers
- +#
- +# CONFIG_SCSI_7000FASST is not set
- +# CONFIG_SCSI_ACARD is not set
- +# CONFIG_SCSI_AHA152X is not set
- +# CONFIG_SCSI_AHA1542 is not set
- +# CONFIG_SCSI_AHA1740 is not set
- +# CONFIG_SCSI_AACRAID is not set
- +# CONFIG_SCSI_AIC7XXX is not set
- +# CONFIG_SCSI_AIC79XX is not set
- +# CONFIG_SCSI_AIC7XXX_OLD is not set
- +# CONFIG_SCSI_DPT_I2O is not set
- +# CONFIG_SCSI_ADVANSYS is not set
- +# CONFIG_SCSI_IN2000 is not set
- +# CONFIG_SCSI_AM53C974 is not set
- +# CONFIG_SCSI_MEGARAID is not set
- +# CONFIG_SCSI_MEGARAID2 is not set
- +# CONFIG_SCSI_SATA is not set
- +# CONFIG_SCSI_SATA_AHCI is not set
- +# CONFIG_SCSI_SATA_SVW is not set
- +# CONFIG_SCSI_ATA_PIIX is not set
- +# CONFIG_SCSI_SATA_NV is not set
- +# CONFIG_SCSI_SATA_QSTOR is not set
- +# CONFIG_SCSI_SATA_PROMISE is not set
- +# CONFIG_SCSI_SATA_SX4 is not set
- +# CONFIG_SCSI_SATA_SIL is not set
- +# CONFIG_SCSI_SATA_SIS is not set
- +# CONFIG_SCSI_SATA_ULI is not set
- +# CONFIG_SCSI_SATA_VIA is not set
- +# CONFIG_SCSI_SATA_VITESSE is not set
- +# CONFIG_SCSI_BUSLOGIC is not set
- +# CONFIG_SCSI_DMX3191D is not set
- +# CONFIG_SCSI_DTC3280 is not set
- +# CONFIG_SCSI_EATA is not set
- +# CONFIG_SCSI_EATA_DMA is not set
- +# CONFIG_SCSI_EATA_PIO is not set
- +# CONFIG_SCSI_FUTURE_DOMAIN is not set
- +# CONFIG_SCSI_GDTH is not set
- +# CONFIG_SCSI_GENERIC_NCR5380 is not set
- +# CONFIG_SCSI_INITIO is not set
- +# CONFIG_SCSI_INIA100 is not set
- +# CONFIG_SCSI_NCR53C406A is not set
- +# CONFIG_SCSI_NCR53C7xx is not set
- +# CONFIG_SCSI_PAS16 is not set
- +# CONFIG_SCSI_PCI2000 is not set
- +# CONFIG_SCSI_PCI2220I is not set
- +# CONFIG_SCSI_PSI240I is not set
- +# CONFIG_SCSI_QLOGIC_FAS is not set
- +# CONFIG_SCSI_SIM710 is not set
- +# CONFIG_SCSI_SYM53C416 is not set
- +# CONFIG_SCSI_T128 is not set
- +# CONFIG_SCSI_U14_34F is not set
- +# CONFIG_SCSI_NSP32 is not set
- +# CONFIG_SCSI_DEBUG is not set
- +
- +#
- +# Fusion MPT device support
- +#
- +# CONFIG_FUSION is not set
- +# CONFIG_FUSION_BOOT is not set
- +# CONFIG_FUSION_ISENSE is not set
- +# CONFIG_FUSION_CTL is not set
- +# CONFIG_FUSION_LAN 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_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_NET_ISA is not set
- +# CONFIG_NET_PCI is not set
- +# CONFIG_NET_POCKET is not set
- +
- +#
- +# Ethernet (1000 Mbit)
- +#
- +# CONFIG_ACENIC is not set
- +# CONFIG_DL2K is not set
- +# CONFIG_E1000 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_R8169 is not set
- +# CONFIG_SK98LIN is not set
- +# CONFIG_TIGON3 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
- +
- +#
- +# Input core support
- +#
- +CONFIG_INPUT=y
- +CONFIG_INPUT_KEYBDEV=y
- +CONFIG_INPUT_MOUSEDEV=y
- +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
- +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
- +# CONFIG_INPUT_JOYDEV is not set
- +CONFIG_INPUT_EVDEV=y
- +# CONFIG_INPUT_UINPUT is not set
- +
- +#
- +# Character devices
- +#
- +CONFIG_VT=y
- +CONFIG_VT_CONSOLE=y
- +# CONFIG_SERIAL is not set
- +# CONFIG_SERIAL_EXTENDED is not set
- +CONFIG_SERIAL_NONSTANDARD=y
- +# CONFIG_COMPUTONE is not set
- +# CONFIG_ROCKETPORT is not set
- +# CONFIG_CYCLADES is not set
- +# CONFIG_DIGIEPCA is not set
- +# CONFIG_DIGI is not set
- +# CONFIG_ESPSERIAL is not set
- +# CONFIG_MOXA_INTELLIO is not set
- +# CONFIG_MOXA_SMARTIO is not set
- +# CONFIG_ISI is not set
- +# CONFIG_SYNCLINK is not set
- +# CONFIG_SYNCLINKMP is not set
- +# CONFIG_N_HDLC is not set
- +# CONFIG_RISCOM8 is not set
- +# CONFIG_SPECIALIX is not set
- +# CONFIG_SX is not set
- +# CONFIG_RIO is not set
- +# CONFIG_STALDRV is not set
- +# CONFIG_SERIAL_TX3912 is not set
- +# CONFIG_SERIAL_TX3912_CONSOLE is not set
- +# CONFIG_SERIAL_TXX9 is not set
- +# CONFIG_SERIAL_TXX9_CONSOLE is not set
- +# CONFIG_TXX927_SERIAL is not set
- +CONFIG_UNIX98_PTYS=y
- +CONFIG_UNIX98_PTY_COUNT=256
- +
- +#
- +# I2C support
- +#
- +CONFIG_I2C=y
- +# CONFIG_I2C_ALGOBIT is not set
- +# CONFIG_SCx200_ACB is not set
- +# CONFIG_I2C_ALGOPCF is not set
- +# CONFIG_I2C_CHARDEV is not set
- +# CONFIG_I2C_PROC is not set
- +
- +#
- +# Mice
- +#
- +# CONFIG_BUSMOUSE is not set
- +# CONFIG_MOUSE is not set
- +
- +#
- +# Joysticks
- +#
- +# CONFIG_INPUT_GAMEPORT is not set
- +# CONFIG_INPUT_NS558 is not set
- +# CONFIG_INPUT_LIGHTNING is not set
- +# CONFIG_INPUT_PCIGAME is not set
- +# CONFIG_INPUT_CS461X is not set
- +# CONFIG_INPUT_EMU10K1 is not set
- +# CONFIG_INPUT_SERIO is not set
- +# CONFIG_INPUT_SERPORT is not set
- +
- +#
- +# Joysticks
- +#
- +# CONFIG_INPUT_ANALOG is not set
- +# CONFIG_INPUT_A3D is not set
- +# CONFIG_INPUT_ADI is not set
- +# CONFIG_INPUT_COBRA is not set
- +# CONFIG_INPUT_GF2K is not set
- +# CONFIG_INPUT_GRIP is not set
- +# CONFIG_INPUT_INTERACT is not set
- +# CONFIG_INPUT_TMDC is not set
- +# CONFIG_INPUT_SIDEWINDER is not set
- +# CONFIG_INPUT_IFORCE_USB is not set
- +# CONFIG_INPUT_IFORCE_232 is not set
- +# CONFIG_INPUT_WARRIOR is not set
- +# CONFIG_INPUT_MAGELLAN is not set
- +# CONFIG_INPUT_SPACEORB is not set
- +# CONFIG_INPUT_SPACEBALL is not set
- +# CONFIG_INPUT_STINGER is not set
- +# CONFIG_INPUT_DB9 is not set
- +# CONFIG_INPUT_GAMECON is not set
- +# CONFIG_INPUT_TURBOGRAFX is not set
- +# CONFIG_QIC02_TAPE is not set
- +# CONFIG_IPMI_HANDLER is not set
- +# CONFIG_IPMI_PANIC_EVENT is not set
- +# CONFIG_IPMI_DEVICE_INTERFACE is not set
- +# CONFIG_IPMI_KCS is not set
- +# CONFIG_IPMI_WATCHDOG is not set
- +
- +#
- +# Watchdog Cards
- +#
- +# CONFIG_WATCHDOG is not set
- +# CONFIG_SCx200 is not set
- +# CONFIG_SCx200_GPIO is not set
- +# CONFIG_AMD_PM768 is not set
- +# CONFIG_NVRAM is not set
- +# CONFIG_RTC is not set
- +# 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
- +
- +#
- +# Direct Rendering Manager (XFree86 DRI support)
- +#
- +# CONFIG_DRM is not set
- +
- +#
- +# File systems
- +#
- +# CONFIG_QUOTA is not set
- +# CONFIG_QFMT_V2 is not set
- +CONFIG_AUTOFS_FS=y
- +# CONFIG_AUTOFS4_FS is not set
- +# 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_HFSPLUS_FS is not set
- +# CONFIG_BEFS_FS is not set
- +# CONFIG_BEFS_DEBUG is not set
- +# CONFIG_BFS_FS is not set
- +CONFIG_EXT3_FS=y
- +CONFIG_JBD=y
- +# CONFIG_JBD_DEBUG is not set
- +CONFIG_FAT_FS=y
- +CONFIG_MSDOS_FS=y
- +# CONFIG_UMSDOS_FS is not set
- +CONFIG_VFAT_FS=y
- +# 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=y
- +# CONFIG_ISO9660_FS is not set
- +# CONFIG_JOLIET is not set
- +# CONFIG_ZISOFS is not set
- +# CONFIG_JFS_FS is not set
- +# CONFIG_JFS_DEBUG is not set
- +# CONFIG_JFS_STATISTICS 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
- +# CONFIG_XFS_FS is not set
- +# CONFIG_XFS_QUOTA is not set
- +# CONFIG_XFS_RT is not set
- +# CONFIG_XFS_TRACE is not set
- +# CONFIG_XFS_DEBUG is not set
- +
- +#
- +# Network File Systems
- +#
- +# CONFIG_CODA_FS is not set
- +# CONFIG_INTERMEZZO_FS is not set
- +# CONFIG_NFS_FS is not set
- +# CONFIG_NFS_V3 is not set
- +# CONFIG_NFS_DIRECTIO is not set
- +# CONFIG_ROOT_NFS is not set
- +# CONFIG_NFSD is not set
- +# CONFIG_NFSD_V3 is not set
- +# CONFIG_NFSD_TCP is not set
- +# CONFIG_SUNRPC is not set
- +# CONFIG_LOCKD is not set
- +# 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
- +
- +#
- +# Partition Types
- +#
- +# CONFIG_PARTITION_ADVANCED is not set
- +CONFIG_MSDOS_PARTITION=y
- +# CONFIG_SMB_NLS is not set
- +CONFIG_NLS=y
- +
- +#
- +# Native Language Support
- +#
- +CONFIG_NLS_DEFAULT="iso8859-1"
- +# CONFIG_NLS_CODEPAGE_437 is not set
- +# CONFIG_NLS_CODEPAGE_737 is not set
- +# CONFIG_NLS_CODEPAGE_775 is not set
- +# CONFIG_NLS_CODEPAGE_850 is not set
- +# CONFIG_NLS_CODEPAGE_852 is not set
- +# CONFIG_NLS_CODEPAGE_855 is not set
- +# CONFIG_NLS_CODEPAGE_857 is not set
- +# CONFIG_NLS_CODEPAGE_860 is not set
- +# CONFIG_NLS_CODEPAGE_861 is not set
- +# CONFIG_NLS_CODEPAGE_862 is not set
- +# CONFIG_NLS_CODEPAGE_863 is not set
- +# CONFIG_NLS_CODEPAGE_864 is not set
- +# CONFIG_NLS_CODEPAGE_865 is not set
- +# CONFIG_NLS_CODEPAGE_866 is not set
- +# CONFIG_NLS_CODEPAGE_869 is not set
- +# CONFIG_NLS_CODEPAGE_936 is not set
- +# CONFIG_NLS_CODEPAGE_950 is not set
- +# CONFIG_NLS_CODEPAGE_932 is not set
- +# CONFIG_NLS_CODEPAGE_949 is not set
- +# CONFIG_NLS_CODEPAGE_874 is not set
- +# CONFIG_NLS_ISO8859_8 is not set
- +# CONFIG_NLS_CODEPAGE_1250 is not set
- +# CONFIG_NLS_CODEPAGE_1251 is not set
- +# CONFIG_NLS_ISO8859_1 is not set
- +# CONFIG_NLS_ISO8859_2 is not set
- +# CONFIG_NLS_ISO8859_3 is not set
- +# CONFIG_NLS_ISO8859_4 is not set
- +# CONFIG_NLS_ISO8859_5 is not set
- +# CONFIG_NLS_ISO8859_6 is not set
- +# CONFIG_NLS_ISO8859_7 is not set
- +# CONFIG_NLS_ISO8859_9 is not set
- +# CONFIG_NLS_ISO8859_13 is not set
- +# CONFIG_NLS_ISO8859_14 is not set
- +# CONFIG_NLS_ISO8859_15 is not set
- +# CONFIG_NLS_KOI8_R is not set
- +# CONFIG_NLS_KOI8_U is not set
- +# CONFIG_NLS_UTF8 is not set
- +
- +#
- +# Multimedia devices
- +#
- +# CONFIG_VIDEO_DEV is not set
- +
- +#
- +# Console drivers
- +#
- +# CONFIG_VGA_CONSOLE is not set
- +# CONFIG_MDA_CONSOLE is not set
- +
- +#
- +# Frame-buffer support
- +#
- +CONFIG_FB=y
- +CONFIG_DUMMY_CONSOLE=y
- +# CONFIG_FB_CYBER2000 is not set
- +# CONFIG_FB_VIRTUAL is not set
- +CONFIG_FBCON_ADVANCED=y
- +# CONFIG_FBCON_MFB is not set
- +# CONFIG_FBCON_CFB2 is not set
- +# CONFIG_FBCON_CFB4 is not set
- +# CONFIG_FBCON_CFB8 is not set
- +CONFIG_FBCON_CFB16=y
- +# CONFIG_FBCON_CFB24 is not set
- +# CONFIG_FBCON_CFB32 is not set
- +# CONFIG_FBCON_AFB is not set
- +# CONFIG_FBCON_ILBM is not set
- +# CONFIG_FBCON_IPLAN2P2 is not set
- +# CONFIG_FBCON_IPLAN2P4 is not set
- +# CONFIG_FBCON_IPLAN2P8 is not set
- +# CONFIG_FBCON_MAC is not set
- +# CONFIG_FBCON_VGA_PLANES is not set
- +# CONFIG_FBCON_VGA is not set
- +# CONFIG_FBCON_HGA is not set
- +# CONFIG_FBCON_FONTWIDTH8_ONLY is not set
- +CONFIG_FBCON_FONTS=y
- +CONFIG_FONT_8x8=y
- +CONFIG_FONT_8x16=y
- +# CONFIG_FONT_SUN8x16 is not set
- +# CONFIG_FONT_SUN12x22 is not set
- +# CONFIG_FONT_6x11 is not set
- +# CONFIG_FONT_PEARL_8x8 is not set
- +# CONFIG_FONT_ACORN_8x8 is not set
- +
- +#
- +# Sound
- +#
- +CONFIG_SOUND=y
- +# CONFIG_SOUND_ALI5455 is not set
- +# CONFIG_SOUND_BT878 is not set
- +# CONFIG_SOUND_CMPCI is not set
- +# CONFIG_SOUND_EMU10K1 is not set
- +# 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_FORTE is not set
- +# CONFIG_SOUND_ICH is not set
- +# CONFIG_SOUND_RME96XX is not set
- +# CONFIG_SOUND_SONICVIBES 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_OSS is not set
- +# CONFIG_SOUND_TVMIXER is not set
- +# CONFIG_SOUND_AD1980 is not set
- +# CONFIG_SOUND_WM97XX is not set
- +
- +#
- +# USB support
- +#
- +# CONFIG_USB is not set
- +
- +#
- +# Support for USB gadgets
- +#
- +# CONFIG_USB_GADGET is not set
- +
- +#
- +# Bluetooth support
- +#
- +# CONFIG_BLUEZ is not set
- +
- +#
- +# Kernel hacking
- +#
- +CONFIG_CROSSCOMPILE=y
- +# CONFIG_RUNTIME_DEBUG is not set
- +# CONFIG_KGDB is not set
- +# CONFIG_GDB_CONSOLE is not set
- +# CONFIG_DEBUG_INFO is not set
- +# CONFIG_MAGIC_SYSRQ is not set
- +# CONFIG_MIPS_UNCACHED is not set
- +CONFIG_LOG_BUF_SHIFT=0
- +
- +#
- +# Cryptographic options
- +#
- +# CONFIG_CRYPTO is not set
- +
- +#
- +# Library routines
- +#
- +# CONFIG_CRC32 is not set
- +CONFIG_ZLIB_INFLATE=m
- +CONFIG_ZLIB_DEFLATE=m
- --- a/arch/mips/defconfig-hp-lj
- +++ b/arch/mips/defconfig-hp-lj
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -184,8 +184,8 @@ CONFIG_MTD_CFI_AMDSTD=y
- # Mapping drivers for chip access
- #
- CONFIG_MTD_PHYSMAP=y
- -CONFIG_MTD_PHYSMAP_START=10040000
- -CONFIG_MTD_PHYSMAP_LEN=00fc0000
- +CONFIG_MTD_PHYSMAP_START=0x10040000
- +CONFIG_MTD_PHYSMAP_LEN=0x00fc0000
- CONFIG_MTD_PHYSMAP_BUSWIDTH=4
- # CONFIG_MTD_PB1000 is not set
- # CONFIG_MTD_PB1500 is not set
- @@ -193,9 +193,7 @@ CONFIG_MTD_PHYSMAP_BUSWIDTH=4
- # CONFIG_MTD_BOSPORUS is not set
- # CONFIG_MTD_XXS1500 is not set
- # CONFIG_MTD_MTX1 is not set
- -# CONFIG_MTD_DB1X00 is not set
- # CONFIG_MTD_PB1550 is not set
- -# CONFIG_MTD_HYDROGEN3 is not set
- # CONFIG_MTD_MIRAGE is not set
- # CONFIG_MTD_CSTM_MIPS_IXX is not set
- # CONFIG_MTD_OCELOT is not set
- @@ -214,7 +212,6 @@ CONFIG_MTD_PHYSMAP_BUSWIDTH=4
- #
- # 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
- @@ -304,11 +301,6 @@ CONFIG_IP_PNP_DHCP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -604,7 +596,6 @@ CONFIG_SERIAL=y
- CONFIG_SERIAL_CONSOLE=y
- # CONFIG_SERIAL_EXTENDED is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- # CONFIG_UNIX98_PTYS is not set
-
- #
- --- a/arch/mips/defconfig-hydrogen3
- +++ b/arch/mips/defconfig-hydrogen3
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -CONFIG_MIPS_HYDROGEN3=y
- # CONFIG_MIPS_PB1550 is not set
- +CONFIG_MIPS_HYDROGEN3=y
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -214,9 +214,7 @@ CONFIG_MTD_CFI_AMDSTD=y
- # CONFIG_MTD_BOSPORUS is not set
- # CONFIG_MTD_XXS1500 is not set
- # CONFIG_MTD_MTX1 is not set
- -# CONFIG_MTD_DB1X00 is not set
- # CONFIG_MTD_PB1550 is not set
- -CONFIG_MTD_HYDROGEN3=y
- # CONFIG_MTD_MIRAGE is not set
- # CONFIG_MTD_CSTM_MIPS_IXX is not set
- # CONFIG_MTD_OCELOT is not set
- @@ -235,7 +233,6 @@ CONFIG_MTD_HYDROGEN3=y
- #
- # 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
- @@ -340,11 +337,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -590,7 +582,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
- # CONFIG_AU1X00_USB_TTY is not set
- # CONFIG_AU1X00_USB_RAW is not set
- # CONFIG_TXX927_SERIAL is not set
- -CONFIG_MIPS_HYDROGEN3_BUTTONS=y
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- @@ -838,6 +829,7 @@ CONFIG_DUMMY_CONSOLE=y
- # CONFIG_FB_PM2 is not set
- # CONFIG_FB_PM3 is not set
- # CONFIG_FB_CYBER2000 is not set
- +CONFIG_FB_AU1100=y
- # CONFIG_FB_MATROX is not set
- # CONFIG_FB_ATY is not set
- # CONFIG_FB_RADEON is not set
- @@ -849,7 +841,6 @@ CONFIG_DUMMY_CONSOLE=y
- # CONFIG_FB_VOODOO1 is not set
- # CONFIG_FB_TRIDENT is not set
- # CONFIG_FB_E1356 is not set
- -CONFIG_FB_AU1100=y
- # CONFIG_FB_IT8181 is not set
- # CONFIG_FB_VIRTUAL is not set
- CONFIG_FBCON_ADVANCED=y
- --- a/arch/mips/defconfig-ip22
- +++ b/arch/mips/defconfig-ip22
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -235,11 +235,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -319,9 +314,11 @@ CONFIG_SGIWD93_SCSI=y
- # CONFIG_SCSI_MEGARAID is not set
- # CONFIG_SCSI_MEGARAID2 is not set
- # CONFIG_SCSI_SATA is not set
- +# CONFIG_SCSI_SATA_AHCI is not set
- # CONFIG_SCSI_SATA_SVW is not set
- # CONFIG_SCSI_ATA_PIIX is not set
- # CONFIG_SCSI_SATA_NV is not set
- +# CONFIG_SCSI_SATA_QSTOR is not set
- # CONFIG_SCSI_SATA_PROMISE is not set
- # CONFIG_SCSI_SATA_SX4 is not set
- # CONFIG_SCSI_SATA_SIL is not set
- @@ -465,7 +462,6 @@ CONFIG_VT_CONSOLE=y
- # CONFIG_SERIAL is not set
- # CONFIG_SERIAL_EXTENDED is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips/defconfig-it8172
- +++ b/arch/mips/defconfig-it8172
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -186,8 +186,8 @@ CONFIG_MTD_CFI_INTELEXT=y
- # Mapping drivers for chip access
- #
- CONFIG_MTD_PHYSMAP=y
- -CONFIG_MTD_PHYSMAP_START=8000000
- -CONFIG_MTD_PHYSMAP_LEN=2000000
- +CONFIG_MTD_PHYSMAP_START=0x8000000
- +CONFIG_MTD_PHYSMAP_LEN=0x2000000
- CONFIG_MTD_PHYSMAP_BUSWIDTH=4
- # CONFIG_MTD_PB1000 is not set
- # CONFIG_MTD_PB1500 is not set
- @@ -195,9 +195,7 @@ CONFIG_MTD_PHYSMAP_BUSWIDTH=4
- # CONFIG_MTD_BOSPORUS is not set
- # CONFIG_MTD_XXS1500 is not set
- # CONFIG_MTD_MTX1 is not set
- -# CONFIG_MTD_DB1X00 is not set
- # CONFIG_MTD_PB1550 is not set
- -# CONFIG_MTD_HYDROGEN3 is not set
- # CONFIG_MTD_MIRAGE is not set
- # CONFIG_MTD_CSTM_MIPS_IXX is not set
- # CONFIG_MTD_OCELOT is not set
- @@ -216,7 +214,6 @@ CONFIG_MTD_PHYSMAP_BUSWIDTH=4
- #
- # 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
- @@ -304,11 +301,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -592,7 +584,6 @@ CONFIG_SERIAL_CONSOLE=y
- CONFIG_PC_KEYB=y
- # CONFIG_IT8172_SCR0 is not set
- # CONFIG_IT8172_SCR1 is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips/defconfig-ivr
- +++ b/arch/mips/defconfig-ivr
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -226,11 +226,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -516,7 +511,6 @@ CONFIG_SERIAL_CONSOLE=y
- CONFIG_QTRONIX_KEYBOARD=y
- CONFIG_IT8172_CIR=y
- # CONFIG_IT8172_SCR0 is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips/defconfig-jmr3927
- +++ b/arch/mips/defconfig-jmr3927
- @@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -225,11 +225,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -454,7 +449,6 @@ CONFIG_SERIAL_NONSTANDARD=y
- # CONFIG_SERIAL_TXX9_CONSOLE is not set
- CONFIG_TXX927_SERIAL=y
- CONFIG_TXX927_SERIAL_CONSOLE=y
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- # CONFIG_UNIX98_PTYS is not set
-
- #
- --- a/arch/mips/defconfig-lasat
- +++ b/arch/mips/defconfig-lasat
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -198,9 +198,7 @@ CONFIG_MTD_CFI_AMDSTD=y
- # CONFIG_MTD_BOSPORUS is not set
- # CONFIG_MTD_XXS1500 is not set
- # CONFIG_MTD_MTX1 is not set
- -# CONFIG_MTD_DB1X00 is not set
- # CONFIG_MTD_PB1550 is not set
- -# CONFIG_MTD_HYDROGEN3 is not set
- # CONFIG_MTD_MIRAGE is not set
- # CONFIG_MTD_CSTM_MIPS_IXX is not set
- # CONFIG_MTD_OCELOT is not set
- @@ -219,7 +217,6 @@ CONFIG_MTD_LASAT=y
- #
- # 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
- @@ -303,11 +300,6 @@ CONFIG_INET=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -584,7 +576,6 @@ CONFIG_SERIAL=y
- CONFIG_SERIAL_CONSOLE=y
- # CONFIG_SERIAL_EXTENDED is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips/defconfig-malta
- +++ b/arch/mips/defconfig-malta
- @@ -22,16 +22,19 @@ CONFIG_KMOD=y
- #
- # CONFIG_ACER_PICA_61 is not set
- # CONFIG_MIPS_BOSPORUS is not set
- +# CONFIG_MIPS_FICMMP is not set
- # CONFIG_MIPS_MIRAGE is not set
- # CONFIG_MIPS_DB1000 is not set
- # CONFIG_MIPS_DB1100 is not set
- # CONFIG_MIPS_DB1500 is not set
- # CONFIG_MIPS_DB1550 is not set
- +# CONFIG_MIPS_DB1200 is not set
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_PB1200 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -237,11 +240,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -273,8 +271,83 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # ATA/IDE/MFM/RLL support
- #
- -# CONFIG_IDE is not set
- +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_IDE_SATA is not set
- +CONFIG_BLK_DEV_IDEDISK=y
- +# CONFIG_IDEDISK_MULTI_MODE is not set
- +# CONFIG_IDEDISK_STROKE is not set
- +# CONFIG_BLK_DEV_IDECS is not set
- +# CONFIG_BLK_DEV_DELKIN is not set
- +CONFIG_BLK_DEV_IDECD=y
- +CONFIG_BLK_DEV_IDETAPE=y
- +CONFIG_BLK_DEV_IDEFLOPPY=y
- +CONFIG_BLK_DEV_IDESCSI=y
- +# CONFIG_IDE_TASK_IOCTL 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_IDEPCI=y
- +CONFIG_BLK_DEV_GENERIC=y
- +CONFIG_IDEPCI_SHARE_IRQ=y
- +CONFIG_BLK_DEV_IDEDMA_PCI=y
- +# CONFIG_BLK_DEV_OFFBOARD is not set
- +CONFIG_BLK_DEV_IDEDMA_FORCED=y
- +CONFIG_IDEDMA_PCI_AUTO=y
- +# CONFIG_IDEDMA_ONLYDISK is not set
- +CONFIG_BLK_DEV_IDEDMA=y
- +# CONFIG_IDEDMA_PCI_WIP is not set
- +# CONFIG_BLK_DEV_ADMA100 is not set
- +# CONFIG_BLK_DEV_AEC62XX is not set
- +# CONFIG_BLK_DEV_ALI15X3 is not set
- +# CONFIG_WDC_ALI15X3 is not set
- +# CONFIG_BLK_DEV_AMD74XX is not set
- +# CONFIG_AMD74XX_OVERRIDE is not set
- +# CONFIG_BLK_DEV_ATIIXP is not set
- +# CONFIG_BLK_DEV_CMD64X is not set
- +# CONFIG_BLK_DEV_TRIFLEX is not set
- +# CONFIG_BLK_DEV_CY82C693 is not set
- +# CONFIG_BLK_DEV_CS5530 is not set
- +# CONFIG_BLK_DEV_HPT34X is not set
- +# CONFIG_HPT34X_AUTODMA is not set
- +# CONFIG_BLK_DEV_HPT366 is not set
- +CONFIG_BLK_DEV_PIIX=y
- +# CONFIG_BLK_DEV_NS87415 is not set
- +# CONFIG_BLK_DEV_OPTI621 is not set
- +# CONFIG_BLK_DEV_PDC202XX_OLD is not set
- +# CONFIG_PDC202XX_BURST is not set
- +# CONFIG_BLK_DEV_PDC202XX_NEW is not set
- +# CONFIG_BLK_DEV_RZ1000 is not set
- +# CONFIG_BLK_DEV_SC1200 is not set
- +# CONFIG_BLK_DEV_SVWKS is not set
- +# CONFIG_BLK_DEV_SIIMAGE is not set
- +# CONFIG_BLK_DEV_SIS5513 is not set
- +# CONFIG_BLK_DEV_SLC90E66 is not set
- +# CONFIG_BLK_DEV_TRM290 is not set
- +# CONFIG_BLK_DEV_VIA82CXXX is not set
- +# CONFIG_IDE_CHIPSETS is not set
- +CONFIG_IDEDMA_AUTO=y
- +# CONFIG_IDEDMA_IVB is not set
- +# CONFIG_DMA_NONPCI 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
- +# CONFIG_BLK_DEV_ATARAID_MEDLEY is not set
- +# CONFIG_BLK_DEV_ATARAID_SII is not set
-
- #
- # SCSI support
- @@ -319,9 +392,11 @@ CONFIG_SD_EXTRA_DEVS=40
- # CONFIG_SCSI_MEGARAID is not set
- # CONFIG_SCSI_MEGARAID2 is not set
- # CONFIG_SCSI_SATA is not set
- +# CONFIG_SCSI_SATA_AHCI is not set
- # CONFIG_SCSI_SATA_SVW is not set
- # CONFIG_SCSI_ATA_PIIX is not set
- # CONFIG_SCSI_SATA_NV is not set
- +# CONFIG_SCSI_SATA_QSTOR is not set
- # CONFIG_SCSI_SATA_PROMISE is not set
- # CONFIG_SCSI_SATA_SX4 is not set
- # CONFIG_SCSI_SATA_SIL is not set
- @@ -524,7 +599,6 @@ CONFIG_SERIAL=y
- CONFIG_SERIAL_CONSOLE=y
- # CONFIG_SERIAL_EXTENDED is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips/defconfig-mirage
- +++ b/arch/mips/defconfig-mirage
- @@ -30,8 +30,8 @@ CONFIG_MIPS_MIRAGE=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -209,9 +209,7 @@ CONFIG_MTD_CFI_AMDSTD=y
- # CONFIG_MTD_BOSPORUS is not set
- # CONFIG_MTD_XXS1500 is not set
- # CONFIG_MTD_MTX1 is not set
- -# CONFIG_MTD_DB1X00 is not set
- # CONFIG_MTD_PB1550 is not set
- -# CONFIG_MTD_HYDROGEN3 is not set
- CONFIG_MTD_MIRAGE=y
- # CONFIG_MTD_CSTM_MIPS_IXX is not set
- # CONFIG_MTD_OCELOT is not set
- @@ -230,7 +228,6 @@ CONFIG_MTD_MIRAGE=y
- #
- # 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
- @@ -335,11 +332,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -560,7 +552,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
- # CONFIG_AU1X00_USB_TTY is not set
- # CONFIG_AU1X00_USB_RAW is not set
- # CONFIG_TXX927_SERIAL is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips/defconfig-mpc30x
- +++ b/arch/mips/defconfig-mpc30x
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -228,11 +228,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -400,7 +395,6 @@ CONFIG_SERIAL=y
- CONFIG_SERIAL_CONSOLE=y
- # CONFIG_SERIAL_EXTENDED is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- # CONFIG_VR41XX_KIU is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
- --- a/arch/mips/defconfig-mtx-1
- +++ b/arch/mips/defconfig-mtx-1
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- CONFIG_MIPS_MTX1=y
- # CONFIG_COGENT_CSB250 is not set
- @@ -193,9 +193,7 @@ CONFIG_MTD_CFI_AMDSTD=y
- # CONFIG_MTD_BOSPORUS is not set
- # CONFIG_MTD_XXS1500 is not set
- CONFIG_MTD_MTX1=y
- -# CONFIG_MTD_DB1X00 is not set
- # CONFIG_MTD_PB1550 is not set
- -# CONFIG_MTD_HYDROGEN3 is not set
- # CONFIG_MTD_MIRAGE is not set
- # CONFIG_MTD_CSTM_MIPS_IXX is not set
- # CONFIG_MTD_OCELOT is not set
- @@ -214,7 +212,6 @@ CONFIG_MTD_MTX1=y
- #
- # 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
- @@ -371,11 +368,6 @@ CONFIG_VLAN_8021Q=m
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- CONFIG_BRIDGE=m
- # CONFIG_X25 is not set
- @@ -479,9 +471,11 @@ CONFIG_SR_EXTRA_DEVS=2
- # CONFIG_SCSI_MEGARAID is not set
- # CONFIG_SCSI_MEGARAID2 is not set
- # CONFIG_SCSI_SATA is not set
- +# CONFIG_SCSI_SATA_AHCI is not set
- # CONFIG_SCSI_SATA_SVW is not set
- # CONFIG_SCSI_ATA_PIIX is not set
- # CONFIG_SCSI_SATA_NV is not set
- +# CONFIG_SCSI_SATA_QSTOR is not set
- # CONFIG_SCSI_SATA_PROMISE is not set
- # CONFIG_SCSI_SATA_SX4 is not set
- # CONFIG_SCSI_SATA_SIL is not set
- @@ -700,7 +694,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
- # CONFIG_AU1X00_USB_TTY is not set
- # CONFIG_AU1X00_USB_RAW is not set
- # CONFIG_TXX927_SERIAL is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips/defconfig-nino
- +++ b/arch/mips/defconfig-nino
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -226,11 +226,6 @@ CONFIG_INET=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -339,7 +334,6 @@ CONFIG_SERIAL_TX3912_CONSOLE=y
- # CONFIG_SERIAL_TXX9 is not set
- # CONFIG_SERIAL_TXX9_CONSOLE is not set
- # CONFIG_TXX927_SERIAL is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- # CONFIG_UNIX98_PTYS is not set
-
- #
- --- a/arch/mips/defconfig-ocelot
- +++ b/arch/mips/defconfig-ocelot
- @@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -194,9 +194,7 @@ CONFIG_MTD_JEDEC=y
- # CONFIG_MTD_BOSPORUS is not set
- # CONFIG_MTD_XXS1500 is not set
- # CONFIG_MTD_MTX1 is not set
- -# CONFIG_MTD_DB1X00 is not set
- # CONFIG_MTD_PB1550 is not set
- -# CONFIG_MTD_HYDROGEN3 is not set
- # CONFIG_MTD_MIRAGE is not set
- # CONFIG_MTD_CSTM_MIPS_IXX is not set
- CONFIG_MTD_OCELOT=y
- @@ -215,7 +213,6 @@ CONFIG_MTD_OCELOT=y
- #
- # Disk-On-Chip Device Drivers
- #
- -# CONFIG_MTD_DOC1000 is not set
- CONFIG_MTD_DOC2000=y
- # CONFIG_MTD_DOC2001 is not set
- CONFIG_MTD_DOCPROBE=y
- @@ -307,11 +304,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -513,7 +505,6 @@ CONFIG_SERIAL=y
- CONFIG_SERIAL_CONSOLE=y
- # CONFIG_SERIAL_EXTENDED is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips/defconfig-osprey
- +++ b/arch/mips/defconfig-osprey
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -227,11 +227,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -388,7 +383,6 @@ CONFIG_SERIAL_MANY_PORTS=y
- # CONFIG_SERIAL_MULTIPORT is not set
- # CONFIG_HUB6 is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- # CONFIG_VR41XX_KIU is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
- --- a/arch/mips/defconfig-pb1000
- +++ b/arch/mips/defconfig-pb1000
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- CONFIG_MIPS_PB1000=y
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -215,9 +215,7 @@ CONFIG_MTD_PB1000=y
- # CONFIG_MTD_BOSPORUS is not set
- # CONFIG_MTD_XXS1500 is not set
- # CONFIG_MTD_MTX1 is not set
- -# CONFIG_MTD_DB1X00 is not set
- # CONFIG_MTD_PB1550 is not set
- -# CONFIG_MTD_HYDROGEN3 is not set
- # CONFIG_MTD_MIRAGE is not set
- # CONFIG_MTD_CSTM_MIPS_IXX is not set
- # CONFIG_MTD_OCELOT is not set
- @@ -236,7 +234,6 @@ CONFIG_MTD_PB1000=y
- #
- # 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
- @@ -324,11 +321,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -622,7 +614,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
- # CONFIG_AU1X00_USB_TTY is not set
- # CONFIG_AU1X00_USB_RAW is not set
- # CONFIG_TXX927_SERIAL is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- @@ -707,7 +698,7 @@ CONFIG_UNIX98_PTY_COUNT=256
- #
- # CONFIG_PCMCIA_SERIAL_CS is not set
- # CONFIG_SYNCLINK_CS is not set
- -CONFIG_AU1X00_GPIO=m
- +CONFIG_AU1X00_GPIO=y
- # CONFIG_TS_AU1X00_ADS7846 is not set
-
- #
- --- a/arch/mips/defconfig-pb1100
- +++ b/arch/mips/defconfig-pb1100
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- CONFIG_MIPS_PB1100=y
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -198,9 +198,7 @@ CONFIG_MTD_PB1100=y
- # CONFIG_MTD_MTX1 is not set
- CONFIG_MTD_PB1500_BOOT=y
- CONFIG_MTD_PB1500_USER=y
- -# CONFIG_MTD_DB1X00 is not set
- # CONFIG_MTD_PB1550 is not set
- -# CONFIG_MTD_HYDROGEN3 is not set
- # CONFIG_MTD_MIRAGE is not set
- # CONFIG_MTD_CSTM_MIPS_IXX is not set
- # CONFIG_MTD_OCELOT is not set
- @@ -219,7 +217,6 @@ CONFIG_MTD_PB1500_USER=y
- #
- # 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
- @@ -324,11 +321,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -613,7 +605,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
- # CONFIG_AU1X00_USB_TTY is not set
- # CONFIG_AU1X00_USB_RAW is not set
- # CONFIG_TXX927_SERIAL is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- @@ -859,6 +850,7 @@ CONFIG_DUMMY_CONSOLE=y
- # CONFIG_FB_PM2 is not set
- # CONFIG_FB_PM3 is not set
- # CONFIG_FB_CYBER2000 is not set
- +CONFIG_FB_AU1100=y
- # CONFIG_FB_MATROX is not set
- # CONFIG_FB_ATY is not set
- # CONFIG_FB_RADEON is not set
- @@ -870,7 +862,6 @@ CONFIG_DUMMY_CONSOLE=y
- # CONFIG_FB_VOODOO1 is not set
- # CONFIG_FB_TRIDENT is not set
- # CONFIG_FB_E1356 is not set
- -CONFIG_FB_AU1100=y
- # CONFIG_FB_IT8181 is not set
- # CONFIG_FB_VIRTUAL is not set
- CONFIG_FBCON_ADVANCED=y
- --- /dev/null
- +++ b/arch/mips/defconfig-pb1200
- @@ -0,0 +1,1060 @@
- +#
- +# Automatically generated make config: don't edit
- +#
- +CONFIG_MIPS=y
- +CONFIG_MIPS32=y
- +# CONFIG_MIPS64 is not set
- +
- +#
- +# 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_BOSPORUS is not set
- +# CONFIG_MIPS_MIRAGE is not set
- +# CONFIG_MIPS_DB1000 is not set
- +# CONFIG_MIPS_DB1100 is not set
- +# CONFIG_MIPS_DB1500 is not set
- +# CONFIG_MIPS_DB1550 is not set
- +# CONFIG_MIPS_PB1000 is not set
- +# CONFIG_MIPS_PB1100 is not set
- +# CONFIG_MIPS_PB1500 is not set
- +# CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- +# CONFIG_MIPS_XXS1500 is not set
- +# CONFIG_MIPS_MTX1 is not set
- +# CONFIG_COGENT_CSB250 is not set
- +# CONFIG_BAGET_MIPS is not set
- +# CONFIG_CASIO_E55 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_IBM_WORKPAD is not set
- +# CONFIG_LASAT 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_MIPS_SEAD is not set
- +# CONFIG_MOMENCO_OCELOT is not set
- +# CONFIG_MOMENCO_OCELOT_G is not set
- +# CONFIG_MOMENCO_OCELOT_C is not set
- +# CONFIG_MOMENCO_JAGUAR_ATX is not set
- +# CONFIG_PMC_BIG_SUR is not set
- +# CONFIG_PMC_STRETCH is not set
- +# CONFIG_PMC_YOSEMITE 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_OLIVETTI_M700 is not set
- +# CONFIG_NINO is not set
- +# CONFIG_SGI_IP22 is not set
- +# CONFIG_SGI_IP27 is not set
- +# CONFIG_SIBYTE_SB1xxx_SOC is not set
- +# CONFIG_SNI_RM200_PCI is not set
- +# CONFIG_TANBAC_TB0226 is not set
- +# CONFIG_TANBAC_TB0229 is not set
- +# CONFIG_TOSHIBA_JMR3927 is not set
- +# CONFIG_TOSHIBA_RBTX4927 is not set
- +# CONFIG_VICTOR_MPC30X is not set
- +# CONFIG_ZAO_CAPCELLA is not set
- +# CONFIG_HIGHMEM is not set
- +CONFIG_RWSEM_GENERIC_SPINLOCK=y
- +# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
- +CONFIG_SOC_AU1X00=y
- +CONFIG_SOC_AU1200=y
- +CONFIG_NONCOHERENT_IO=y
- +CONFIG_PC_KEYB=y
- +# CONFIG_MIPS_AU1000 is not set
- +
- +#
- +# CPU selection
- +#
- +CONFIG_CPU_MIPS32=y
- +# CONFIG_CPU_MIPS64 is not set
- +# CONFIG_CPU_R3000 is not set
- +# CONFIG_CPU_TX39XX is not set
- +# CONFIG_CPU_VR41XX is not set
- +# 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_R6000 is not set
- +# CONFIG_CPU_NEVADA is not set
- +# CONFIG_CPU_R8000 is not set
- +# CONFIG_CPU_R10000 is not set
- +# CONFIG_CPU_RM7000 is not set
- +# CONFIG_CPU_RM9000 is not set
- +# CONFIG_CPU_SB1 is not set
- +CONFIG_PAGE_SIZE_4KB=y
- +# CONFIG_PAGE_SIZE_16KB is not set
- +# CONFIG_PAGE_SIZE_64KB is not set
- +CONFIG_CPU_HAS_PREFETCH=y
- +# CONFIG_VTAG_ICACHE is not set
- +CONFIG_64BIT_PHYS_ADDR=y
- +# CONFIG_CPU_ADVANCED is not set
- +CONFIG_CPU_HAS_LLSC=y
- +# CONFIG_CPU_HAS_LLDSCD is not set
- +# CONFIG_CPU_HAS_WB is not set
- +CONFIG_CPU_HAS_SYNC=y
- +
- +#
- +# General setup
- +#
- +CONFIG_CPU_LITTLE_ENDIAN=y
- +# CONFIG_BUILD_ELF64 is not set
- +CONFIG_NET=y
- +CONFIG_PCI=y
- +CONFIG_PCI_NEW=y
- +CONFIG_PCI_AUTO=y
- +# CONFIG_PCI_NAMES is not set
- +# CONFIG_ISA is not set
- +# CONFIG_TC is not set
- +# CONFIG_MCA is not set
- +# CONFIG_SBUS is not set
- +CONFIG_HOTPLUG=y
- +
- +#
- +# PCMCIA/CardBus support
- +#
- +CONFIG_PCMCIA=m
- +# CONFIG_CARDBUS is not set
- +# CONFIG_TCIC is not set
- +# CONFIG_I82092 is not set
- +# CONFIG_I82365 is not set
- +CONFIG_PCMCIA_AU1X00=m
- +
- +#
- +# PCI Hotplug Support
- +#
- +# CONFIG_HOTPLUG_PCI is not set
- +# CONFIG_HOTPLUG_PCI_COMPAQ is not set
- +# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
- +# CONFIG_HOTPLUG_PCI_SHPC is not set
- +# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set
- +# CONFIG_HOTPLUG_PCI_PCIE is not set
- +# CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE 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_MIPS32_COMPAT is not set
- +# CONFIG_MIPS32_O32 is not set
- +# CONFIG_MIPS32_N32 is not set
- +# CONFIG_BINFMT_ELF32 is not set
- +# CONFIG_BINFMT_MISC is not set
- +# CONFIG_OOM_KILLER is not set
- +CONFIG_CMDLINE_BOOL=y
- +CONFIG_CMDLINE="mem=96M"
- +# CONFIG_PM 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_CISS_SCSI_TAPE is not set
- +# CONFIG_CISS_MONITOR_THREAD is not set
- +# CONFIG_BLK_DEV_DAC960 is not set
- +# CONFIG_BLK_DEV_UMEM is not set
- +# CONFIG_BLK_DEV_SX8 is not set
- +CONFIG_BLK_DEV_LOOP=y
- +# CONFIG_BLK_DEV_NBD is not set
- +# CONFIG_BLK_DEV_RAM is not set
- +# CONFIG_BLK_DEV_INITRD is not set
- +# CONFIG_BLK_STATS 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 is not set
- +# CONFIG_NETLINK_DEV is not set
- +CONFIG_NETFILTER=y
- +# CONFIG_NETFILTER_DEBUG is not set
- +CONFIG_FILTER=y
- +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
- +
- +#
- +# IP: Netfilter Configuration
- +#
- +# CONFIG_IP_NF_CONNTRACK is not set
- +# CONFIG_IP_NF_QUEUE is not set
- +# CONFIG_IP_NF_IPTABLES is not set
- +# CONFIG_IP_NF_ARPTABLES is not set
- +# CONFIG_IP_NF_COMPAT_IPCHAINS is not set
- +# CONFIG_IP_NF_COMPAT_IPFWADM is not set
- +
- +#
- +# IP: Virtual Server Configuration
- +#
- +# CONFIG_IP_VS is not set
- +# CONFIG_IPV6 is not set
- +# CONFIG_KHTTPD is not set
- +
- +#
- +# SCTP Configuration (EXPERIMENTAL)
- +#
- +# CONFIG_IP_SCTP 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
- +
- +#
- +# Network testing
- +#
- +# CONFIG_NET_PKTGEN 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_IDE_SATA is not set
- +CONFIG_BLK_DEV_IDEDISK=y
- +CONFIG_IDEDISK_MULTI_MODE=y
- +CONFIG_IDEDISK_STROKE=y
- +CONFIG_BLK_DEV_IDECS=m
- +# CONFIG_BLK_DEV_DELKIN 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
- +# CONFIG_IDE_TASK_IOCTL 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_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_ATARAID is not set
- +# CONFIG_BLK_DEV_ATARAID_PDC is not set
- +# CONFIG_BLK_DEV_ATARAID_HPT is not set
- +# CONFIG_BLK_DEV_ATARAID_MEDLEY is not set
- +# CONFIG_BLK_DEV_ATARAID_SII is not set
- +
- +#
- +# SCSI support
- +#
- +CONFIG_SCSI=y
- +
- +#
- +# SCSI support type (disk, tape, CD-ROM)
- +#
- +CONFIG_BLK_DEV_SD=y
- +CONFIG_SD_EXTRA_DEVS=40
- +CONFIG_CHR_DEV_ST=y
- +# CONFIG_CHR_DEV_OSST is not set
- +CONFIG_BLK_DEV_SR=y
- +# CONFIG_BLK_DEV_SR_VENDOR is not set
- +CONFIG_SR_EXTRA_DEVS=2
- +# CONFIG_CHR_DEV_SG is not set
- +
- +#
- +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
- +#
- +# CONFIG_SCSI_DEBUG_QUEUES is not set
- +# CONFIG_SCSI_MULTI_LUN is not set
- +CONFIG_SCSI_CONSTANTS=y
- +# CONFIG_SCSI_LOGGING is not set
- +
- +#
- +# SCSI low-level drivers
- +#
- +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
- +# CONFIG_SCSI_7000FASST is not set
- +# CONFIG_SCSI_ACARD is not set
- +# CONFIG_SCSI_AHA152X is not set
- +# CONFIG_SCSI_AHA1542 is not set
- +# CONFIG_SCSI_AHA1740 is not set
- +# CONFIG_SCSI_AACRAID is not set
- +# CONFIG_SCSI_AIC7XXX is not set
- +# CONFIG_SCSI_AIC79XX is not set
- +# CONFIG_SCSI_AIC7XXX_OLD is not set
- +# CONFIG_SCSI_DPT_I2O is not set
- +# CONFIG_SCSI_ADVANSYS is not set
- +# CONFIG_SCSI_IN2000 is not set
- +# CONFIG_SCSI_AM53C974 is not set
- +# CONFIG_SCSI_MEGARAID is not set
- +# CONFIG_SCSI_MEGARAID2 is not set
- +# CONFIG_SCSI_SATA is not set
- +# CONFIG_SCSI_SATA_AHCI is not set
- +# CONFIG_SCSI_SATA_SVW is not set
- +# CONFIG_SCSI_ATA_PIIX is not set
- +# CONFIG_SCSI_SATA_NV is not set
- +# CONFIG_SCSI_SATA_QSTOR is not set
- +# CONFIG_SCSI_SATA_PROMISE is not set
- +# CONFIG_SCSI_SATA_SX4 is not set
- +# CONFIG_SCSI_SATA_SIL is not set
- +# CONFIG_SCSI_SATA_SIS is not set
- +# CONFIG_SCSI_SATA_ULI is not set
- +# CONFIG_SCSI_SATA_VIA is not set
- +# CONFIG_SCSI_SATA_VITESSE is not set
- +# CONFIG_SCSI_BUSLOGIC is not set
- +# CONFIG_SCSI_CPQFCTS is not set
- +# CONFIG_SCSI_DMX3191D is not set
- +# CONFIG_SCSI_DTC3280 is not set
- +# CONFIG_SCSI_EATA is not set
- +# CONFIG_SCSI_EATA_DMA is not set
- +# CONFIG_SCSI_EATA_PIO is not set
- +# CONFIG_SCSI_FUTURE_DOMAIN is not set
- +# CONFIG_SCSI_GDTH is not set
- +# CONFIG_SCSI_GENERIC_NCR5380 is not set
- +# CONFIG_SCSI_INITIO is not set
- +# CONFIG_SCSI_INIA100 is not set
- +# CONFIG_SCSI_NCR53C406A is not set
- +# CONFIG_SCSI_NCR53C7xx is not set
- +# CONFIG_SCSI_SYM53C8XX_2 is not set
- +# CONFIG_SCSI_NCR53C8XX is not set
- +# CONFIG_SCSI_SYM53C8XX is not set
- +# CONFIG_SCSI_PAS16 is not set
- +# CONFIG_SCSI_PCI2000 is not set
- +# CONFIG_SCSI_PCI2220I is not set
- +# CONFIG_SCSI_PSI240I is not set
- +# CONFIG_SCSI_QLOGIC_FAS is not set
- +# CONFIG_SCSI_QLOGIC_ISP is not set
- +# CONFIG_SCSI_QLOGIC_FC is not set
- +# CONFIG_SCSI_QLOGIC_1280 is not set
- +# CONFIG_SCSI_SIM710 is not set
- +# CONFIG_SCSI_SYM53C416 is not set
- +# CONFIG_SCSI_DC390T is not set
- +# CONFIG_SCSI_T128 is not set
- +# CONFIG_SCSI_U14_34F is not set
- +# CONFIG_SCSI_NSP32 is not set
- +# CONFIG_SCSI_DEBUG is not set
- +
- +#
- +# PCMCIA SCSI adapter support
- +#
- +# CONFIG_SCSI_PCMCIA is not set
- +
- +#
- +# Fusion MPT device support
- +#
- +# CONFIG_FUSION is not set
- +# CONFIG_FUSION_BOOT is not set
- +# CONFIG_FUSION_ISENSE is not set
- +# CONFIG_FUSION_CTL is not set
- +# CONFIG_FUSION_LAN is not set
- +
- +#
- +# IEEE 1394 (FireWire) support (EXPERIMENTAL)
- +#
- +# CONFIG_IEEE1394 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_MIPS_AU1X00_ENET is not set
- +# 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 is not set
- +# CONFIG_NET_POCKET is not set
- +
- +#
- +# Ethernet (1000 Mbit)
- +#
- +# CONFIG_ACENIC is not set
- +# CONFIG_DL2K is not set
- +# CONFIG_E1000 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_R8169 is not set
- +# CONFIG_SK98LIN is not set
- +# CONFIG_TIGON3 is not set
- +# CONFIG_FDDI is not set
- +# CONFIG_HIPPI is not set
- +# CONFIG_PLIP is not set
- +CONFIG_PPP=m
- +CONFIG_PPP_MULTILINK=y
- +# CONFIG_PPP_FILTER is not set
- +CONFIG_PPP_ASYNC=m
- +# CONFIG_PPP_SYNC_TTY is not set
- +CONFIG_PPP_DEFLATE=m
- +# CONFIG_PPP_BSDCOMP is not set
- +CONFIG_PPPOE=m
- +# 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
- +
- +#
- +# PCMCIA network device support
- +#
- +# CONFIG_NET_PCMCIA 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
- +
- +#
- +# Input core support
- +#
- +CONFIG_INPUT=y
- +CONFIG_INPUT_KEYBDEV=y
- +CONFIG_INPUT_MOUSEDEV=y
- +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
- +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
- +# CONFIG_INPUT_JOYDEV is not set
- +CONFIG_INPUT_EVDEV=y
- +# CONFIG_INPUT_UINPUT is not set
- +
- +#
- +# Character devices
- +#
- +CONFIG_VT=y
- +# CONFIG_VT_CONSOLE is not set
- +# CONFIG_SERIAL is not set
- +# CONFIG_SERIAL_EXTENDED is not set
- +CONFIG_SERIAL_NONSTANDARD=y
- +# CONFIG_COMPUTONE is not set
- +# CONFIG_ROCKETPORT is not set
- +# CONFIG_CYCLADES is not set
- +# CONFIG_DIGIEPCA is not set
- +# CONFIG_DIGI is not set
- +# CONFIG_ESPSERIAL is not set
- +# CONFIG_MOXA_INTELLIO is not set
- +# CONFIG_MOXA_SMARTIO is not set
- +# CONFIG_ISI is not set
- +# CONFIG_SYNCLINK is not set
- +# CONFIG_SYNCLINKMP is not set
- +# CONFIG_N_HDLC is not set
- +# CONFIG_RISCOM8 is not set
- +# CONFIG_SPECIALIX is not set
- +# CONFIG_SX is not set
- +# CONFIG_RIO is not set
- +# CONFIG_STALDRV is not set
- +# CONFIG_SERIAL_TX3912 is not set
- +# CONFIG_SERIAL_TX3912_CONSOLE is not set
- +# CONFIG_SERIAL_TXX9 is not set
- +# CONFIG_SERIAL_TXX9_CONSOLE is not set
- +CONFIG_AU1X00_UART=y
- +CONFIG_AU1X00_SERIAL_CONSOLE=y
- +# CONFIG_AU1X00_USB_TTY is not set
- +# CONFIG_AU1X00_USB_RAW is not set
- +# CONFIG_TXX927_SERIAL is not set
- +CONFIG_UNIX98_PTYS=y
- +CONFIG_UNIX98_PTY_COUNT=256
- +
- +#
- +# I2C support
- +#
- +CONFIG_I2C=y
- +# CONFIG_I2C_ALGOBIT is not set
- +# CONFIG_SCx200_ACB is not set
- +# CONFIG_I2C_ALGOPCF is not set
- +# CONFIG_I2C_CHARDEV is not set
- +CONFIG_I2C_PROC=y
- +
- +#
- +# Mice
- +#
- +# CONFIG_BUSMOUSE is not set
- +# CONFIG_MOUSE is not set
- +
- +#
- +# Joysticks
- +#
- +# CONFIG_INPUT_GAMEPORT is not set
- +# CONFIG_INPUT_NS558 is not set
- +# CONFIG_INPUT_LIGHTNING is not set
- +# CONFIG_INPUT_PCIGAME is not set
- +# CONFIG_INPUT_CS461X is not set
- +# CONFIG_INPUT_EMU10K1 is not set
- +# CONFIG_INPUT_SERIO is not set
- +# CONFIG_INPUT_SERPORT is not set
- +
- +#
- +# Joysticks
- +#
- +# CONFIG_INPUT_ANALOG is not set
- +# CONFIG_INPUT_A3D is not set
- +# CONFIG_INPUT_ADI is not set
- +# CONFIG_INPUT_COBRA is not set
- +# CONFIG_INPUT_GF2K is not set
- +# CONFIG_INPUT_GRIP is not set
- +# CONFIG_INPUT_INTERACT is not set
- +# CONFIG_INPUT_TMDC is not set
- +# CONFIG_INPUT_SIDEWINDER is not set
- +# CONFIG_INPUT_IFORCE_USB is not set
- +# CONFIG_INPUT_IFORCE_232 is not set
- +# CONFIG_INPUT_WARRIOR is not set
- +# CONFIG_INPUT_MAGELLAN is not set
- +# CONFIG_INPUT_SPACEORB is not set
- +# CONFIG_INPUT_SPACEBALL is not set
- +# CONFIG_INPUT_STINGER is not set
- +# CONFIG_INPUT_DB9 is not set
- +# CONFIG_INPUT_GAMECON is not set
- +# CONFIG_INPUT_TURBOGRAFX is not set
- +# CONFIG_QIC02_TAPE is not set
- +# CONFIG_IPMI_HANDLER is not set
- +# CONFIG_IPMI_PANIC_EVENT is not set
- +# CONFIG_IPMI_DEVICE_INTERFACE is not set
- +# CONFIG_IPMI_KCS is not set
- +# CONFIG_IPMI_WATCHDOG is not set
- +
- +#
- +# Watchdog Cards
- +#
- +# CONFIG_WATCHDOG is not set
- +# CONFIG_SCx200 is not set
- +# CONFIG_SCx200_GPIO is not set
- +# CONFIG_AMD_PM768 is not set
- +# CONFIG_NVRAM is not set
- +# CONFIG_RTC is not set
- +# 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
- +
- +#
- +# Direct Rendering Manager (XFree86 DRI support)
- +#
- +# CONFIG_DRM is not set
- +
- +#
- +# PCMCIA character devices
- +#
- +# CONFIG_PCMCIA_SERIAL_CS is not set
- +# CONFIG_SYNCLINK_CS is not set
- +# CONFIG_AU1X00_GPIO is not set
- +# CONFIG_TS_AU1X00_ADS7846 is not set
- +
- +#
- +# File systems
- +#
- +# CONFIG_QUOTA is not set
- +# CONFIG_QFMT_V2 is not set
- +CONFIG_AUTOFS_FS=y
- +# CONFIG_AUTOFS4_FS is not set
- +# 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_HFSPLUS_FS is not set
- +# CONFIG_BEFS_FS is not set
- +# CONFIG_BEFS_DEBUG is not set
- +# CONFIG_BFS_FS is not set
- +CONFIG_EXT3_FS=y
- +CONFIG_JBD=y
- +# CONFIG_JBD_DEBUG is not set
- +CONFIG_FAT_FS=y
- +CONFIG_MSDOS_FS=y
- +# CONFIG_UMSDOS_FS is not set
- +CONFIG_VFAT_FS=y
- +# 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=y
- +CONFIG_RAMFS=y
- +# CONFIG_ISO9660_FS is not set
- +# CONFIG_JOLIET is not set
- +# CONFIG_ZISOFS is not set
- +# CONFIG_JFS_FS is not set
- +# CONFIG_JFS_DEBUG is not set
- +# CONFIG_JFS_STATISTICS 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
- +# CONFIG_XFS_FS is not set
- +# CONFIG_XFS_QUOTA is not set
- +# CONFIG_XFS_RT is not set
- +# CONFIG_XFS_TRACE is not set
- +# CONFIG_XFS_DEBUG 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=y
- +# CONFIG_NFS_DIRECTIO is not set
- +CONFIG_ROOT_NFS=y
- +# CONFIG_NFSD is not set
- +# CONFIG_NFSD_V3 is not set
- +# CONFIG_NFSD_TCP is not set
- +CONFIG_SUNRPC=y
- +CONFIG_LOCKD=y
- +CONFIG_LOCKD_V4=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
- +
- +#
- +# Partition Types
- +#
- +# CONFIG_PARTITION_ADVANCED is not set
- +CONFIG_MSDOS_PARTITION=y
- +# CONFIG_SMB_NLS is not set
- +CONFIG_NLS=y
- +
- +#
- +# Native Language Support
- +#
- +CONFIG_NLS_DEFAULT="iso8859-1"
- +# CONFIG_NLS_CODEPAGE_437 is not set
- +# CONFIG_NLS_CODEPAGE_737 is not set
- +# CONFIG_NLS_CODEPAGE_775 is not set
- +# CONFIG_NLS_CODEPAGE_850 is not set
- +# CONFIG_NLS_CODEPAGE_852 is not set
- +# CONFIG_NLS_CODEPAGE_855 is not set
- +# CONFIG_NLS_CODEPAGE_857 is not set
- +# CONFIG_NLS_CODEPAGE_860 is not set
- +# CONFIG_NLS_CODEPAGE_861 is not set
- +# CONFIG_NLS_CODEPAGE_862 is not set
- +# CONFIG_NLS_CODEPAGE_863 is not set
- +# CONFIG_NLS_CODEPAGE_864 is not set
- +# CONFIG_NLS_CODEPAGE_865 is not set
- +# CONFIG_NLS_CODEPAGE_866 is not set
- +# CONFIG_NLS_CODEPAGE_869 is not set
- +# CONFIG_NLS_CODEPAGE_936 is not set
- +# CONFIG_NLS_CODEPAGE_950 is not set
- +# CONFIG_NLS_CODEPAGE_932 is not set
- +# CONFIG_NLS_CODEPAGE_949 is not set
- +# CONFIG_NLS_CODEPAGE_874 is not set
- +# CONFIG_NLS_ISO8859_8 is not set
- +# CONFIG_NLS_CODEPAGE_1250 is not set
- +# CONFIG_NLS_CODEPAGE_1251 is not set
- +# CONFIG_NLS_ISO8859_1 is not set
- +# CONFIG_NLS_ISO8859_2 is not set
- +# CONFIG_NLS_ISO8859_3 is not set
- +# CONFIG_NLS_ISO8859_4 is not set
- +# CONFIG_NLS_ISO8859_5 is not set
- +# CONFIG_NLS_ISO8859_6 is not set
- +# CONFIG_NLS_ISO8859_7 is not set
- +# CONFIG_NLS_ISO8859_9 is not set
- +# CONFIG_NLS_ISO8859_13 is not set
- +# CONFIG_NLS_ISO8859_14 is not set
- +# CONFIG_NLS_ISO8859_15 is not set
- +# CONFIG_NLS_KOI8_R is not set
- +# CONFIG_NLS_KOI8_U is not set
- +# CONFIG_NLS_UTF8 is not set
- +
- +#
- +# Multimedia devices
- +#
- +# CONFIG_VIDEO_DEV is not set
- +
- +#
- +# Console drivers
- +#
- +# CONFIG_VGA_CONSOLE is not set
- +# CONFIG_MDA_CONSOLE is not set
- +
- +#
- +# Frame-buffer support
- +#
- +CONFIG_FB=y
- +CONFIG_DUMMY_CONSOLE=y
- +# CONFIG_FB_RIVA is not set
- +# CONFIG_FB_CLGEN is not set
- +# CONFIG_FB_PM2 is not set
- +# CONFIG_FB_PM3 is not set
- +# CONFIG_FB_CYBER2000 is not set
- +# CONFIG_FB_MATROX is not set
- +# CONFIG_FB_ATY is not set
- +# CONFIG_FB_RADEON is not set
- +# CONFIG_FB_ATY128 is not set
- +# CONFIG_FB_INTEL is not set
- +# CONFIG_FB_SIS is not set
- +# CONFIG_FB_NEOMAGIC is not set
- +# CONFIG_FB_3DFX is not set
- +# CONFIG_FB_VOODOO1 is not set
- +# CONFIG_FB_TRIDENT is not set
- +# CONFIG_FB_E1356 is not set
- +# CONFIG_FB_IT8181 is not set
- +# CONFIG_FB_VIRTUAL is not set
- +CONFIG_FBCON_ADVANCED=y
- +# CONFIG_FBCON_MFB is not set
- +# CONFIG_FBCON_CFB2 is not set
- +# CONFIG_FBCON_CFB4 is not set
- +# CONFIG_FBCON_CFB8 is not set
- +CONFIG_FBCON_CFB16=y
- +# CONFIG_FBCON_CFB24 is not set
- +CONFIG_FBCON_CFB32=y
- +# CONFIG_FBCON_AFB is not set
- +# CONFIG_FBCON_ILBM is not set
- +# CONFIG_FBCON_IPLAN2P2 is not set
- +# CONFIG_FBCON_IPLAN2P4 is not set
- +# CONFIG_FBCON_IPLAN2P8 is not set
- +# CONFIG_FBCON_MAC is not set
- +# CONFIG_FBCON_VGA_PLANES is not set
- +# CONFIG_FBCON_VGA is not set
- +# CONFIG_FBCON_HGA is not set
- +# CONFIG_FBCON_FONTWIDTH8_ONLY is not set
- +CONFIG_FBCON_FONTS=y
- +CONFIG_FONT_8x8=y
- +CONFIG_FONT_8x16=y
- +# CONFIG_FONT_SUN8x16 is not set
- +# CONFIG_FONT_SUN12x22 is not set
- +# CONFIG_FONT_6x11 is not set
- +# CONFIG_FONT_PEARL_8x8 is not set
- +# CONFIG_FONT_ACORN_8x8 is not set
- +
- +#
- +# Sound
- +#
- +CONFIG_SOUND=y
- +# CONFIG_SOUND_ALI5455 is not set
- +# CONFIG_SOUND_BT878 is not set
- +# CONFIG_SOUND_CMPCI is not set
- +# CONFIG_SOUND_EMU10K1 is not set
- +# 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_FORTE is not set
- +# CONFIG_SOUND_ICH is not set
- +# CONFIG_SOUND_RME96XX is not set
- +# CONFIG_SOUND_SONICVIBES is not set
- +# CONFIG_SOUND_AU1X00 is not set
- +CONFIG_SOUND_AU1550_PSC=y
- +# CONFIG_SOUND_AU1550_I2S 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_OSS is not set
- +# CONFIG_SOUND_TVMIXER is not set
- +# CONFIG_SOUND_AD1980 is not set
- +# CONFIG_SOUND_WM97XX is not set
- +
- +#
- +# USB support
- +#
- +CONFIG_USB=y
- +# CONFIG_USB_DEBUG is not set
- +
- +#
- +# Miscellaneous USB options
- +#
- +CONFIG_USB_DEVICEFS=y
- +# CONFIG_USB_BANDWIDTH is not set
- +
- +#
- +# USB Host Controller Drivers
- +#
- +# CONFIG_USB_EHCI_HCD is not set
- +# CONFIG_USB_UHCI is not set
- +# CONFIG_USB_UHCI_ALT is not set
- +CONFIG_USB_OHCI=y
- +
- +#
- +# USB Device Class drivers
- +#
- +# CONFIG_USB_AUDIO is not set
- +# CONFIG_USB_EMI26 is not set
- +# CONFIG_USB_BLUETOOTH is not set
- +# CONFIG_USB_MIDI is not set
- +CONFIG_USB_STORAGE=y
- +# 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_SDDR55 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)
- +#
- +CONFIG_USB_HID=y
- +CONFIG_USB_HIDINPUT=y
- +CONFIG_USB_HIDDEV=y
- +# CONFIG_USB_AIPTEK is not set
- +# CONFIG_USB_WACOM is not set
- +# CONFIG_USB_KBTAB is not set
- +# CONFIG_USB_POWERMATE is not set
- +
- +#
- +# 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_RTL8150 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
- +
- +#
- +# USB Miscellaneous drivers
- +#
- +# CONFIG_USB_RIO500 is not set
- +# CONFIG_USB_AUERSWALD is not set
- +# CONFIG_USB_TIGL is not set
- +# CONFIG_USB_BRLVGER is not set
- +# CONFIG_USB_LCD is not set
- +
- +#
- +# Support for USB gadgets
- +#
- +# CONFIG_USB_GADGET is not set
- +
- +#
- +# Bluetooth support
- +#
- +# CONFIG_BLUEZ is not set
- +
- +#
- +# Kernel hacking
- +#
- +CONFIG_CROSSCOMPILE=y
- +# CONFIG_RUNTIME_DEBUG is not set
- +# CONFIG_KGDB is not set
- +# CONFIG_GDB_CONSOLE is not set
- +# CONFIG_DEBUG_INFO is not set
- +# CONFIG_MAGIC_SYSRQ is not set
- +# CONFIG_MIPS_UNCACHED is not set
- +CONFIG_LOG_BUF_SHIFT=0
- +
- +#
- +# Cryptographic options
- +#
- +# CONFIG_CRYPTO is not set
- +
- +#
- +# Library routines
- +#
- +# CONFIG_CRC32 is not set
- +CONFIG_ZLIB_INFLATE=m
- +CONFIG_ZLIB_DEFLATE=m
- +# CONFIG_FW_LOADER is not set
- --- a/arch/mips/defconfig-pb1500
- +++ b/arch/mips/defconfig-pb1500
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- CONFIG_MIPS_PB1500=y
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -215,9 +215,7 @@ CONFIG_MTD_PB1500=y
- # CONFIG_MTD_MTX1 is not set
- CONFIG_MTD_PB1500_BOOT=y
- # CONFIG_MTD_PB1500_USER is not set
- -# CONFIG_MTD_DB1X00 is not set
- # CONFIG_MTD_PB1550 is not set
- -# CONFIG_MTD_HYDROGEN3 is not set
- # CONFIG_MTD_MIRAGE is not set
- # CONFIG_MTD_CSTM_MIPS_IXX is not set
- # CONFIG_MTD_OCELOT is not set
- @@ -236,7 +234,6 @@ CONFIG_MTD_PB1500_BOOT=y
- #
- # 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
- @@ -341,11 +338,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -675,7 +667,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
- # CONFIG_AU1X00_USB_TTY is not set
- # CONFIG_AU1X00_USB_RAW is not set
- # CONFIG_TXX927_SERIAL is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips/defconfig-pb1550
- +++ b/arch/mips/defconfig-pb1550
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- CONFIG_MIPS_PB1550=y
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -213,11 +213,9 @@ CONFIG_MTD_CFI_AMDSTD=y
- # CONFIG_MTD_BOSPORUS is not set
- # CONFIG_MTD_XXS1500 is not set
- # CONFIG_MTD_MTX1 is not set
- -# CONFIG_MTD_DB1X00 is not set
- CONFIG_MTD_PB1550=y
- CONFIG_MTD_PB1550_BOOT=y
- CONFIG_MTD_PB1550_USER=y
- -# CONFIG_MTD_HYDROGEN3 is not set
- # CONFIG_MTD_MIRAGE is not set
- # CONFIG_MTD_CSTM_MIPS_IXX is not set
- # CONFIG_MTD_OCELOT is not set
- @@ -236,7 +234,6 @@ CONFIG_MTD_PB1550_USER=y
- #
- # 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
- @@ -343,11 +340,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -633,7 +625,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
- # CONFIG_AU1X00_USB_TTY is not set
- # CONFIG_AU1X00_USB_RAW is not set
- # CONFIG_TXX927_SERIAL is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips/defconfig-rbtx4927
- +++ b/arch/mips/defconfig-rbtx4927
- @@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -223,11 +223,6 @@ CONFIG_IP_PNP_DHCP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -466,7 +461,6 @@ CONFIG_SERIAL_NONSTANDARD=y
- CONFIG_SERIAL_TXX9=y
- CONFIG_SERIAL_TXX9_CONSOLE=y
- # CONFIG_TXX927_SERIAL is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- # CONFIG_UNIX98_PTYS is not set
-
- #
- --- a/arch/mips/defconfig-rm200
- +++ b/arch/mips/defconfig-rm200
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -229,11 +229,6 @@ CONFIG_INET=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -340,7 +335,6 @@ CONFIG_VT_CONSOLE=y
- # CONFIG_SERIAL is not set
- # CONFIG_SERIAL_EXTENDED is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips/defconfig-sb1250-swarm
- +++ b/arch/mips/defconfig-sb1250-swarm
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -90,6 +90,7 @@ CONFIG_SIBYTE_CFE=y
- # CONFIG_SIBYTE_TBPROF is not set
- CONFIG_SIBYTE_GENBUS_IDE=y
- CONFIG_SMP_CAPABLE=y
- +CONFIG_MIPS_RTC=y
- # CONFIG_SNI_RM200_PCI is not set
- # CONFIG_TANBAC_TB0226 is not set
- # CONFIG_TANBAC_TB0229 is not set
- @@ -253,11 +254,6 @@ CONFIG_INET=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -469,7 +465,6 @@ CONFIG_SERIAL_NONSTANDARD=y
- CONFIG_SIBYTE_SB1250_DUART=y
- CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y
- CONFIG_SERIAL_CONSOLE=y
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips/defconfig-sead
- +++ b/arch/mips/defconfig-sead
- @@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -244,7 +244,6 @@ CONFIG_SERIAL=y
- CONFIG_SERIAL_CONSOLE=y
- # CONFIG_SERIAL_EXTENDED is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- # CONFIG_UNIX98_PTYS is not set
-
- #
- --- a/arch/mips/defconfig-stretch
- +++ b/arch/mips/defconfig-stretch
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -240,11 +240,6 @@ CONFIG_IP_PNP_DHCP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -324,9 +319,11 @@ CONFIG_CHR_DEV_SG=y
- # CONFIG_SCSI_MEGARAID is not set
- # CONFIG_SCSI_MEGARAID2 is not set
- # CONFIG_SCSI_SATA is not set
- +# CONFIG_SCSI_SATA_AHCI is not set
- # CONFIG_SCSI_SATA_SVW is not set
- # CONFIG_SCSI_ATA_PIIX is not set
- # CONFIG_SCSI_SATA_NV is not set
- +# CONFIG_SCSI_SATA_QSTOR is not set
- # CONFIG_SCSI_SATA_PROMISE is not set
- # CONFIG_SCSI_SATA_SX4 is not set
- # CONFIG_SCSI_SATA_SIL is not set
- @@ -516,7 +513,6 @@ CONFIG_SERIAL_NONSTANDARD=y
- # CONFIG_SERIAL_TXX9 is not set
- # CONFIG_SERIAL_TXX9_CONSOLE is not set
- # CONFIG_TXX927_SERIAL is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips/defconfig-tb0226
- +++ b/arch/mips/defconfig-tb0226
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -228,11 +228,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -312,9 +307,11 @@ CONFIG_SCSI_CONSTANTS=y
- # CONFIG_SCSI_MEGARAID is not set
- # CONFIG_SCSI_MEGARAID2 is not set
- # CONFIG_SCSI_SATA is not set
- +# CONFIG_SCSI_SATA_AHCI is not set
- # CONFIG_SCSI_SATA_SVW is not set
- # CONFIG_SCSI_ATA_PIIX is not set
- # CONFIG_SCSI_SATA_NV is not set
- +# CONFIG_SCSI_SATA_QSTOR is not set
- # CONFIG_SCSI_SATA_PROMISE is not set
- # CONFIG_SCSI_SATA_SX4 is not set
- # CONFIG_SCSI_SATA_SIL is not set
- @@ -518,7 +515,6 @@ CONFIG_SERIAL=y
- CONFIG_SERIAL_CONSOLE=y
- # CONFIG_SERIAL_EXTENDED is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- # CONFIG_VR41XX_KIU is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
- --- a/arch/mips/defconfig-tb0229
- +++ b/arch/mips/defconfig-tb0229
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -230,11 +230,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -445,7 +440,6 @@ CONFIG_SERIAL=y
- CONFIG_SERIAL_CONSOLE=y
- # CONFIG_SERIAL_EXTENDED is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- # CONFIG_VR41XX_KIU is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
- --- a/arch/mips/defconfig-ti1500
- +++ b/arch/mips/defconfig-ti1500
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- CONFIG_MIPS_XXS1500=y
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -213,9 +213,7 @@ CONFIG_MTD_CFI_AMDSTD=y
- # CONFIG_MTD_BOSPORUS is not set
- CONFIG_MTD_XXS1500=y
- # CONFIG_MTD_MTX1 is not set
- -# CONFIG_MTD_DB1X00 is not set
- # CONFIG_MTD_PB1550 is not set
- -# CONFIG_MTD_HYDROGEN3 is not set
- # CONFIG_MTD_MIRAGE is not set
- # CONFIG_MTD_CSTM_MIPS_IXX is not set
- # CONFIG_MTD_OCELOT is not set
- @@ -234,7 +232,6 @@ CONFIG_MTD_XXS1500=y
- #
- # 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
- @@ -339,11 +336,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -600,7 +592,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
- # CONFIG_AU1X00_USB_TTY is not set
- # CONFIG_AU1X00_USB_RAW is not set
- # CONFIG_TXX927_SERIAL is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips/defconfig-workpad
- +++ b/arch/mips/defconfig-workpad
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -222,11 +222,6 @@ CONFIG_IP_MULTICAST=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -426,7 +421,6 @@ CONFIG_SERIAL_MANY_PORTS=y
- # CONFIG_SERIAL_MULTIPORT is not set
- # CONFIG_HUB6 is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- # CONFIG_VR41XX_KIU is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
- --- a/arch/mips/defconfig-xxs1500
- +++ b/arch/mips/defconfig-xxs1500
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- CONFIG_MIPS_XXS1500=y
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -213,9 +213,7 @@ CONFIG_MTD_CFI_AMDSTD=y
- # CONFIG_MTD_BOSPORUS is not set
- CONFIG_MTD_XXS1500=y
- # CONFIG_MTD_MTX1 is not set
- -# CONFIG_MTD_DB1X00 is not set
- # CONFIG_MTD_PB1550 is not set
- -# CONFIG_MTD_HYDROGEN3 is not set
- # CONFIG_MTD_MIRAGE is not set
- # CONFIG_MTD_CSTM_MIPS_IXX is not set
- # CONFIG_MTD_OCELOT is not set
- @@ -234,7 +232,6 @@ CONFIG_MTD_XXS1500=y
- #
- # 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
- @@ -339,11 +336,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -671,7 +663,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
- # CONFIG_AU1X00_USB_TTY is not set
- # CONFIG_AU1X00_USB_RAW is not set
- # CONFIG_TXX927_SERIAL is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips/defconfig-yosemite
- +++ b/arch/mips/defconfig-yosemite
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -227,11 +227,6 @@ CONFIG_IP_PNP_DHCP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -310,9 +305,11 @@ CONFIG_CHR_DEV_SG=y
- # CONFIG_SCSI_MEGARAID is not set
- # CONFIG_SCSI_MEGARAID2 is not set
- # CONFIG_SCSI_SATA is not set
- +# CONFIG_SCSI_SATA_AHCI is not set
- # CONFIG_SCSI_SATA_SVW is not set
- # CONFIG_SCSI_ATA_PIIX is not set
- # CONFIG_SCSI_SATA_NV is not set
- +# CONFIG_SCSI_SATA_QSTOR is not set
- # CONFIG_SCSI_SATA_PROMISE is not set
- # CONFIG_SCSI_SATA_SX4 is not set
- # CONFIG_SCSI_SATA_SIL is not set
- @@ -477,7 +474,6 @@ CONFIG_SERIAL_NONSTANDARD=y
- # CONFIG_SERIAL_TXX9 is not set
- # CONFIG_SERIAL_TXX9_CONSOLE is not set
- # CONFIG_TXX927_SERIAL is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips/kernel/cpu-probe.c
- +++ b/arch/mips/kernel/cpu-probe.c
- @@ -34,21 +34,16 @@ static void r4k_wait(void)
- ".set\tmips0");
- }
-
- -/* The Au1xxx wait is available only if we run CONFIG_PM and
- - * the timer setup found we had a 32KHz counter available.
- - * There are still problems with functions that may call au1k_wait
- - * directly, but that will be discovered pretty quickly.
- - */
- -extern void (*au1k_wait_ptr)(void);
- -void au1k_wait(void)
- +/* The Au1xxx wait is available only if using 32khz counter or
- + * external timer source, but specifically not CP0 Counter. */
- +int allow_au1k_wait;
- +
- +static void au1k_wait(void)
- {
- -#ifdef CONFIG_PM
- - unsigned long addr;
- /* using the wait instruction makes CP0 counter unusable */
- - __asm__("la %0,au1k_wait\n\t"
- - ".set mips3\n\t"
- - "cache 0x14,0(%0)\n\t"
- - "cache 0x14,32(%0)\n\t"
- + __asm__(".set mips3\n\t"
- + "cache 0x14, 0(%0)\n\t"
- + "cache 0x14, 32(%0)\n\t"
- "sync\n\t"
- "nop\n\t"
- "wait\n\t"
- @@ -57,11 +52,7 @@ void au1k_wait(void)
- "nop\n\t"
- "nop\n\t"
- ".set mips0\n\t"
- - : : "r" (addr));
- -#else
- - __asm__("nop\n\t"
- - "nop");
- -#endif
- + : : "r" (au1k_wait));
- }
-
- static inline void check_wait(void)
- @@ -100,20 +91,17 @@ static inline void check_wait(void)
- cpu_wait = r4k_wait;
- printk(" available.\n");
- break;
- -#ifdef CONFIG_PM
- case CPU_AU1000:
- case CPU_AU1100:
- case CPU_AU1500:
- case CPU_AU1550:
- - if (au1k_wait_ptr != NULL) {
- - cpu_wait = au1k_wait_ptr;
- + case CPU_AU1200:
- + if (allow_au1k_wait) {
- + cpu_wait = au1k_wait;
- printk(" available.\n");
- - }
- - else {
- + } else
- printk(" unavailable.\n");
- - }
- break;
- -#endif
- default:
- printk(" unavailable.\n");
- break;
- --- a/arch/mips/kernel/head.S
- +++ b/arch/mips/kernel/head.S
- @@ -43,9 +43,9 @@
-
- /* Cache Error */
- LEAF(except_vec2_generic)
- + .set push
- .set noreorder
- .set noat
- - .set mips0
- /*
- * This is a very bad place to be. Our cache error
- * detection has triggered. If we have write-back data
- @@ -64,10 +64,9 @@
-
- j cache_parity_error
- nop
- + .set pop
- END(except_vec2_generic)
-
- - .set at
- -
- /*
- * Special interrupt vector for embedded MIPS. This is a
- * dedicated interrupt vector which reduces interrupt processing
- @@ -76,8 +75,11 @@
- * size!
- */
- NESTED(except_vec4, 0, sp)
- + .set push
- + .set noreorder
- 1: j 1b /* Dummy, will be replaced */
- nop
- + .set pop
- END(except_vec4)
-
- /*
- @@ -87,8 +89,11 @@
- * unconditional jump to this vector.
- */
- NESTED(except_vec_ejtag_debug, 0, sp)
- + .set push
- + .set noreorder
- j ejtag_debug_handler
- nop
- + .set pop
- END(except_vec_ejtag_debug)
-
- __FINIT
- @@ -97,6 +102,7 @@
- * EJTAG debug exception handler.
- */
- NESTED(ejtag_debug_handler, PT_SIZE, sp)
- + .set push
- .set noat
- .set noreorder
- mtc0 k0, CP0_DESAVE
- @@ -120,7 +126,7 @@ ejtag_return:
- deret
- .set mips0
- nop
- - .set at
- + .set pop
- END(ejtag_debug_handler)
-
- __INIT
- @@ -132,13 +138,17 @@ ejtag_return:
- * unconditional jump to this vector.
- */
- NESTED(except_vec_nmi, 0, sp)
- + .set push
- + .set noreorder
- j nmi_handler
- nop
- + .set pop
- END(except_vec_nmi)
-
- __FINIT
-
- NESTED(nmi_handler, PT_SIZE, sp)
- + .set push
- .set noat
- .set noreorder
- .set mips3
- @@ -147,8 +157,7 @@ ejtag_return:
- move a0, sp
- RESTORE_ALL
- eret
- - .set at
- - .set mips0
- + .set pop
- END(nmi_handler)
-
- __INIT
- @@ -157,7 +166,20 @@ ejtag_return:
- * Kernel entry point
- */
- NESTED(kernel_entry, 16, sp)
- + .set push
- + /*
- + * For the moment disable interrupts and mark the kernel mode.
- + * A full initialization of the CPU's status register is done
- + * later in per_cpu_trap_init().
- + */
- + mfc0 t0, CP0_STATUS
- + or t0, ST0_CU0|0x1f
- + xor t0, 0x1f
- + mtc0 t0, CP0_STATUS
- +
- .set noreorder
- + sll zero,3 # ehb
- + .set reorder
-
- /*
- * The firmware/bootloader passes argc/argp/envp
- @@ -170,8 +192,8 @@ ejtag_return:
- la t1, (_end - 4)
- 1:
- addiu t0, 4
- + sw zero, (t0)
- bne t0, t1, 1b
- - sw zero, (t0)
-
- /*
- * Stack for kernel and init, current variable
- @@ -182,7 +204,7 @@ ejtag_return:
- sw t0, kernelsp
-
- jal init_arch
- - nop
- + .set pop
- END(kernel_entry)
-
-
- @@ -193,17 +215,26 @@ ejtag_return:
- * function after setting up the stack and gp registers.
- */
- LEAF(smp_bootstrap)
- - .set push
- - .set noreorder
- - mtc0 zero, CP0_WIRED
- - CLI
- + .set push
- + /*
- + * For the moment disable interrupts and bootstrap exception
- + * vectors and mark the kernel mode. A full initialization of
- + * the CPU's status register is done later in
- + * per_cpu_trap_init().
- + */
- mfc0 t0, CP0_STATUS
- - li t1, ~(ST0_CU1|ST0_CU2|ST0_CU3|ST0_KX|ST0_SX|ST0_UX)
- - and t0, t1
- - or t0, (ST0_CU0);
- + or t0, ST0_CU0|ST0_BEV|0x1f
- + xor t0, ST0_BEV|0x1f
- + mtc0 t0, CP0_STATUS
- +
- + .set noreorder
- + sll zero,3 # ehb
- + .set reorder
- +
- + mtc0 zero, CP0_WIRED
- +
- jal start_secondary
- - mtc0 t0, CP0_STATUS
- - .set pop
- + .set pop
- END(smp_bootstrap)
- #endif
-
- --- a/arch/mips/kernel/process.c
- +++ b/arch/mips/kernel/process.c
- @@ -128,6 +128,26 @@ int dump_fpu(struct pt_regs *regs, elf_f
- return 1;
- }
-
- +void dump_regs(elf_greg_t *gp, struct pt_regs *regs)
- +{
- + int i;
- +
- + for (i = 0; i < EF_REG0; i++)
- + gp[i] = 0;
- + gp[EF_REG0] = 0;
- + for (i = 1; i <= 31; i++)
- + gp[EF_REG0 + i] = regs->regs[i];
- + gp[EF_REG26] = 0;
- + gp[EF_REG27] = 0;
- + gp[EF_LO] = regs->lo;
- + gp[EF_HI] = regs->hi;
- + gp[EF_CP0_EPC] = regs->cp0_epc;
- + gp[EF_CP0_BADVADDR] = regs->cp0_badvaddr;
- + gp[EF_CP0_STATUS] = regs->cp0_status;
- + gp[EF_CP0_CAUSE] = regs->cp0_cause;
- + gp[EF_UNUSED0] = 0;
- +}
- +
- /*
- * Create a kernel thread
- */
- --- a/arch/mips/kernel/scall_o32.S
- +++ b/arch/mips/kernel/scall_o32.S
- @@ -121,15 +121,14 @@ reschedule:
-
- trace_a_syscall:
- SAVE_STATIC
- - sw t2, PT_R1(sp)
- + move s0, t2
- jal syscall_trace
- - lw t2, PT_R1(sp)
-
- lw a0, PT_R4(sp) # Restore argument registers
- lw a1, PT_R5(sp)
- lw a2, PT_R6(sp)
- lw a3, PT_R7(sp)
- - jalr t2
- + jalr s0
-
- li t0, -EMAXERRNO - 1 # error?
- sltu t0, t0, v0
- --- a/arch/mips/kernel/setup.c
- +++ b/arch/mips/kernel/setup.c
- @@ -5,7 +5,7 @@
- *
- * Copyright (C) 1995 Linus Torvalds
- * Copyright (C) 1995 Waldorf Electronics
- - * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001 Ralf Baechle
- + * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 01, 05 Ralf Baechle
- * Copyright (C) 1996 Stoned Elipot
- * Copyright (C) 2000, 2001, 2002 Maciej W. Rozycki
- */
- @@ -71,6 +71,8 @@ extern void * __rd_start, * __rd_end;
- extern struct rtc_ops no_rtc_ops;
- struct rtc_ops *rtc_ops;
-
- +EXPORT_SYMBOL(rtc_ops);
- +
- #ifdef CONFIG_PC_KEYB
- struct kbd_ops *kbd_ops;
- #endif
- @@ -132,10 +134,6 @@ init_arch(int argc, char **argv, char **
- */
- load_mmu();
-
- - /* Disable coprocessors and set FPU for 16/32 FPR register model */
- - clear_c0_status(ST0_CU1|ST0_CU2|ST0_CU3|ST0_KX|ST0_SX|ST0_FR);
- - set_c0_status(ST0_CU0);
- -
- start_kernel();
- }
-
- --- a/arch/mips/kernel/traps.c
- +++ b/arch/mips/kernel/traps.c
- @@ -452,9 +452,10 @@ static inline void simulate_ll(struct pt
- }
- ll_task = current;
-
- + compute_return_epc(regs);
- +
- regs->regs[(opcode & RT) >> 16] = value;
-
- - compute_return_epc(regs);
- return;
-
- sig:
- @@ -485,8 +486,8 @@ static inline void simulate_sc(struct pt
- goto sig;
- }
- if (ll_bit == 0 || ll_task != current) {
- - regs->regs[reg] = 0;
- compute_return_epc(regs);
- + regs->regs[reg] = 0;
- return;
- }
-
- @@ -495,9 +496,9 @@ static inline void simulate_sc(struct pt
- goto sig;
- }
-
- + compute_return_epc(regs);
- regs->regs[reg] = 1;
-
- - compute_return_epc(regs);
- return;
-
- sig:
- @@ -887,12 +888,18 @@ extern asmlinkage int fpu_emulator_resto
- void __init per_cpu_trap_init(void)
- {
- unsigned int cpu = smp_processor_id();
- + unsigned int status_set = ST0_CU0;
-
- - /* Some firmware leaves the BEV flag set, clear it. */
- - clear_c0_status(ST0_CU3|ST0_CU2|ST0_CU1|ST0_BEV|ST0_KX|ST0_SX|ST0_UX);
- -
- + /*
- + * Disable coprocessors and 64-bit addressing and set FPU for
- + * the 16/32 FPR register model. Reset the BEV flag that some
- + * firmware may have left set and the TS bit (for IP27). Set
- + * XX for ISA IV code to work.
- + */
- if (current_cpu_data.isa_level == MIPS_CPU_ISA_IV)
- - set_c0_status(ST0_XX);
- + status_set |= ST0_XX;
- + change_c0_status(ST0_CU|ST0_FR|ST0_BEV|ST0_TS|ST0_KX|ST0_SX|ST0_UX,
- + status_set);
-
- /*
- * Some MIPS CPUs have a dedicated interrupt vector which reduces the
- @@ -902,7 +909,7 @@ void __init per_cpu_trap_init(void)
- set_c0_cause(CAUSEF_IV);
-
- cpu_data[cpu].asid_cache = ASID_FIRST_VERSION;
- - write_c0_context(cpu << 23);
- + TLBMISS_HANDLER_SETUP();
-
- atomic_inc(&init_mm.mm_count);
- current->active_mm = &init_mm;
- @@ -918,8 +925,6 @@ void __init trap_init(void)
- extern char except_vec4;
- unsigned long i;
-
- - per_cpu_trap_init();
- -
- /* Copy the generic exception handler code to it's final destination. */
- memcpy((void *)(KSEG0 + 0x80), &except_vec1_generic, 0x80);
-
- @@ -1020,10 +1025,5 @@ void __init trap_init(void)
-
- flush_icache_range(KSEG0, KSEG0 + 0x400);
-
- - atomic_inc(&init_mm.mm_count); /* XXX UP? */
- - current->active_mm = &init_mm;
- -
- - /* XXX Must be done for all CPUs */
- - current_cpu_data.asid_cache = ASID_FIRST_VERSION;
- - TLBMISS_HANDLER_SETUP();
- + per_cpu_trap_init();
- }
- --- a/arch/mips/lib/rtc-no.c
- +++ b/arch/mips/lib/rtc-no.c
- @@ -6,10 +6,9 @@
- * Stub RTC routines to keep Linux from crashing on machine which don't
- * have a RTC chip.
- *
- - * Copyright (C) 1998, 2001 by Ralf Baechle
- + * Copyright (C) 1998, 2001, 2005 by Ralf Baechle
- */
- #include <linux/kernel.h>
- -#include <linux/module.h>
- #include <linux/mc146818rtc.h>
-
- static unsigned int shouldnt_happen(void)
- @@ -29,5 +28,3 @@ struct rtc_ops no_rtc_ops = {
- .rtc_write_data = (void *) &shouldnt_happen,
- .rtc_bcd_mode = (void *) &shouldnt_happen
- };
- -
- -EXPORT_SYMBOL(rtc_ops);
- --- a/arch/mips/lib/rtc-std.c
- +++ b/arch/mips/lib/rtc-std.c
- @@ -5,9 +5,8 @@
- *
- * RTC routines for PC style attached Dallas chip.
- *
- - * Copyright (C) 1998, 2001 by Ralf Baechle
- + * Copyright (C) 1998, 2001, 05 by Ralf Baechle
- */
- -#include <linux/module.h>
- #include <linux/mc146818rtc.h>
- #include <asm/io.h>
-
- @@ -33,5 +32,3 @@ struct rtc_ops std_rtc_ops = {
- &std_rtc_write_data,
- &std_rtc_bcd_mode
- };
- -
- -EXPORT_SYMBOL(rtc_ops);
- --- a/arch/mips/Makefile
- +++ b/arch/mips/Makefile
- @@ -209,7 +209,7 @@ LOADADDR := 0x80080000
- endif
-
- #
- -# Au1000 (Alchemy Semi PB1000) eval board
- +# Au1x AMD Alchemy eval boards
- #
- ifdef CONFIG_MIPS_PB1000
- LIBS += arch/mips/au1000/pb1000/pb1000.o \
- @@ -218,9 +218,6 @@ SUBDIRS += arch/mips/au1000/pb1000 arch
- LOADADDR := 0x80100000
- endif
-
- -#
- -# Au1100 (Alchemy Semi PB1100) eval board
- -#
- ifdef CONFIG_MIPS_PB1100
- LIBS += arch/mips/au1000/pb1100/pb1100.o \
- arch/mips/au1000/common/au1000.o
- @@ -228,9 +225,6 @@ SUBDIRS += arch/mips/au1000/pb1100
- LOADADDR += 0x80100000
- endif
-
- -#
- -# Au1500 (Alchemy Semi PB1500) eval board
- -#
- ifdef CONFIG_MIPS_PB1500
- LIBS += arch/mips/au1000/pb1500/pb1500.o \
- arch/mips/au1000/common/au1000.o
- @@ -238,9 +232,6 @@ SUBDIRS += arch/mips/au1000/pb1500 arch
- LOADADDR := 0x80100000
- endif
-
- -#
- -# Au1x00 (AMD/Alchemy) eval boards
- -#
- ifdef CONFIG_MIPS_DB1000
- LIBS += arch/mips/au1000/db1x00/db1x00.o \
- arch/mips/au1000/common/au1000.o
- @@ -311,6 +302,27 @@ SUBDIRS += arch/mips/au1000/pb1550
- LOADADDR += 0x80100000
- endif
-
- +ifdef CONFIG_MIPS_PB1200
- +LIBS += arch/mips/au1000/pb1200/pb1200.o \
- + arch/mips/au1000/common/au1000.o
- +SUBDIRS += arch/mips/au1000/pb1200 arch/mips/au1000/common
- +LOADADDR += 0x80100000
- +endif
- +
- +ifdef CONFIG_MIPS_DB1200
- +LIBS += arch/mips/au1000/pb1200/pb1200.o \
- + arch/mips/au1000/common/au1000.o
- +SUBDIRS += arch/mips/au1000/pb1200 arch/mips/au1000/common
- +LOADADDR += 0x80100000
- +endif
- +
- +ifdef CONFIG_MIPS_FICMMP
- +LIBS += arch/mips/au1000/ficmmp/ficmmp.o \
- + arch/mips/au1000/common/au1000.o
- +SUBDIRS += arch/mips/au1000/ficmmp arch/mips/au1000/common
- +LOADADDR += 0x80100000
- +endif
- +
-
- #
- # Cogent CSB250
- --- a/arch/mips/mm/cerr-sb1.c
- +++ b/arch/mips/mm/cerr-sb1.c
- @@ -252,14 +252,14 @@ static const uint8_t parity[256] = {
-
- /* Masks to select bits for Hamming parity, mask_72_64[i] for bit[i] */
- static const uint64_t mask_72_64[8] = {
- - 0x0738C808099264FFL,
- - 0x38C808099264FF07L,
- - 0xC808099264FF0738L,
- - 0x08099264FF0738C8L,
- - 0x099264FF0738C808L,
- - 0x9264FF0738C80809L,
- - 0x64FF0738C8080992L,
- - 0xFF0738C808099264L
- + 0x0738C808099264FFULL,
- + 0x38C808099264FF07ULL,
- + 0xC808099264FF0738ULL,
- + 0x08099264FF0738C8ULL,
- + 0x099264FF0738C808ULL,
- + 0x9264FF0738C80809ULL,
- + 0x64FF0738C8080992ULL,
- + 0xFF0738C808099264ULL
- };
-
- /* Calculate the parity on a range of bits */
- @@ -331,9 +331,9 @@ static uint32_t extract_ic(unsigned shor
- ((lru >> 4) & 0x3),
- ((lru >> 6) & 0x3));
- }
- - va = (taglo & 0xC0000FFFFFFFE000) | addr;
- + va = (taglo & 0xC0000FFFFFFFE000ULL) | addr;
- if ((taglo & (1 << 31)) && (((taglo >> 62) & 0x3) == 3))
- - va |= 0x3FFFF00000000000;
- + va |= 0x3FFFF00000000000ULL;
- valid = ((taghi >> 29) & 1);
- if (valid) {
- tlo_tmp = taglo & 0xfff3ff;
- @@ -474,7 +474,7 @@ static uint32_t extract_dc(unsigned shor
- : "r" ((way << 13) | addr));
-
- taglo = ((unsigned long long)taglohi << 32) | taglolo;
- - pa = (taglo & 0xFFFFFFE000) | addr;
- + pa = (taglo & 0xFFFFFFE000ULL) | addr;
- if (way == 0) {
- lru = (taghi >> 14) & 0xff;
- prom_printf("[Bank %d Set 0x%02x] LRU > %d %d %d %d > MRU\n",
- --- a/arch/mips/mm/c-r4k.c
- +++ b/arch/mips/mm/c-r4k.c
- @@ -867,9 +867,16 @@ static void __init probe_pcache(void)
- * normally they'd suffer from aliases but magic in the hardware deals
- * with that for us so we don't need to take care ourselves.
- */
- - if (c->cputype != CPU_R10000 && c->cputype != CPU_R12000)
- - if (c->dcache.waysize > PAGE_SIZE)
- - c->dcache.flags |= MIPS_CACHE_ALIASES;
- + switch (c->cputype) {
- + case CPU_R10000:
- + case CPU_R12000:
- + break;
- + case CPU_24K:
- + if (!(read_c0_config7() & (1 << 16)))
- + default:
- + if (c->dcache.waysize > PAGE_SIZE)
- + c->dcache.flags |= MIPS_CACHE_ALIASES;
- + }
-
- switch (c->cputype) {
- case CPU_20KC:
- @@ -1069,9 +1076,6 @@ void __init ld_mmu_r4xx0(void)
- probe_pcache();
- setup_scache();
-
- - if (c->dcache.sets * c->dcache.ways > PAGE_SIZE)
- - c->dcache.flags |= MIPS_CACHE_ALIASES;
- -
- r4k_blast_dcache_page_setup();
- r4k_blast_dcache_page_indexed_setup();
- r4k_blast_dcache_setup();
- --- a/arch/mips/mm/tlbex-mips32.S
- +++ b/arch/mips/mm/tlbex-mips32.S
- @@ -196,7 +196,7 @@
- .set noat; \
- SAVE_ALL; \
- mfc0 a2, CP0_BADVADDR; \
- - STI; \
- + KMODE; \
- .set at; \
- move a0, sp; \
- jal do_page_fault; \
- --- a/arch/mips/mm/tlbex-r4k.S
- +++ b/arch/mips/mm/tlbex-r4k.S
- @@ -184,13 +184,10 @@
- P_MTC0 k0, CP0_ENTRYLO0 # load it
- PTE_SRL k1, k1, 6 # convert to entrylo1
- P_MTC0 k1, CP0_ENTRYLO1 # load it
- - b 1f
- - rm9000_tlb_hazard
- + mtc0_tlbw_hazard
- tlbwr # write random tlb entry
- -1:
- - nop
- - rm9000_tlb_hazard
- - eret # return from trap
- + tlbw_eret_hazard
- + eret
- END(except_vec0_r4000)
-
- /* TLB refill, EXL == 0, R4600 version */
- @@ -468,13 +465,9 @@ invalid_tlbl:
- PTE_PRESENT(k0, k1, nopage_tlbl)
- PTE_MAKEVALID(k0, k1)
- PTE_RELOAD(k1, k0)
- - rm9000_tlb_hazard
- - nop
- - b 1f
- - tlbwi
- -1:
- - nop
- - rm9000_tlb_hazard
- + mtc0_tlbw_hazard
- + tlbwi
- + tlbw_eret_hazard
- .set mips3
- eret
- .set mips0
- @@ -496,13 +489,9 @@ nopage_tlbl:
- PTE_WRITABLE(k0, k1, nopage_tlbs)
- PTE_MAKEWRITE(k0, k1)
- PTE_RELOAD(k1, k0)
- - rm9000_tlb_hazard
- - nop
- - b 1f
- - tlbwi
- -1:
- - nop
- - rm9000_tlb_hazard
- + mtc0_tlbw_hazard
- + tlbwi
- + tlbw_eret_hazard
- .set mips3
- eret
- .set mips0
- @@ -529,13 +518,9 @@ nopage_tlbs:
-
- /* Now reload the entry into the tlb. */
- PTE_RELOAD(k1, k0)
- - rm9000_tlb_hazard
- - nop
- - b 1f
- - tlbwi
- -1:
- - rm9000_tlb_hazard
- - nop
- + mtc0_tlbw_hazard
- + tlbwi
- + tlbw_eret_hazard
- .set mips3
- eret
- .set mips0
- --- a/arch/mips/mm/tlb-r4k.c
- +++ b/arch/mips/mm/tlb-r4k.c
- @@ -3,17 +3,12 @@
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- - * r4xx0.c: R4000 processor variant specific MMU/Cache routines.
- - *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
- * Copyright (C) 1997, 1998, 1999, 2000 Ralf Baechle ralf@gnu.org
- - *
- - * To do:
- - *
- - * - this code is a overbloated pig
- - * - many of the bug workarounds are not efficient at all, but at
- - * least they are functional ...
- + * Carsten Langgaard, carstenl@mips.com
- + * Copyright (C) 2002 MIPS Technologies, Inc. All rights reserved.
- */
- +#include <linux/config.h>
- #include <linux/init.h>
- #include <linux/sched.h>
- #include <linux/mm.h>
- @@ -25,9 +20,6 @@
- #include <asm/pgtable.h>
- #include <asm/system.h>
-
- -#undef DEBUG_TLB
- -#undef DEBUG_TLBUPDATE
- -
- extern char except_vec0_nevada, except_vec0_r4000, except_vec0_r4600;
-
- /* CP0 hazard avoidance. */
- @@ -41,33 +33,23 @@ void local_flush_tlb_all(void)
- unsigned long old_ctx;
- int entry;
-
- -#ifdef DEBUG_TLB
- - printk("[tlball]");
- -#endif
- -
- local_irq_save(flags);
- /* Save old context and create impossible VPN2 value */
- old_ctx = read_c0_entryhi();
- write_c0_entrylo0(0);
- write_c0_entrylo1(0);
- - BARRIER;
-
- entry = read_c0_wired();
-
- /* Blast 'em all away. */
- while (entry < current_cpu_data.tlbsize) {
- - /*
- - * Make sure all entries differ. If they're not different
- - * MIPS32 will take revenge ...
- - */
- write_c0_entryhi(KSEG0 + entry*0x2000);
- write_c0_index(entry);
- - BARRIER;
- + mtc0_tlbw_hazard();
- tlb_write_indexed();
- - BARRIER;
- entry++;
- }
- - BARRIER;
- + tlbw_use_hazard();
- write_c0_entryhi(old_ctx);
- local_irq_restore(flags);
- }
- @@ -76,12 +58,8 @@ void local_flush_tlb_mm(struct mm_struct
- {
- int cpu = smp_processor_id();
-
- - if (cpu_context(cpu, mm) != 0) {
- -#ifdef DEBUG_TLB
- - printk("[tlbmm<%d>]", cpu_context(cpu, mm));
- -#endif
- + if (cpu_context(cpu, mm) != 0)
- drop_mmu_context(mm,cpu);
- - }
- }
-
- void local_flush_tlb_range(struct mm_struct *mm, unsigned long start,
- @@ -93,10 +71,6 @@ void local_flush_tlb_range(struct mm_str
- unsigned long flags;
- int size;
-
- -#ifdef DEBUG_TLB
- - printk("[tlbrange<%02x,%08lx,%08lx>]",
- - cpu_asid(cpu, mm), start, end);
- -#endif
- local_irq_save(flags);
- size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT;
- size = (size + 1) >> 1;
- @@ -112,7 +86,7 @@ void local_flush_tlb_range(struct mm_str
-
- write_c0_entryhi(start | newpid);
- start += (PAGE_SIZE << 1);
- - BARRIER;
- + mtc0_tlbw_hazard();
- tlb_probe();
- BARRIER;
- idx = read_c0_index();
- @@ -122,10 +96,10 @@ void local_flush_tlb_range(struct mm_str
- continue;
- /* Make sure all entries differ. */
- write_c0_entryhi(KSEG0 + idx*0x2000);
- - BARRIER;
- + mtc0_tlbw_hazard();
- tlb_write_indexed();
- - BARRIER;
- }
- + tlbw_use_hazard();
- write_c0_entryhi(oldpid);
- } else {
- drop_mmu_context(mm, cpu);
- @@ -138,34 +112,30 @@ void local_flush_tlb_page(struct vm_area
- {
- int cpu = smp_processor_id();
-
- - if (!vma || cpu_context(cpu, vma->vm_mm) != 0) {
- + if (cpu_context(cpu, vma->vm_mm) != 0) {
- unsigned long flags;
- - int oldpid, newpid, idx;
- + unsigned long oldpid, newpid, idx;
-
- -#ifdef DEBUG_TLB
- - printk("[tlbpage<%d,%08lx>]", cpu_context(cpu, vma->vm_mm),
- - page);
- -#endif
- newpid = cpu_asid(cpu, vma->vm_mm);
- page &= (PAGE_MASK << 1);
- local_irq_save(flags);
- oldpid = read_c0_entryhi();
- write_c0_entryhi(page | newpid);
- - BARRIER;
- + mtc0_tlbw_hazard();
- tlb_probe();
- BARRIER;
- idx = read_c0_index();
- write_c0_entrylo0(0);
- write_c0_entrylo1(0);
- - if(idx < 0)
- + if (idx < 0)
- goto finish;
- /* Make sure all entries differ. */
- write_c0_entryhi(KSEG0+idx*0x2000);
- - BARRIER;
- + mtc0_tlbw_hazard();
- tlb_write_indexed();
- + tlbw_use_hazard();
-
- finish:
- - BARRIER;
- write_c0_entryhi(oldpid);
- local_irq_restore(flags);
- }
- @@ -185,7 +155,7 @@ void local_flush_tlb_one(unsigned long p
-
- local_irq_save(flags);
- write_c0_entryhi(page);
- - BARRIER;
- + mtc0_tlbw_hazard();
- tlb_probe();
- BARRIER;
- idx = read_c0_index();
- @@ -194,18 +164,19 @@ void local_flush_tlb_one(unsigned long p
- if (idx >= 0) {
- /* Make sure all entries differ. */
- write_c0_entryhi(KSEG0+idx*0x2000);
- + mtc0_tlbw_hazard();
- tlb_write_indexed();
- + tlbw_use_hazard();
- }
- - BARRIER;
- write_c0_entryhi(oldpid);
- +
- local_irq_restore(flags);
- }
-
- EXPORT_SYMBOL(local_flush_tlb_one);
-
- -/* We will need multiple versions of update_mmu_cache(), one that just
- - * updates the TLB with the new pte(s), and another which also checks
- - * for the R4k "end of page" hardware bug and does the needy.
- +/*
- + * Updates the TLB with the new pte(s).
- */
- void __update_tlb(struct vm_area_struct * vma, unsigned long address, pte_t pte)
- {
- @@ -223,25 +194,16 @@ void __update_tlb(struct vm_area_struct
-
- pid = read_c0_entryhi() & ASID_MASK;
-
- -#ifdef DEBUG_TLB
- - if ((pid != cpu_asid(cpu, vma->vm_mm)) ||
- - (cpu_context(vma->vm_mm) == 0)) {
- - printk("update_mmu_cache: Wheee, bogus tlbpid mmpid=%d "
- - "tlbpid=%d\n", (int) (cpu_asid(cpu, vma->vm_mm)), pid);
- - }
- -#endif
- -
- local_irq_save(flags);
- address &= (PAGE_MASK << 1);
- write_c0_entryhi(address | pid);
- pgdp = pgd_offset(vma->vm_mm, address);
- - BARRIER;
- + mtc0_tlbw_hazard();
- tlb_probe();
- BARRIER;
- pmdp = pmd_offset(pgdp, address);
- idx = read_c0_index();
- ptep = pte_offset(pmdp, address);
- - BARRIER;
- #if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32)
- write_c0_entrylo0(ptep->pte_high);
- ptep++;
- @@ -251,15 +213,13 @@ void __update_tlb(struct vm_area_struct
- write_c0_entrylo1(pte_val(*ptep) >> 6);
- #endif
- write_c0_entryhi(address | pid);
- - BARRIER;
- - if (idx < 0) {
- + mtc0_tlbw_hazard();
- + if (idx < 0)
- tlb_write_random();
- - } else {
- + else
- tlb_write_indexed();
- - }
- - BARRIER;
- + tlbw_use_hazard();
- write_c0_entryhi(pid);
- - BARRIER;
- local_irq_restore(flags);
- }
-
- @@ -279,24 +239,26 @@ static void r4k_update_mmu_cache_hwbug(s
- asid = read_c0_entryhi() & ASID_MASK;
- write_c0_entryhi(address | asid);
- pgdp = pgd_offset(vma->vm_mm, address);
- + mtc0_tlbw_hazard();
- tlb_probe();
- + BARRIER;
- pmdp = pmd_offset(pgdp, address);
- idx = read_c0_index();
- ptep = pte_offset(pmdp, address);
- write_c0_entrylo0(pte_val(*ptep++) >> 6);
- write_c0_entrylo1(pte_val(*ptep) >> 6);
- - BARRIER;
- + mtc0_tlbw_hazard();
- if (idx < 0)
- tlb_write_random();
- else
- tlb_write_indexed();
- - BARRIER;
- + tlbw_use_hazard();
- local_irq_restore(flags);
- }
- #endif
-
- void __init add_wired_entry(unsigned long entrylo0, unsigned long entrylo1,
- - unsigned long entryhi, unsigned long pagemask)
- + unsigned long entryhi, unsigned long pagemask)
- {
- unsigned long flags;
- unsigned long wired;
- @@ -315,9 +277,9 @@ void __init add_wired_entry(unsigned lon
- write_c0_entryhi(entryhi);
- write_c0_entrylo0(entrylo0);
- write_c0_entrylo1(entrylo1);
- - BARRIER;
- + mtc0_tlbw_hazard();
- tlb_write_indexed();
- - BARRIER;
- + tlbw_use_hazard();
-
- write_c0_entryhi(old_ctx);
- BARRIER;
- @@ -355,17 +317,15 @@ __init int add_temporary_entry(unsigned
- }
-
- write_c0_index(temp_tlb_entry);
- - BARRIER;
- write_c0_pagemask(pagemask);
- write_c0_entryhi(entryhi);
- write_c0_entrylo0(entrylo0);
- write_c0_entrylo1(entrylo1);
- - BARRIER;
- + mtc0_tlbw_hazard();
- tlb_write_indexed();
- - BARRIER;
- + tlbw_use_hazard();
-
- write_c0_entryhi(old_ctx);
- - BARRIER;
- write_c0_pagemask(old_pagemask);
- out:
- local_irq_restore(flags);
- @@ -375,7 +335,7 @@ out:
- static void __init probe_tlb(unsigned long config)
- {
- struct cpuinfo_mips *c = ¤t_cpu_data;
- - unsigned int reg;
- + unsigned int config1;
-
- /*
- * If this isn't a MIPS32 / MIPS64 compliant CPU. Config 1 register
- @@ -385,16 +345,16 @@ static void __init probe_tlb(unsigned lo
- if ((c->processor_id & 0xff0000) == PRID_COMP_LEGACY)
- return;
-
- - reg = read_c0_config1();
- + config1 = read_c0_config1();
- if (!((config >> 7) & 3))
- panic("No TLB present");
-
- - c->tlbsize = ((reg >> 25) & 0x3f) + 1;
- + c->tlbsize = ((config1 >> 25) & 0x3f) + 1;
- }
-
- void __init r4k_tlb_init(void)
- {
- - u32 config = read_c0_config();
- + unsigned int config = read_c0_config();
-
- /*
- * You should never change this register:
- --- a/arch/mips64/defconfig
- +++ b/arch/mips64/defconfig
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -470,9 +470,11 @@ CONFIG_SCSI_LOGGING=y
- # CONFIG_SCSI_MEGARAID is not set
- # CONFIG_SCSI_MEGARAID2 is not set
- # CONFIG_SCSI_SATA is not set
- +# CONFIG_SCSI_SATA_AHCI is not set
- # CONFIG_SCSI_SATA_SVW is not set
- # CONFIG_SCSI_ATA_PIIX is not set
- # CONFIG_SCSI_SATA_NV is not set
- +# CONFIG_SCSI_SATA_QSTOR is not set
- # CONFIG_SCSI_SATA_PROMISE is not set
- # CONFIG_SCSI_SATA_SX4 is not set
- # CONFIG_SCSI_SATA_SIL is not set
- @@ -658,7 +660,6 @@ CONFIG_SERIAL=y
- CONFIG_SERIAL_CONSOLE=y
- # CONFIG_SERIAL_EXTENDED is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips64/defconfig-atlas
- +++ b/arch/mips64/defconfig-atlas
- @@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -232,11 +232,6 @@ CONFIG_IP_PNP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -314,9 +309,11 @@ CONFIG_SD_EXTRA_DEVS=40
- # CONFIG_SCSI_MEGARAID is not set
- # CONFIG_SCSI_MEGARAID2 is not set
- # CONFIG_SCSI_SATA is not set
- +# CONFIG_SCSI_SATA_AHCI is not set
- # CONFIG_SCSI_SATA_SVW is not set
- # CONFIG_SCSI_ATA_PIIX is not set
- # CONFIG_SCSI_SATA_NV is not set
- +# CONFIG_SCSI_SATA_QSTOR is not set
- # CONFIG_SCSI_SATA_PROMISE is not set
- # CONFIG_SCSI_SATA_SX4 is not set
- # CONFIG_SCSI_SATA_SIL is not set
- @@ -474,7 +471,6 @@ CONFIG_SERIAL=y
- CONFIG_SERIAL_CONSOLE=y
- # CONFIG_SERIAL_EXTENDED is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips64/defconfig-decstation
- +++ b/arch/mips64/defconfig-decstation
- @@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -224,11 +224,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -307,9 +302,11 @@ CONFIG_SCSI_DECNCR=y
- # CONFIG_SCSI_MEGARAID is not set
- # CONFIG_SCSI_MEGARAID2 is not set
- # CONFIG_SCSI_SATA is not set
- +# CONFIG_SCSI_SATA_AHCI is not set
- # CONFIG_SCSI_SATA_SVW is not set
- # CONFIG_SCSI_ATA_PIIX is not set
- # CONFIG_SCSI_SATA_NV is not set
- +# CONFIG_SCSI_SATA_QSTOR is not set
- # CONFIG_SCSI_SATA_PROMISE is not set
- # CONFIG_SCSI_SATA_SX4 is not set
- # CONFIG_SCSI_SATA_SIL is not set
- @@ -477,7 +474,6 @@ CONFIG_SERIAL_DEC=y
- CONFIG_SERIAL_DEC_CONSOLE=y
- # CONFIG_DZ is not set
- CONFIG_ZS=y
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips64/defconfig-ip22
- +++ b/arch/mips64/defconfig-ip22
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -235,11 +235,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -319,9 +314,11 @@ CONFIG_SGIWD93_SCSI=y
- # CONFIG_SCSI_MEGARAID is not set
- # CONFIG_SCSI_MEGARAID2 is not set
- # CONFIG_SCSI_SATA is not set
- +# CONFIG_SCSI_SATA_AHCI is not set
- # CONFIG_SCSI_SATA_SVW is not set
- # CONFIG_SCSI_ATA_PIIX is not set
- # CONFIG_SCSI_SATA_NV is not set
- +# CONFIG_SCSI_SATA_QSTOR is not set
- # CONFIG_SCSI_SATA_PROMISE is not set
- # CONFIG_SCSI_SATA_SX4 is not set
- # CONFIG_SCSI_SATA_SIL is not set
- @@ -488,7 +485,6 @@ CONFIG_SERIAL_NONSTANDARD=y
- # CONFIG_SERIAL_TXX9_CONSOLE is not set
- # CONFIG_TXX927_SERIAL is not set
- CONFIG_IP22_SERIAL=y
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips64/defconfig-ip27
- +++ b/arch/mips64/defconfig-ip27
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -470,9 +470,11 @@ CONFIG_SCSI_LOGGING=y
- # CONFIG_SCSI_MEGARAID is not set
- # CONFIG_SCSI_MEGARAID2 is not set
- # CONFIG_SCSI_SATA is not set
- +# CONFIG_SCSI_SATA_AHCI is not set
- # CONFIG_SCSI_SATA_SVW is not set
- # CONFIG_SCSI_ATA_PIIX is not set
- # CONFIG_SCSI_SATA_NV is not set
- +# CONFIG_SCSI_SATA_QSTOR is not set
- # CONFIG_SCSI_SATA_PROMISE is not set
- # CONFIG_SCSI_SATA_SX4 is not set
- # CONFIG_SCSI_SATA_SIL is not set
- @@ -658,7 +660,6 @@ CONFIG_SERIAL=y
- CONFIG_SERIAL_CONSOLE=y
- # CONFIG_SERIAL_EXTENDED is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips64/defconfig-jaguar
- +++ b/arch/mips64/defconfig-jaguar
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -227,11 +227,6 @@ CONFIG_IP_PNP_DHCP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -403,7 +398,6 @@ CONFIG_SERIAL_NONSTANDARD=y
- # CONFIG_SERIAL_TXX9 is not set
- # CONFIG_SERIAL_TXX9_CONSOLE is not set
- # CONFIG_TXX927_SERIAL is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips64/defconfig-malta
- +++ b/arch/mips64/defconfig-malta
- @@ -22,16 +22,19 @@ CONFIG_KMOD=y
- #
- # CONFIG_ACER_PICA_61 is not set
- # CONFIG_MIPS_BOSPORUS is not set
- +# CONFIG_MIPS_FICMMP is not set
- # CONFIG_MIPS_MIRAGE is not set
- # CONFIG_MIPS_DB1000 is not set
- # CONFIG_MIPS_DB1100 is not set
- # CONFIG_MIPS_DB1500 is not set
- # CONFIG_MIPS_DB1550 is not set
- +# CONFIG_MIPS_DB1200 is not set
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_PB1200 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -146,9 +149,9 @@ CONFIG_KCORE_ELF=y
- CONFIG_BINFMT_ELF=y
- CONFIG_MIPS32_COMPAT=y
- CONFIG_MIPS32_O32=y
- -# CONFIG_MIPS32_N32 is not set
- +CONFIG_MIPS32_N32=y
- CONFIG_BINFMT_ELF32=y
- -# CONFIG_BINFMT_MISC is not set
- +CONFIG_BINFMT_MISC=y
- # CONFIG_OOM_KILLER is not set
- # CONFIG_CMDLINE_BOOL is not set
-
- @@ -235,11 +238,6 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -271,8 +269,83 @@ CONFIG_IP_PNP_BOOTP=y
- #
- # ATA/IDE/MFM/RLL support
- #
- -# CONFIG_IDE is not set
- +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_IDE_SATA is not set
- +CONFIG_BLK_DEV_IDEDISK=y
- +# CONFIG_IDEDISK_MULTI_MODE is not set
- +# CONFIG_IDEDISK_STROKE is not set
- +# CONFIG_BLK_DEV_IDECS is not set
- +# CONFIG_BLK_DEV_DELKIN is not set
- +CONFIG_BLK_DEV_IDECD=y
- +CONFIG_BLK_DEV_IDETAPE=y
- +CONFIG_BLK_DEV_IDEFLOPPY=y
- +# CONFIG_BLK_DEV_IDESCSI is not set
- +# CONFIG_IDE_TASK_IOCTL 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_IDEPCI=y
- +CONFIG_BLK_DEV_GENERIC=y
- +CONFIG_IDEPCI_SHARE_IRQ=y
- +CONFIG_BLK_DEV_IDEDMA_PCI=y
- +# CONFIG_BLK_DEV_OFFBOARD is not set
- +CONFIG_BLK_DEV_IDEDMA_FORCED=y
- +CONFIG_IDEDMA_PCI_AUTO=y
- +# CONFIG_IDEDMA_ONLYDISK is not set
- +CONFIG_BLK_DEV_IDEDMA=y
- +# CONFIG_IDEDMA_PCI_WIP is not set
- +# CONFIG_BLK_DEV_ADMA100 is not set
- +# CONFIG_BLK_DEV_AEC62XX is not set
- +# CONFIG_BLK_DEV_ALI15X3 is not set
- +# CONFIG_WDC_ALI15X3 is not set
- +# CONFIG_BLK_DEV_AMD74XX is not set
- +# CONFIG_AMD74XX_OVERRIDE is not set
- +# CONFIG_BLK_DEV_ATIIXP is not set
- +# CONFIG_BLK_DEV_CMD64X is not set
- +# CONFIG_BLK_DEV_TRIFLEX is not set
- +# CONFIG_BLK_DEV_CY82C693 is not set
- +# CONFIG_BLK_DEV_CS5530 is not set
- +# CONFIG_BLK_DEV_HPT34X is not set
- +# CONFIG_HPT34X_AUTODMA is not set
- +# CONFIG_BLK_DEV_HPT366 is not set
- +CONFIG_BLK_DEV_PIIX=y
- +# CONFIG_BLK_DEV_NS87415 is not set
- +# CONFIG_BLK_DEV_OPTI621 is not set
- +# CONFIG_BLK_DEV_PDC202XX_OLD is not set
- +# CONFIG_PDC202XX_BURST is not set
- +# CONFIG_BLK_DEV_PDC202XX_NEW is not set
- +# CONFIG_BLK_DEV_RZ1000 is not set
- +# CONFIG_BLK_DEV_SC1200 is not set
- +# CONFIG_BLK_DEV_SVWKS is not set
- +# CONFIG_BLK_DEV_SIIMAGE is not set
- +# CONFIG_BLK_DEV_SIS5513 is not set
- +# CONFIG_BLK_DEV_SLC90E66 is not set
- +# CONFIG_BLK_DEV_TRM290 is not set
- +# CONFIG_BLK_DEV_VIA82CXXX is not set
- +# CONFIG_IDE_CHIPSETS is not set
- +CONFIG_IDEDMA_AUTO=y
- +# CONFIG_IDEDMA_IVB is not set
- +# CONFIG_DMA_NONPCI 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
- +# CONFIG_BLK_DEV_ATARAID_MEDLEY is not set
- +# CONFIG_BLK_DEV_ATARAID_SII is not set
-
- #
- # SCSI support
- @@ -317,9 +390,11 @@ CONFIG_SD_EXTRA_DEVS=40
- # CONFIG_SCSI_MEGARAID is not set
- # CONFIG_SCSI_MEGARAID2 is not set
- # CONFIG_SCSI_SATA is not set
- +# CONFIG_SCSI_SATA_AHCI is not set
- # CONFIG_SCSI_SATA_SVW is not set
- # CONFIG_SCSI_ATA_PIIX is not set
- # CONFIG_SCSI_SATA_NV is not set
- +# CONFIG_SCSI_SATA_QSTOR is not set
- # CONFIG_SCSI_SATA_PROMISE is not set
- # CONFIG_SCSI_SATA_SX4 is not set
- # CONFIG_SCSI_SATA_SIL is not set
- @@ -477,7 +552,6 @@ CONFIG_SERIAL=y
- CONFIG_SERIAL_CONSOLE=y
- # CONFIG_SERIAL_EXTENDED is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips64/defconfig-ocelotc
- +++ b/arch/mips64/defconfig-ocelotc
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -231,11 +231,6 @@ CONFIG_IP_PNP_DHCP=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -453,7 +448,6 @@ CONFIG_SERIAL_NONSTANDARD=y
- # CONFIG_SERIAL_TXX9 is not set
- # CONFIG_SERIAL_TXX9_CONSOLE is not set
- # CONFIG_TXX927_SERIAL is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips64/defconfig-sb1250-swarm
- +++ b/arch/mips64/defconfig-sb1250-swarm
- @@ -30,8 +30,8 @@ CONFIG_KMOD=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -90,6 +90,7 @@ CONFIG_SIBYTE_CFE=y
- # CONFIG_SIBYTE_TBPROF is not set
- CONFIG_SIBYTE_GENBUS_IDE=y
- CONFIG_SMP_CAPABLE=y
- +CONFIG_MIPS_RTC=y
- # CONFIG_SNI_RM200_PCI is not set
- # CONFIG_TANBAC_TB0226 is not set
- # CONFIG_TANBAC_TB0229 is not set
- @@ -253,11 +254,6 @@ CONFIG_INET=y
- #
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
- -
- -#
- -# Appletalk devices
- -#
- -# CONFIG_DEV_APPLETALK is not set
- # CONFIG_DECNET is not set
- # CONFIG_BRIDGE is not set
- # CONFIG_X25 is not set
- @@ -432,7 +428,6 @@ CONFIG_SERIAL_NONSTANDARD=y
- CONFIG_SIBYTE_SB1250_DUART=y
- CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y
- CONFIG_SERIAL_CONSOLE=y
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- CONFIG_UNIX98_PTYS=y
- CONFIG_UNIX98_PTY_COUNT=256
-
- --- a/arch/mips64/defconfig-sead
- +++ b/arch/mips64/defconfig-sead
- @@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
- # CONFIG_MIPS_PB1000 is not set
- # CONFIG_MIPS_PB1100 is not set
- # CONFIG_MIPS_PB1500 is not set
- -# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_PB1550 is not set
- +# CONFIG_MIPS_HYDROGEN3 is not set
- # CONFIG_MIPS_XXS1500 is not set
- # CONFIG_MIPS_MTX1 is not set
- # CONFIG_COGENT_CSB250 is not set
- @@ -242,7 +242,6 @@ CONFIG_SERIAL=y
- CONFIG_SERIAL_CONSOLE=y
- # CONFIG_SERIAL_EXTENDED is not set
- # CONFIG_SERIAL_NONSTANDARD is not set
- -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
- # CONFIG_UNIX98_PTYS is not set
-
- #
- --- a/arch/mips64/kernel/binfmt_elfn32.c
- +++ b/arch/mips64/kernel/binfmt_elfn32.c
- @@ -116,4 +116,7 @@ MODULE_AUTHOR("Ralf Baechle (ralf@linux-
- #undef MODULE_DESCRIPTION
- #undef MODULE_AUTHOR
-
- +#undef TASK_SIZE
- +#define TASK_SIZE TASK_SIZE32
- +
- #include "../../../fs/binfmt_elf.c"
- --- a/arch/mips64/kernel/binfmt_elfo32.c
- +++ b/arch/mips64/kernel/binfmt_elfo32.c
- @@ -137,4 +137,7 @@ MODULE_AUTHOR("Ralf Baechle (ralf@linux-
- #undef MODULE_DESCRIPTION
- #undef MODULE_AUTHOR
-
- +#undef TASK_SIZE
- +#define TASK_SIZE TASK_SIZE32
- +
- #include "../../../fs/binfmt_elf.c"
- --- a/arch/mips64/kernel/head.S
- +++ b/arch/mips64/kernel/head.S
- @@ -91,6 +91,21 @@ EXPORT(_stext)
- __INIT
-
- NESTED(kernel_entry, 16, sp) # kernel entry point
- + .set push
- + /*
- + * For the moment disable interrupts, mark the kernel mode and
- + * set ST0_KX so that the CPU does not spit fire when using
- + * 64-bit addresses. A full initialization of the CPU's status
- + * register is done later in per_cpu_trap_init().
- + */
- + mfc0 t0, CP0_STATUS
- + or t0, ST0_CU0|ST0_KX|0x1f
- + xor t0, 0x1f
- + mtc0 t0, CP0_STATUS
- +
- + .set noreorder
- + sll zero,3 # ehb
- + .set reorder
-
- ori sp, 0xf # align stack on 16 byte.
- xori sp, 0xf
- @@ -103,8 +118,6 @@ NESTED(kernel_entry, 16, sp) # kernel
-
- ARC64_TWIDDLE_PC
-
- - CLI # disable interrupts
- -
- /*
- * The firmware/bootloader passes argc/argp/envp
- * to us as arguments. But clear bss first because
- @@ -125,6 +138,7 @@ NESTED(kernel_entry, 16, sp) # kernel
- dsubu sp, 4*SZREG # init stack pointer
-
- j init_arch
- + .set pop
- END(kernel_entry)
-
- #ifdef CONFIG_SMP
- @@ -133,6 +147,23 @@ NESTED(kernel_entry, 16, sp) # kernel
- * function after setting up the stack and gp registers.
- */
- NESTED(smp_bootstrap, 16, sp)
- + .set push
- + /*
- + * For the moment disable interrupts and bootstrap exception
- + * vectors, mark the kernel mode and set ST0_KX so that the CPU
- + * does not spit fire when using 64-bit addresses. A full
- + * initialization of the CPU's status register is done later in
- + * per_cpu_trap_init().
- + */
- + mfc0 t0, CP0_STATUS
- + or t0, ST0_CU0|ST0_BEV|ST0_KX|0x1f
- + xor t0, ST0_BEV|0x1f
- + mtc0 t0, CP0_STATUS
- +
- + .set noreorder
- + sll zero,3 # ehb
- + .set reorder
- +
- #ifdef CONFIG_SGI_IP27
- GET_NASID_ASM t1
- dli t0, KLDIR_OFFSET + (KLI_KERN_VARS * KLDIR_ENT_SIZE) + \
- @@ -146,19 +177,8 @@ NESTED(smp_bootstrap, 16, sp)
- ARC64_TWIDDLE_PC
- #endif /* CONFIG_SGI_IP27 */
-
- - CLI
- -
- - /*
- - * For the moment set ST0_KU so the CPU will not spit fire when
- - * executing 64-bit instructions. The full initialization of the
- - * CPU's status register is done later in per_cpu_trap_init().
- - */
- - mfc0 t0, CP0_STATUS
- - or t0, ST0_KX
- - mtc0 t0, CP0_STATUS
- -
- jal start_secondary # XXX: IP27: cboot
- -
- + .set pop
- END(smp_bootstrap)
- #endif /* CONFIG_SMP */
-
- --- a/arch/mips64/kernel/ioctl32.c
- +++ b/arch/mips64/kernel/ioctl32.c
- @@ -2352,7 +2352,7 @@ static struct ioctl32_list ioctl32_handl
- IOCTL32_HANDLER(AUTOFS_IOC_SETTIMEOUT32, ioc_settimeout),
- IOCTL32_DEFAULT(AUTOFS_IOC_EXPIRE),
- IOCTL32_DEFAULT(AUTOFS_IOC_EXPIRE_MULTI),
- - IOCTL32_DEFAULT(AUTOFS_IOC_PROTSUBVER),
- + IOCTL32_DEFAULT(AUTOFS_IOC_PROTOSUBVER),
- IOCTL32_DEFAULT(AUTOFS_IOC_ASKREGHOST),
- IOCTL32_DEFAULT(AUTOFS_IOC_TOGGLEREGHOST),
- IOCTL32_DEFAULT(AUTOFS_IOC_ASKUMOUNT),
- --- a/arch/mips64/kernel/linux32.c
- +++ b/arch/mips64/kernel/linux32.c
- @@ -1101,6 +1101,7 @@ do_readv_writev32(int type, struct file
- * specially as they have atomicity guarantees and can handle
- * iovec's natively
- */
- + inode = file->f_dentry->d_inode;
- if (inode->i_sock) {
- int err;
- err = sock_readv_writev(type, inode, file, iov, count, tot_len);
- @@ -1187,72 +1188,19 @@ bad_file:
- lseek back to original location. They fail just like lseek does on
- non-seekable files. */
-
- -asmlinkage ssize_t sys32_pread(unsigned int fd, char * buf,
- - size_t count, u32 unused, u64 a4, u64 a5)
- +asmlinkage ssize_t sys32_pread(unsigned int fd, char *buf,
- + size_t count, u32 unused, u64 a4, u64 a5)
- {
- - ssize_t ret;
- - struct file * file;
- - ssize_t (*read)(struct file *, char *, size_t, loff_t *);
- - loff_t pos;
- -
- - ret = -EBADF;
- - file = fget(fd);
- - if (!file)
- - goto bad_file;
- - if (!(file->f_mode & FMODE_READ))
- - goto out;
- - pos = merge_64(a4, a5);
- - ret = locks_verify_area(FLOCK_VERIFY_READ, file->f_dentry->d_inode,
- - file, pos, count);
- - if (ret)
- - goto out;
- - ret = -EINVAL;
- - if (!file->f_op || !(read = file->f_op->read))
- - goto out;
- - if (pos < 0)
- - goto out;
- - ret = read(file, buf, count, &pos);
- - if (ret > 0)
- - dnotify_parent(file->f_dentry, DN_ACCESS);
- -out:
- - fput(file);
- -bad_file:
- - return ret;
- + return sys_pread(fd, buf, count, merge_64(a4, a5));
- }
-
- asmlinkage ssize_t sys32_pwrite(unsigned int fd, const char * buf,
- size_t count, u32 unused, u64 a4, u64 a5)
- {
- - ssize_t ret;
- - struct file * file;
- - ssize_t (*write)(struct file *, const char *, size_t, loff_t *);
- - loff_t pos;
- + return sys_pwrite(fd, buf, count, merge_64(a4, a5));
- +}
-
- - ret = -EBADF;
- - file = fget(fd);
- - if (!file)
- - goto bad_file;
- - if (!(file->f_mode & FMODE_WRITE))
- - goto out;
- - pos = merge_64(a4, a5);
- - ret = locks_verify_area(FLOCK_VERIFY_WRITE, file->f_dentry->d_inode,
- - file, pos, count);
- - if (ret)
- - goto out;
- - ret = -EINVAL;
- - if (!file->f_op || !(write = file->f_op->write))
- - goto out;
- - if (pos < 0)
- - goto out;
-
- - ret = write(file, buf, count, &pos);
- - if (ret > 0)
- - dnotify_parent(file->f_dentry, DN_MODIFY);
- -out:
- - fput(file);
- -bad_file:
- - return ret;
- -}
- /*
- * Ooo, nasty. We need here to frob 32-bit unsigned longs to
- * 64-bit unsigned longs.
- --- a/arch/mips64/kernel/process.c
- +++ b/arch/mips64/kernel/process.c
- @@ -125,6 +125,25 @@ int dump_fpu(struct pt_regs *regs, elf_f
- return 1;
- }
-
- +void dump_regs(elf_greg_t *gp, struct pt_regs *regs)
- +{
- + int i;
- +
- + for (i = 0; i < EF_REG0; i++)
- + gp[i] = 0;
- + gp[EF_REG0] = 0;
- + for (i = 1; i <= 31; i++)
- + gp[EF_REG0 + i] = regs->regs[i];
- + gp[EF_REG26] = 0;
- + gp[EF_REG27] = 0;
- + gp[EF_LO] = regs->lo;
- + gp[EF_HI] = regs->hi;
- + gp[EF_CP0_EPC] = regs->cp0_epc;
- + gp[EF_CP0_BADVADDR] = regs->cp0_badvaddr;
- + gp[EF_CP0_STATUS] = regs->cp0_status;
- + gp[EF_CP0_CAUSE] = regs->cp0_cause;
- +}
- +
- /*
- * Create a kernel thread
- */
- --- a/arch/mips64/kernel/scall_64.S
- +++ b/arch/mips64/kernel/scall_64.S
- @@ -102,15 +102,14 @@ _64_reschedule:
-
- trace_a_syscall:
- SAVE_STATIC
- - sd t2,PT_R1(sp)
- + move s0, t2
- jal syscall_trace
- - ld t2,PT_R1(sp)
-
- ld a0, PT_R4(sp) # Restore argument registers
- ld a1, PT_R5(sp)
- ld a2, PT_R6(sp)
- ld a3, PT_R7(sp)
- - jalr t2
- + jalr s0
-
- li t0, -EMAXERRNO - 1 # error?
- sltu t0, t0, v0
- --- a/arch/mips64/kernel/scall_n32.S
- +++ b/arch/mips64/kernel/scall_n32.S
- @@ -106,15 +106,14 @@ n32_reschedule:
-
- trace_a_syscall:
- SAVE_STATIC
- - sd t2,PT_R1(sp)
- + move s0, t2
- jal syscall_trace
- - ld t2,PT_R1(sp)
-
- ld a0, PT_R4(sp) # Restore argument registers
- ld a1, PT_R5(sp)
- ld a2, PT_R6(sp)
- ld a3, PT_R7(sp)
- - jalr t2
- + jalr s0
-
- li t0, -EMAXERRNO - 1 # error?
- sltu t0, t0, v0
- --- a/arch/mips64/kernel/scall_o32.S
- +++ b/arch/mips64/kernel/scall_o32.S
- @@ -118,9 +118,8 @@ trace_a_syscall:
- sd a6, PT_R10(sp)
- sd a7, PT_R11(sp)
-
- - sd t2,PT_R1(sp)
- + move s0, t2
- jal syscall_trace
- - ld t2,PT_R1(sp)
-
- ld a0, PT_R4(sp) # Restore argument registers
- ld a1, PT_R5(sp)
- @@ -129,7 +128,7 @@ trace_a_syscall:
- ld a4, PT_R8(sp)
- ld a5, PT_R9(sp)
-
- - jalr t2
- + jalr s0
-
- li t0, -EMAXERRNO - 1 # error?
- sltu t0, t0, v0
- @@ -576,6 +575,8 @@ out: jr ra
- sys_call_table:
- syscalltable
-
- + .purgem sys
- +
- .macro sys function, nargs
- .byte \nargs
- .endm
- --- a/arch/mips64/kernel/setup.c
- +++ b/arch/mips64/kernel/setup.c
- @@ -129,14 +129,6 @@ asmlinkage void __init init_arch(int arg
- */
- load_mmu();
-
- - /*
- - * On IP27, I am seeing the TS bit set when the kernel is loaded.
- - * Maybe because the kernel is in ckseg0 and not xkphys? Clear it
- - * anyway ...
- - */
- - clear_c0_status(ST0_BEV|ST0_TS|ST0_CU1|ST0_CU2|ST0_CU3);
- - set_c0_status(ST0_CU0|ST0_KX|ST0_SX|ST0_FR);
- -
- start_kernel();
- }
-
- --- a/arch/mips64/kernel/signal_n32.c
- +++ b/arch/mips64/kernel/signal_n32.c
- @@ -68,7 +68,7 @@ struct rt_sigframe_n32 {
- };
-
- extern asmlinkage int restore_sigcontext(struct pt_regs *regs, struct sigcontext *sc);
- -extern int inline setup_sigcontext(struct pt_regs *regs, struct sigcontext *sc);
- +extern int setup_sigcontext(struct pt_regs *regs, struct sigcontext *sc);
-
- asmlinkage void sysn32_rt_sigreturn(abi64_no_regargs, struct pt_regs regs)
- {
- --- a/arch/mips64/kernel/traps.c
- +++ b/arch/mips64/kernel/traps.c
- @@ -462,9 +462,10 @@ static inline void simulate_ll(struct pt
- }
- ll_task = current;
-
- + compute_return_epc(regs);
- +
- regs->regs[(opcode & RT) >> 16] = value;
-
- - compute_return_epc(regs);
- return;
-
- sig:
- @@ -495,8 +496,8 @@ static inline void simulate_sc(struct pt
- goto sig;
- }
- if (ll_bit == 0 || ll_task != current) {
- - regs->regs[reg] = 0;
- compute_return_epc(regs);
- + regs->regs[reg] = 0;
- return;
- }
-
- @@ -505,9 +506,9 @@ static inline void simulate_sc(struct pt
- goto sig;
- }
-
- + compute_return_epc(regs);
- regs->regs[reg] = 1;
-
- - compute_return_epc(regs);
- return;
-
- sig:
- @@ -809,13 +810,18 @@ extern asmlinkage int fpu_emulator_resto
- void __init per_cpu_trap_init(void)
- {
- unsigned int cpu = smp_processor_id();
- + unsigned int status_set = ST0_CU0|ST0_FR|ST0_KX|ST0_SX|ST0_UX;
-
- - /* Some firmware leaves the BEV flag set, clear it. */
- - clear_c0_status(ST0_CU1|ST0_CU2|ST0_CU3|ST0_BEV);
- - set_c0_status(ST0_CU0|ST0_FR|ST0_KX|ST0_SX|ST0_UX);
- -
- + /*
- + * Disable coprocessors, enable 64-bit addressing and set FPU
- + * for the 32/32 FPR register model. Reset the BEV flag that
- + * some firmware may have left set and the TS bit (for IP27).
- + * Set XX for ISA IV code to work.
- + */
- if (current_cpu_data.isa_level == MIPS_CPU_ISA_IV)
- - set_c0_status(ST0_XX);
- + status_set |= ST0_XX;
- + change_c0_status(ST0_CU|ST0_FR|ST0_BEV|ST0_TS|ST0_KX|ST0_SX|ST0_UX,
- + status_set);
-
- /*
- * Some MIPS CPUs have a dedicated interrupt vector which reduces the
- @@ -825,13 +831,11 @@ void __init per_cpu_trap_init(void)
- set_c0_cause(CAUSEF_IV);
-
- cpu_data[cpu].asid_cache = ASID_FIRST_VERSION;
- - write_c0_context(((long)(&pgd_current[cpu])) << 23);
- - write_c0_wired(0);
- + TLBMISS_HANDLER_SETUP();
-
- atomic_inc(&init_mm.mm_count);
- current->active_mm = &init_mm;
- - if (current->mm)
- - BUG();
- + BUG_ON(current->mm);
- enter_lazy_tlb(&init_mm, current, cpu);
- }
-
- @@ -842,8 +846,6 @@ void __init trap_init(void)
- extern char except_vec4;
- unsigned long i;
-
- - per_cpu_trap_init();
- -
- /* Copy the generic exception handlers to their final destination. */
- memcpy((void *) KSEG0 , &except_vec0_generic, 0x80);
- memcpy((void *)(KSEG0 + 0x180), &except_vec3_generic, 0x80);
- @@ -933,6 +935,5 @@ void __init trap_init(void)
-
- flush_icache_range(KSEG0, KSEG0 + 0x400);
-
- - atomic_inc(&init_mm.mm_count); /* XXX UP? */
- - current->active_mm = &init_mm;
- + per_cpu_trap_init();
- }
- --- a/arch/mips64/mm/cerr-sb1.c
- +++ b/arch/mips64/mm/cerr-sb1.c
- @@ -252,14 +252,14 @@ static const uint8_t parity[256] = {
-
- /* Masks to select bits for Hamming parity, mask_72_64[i] for bit[i] */
- static const uint64_t mask_72_64[8] = {
- - 0x0738C808099264FFL,
- - 0x38C808099264FF07L,
- - 0xC808099264FF0738L,
- - 0x08099264FF0738C8L,
- - 0x099264FF0738C808L,
- - 0x9264FF0738C80809L,
- - 0x64FF0738C8080992L,
- - 0xFF0738C808099264L
- + 0x0738C808099264FFULL,
- + 0x38C808099264FF07ULL,
- + 0xC808099264FF0738ULL,
- + 0x08099264FF0738C8ULL,
- + 0x099264FF0738C808ULL,
- + 0x9264FF0738C80809ULL,
- + 0x64FF0738C8080992ULL,
- + 0xFF0738C808099264ULL
- };
-
- /* Calculate the parity on a range of bits */
- @@ -331,9 +331,9 @@ static uint32_t extract_ic(unsigned shor
- ((lru >> 4) & 0x3),
- ((lru >> 6) & 0x3));
- }
- - va = (taglo & 0xC0000FFFFFFFE000) | addr;
- + va = (taglo & 0xC0000FFFFFFFE000ULL) | addr;
- if ((taglo & (1 << 31)) && (((taglo >> 62) & 0x3) == 3))
- - va |= 0x3FFFF00000000000;
- + va |= 0x3FFFF00000000000ULL;
- valid = ((taghi >> 29) & 1);
- if (valid) {
- tlo_tmp = taglo & 0xfff3ff;
- @@ -474,7 +474,7 @@ static uint32_t extract_dc(unsigned shor
- : "r" ((way << 13) | addr));
-
- taglo = ((unsigned long long)taglohi << 32) | taglolo;
- - pa = (taglo & 0xFFFFFFE000) | addr;
- + pa = (taglo & 0xFFFFFFE000ULL) | addr;
- if (way == 0) {
- lru = (taghi >> 14) & 0xff;
- prom_printf("[Bank %d Set 0x%02x] LRU > %d %d %d %d > MRU\n",
- --- a/arch/mips64/mm/c-r4k.c
- +++ b/arch/mips64/mm/c-r4k.c
- @@ -867,9 +867,16 @@ static void __init probe_pcache(void)
- * normally they'd suffer from aliases but magic in the hardware deals
- * with that for us so we don't need to take care ourselves.
- */
- - if (c->cputype != CPU_R10000 && c->cputype != CPU_R12000)
- - if (c->dcache.waysize > PAGE_SIZE)
- - c->dcache.flags |= MIPS_CACHE_ALIASES;
- + switch (c->cputype) {
- + case CPU_R10000:
- + case CPU_R12000:
- + break;
- + case CPU_24K:
- + if (!(read_c0_config7() & (1 << 16)))
- + default:
- + if (c->dcache.waysize > PAGE_SIZE)
- + c->dcache.flags |= MIPS_CACHE_ALIASES;
- + }
-
- switch (c->cputype) {
- case CPU_20KC:
- @@ -1070,9 +1077,6 @@ void __init ld_mmu_r4xx0(void)
- setup_scache();
- coherency_setup();
-
- - if (c->dcache.sets * c->dcache.ways > PAGE_SIZE)
- - c->dcache.flags |= MIPS_CACHE_ALIASES;
- -
- r4k_blast_dcache_page_setup();
- r4k_blast_dcache_page_indexed_setup();
- r4k_blast_dcache_setup();
- --- a/arch/mips64/mm/tlbex-r4k.S
- +++ b/arch/mips64/mm/tlbex-r4k.S
- @@ -125,6 +125,33 @@ LEAF(except_vec1_r4k)
- nop
- END(except_vec1_r4k)
-
- + __FINIT
- +
- + .align 5
- +LEAF(handle_vec1_r4k)
- + .set noat
- + LOAD_PTE2 k1 k0 9f
- + ld k0, 0(k1) # get even pte
- + ld k1, 8(k1) # get odd pte
- + PTE_RELOAD k0 k1
- + mtc0_tlbw_hazard
- + tlbwr
- + tlbw_eret_hazard
- + eret
- +
- +9: # handle the vmalloc range
- + LOAD_KPTE2 k1 k0 invalid_vmalloc_address
- + ld k0, 0(k1) # get even pte
- + ld k1, 8(k1) # get odd pte
- + PTE_RELOAD k0 k1
- + mtc0_tlbw_hazard
- + tlbwr
- + tlbw_eret_hazard
- + eret
- +END(handle_vec1_r4k)
- +
- + __INIT
- +
- LEAF(except_vec1_sb1)
- #if BCM1250_M3_WAR
- dmfc0 k0, CP0_BADVADDR
- @@ -134,28 +161,24 @@ LEAF(except_vec1_sb1)
- bnez k0, 1f
- #endif
- .set noat
- - dla k0, handle_vec1_r4k
- + dla k0, handle_vec1_sb1
- jr k0
- nop
-
- 1: eret
- - nop
- END(except_vec1_sb1)
-
- __FINIT
-
- .align 5
- -LEAF(handle_vec1_r4k)
- +LEAF(handle_vec1_sb1)
- .set noat
- LOAD_PTE2 k1 k0 9f
- ld k0, 0(k1) # get even pte
- ld k1, 8(k1) # get odd pte
- PTE_RELOAD k0 k1
- - rm9000_tlb_hazard
- - b 1f
- - tlbwr
- -1: nop
- - rm9000_tlb_hazard
- + mtc0_tlbw_hazard
- + tlbwr
- eret
-
- 9: # handle the vmalloc range
- @@ -163,13 +186,10 @@ LEAF(handle_vec1_r4k)
- ld k0, 0(k1) # get even pte
- ld k1, 8(k1) # get odd pte
- PTE_RELOAD k0 k1
- - rm9000_tlb_hazard
- - b 1f
- - tlbwr
- -1: nop
- - rm9000_tlb_hazard
- + mtc0_tlbw_hazard
- + tlbwr
- eret
- -END(handle_vec1_r4k)
- +END(handle_vec1_sb1)
-
-
- __INIT
- @@ -195,10 +215,8 @@ LEAF(handle_vec1_r10k)
- ld k0, 0(k1) # get even pte
- ld k1, 8(k1) # get odd pte
- PTE_RELOAD k0 k1
- - rm9000_tlb_hazard
- - nop
- + mtc0_tlbw_hazard
- tlbwr
- - rm9000_tlb_hazard
- eret
-
- 9: # handle the vmalloc range
- @@ -206,10 +224,8 @@ LEAF(handle_vec1_r10k)
- ld k0, 0(k1) # get even pte
- ld k1, 8(k1) # get odd pte
- PTE_RELOAD k0 k1
- - rm9000_tlb_hazard
- - nop
- + mtc0_tlbw_hazard
- tlbwr
- - rm9000_tlb_hazard
- eret
- END(handle_vec1_r10k)
-
- --- a/arch/mips64/mm/tlb-r4k.c
- +++ b/arch/mips64/mm/tlb-r4k.c
- @@ -1,24 +1,12 @@
- /*
- - * Carsten Langgaard, carstenl@mips.com
- - * Copyright (C) 2002 MIPS Technologies, Inc. All rights reserved.
- - *
- - * This program is free software; you can distribute it and/or modify it
- - * under the terms of the GNU General Public License (Version 2) as
- - * published by the Free Software Foundation.
- - *
- - * This program is distributed in the hope it will be useful, but WITHOUT
- - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- + * 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.
- *
- - * You should have received a copy of the GNU General Public License along
- - * with this program; if not, write to the Free Software Foundation, Inc.,
- - * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
- - *
- - * MIPS64 CPU variant specific MMU routines.
- - * These routine are not optimized in any way, they are done in a generic way
- - * so they can be used on all MIPS64 compliant CPUs, and also done in an
- - * attempt not to break anything for the R4xx0 style CPUs.
- + * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
- + * Copyright (C) 1997, 1998, 1999, 2000 Ralf Baechle ralf@gnu.org
- + * Carsten Langgaard, carstenl@mips.com
- + * Copyright (C) 2002 MIPS Technologies, Inc. All rights reserved.
- */
- #include <linux/init.h>
- #include <linux/sched.h>
- @@ -30,9 +18,6 @@
- #include <asm/pgtable.h>
- #include <asm/system.h>
-
- -#undef DEBUG_TLB
- -#undef DEBUG_TLBUPDATE
- -
- extern void except_vec1_r4k(void);
-
- /* CP0 hazard avoidance. */
- @@ -46,31 +31,23 @@ void local_flush_tlb_all(void)
- unsigned long old_ctx;
- int entry;
-
- -#ifdef DEBUG_TLB
- - printk("[tlball]");
- -#endif
- -
- local_irq_save(flags);
- /* Save old context and create impossible VPN2 value */
- old_ctx = read_c0_entryhi();
- - write_c0_entryhi(XKPHYS);
- write_c0_entrylo0(0);
- write_c0_entrylo1(0);
- - BARRIER;
-
- entry = read_c0_wired();
-
- /* Blast 'em all away. */
- - while(entry < current_cpu_data.tlbsize) {
- - /* Make sure all entries differ. */
- - write_c0_entryhi(XKPHYS+entry*0x2000);
- + while (entry < current_cpu_data.tlbsize) {
- + write_c0_entryhi(XKPHYS + entry*0x2000);
- write_c0_index(entry);
- - BARRIER;
- + mtc0_tlbw_hazard();
- tlb_write_indexed();
- - BARRIER;
- entry++;
- }
- - BARRIER;
- + tlbw_use_hazard();
- write_c0_entryhi(old_ctx);
- local_irq_restore(flags);
- }
- @@ -79,12 +56,8 @@ void local_flush_tlb_mm(struct mm_struct
- {
- int cpu = smp_processor_id();
-
- - if (cpu_context(cpu, mm) != 0) {
- -#ifdef DEBUG_TLB
- - printk("[tlbmm<%d>]", mm->context);
- -#endif
- + if (cpu_context(cpu, mm) != 0)
- drop_mmu_context(mm,cpu);
- - }
- }
-
- void local_flush_tlb_range(struct mm_struct *mm, unsigned long start,
- @@ -96,10 +69,6 @@ void local_flush_tlb_range(struct mm_str
- unsigned long flags;
- int size;
-
- -#ifdef DEBUG_TLB
- - printk("[tlbrange<%02x,%08lx,%08lx>]", (mm->context & ASID_MASK),
- - start, end);
- -#endif
- local_irq_save(flags);
- size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT;
- size = (size + 1) >> 1;
- @@ -110,25 +79,25 @@ void local_flush_tlb_range(struct mm_str
- start &= (PAGE_MASK << 1);
- end += ((PAGE_SIZE << 1) - 1);
- end &= (PAGE_MASK << 1);
- - while(start < end) {
- + while (start < end) {
- int idx;
-
- write_c0_entryhi(start | newpid);
- start += (PAGE_SIZE << 1);
- - BARRIER;
- + mtc0_tlbw_hazard();
- tlb_probe();
- BARRIER;
- idx = read_c0_index();
- write_c0_entrylo0(0);
- write_c0_entrylo1(0);
- - if(idx < 0)
- + if (idx < 0)
- continue;
- /* Make sure all entries differ. */
- write_c0_entryhi(XKPHYS+idx*0x2000);
- - BARRIER;
- + mtc0_tlbw_hazard();
- tlb_write_indexed();
- - BARRIER;
- }
- + tlbw_use_hazard();
- write_c0_entryhi(oldpid);
- } else {
- drop_mmu_context(mm, cpu);
- @@ -145,28 +114,26 @@ void local_flush_tlb_page(struct vm_area
- unsigned long flags;
- unsigned long oldpid, newpid, idx;
-
- -#ifdef DEBUG_TLB
- - printk("[tlbpage<%d,%08lx>]", vma->vm_mm->context, page);
- -#endif
- newpid = cpu_asid(cpu, vma->vm_mm);
- page &= (PAGE_MASK << 1);
- local_irq_save(flags);
- oldpid = read_c0_entryhi();
- write_c0_entryhi(page | newpid);
- - BARRIER;
- + mtc0_tlbw_hazard();
- tlb_probe();
- BARRIER;
- idx = read_c0_index();
- write_c0_entrylo0(0);
- write_c0_entrylo1(0);
- - if(idx < 0)
- + if (idx < 0)
- goto finish;
- /* Make sure all entries differ. */
- write_c0_entryhi(XKPHYS+idx*0x2000);
- - BARRIER;
- + mtc0_tlbw_hazard();
- tlb_write_indexed();
- + tlbw_use_hazard();
- +
- finish:
- - BARRIER;
- write_c0_entryhi(oldpid);
- local_irq_restore(flags);
- }
- @@ -186,7 +153,7 @@ void local_flush_tlb_one(unsigned long p
-
- local_irq_save(flags);
- write_c0_entryhi(page);
- - BARRIER;
- + mtc0_tlbw_hazard();
- tlb_probe();
- BARRIER;
- idx = read_c0_index();
- @@ -195,10 +162,12 @@ void local_flush_tlb_one(unsigned long p
- if (idx >= 0) {
- /* Make sure all entries differ. */
- write_c0_entryhi(KSEG0+idx*0x2000);
- + mtc0_tlbw_hazard();
- tlb_write_indexed();
- + tlbw_use_hazard();
- }
- - BARRIER;
- write_c0_entryhi(oldpid);
- +
- local_irq_restore(flags);
- }
-
- @@ -208,7 +177,6 @@ void local_flush_tlb_one(unsigned long p
- void __update_tlb(struct vm_area_struct * vma, unsigned long address, pte_t pte)
- {
- unsigned long flags;
- - unsigned int asid;
- pgd_t *pgdp;
- pmd_t *pmdp;
- pte_t *ptep;
- @@ -222,70 +190,58 @@ void __update_tlb(struct vm_area_struct
-
- pid = read_c0_entryhi() & ASID_MASK;
-
- -#ifdef DEBUG_TLB
- - if ((pid != (cpu_asid(smp_processor_id(), vma->vm_mm))) ||
- - (cpu_context(smp_processor_id(), vma->vm_mm) == 0)) {
- - printk("update_mmu_cache: Wheee, bogus tlbpid mmpid=%d"
- - "tlbpid=%d\n", (int) (cpu_context(smp_processor_id(),
- - vma->vm_mm) & ASID_MASK), pid);
- - }
- -#endif
- -
- local_irq_save(flags);
- address &= (PAGE_MASK << 1);
- - write_c0_entryhi(address | (pid));
- + write_c0_entryhi(address | pid);
- pgdp = pgd_offset(vma->vm_mm, address);
- - BARRIER;
- + mtc0_tlbw_hazard();
- tlb_probe();
- BARRIER;
- pmdp = pmd_offset(pgdp, address);
- idx = read_c0_index();
- ptep = pte_offset(pmdp, address);
- - BARRIER;
- write_c0_entrylo0(pte_val(*ptep++) >> 6);
- write_c0_entrylo1(pte_val(*ptep) >> 6);
- - write_c0_entryhi(address | (pid));
- - BARRIER;
- - if(idx < 0) {
- + write_c0_entryhi(address | pid);
- + mtc0_tlbw_hazard();
- + if (idx < 0)
- tlb_write_random();
- - } else {
- + else
- tlb_write_indexed();
- - }
- - BARRIER;
- + tlbw_use_hazard();
- write_c0_entryhi(pid);
- - BARRIER;
- local_irq_restore(flags);
- }
-
- -void add_wired_entry(unsigned long entrylo0, unsigned long entrylo1,
- - unsigned long entryhi, unsigned long pagemask)
- +void __init add_wired_entry(unsigned long entrylo0, unsigned long entrylo1,
- + unsigned long entryhi, unsigned long pagemask)
- {
- - unsigned long flags;
- - unsigned long wired;
- - unsigned long old_pagemask;
- - unsigned long old_ctx;
- -
- - local_irq_save(flags);
- - /* Save old context and create impossible VPN2 value */
- - old_ctx = (read_c0_entryhi() & ASID_MASK);
- - old_pagemask = read_c0_pagemask();
- - wired = read_c0_wired();
- - write_c0_wired(wired + 1);
- - write_c0_index(wired);
- - BARRIER;
- - write_c0_pagemask(pagemask);
- - write_c0_entryhi(entryhi);
- - write_c0_entrylo0(entrylo0);
- - write_c0_entrylo1(entrylo1);
- - BARRIER;
- - tlb_write_indexed();
- - BARRIER;
- -
- - write_c0_entryhi(old_ctx);
- - BARRIER;
- - write_c0_pagemask(old_pagemask);
- - local_flush_tlb_all();
- - local_irq_restore(flags);
- + unsigned long flags;
- + unsigned long wired;
- + unsigned long old_pagemask;
- + unsigned long old_ctx;
- +
- + local_irq_save(flags);
- + /* Save old context and create impossible VPN2 value */
- + old_ctx = read_c0_entryhi() & ASID_MASK;
- + old_pagemask = read_c0_pagemask();
- + wired = read_c0_wired();
- + write_c0_wired(wired + 1);
- + write_c0_index(wired);
- + BARRIER;
- + write_c0_pagemask(pagemask);
- + write_c0_entryhi(entryhi);
- + write_c0_entrylo0(entrylo0);
- + write_c0_entrylo1(entrylo1);
- + mtc0_tlbw_hazard();
- + tlb_write_indexed();
- + tlbw_use_hazard();
- +
- + write_c0_entryhi(old_ctx);
- + BARRIER;
- + write_c0_pagemask(old_pagemask);
- + local_flush_tlb_all();
- + local_irq_restore(flags);
- }
-
- /*
- @@ -317,17 +273,15 @@ __init int add_temporary_entry(unsigned
- }
-
- write_c0_index(temp_tlb_entry);
- - BARRIER;
- write_c0_pagemask(pagemask);
- write_c0_entryhi(entryhi);
- write_c0_entrylo0(entrylo0);
- write_c0_entrylo1(entrylo1);
- - BARRIER;
- + mtc0_tlbw_hazard();
- tlb_write_indexed();
- - BARRIER;
- + tlbw_use_hazard();
-
- write_c0_entryhi(old_ctx);
- - BARRIER;
- write_c0_pagemask(old_pagemask);
- out:
- local_irq_restore(flags);
- @@ -348,15 +302,23 @@ static void __init probe_tlb(unsigned lo
- return;
-
- config1 = read_c0_config1();
- - if (!((config1 >> 7) & 3))
- - panic("No MMU present");
- + if (!((config >> 7) & 3))
- + panic("No TLB present");
-
- c->tlbsize = ((config1 >> 25) & 0x3f) + 1;
- }
-
- void __init r4k_tlb_init(void)
- {
- - unsigned long config = read_c0_config();
- + unsigned int config = read_c0_config();
- +
- + /*
- + * You should never change this register:
- + * - On R4600 1.7 the tlbp never hits for pages smaller than
- + * the value in the c0_pagemask register.
- + * - The entire mm handling assumes the c0_pagemask register to
- + * be set for 4kb pages.
- + */
- probe_tlb(config);
- write_c0_pagemask(PM_DEFAULT_MASK);
- write_c0_wired(0);
- --- a/drivers/char/au1000_gpio.c
- +++ b/drivers/char/au1000_gpio.c
- @@ -246,7 +246,7 @@ static struct file_operations au1000gpio
-
- static struct miscdevice au1000gpio_miscdev =
- {
- - GPIO_MINOR,
- + MISC_DYNAMIC_MINOR,
- "au1000_gpio",
- &au1000gpio_fops
- };
- --- /dev/null
- +++ b/drivers/char/au1550_psc_spi.c
- @@ -0,0 +1,466 @@
- +/*
- + * Driver for Alchemy Au1550 SPI on the PSC.
- + *
- + * Copyright 2004 Embedded Edge, LLC.
- + * dan@embeddededge.com
- + *
- + * 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.
- + *
- + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- + * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- + *
- + * You should have received a copy of the GNU General Public License along
- + * with this program; if not, write to the Free Software Foundation, Inc.,
- + * 675 Mass Ave, Cambridge, MA 02139, USA.
- + */
- +
- +#include <linux/module.h>
- +#include <linux/config.h>
- +#include <linux/types.h>
- +#include <linux/kernel.h>
- +#include <linux/miscdevice.h>
- +#include <linux/init.h>
- +#include <asm/uaccess.h>
- +#include <asm/io.h>
- +#include <asm/au1000.h>
- +#include <asm/au1550_spi.h>
- +#include <asm/au1xxx_psc.h>
- +
- +#ifdef CONFIG_MIPS_PB1550
- +#include <asm/pb1550.h>
- +#endif
- +
- +#ifdef CONFIG_MIPS_DB1550
- +#include <asm/db1x00.h>
- +#endif
- +
- +#ifdef CONFIG_MIPS_PB1200
- +#include <asm/pb1200.h>
- +#endif
- +
- +/* This is just a simple programmed I/O SPI interface on the PSC of the 1550.
- + * We support open, close, write, and ioctl. The SPI is a full duplex
- + * interface, you can't read without writing. So, the write system call
- + * copies the bytes out to the SPI, and whatever is returned is placed
- + * in the same buffer. Kinda weird, maybe we'll change it, but for now
- + * it works OK.
- + * I didn't implement any DMA yet, and it's a debate about the necessity.
- + * The SPI clocks are usually quite fast, so data is sent/received as
- + * quickly as you can stuff the FIFO. The overhead of DMA and interrupts
- + * are usually far greater than the data transfer itself. If, however,
- + * we find applications that move large amounts of data, we may choose
- + * use the overhead of buffering and DMA to do the work.
- + */
- +
- +/* The maximum clock rate specified in the manual is 2mHz.
- +*/
- +#define MAX_BAUD_RATE (2 * 1000000)
- +#define PSC_INTCLK_RATE (32 * 1000000)
- +
- +static int inuse;
- +
- +/* We have to know what the user requested for the data length
- + * so we know how to stuff the fifo. The FIFO is 32 bits wide,
- + * and we have to load it with the bits to go in a single transfer.
- + */
- +static uint spi_datalen;
- +
- +static int
- +au1550spi_master_done( int ms )
- +{
- + int timeout=ms;
- + volatile psc_spi_t *sp;
- +
- + sp = (volatile psc_spi_t *)SPI_PSC_BASE;
- +
- + /* Loop until MD is set or timeout has expired */
- + while(!(sp->psc_spievent & PSC_SPIEVNT_MD) && timeout--) udelay(1000);
- +
- + if ( !timeout )
- + return 0;
- + else
- + sp->psc_spievent |= PSC_SPIEVNT_MD;
- +
- + return 1;
- +}
- +
- +static int
- +au1550spi_open(struct inode *inode, struct file *file)
- +{
- + if (inuse)
- + return -EBUSY;
- +
- + inuse = 1;
- +
- + MOD_INC_USE_COUNT;
- +
- + return 0;
- +}
- +
- +static ssize_t
- +au1550spi_write(struct file *fp, const char *bp, size_t count, loff_t *ppos)
- +{
- + int bytelen, i;
- + size_t rcount, retval;
- + unsigned char sb, *rp, *wp;
- + uint fifoword, pcr, stat;
- + volatile psc_spi_t *sp;
- +
- + /* Get the number of bytes per transfer.
- + */
- + bytelen = ((spi_datalen - 1) / 8) + 1;
- +
- + /* User needs to send us multiple of this count.
- + */
- + if ((count % bytelen) != 0)
- + return -EINVAL;
- +
- + rp = wp = (unsigned char *)bp;
- + retval = rcount = count;
- +
- + /* Reset the FIFO.
- + */
- + sp = (volatile psc_spi_t *)SPI_PSC_BASE;
- + sp->psc_spipcr = (PSC_SPIPCR_RC | PSC_SPIPCR_TC);
- + au_sync();
- + do {
- + pcr = sp->psc_spipcr;
- + au_sync();
- + } while (pcr != 0);
- +
- + /* Prime the transmit FIFO.
- + */
- + while (count > 0) {
- + fifoword = 0;
- + for (i=0; i<bytelen; i++) {
- + fifoword <<= 8;
- + if (get_user(sb, wp) < 0)
- + return -EFAULT;
- + fifoword |= sb;
- + wp++;
- + }
- + count -= bytelen;
- + if (count <= 0)
- + fifoword |= PSC_SPITXRX_LC;
- + sp->psc_spitxrx = fifoword;
- + au_sync();
- + stat = sp->psc_spistat;
- + au_sync();
- + if (stat & PSC_SPISTAT_TF)
- + break;
- + }
- +
- + /* Start the transfer.
- + */
- + sp->psc_spipcr = PSC_SPIPCR_MS;
- + au_sync();
- +
- + /* Now, just keep the transmit fifo full and empty the receive.
- + */
- + while (count > 0) {
- + stat = sp->psc_spistat;
- + au_sync();
- + while ((stat & PSC_SPISTAT_RE) == 0) {
- + fifoword = sp->psc_spitxrx;
- + au_sync();
- + for (i=0; i<bytelen; i++) {
- + sb = fifoword & 0xff;
- + if (put_user(sb, rp) < 0)
- + return -EFAULT;
- + fifoword >>= 8;
- + rp++;
- + }
- + rcount -= bytelen;
- + stat = sp->psc_spistat;
- + au_sync();
- + }
- + if ((stat & PSC_SPISTAT_TF) == 0) {
- + fifoword = 0;
- + for (i=0; i<bytelen; i++) {
- + fifoword <<= 8;
- + if (get_user(sb, wp) < 0)
- + return -EFAULT;
- + fifoword |= sb;
- + wp++;
- + }
- + count -= bytelen;
- + if (count <= 0)
- + fifoword |= PSC_SPITXRX_LC;
- + sp->psc_spitxrx = fifoword;
- + au_sync();
- + }
- + }
- +
- + /* All of the bytes for transmit have been written. Hang
- + * out waiting for any residual bytes that are yet to be
- + * read from the fifo.
- + */
- + while (rcount > 0) {
- + stat = sp->psc_spistat;
- + au_sync();
- + if ((stat & PSC_SPISTAT_RE) == 0) {
- + fifoword = sp->psc_spitxrx;
- + au_sync();
- + for (i=0; i<bytelen; i++) {
- + sb = fifoword & 0xff;
- + if (put_user(sb, rp) < 0)
- + return -EFAULT;
- + fifoword >>= 8;
- + rp++;
- + }
- + rcount -= bytelen;
- + }
- + }
- +
- + /* Wait for MasterDone event. 30ms timeout */
- + if (!au1550spi_master_done(30) ) retval = -EFAULT;
- + return retval;
- +}
- +
- +static int
- +au1550spi_release(struct inode *inode, struct file *file)
- +{
- + MOD_DEC_USE_COUNT;
- +
- + inuse = 0;
- +
- + return 0;
- +}
- +
- +/* Set the baud rate closest to the request, then return the actual
- + * value we are using.
- + */
- +static uint
- +set_baud_rate(uint baud)
- +{
- + uint rate, tmpclk, brg, ctl, stat;
- + volatile psc_spi_t *sp;
- +
- + /* For starters, the input clock is divided by two.
- + */
- + tmpclk = PSC_INTCLK_RATE/2;
- +
- + rate = tmpclk / baud;
- +
- + /* The dividers work as follows:
- + * baud = tmpclk / (2 * (brg + 1))
- + */
- + brg = (rate/2) - 1;
- +
- + /* Test BRG to ensure it will fit into the 6 bits allocated.
- + */
- +
- + /* Make sure the device is disabled while we make the change.
- + */
- + sp = (volatile psc_spi_t *)SPI_PSC_BASE;
- + ctl = sp->psc_spicfg;
- + au_sync();
- + sp->psc_spicfg = ctl & ~PSC_SPICFG_DE_ENABLE;
- + au_sync();
- + ctl = PSC_SPICFG_CLR_BAUD(ctl);
- + ctl |= PSC_SPICFG_SET_BAUD(brg);
- + sp->psc_spicfg = ctl;
- + au_sync();
- +
- + /* If the device was running prior to getting here, wait for
- + * it to restart.
- + */
- + if (ctl & PSC_SPICFG_DE_ENABLE) {
- + do {
- + stat = sp->psc_spistat;
- + au_sync();
- + } while ((stat & PSC_SPISTAT_DR) == 0);
- + }
- +
- + /* Return the actual value.
- + */
- + rate = tmpclk / (2 * (brg + 1));
- +
- + return(rate);
- +}
- +
- +static uint
- +set_word_len(uint len)
- +{
- + uint ctl, stat;
- + volatile psc_spi_t *sp;
- +
- + if ((len < 4) || (len > 24))
- + return -EINVAL;
- +
- + /* Make sure the device is disabled while we make the change.
- + */
- + sp = (volatile psc_spi_t *)SPI_PSC_BASE;
- + ctl = sp->psc_spicfg;
- + au_sync();
- + sp->psc_spicfg = ctl & ~PSC_SPICFG_DE_ENABLE;
- + au_sync();
- + ctl = PSC_SPICFG_CLR_LEN(ctl);
- + ctl |= PSC_SPICFG_SET_LEN(len);
- + sp->psc_spicfg = ctl;
- + au_sync();
- +
- + /* If the device was running prior to getting here, wait for
- + * it to restart.
- + */
- + if (ctl & PSC_SPICFG_DE_ENABLE) {
- + do {
- + stat = sp->psc_spistat;
- + au_sync();
- + } while ((stat & PSC_SPISTAT_DR) == 0);
- + }
- +
- + return 0;
- +}
- +
- +static int
- +au1550spi_ioctl(struct inode *inode, struct file *file,
- + unsigned int cmd, unsigned long arg)
- +{
- + int status;
- + u32 val;
- +
- + status = 0;
- +
- + switch(cmd) {
- + case AU1550SPI_WORD_LEN:
- + status = set_word_len(arg);
- + break;
- +
- + case AU1550SPI_SET_BAUD:
- + if (get_user(val, (u32 *)arg))
- + return -EFAULT;
- +
- + val = set_baud_rate(val);
- + if (put_user(val, (u32 *)arg))
- + return -EFAULT;
- + break;
- +
- + default:
- + status = -ENOIOCTLCMD;
- +
- + }
- +
- + return status;
- +}
- +
- +
- +static struct file_operations au1550spi_fops =
- +{
- + owner: THIS_MODULE,
- + write: au1550spi_write,
- + ioctl: au1550spi_ioctl,
- + open: au1550spi_open,
- + release: au1550spi_release,
- +};
- +
- +
- +static struct miscdevice au1550spi_miscdev =
- +{
- + MISC_DYNAMIC_MINOR,
- + "au1550_spi",
- + &au1550spi_fops
- +};
- +
- +
- +int __init
- +au1550spi_init(void)
- +{
- + uint clk, rate, stat;
- + volatile psc_spi_t *sp;
- +
- + /* Wire up Freq3 as a clock for the SPI. The PSC does
- + * factor of 2 divisor, so run a higher rate so we can
- + * get some granularity to the clock speeds.
- + * We can't do this in board set up because the frequency
- + * is computed too late.
- + */
- + rate = get_au1x00_speed();
- + rate /= PSC_INTCLK_RATE;
- +
- + /* The FRDIV in the frequency control is (FRDIV + 1) * 2
- + */
- + rate /=2;
- + rate--;
- + clk = au_readl(SYS_FREQCTRL1);
- + au_sync();
- + clk &= ~SYS_FC_FRDIV3_MASK;
- + clk |= (rate << SYS_FC_FRDIV3_BIT);
- + clk |= SYS_FC_FE3;
- + au_writel(clk, SYS_FREQCTRL1);
- + au_sync();
- +
- + /* Set up the clock source routing to get Freq3 to PSC0_intclk.
- + */
- + clk = au_readl(SYS_CLKSRC);
- + au_sync();
- + clk &= ~0x03e0;
- + clk |= (5 << 7);
- + au_writel(clk, SYS_CLKSRC);
- + au_sync();
- +
- + /* Set up GPIO pin function to drive PSC0_SYNC1, which is
- + * the SPI Select.
- + */
- + clk = au_readl(SYS_PINFUNC);
- + au_sync();
- + clk |= 1;
- + au_writel(clk, SYS_PINFUNC);
- + au_sync();
- +
- + /* Now, set up the PSC for SPI PIO mode.
- + */
- + sp = (volatile psc_spi_t *)SPI_PSC_BASE;
- + sp->psc_ctrl = PSC_CTRL_DISABLE;
- + au_sync();
- + sp->psc_sel = PSC_SEL_PS_SPIMODE;
- + sp->psc_spicfg = 0;
- + au_sync();
- + sp->psc_ctrl = PSC_CTRL_ENABLE;
- + au_sync();
- + do {
- + stat = sp->psc_spistat;
- + au_sync();
- + } while ((stat & PSC_SPISTAT_SR) == 0);
- +
- + sp->psc_spicfg = (PSC_SPICFG_RT_FIFO8 | PSC_SPICFG_TT_FIFO8 |
- + PSC_SPICFG_DD_DISABLE | PSC_SPICFG_MO);
- + sp->psc_spicfg |= PSC_SPICFG_SET_LEN(8);
- + spi_datalen = 8;
- + sp->psc_spimsk = PSC_SPIMSK_ALLMASK;
- + au_sync();
- +
- + set_baud_rate(1000000);
- +
- + sp->psc_spicfg |= PSC_SPICFG_DE_ENABLE;
- + do {
- + stat = sp->psc_spistat;
- + au_sync();
- + } while ((stat & PSC_SPISTAT_DR) == 0);
- +
- + misc_register(&au1550spi_miscdev);
- + printk("Au1550 SPI driver\n");
- + return 0;
- +}
- +
- +
- +void __exit
- +au1550spi_exit(void)
- +{
- + misc_deregister(&au1550spi_miscdev);
- +}
- +
- +
- +module_init(au1550spi_init);
- +module_exit(au1550spi_exit);
- --- a/drivers/char/Config.in
- +++ b/drivers/char/Config.in
- @@ -320,14 +320,11 @@ fi
- if [ "$CONFIG_OBSOLETE" = "y" -a "$CONFIG_ALPHA_BOOK1" = "y" ]; then
- bool 'Tadpole ANA H8 Support (OBSOLETE)' CONFIG_H8
- fi
- -if [ "$CONFIG_MIPS" = "y" -a "$CONFIG_NEW_TIME_C" = "y" ]; then
- - tristate 'Generic MIPS RTC Support' CONFIG_MIPS_RTC
- -fi
- if [ "$CONFIG_SGI_IP22" = "y" ]; then
- - bool 'SGI DS1286 RTC support' CONFIG_SGI_DS1286
- + tristate 'Dallas DS1286 RTC support' CONFIG_DS1286
- fi
- if [ "$CONFIG_SGI_IP27" = "y" ]; then
- - bool 'SGI M48T35 RTC support' CONFIG_SGI_IP27_RTC
- + tristate 'SGI M48T35 RTC support' CONFIG_SGI_IP27_RTC
- fi
- if [ "$CONFIG_TOSHIBA_RBTX4927" = "y" -o "$CONFIG_TOSHIBA_JMR3927" = "y" ]; then
- tristate 'Dallas DS1742 RTC support' CONFIG_DS1742
- @@ -390,6 +387,11 @@ if [ "$CONFIG_DRM" = "y" ]; then
- source drivers/char/drm/Config.in
- fi
- fi
- +
- +if [ "$CONFIG_X86" = "y" ]; then
- + tristate 'ACP Modem (Mwave) support' CONFIG_MWAVE
- +fi
- +
- endmenu
-
- if [ "$CONFIG_HOTPLUG" = "y" -a "$CONFIG_PCMCIA" != "n" ]; then
- @@ -398,6 +400,7 @@ fi
- if [ "$CONFIG_SOC_AU1X00" = "y" ]; then
- tristate ' Alchemy Au1x00 GPIO device support' CONFIG_AU1X00_GPIO
- tristate ' Au1000/ADS7846 touchscreen support' CONFIG_TS_AU1X00_ADS7846
- + #tristate ' Alchemy Au1550 PSC SPI support' CONFIG_AU1550_PSC_SPI
- fi
- if [ "$CONFIG_MIPS_ITE8172" = "y" ]; then
- tristate ' ITE GPIO' CONFIG_ITE_GPIO
- --- a/drivers/char/decserial.c
- +++ b/drivers/char/decserial.c
- @@ -3,95 +3,105 @@
- * choose the right serial device at boot time
- *
- * triemer 6-SEP-1998
- - * sercons.c is designed to allow the three different kinds
- + * sercons.c is designed to allow the three different kinds
- * of serial devices under the decstation world to co-exist
- - * in the same kernel. The idea here is to abstract
- + * in the same kernel. The idea here is to abstract
- * the pieces of the drivers that are common to this file
- * so that they do not clash at compile time and runtime.
- *
- * HK 16-SEP-1998 v0.002
- * removed the PROM console as this is not a real serial
- * device. Added support for PROM console in drivers/char/tty_io.c
- - * instead. Although it may work to enable more than one
- + * instead. Although it may work to enable more than one
- * console device I strongly recommend to use only one.
- + *
- + * Copyright (C) 2004 Maciej W. Rozycki
- */
-
- #include <linux/config.h>
- +#include <linux/errno.h>
- #include <linux/init.h>
- +
- #include <asm/dec/machtype.h>
- +#include <asm/dec/serial.h>
- +
- +extern int register_zs_hook(unsigned int channel,
- + struct dec_serial_hook *hook);
- +extern int unregister_zs_hook(unsigned int channel);
- +
- +extern int register_dz_hook(unsigned int channel,
- + struct dec_serial_hook *hook);
- +extern int unregister_dz_hook(unsigned int channel);
-
- +int register_dec_serial_hook(unsigned int channel,
- + struct dec_serial_hook *hook)
- +{
- #ifdef CONFIG_ZS
- -extern int zs_init(void);
- + if (IOASIC)
- + return register_zs_hook(channel, hook);
- #endif
- -
- #ifdef CONFIG_DZ
- -extern int dz_init(void);
- + if (!IOASIC)
- + return register_dz_hook(channel, hook);
- #endif
- + return 0;
- +}
-
- -#ifdef CONFIG_SERIAL_DEC_CONSOLE
- -
- +int unregister_dec_serial_hook(unsigned int channel)
- +{
- #ifdef CONFIG_ZS
- -extern void zs_serial_console_init(void);
- + if (IOASIC)
- + return unregister_zs_hook(channel);
- #endif
- -
- #ifdef CONFIG_DZ
- -extern void dz_serial_console_init(void);
- -#endif
- -
- + if (!IOASIC)
- + return unregister_dz_hook(channel);
- #endif
- + return 0;
- +}
-
- -/* rs_init - starts up the serial interface -
- - handle normal case of starting up the serial interface */
-
- -#ifdef CONFIG_SERIAL_DEC
- +extern int zs_init(void);
- +extern int dz_init(void);
-
- +/*
- + * rs_init - starts up the serial interface -
- + * handle normal case of starting up the serial interface
- + */
- int __init rs_init(void)
- {
- -
- -#if defined(CONFIG_ZS) && defined(CONFIG_DZ)
- - if (IOASIC)
- - return zs_init();
- - else
- - return dz_init();
- -#else
- -
- #ifdef CONFIG_ZS
- - return zs_init();
- + if (IOASIC)
- + return zs_init();
- #endif
- -
- #ifdef CONFIG_DZ
- - return dz_init();
- -#endif
- -
- + if (!IOASIC)
- + return dz_init();
- #endif
- + return -ENXIO;
- }
-
- __initcall(rs_init);
-
- -#endif
-
- #ifdef CONFIG_SERIAL_DEC_CONSOLE
-
- -/* dec_serial_console_init handles the special case of starting
- - * up the console on the serial port
- +extern void zs_serial_console_init(void);
- +extern void dz_serial_console_init(void);
- +
- +/*
- + * dec_serial_console_init handles the special case of starting
- + * up the console on the serial port
- */
- void __init dec_serial_console_init(void)
- {
- -#if defined(CONFIG_ZS) && defined(CONFIG_DZ)
- - if (IOASIC)
- - zs_serial_console_init();
- - else
- - dz_serial_console_init();
- -#else
- -
- #ifdef CONFIG_ZS
- - zs_serial_console_init();
- + if (IOASIC)
- + zs_serial_console_init();
- #endif
- -
- #ifdef CONFIG_DZ
- - dz_serial_console_init();
- -#endif
- -
- + if (!IOASIC)
- + dz_serial_console_init();
- #endif
- }
-
- --- a/drivers/char/ds1286.c
- +++ b/drivers/char/ds1286.c
- @@ -1,6 +1,10 @@
- /*
- * DS1286 Real Time Clock interface for Linux
- *
- + * Copyright (C) 2003 TimeSys Corp.
- + * S. James Hill (James.Hill@timesys.com)
- + * (sjhill@realitydiluted.com)
- + *
- * Copyright (C) 1998, 1999, 2000 Ralf Baechle
- *
- * Based on code written by Paul Gortmaker.
- @@ -29,6 +33,7 @@
- #include <linux/types.h>
- #include <linux/errno.h>
- #include <linux/miscdevice.h>
- +#include <linux/module.h>
- #include <linux/slab.h>
- #include <linux/ioport.h>
- #include <linux/fcntl.h>
- @@ -95,6 +100,12 @@ static ssize_t ds1286_read(struct file *
- return -EIO;
- }
-
- +void rtc_ds1286_wait(void)
- +{
- + unsigned char sec = CMOS_READ(RTC_SECONDS);
- + while (sec == CMOS_READ(RTC_SECONDS));
- +}
- +
- static int ds1286_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg)
- {
- @@ -249,23 +260,22 @@ static int ds1286_open(struct inode *ino
- {
- spin_lock_irq(&ds1286_lock);
-
- - if (ds1286_status & RTC_IS_OPEN)
- - goto out_busy;
- + if (ds1286_status & RTC_IS_OPEN) {
- + spin_unlock_irq(&ds1286_lock);
- + return -EBUSY;
- + }
-
- ds1286_status |= RTC_IS_OPEN;
-
- - spin_lock_irq(&ds1286_lock);
- + spin_unlock_irq(&ds1286_lock);
- return 0;
- -
- -out_busy:
- - spin_lock_irq(&ds1286_lock);
- - return -EBUSY;
- }
-
- static int ds1286_release(struct inode *inode, struct file *file)
- {
- + spin_lock_irq(&ds1286_lock);
- ds1286_status &= ~RTC_IS_OPEN;
- -
- + spin_unlock_irq(&ds1286_lock);
- return 0;
- }
-
- @@ -276,32 +286,6 @@ static unsigned int ds1286_poll(struct f
- return 0;
- }
-
- -/*
- - * The various file operations we support.
- - */
- -
- -static struct file_operations ds1286_fops = {
- - .llseek = no_llseek,
- - .read = ds1286_read,
- - .poll = ds1286_poll,
- - .ioctl = ds1286_ioctl,
- - .open = ds1286_open,
- - .release = ds1286_release,
- -};
- -
- -static struct miscdevice ds1286_dev=
- -{
- - .minor = RTC_MINOR,
- - .name = "rtc",
- - .fops = &ds1286_fops,
- -};
- -
- -int __init ds1286_init(void)
- -{
- - printk(KERN_INFO "DS1286 Real Time Clock Driver v%s\n", DS1286_VERSION);
- - return misc_register(&ds1286_dev);
- -}
- -
- static char *days[] = {
- "***", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
- };
- @@ -528,3 +512,38 @@ void ds1286_get_alm_time(struct rtc_time
- BCD_TO_BIN(alm_tm->tm_hour);
- alm_tm->tm_sec = 0;
- }
- +
- +static struct file_operations ds1286_fops = {
- + .owner = THIS_MODULE,
- + .llseek = no_llseek,
- + .read = ds1286_read,
- + .poll = ds1286_poll,
- + .ioctl = ds1286_ioctl,
- + .open = ds1286_open,
- + .release = ds1286_release,
- +};
- +
- +static struct miscdevice ds1286_dev =
- +{
- + .minor = RTC_MINOR,
- + .name = "rtc",
- + .fops = &ds1286_fops,
- +};
- +
- +static int __init ds1286_init(void)
- +{
- + printk(KERN_INFO "DS1286 Real Time Clock Driver v%s\n", DS1286_VERSION);
- + return misc_register(&ds1286_dev);
- +}
- +
- +static void __exit ds1286_exit(void)
- +{
- + misc_deregister(&ds1286_dev);
- +}
- +
- +module_init(ds1286_init);
- +module_exit(ds1286_exit);
- +EXPORT_NO_SYMBOLS;
- +
- +MODULE_AUTHOR("Ralf Baechle");
- +MODULE_LICENSE("GPL");
- --- a/drivers/char/ds1742.c
- +++ b/drivers/char/ds1742.c
- @@ -142,6 +142,7 @@ static int rtc_ds1742_set_time(unsigned
- CMOS_WRITE(RTC_WRITE, RTC_CONTROL);
-
- /* convert */
- + memset(&tm, 0, sizeof(struct rtc_time));
- to_tm(t, &tm);
-
- /* check each field one by one */
- @@ -216,6 +217,7 @@ static int get_ds1742_status(char *buf)
- unsigned long curr_time;
-
- curr_time = rtc_ds1742_get_time();
- + memset(&tm, 0, sizeof(struct rtc_time));
- to_tm(curr_time, &tm);
-
- p = buf;
- @@ -251,8 +253,8 @@ static int ds1742_read_proc(char *page,
-
- void rtc_ds1742_wait(void)
- {
- - while (CMOS_READ(RTC_SECONDS) & 1);
- - while (!(CMOS_READ(RTC_SECONDS) & 1));
- + unsigned char sec = CMOS_READ(RTC_SECONDS);
- + while (sec == CMOS_READ(RTC_SECONDS));
- }
-
- static int ds1742_ioctl(struct inode *inode, struct file *file,
- @@ -264,6 +266,7 @@ static int ds1742_ioctl(struct inode *in
- switch (cmd) {
- case RTC_RD_TIME: /* Read the time/date from RTC */
- curr_time = rtc_ds1742_get_time();
- + memset(&rtc_tm, 0, sizeof(struct rtc_time));
- to_tm(curr_time, &rtc_tm);
- rtc_tm.tm_year -= 1900;
- return copy_to_user((void *) arg, &rtc_tm, sizeof(rtc_tm)) ?
- --- a/drivers/char/dummy_keyb.c
- +++ b/drivers/char/dummy_keyb.c
- @@ -141,3 +141,7 @@ void __init kbd_init_hw(void)
- {
- printk("Dummy keyboard driver installed.\n");
- }
- +#ifdef CONFIG_MAGIC_SYSRQ
- +unsigned char kbd_sysrq_key;
- +unsigned char kbd_sysrq_xlate[128];
- +#endif
- --- a/drivers/char/dz.c
- +++ b/drivers/char/dz.c
- @@ -1,11 +1,13 @@
- /*
- - * dz.c: Serial port driver for DECStations equiped
- + * dz.c: Serial port driver for DECstations equipped
- * with the DZ chipset.
- *
- * Copyright (C) 1998 Olivier A. D. Lebaillif
- *
- * Email: olivier.lebaillif@ifrsys.com
- *
- + * Copyright (C) 2004 Maciej W. Rozycki
- + *
- * [31-AUG-98] triemer
- * Changed IRQ to use Harald's dec internals interrupts.h
- * removed base_addr code - moving address assignment to setup.c
- @@ -24,6 +26,7 @@
- #undef DEBUG_DZ
-
- #include <linux/config.h>
- +#include <linux/delay.h>
- #include <linux/version.h>
- #include <linux/kernel.h>
- #include <linux/sched.h>
- @@ -54,33 +57,56 @@
- #include <asm/system.h>
- #include <asm/uaccess.h>
-
- -#define CONSOLE_LINE (3) /* for definition of struct console */
- +#ifdef CONFIG_MAGIC_SYSRQ
- +#include <linux/sysrq.h>
- +#endif
-
- #include "dz.h"
-
- -#define DZ_INTR_DEBUG 1
- -
- DECLARE_TASK_QUEUE(tq_serial);
-
- -static struct dz_serial *lines[4];
- -static unsigned char tmp_buffer[256];
- +static struct dz_serial multi[DZ_NB_PORT]; /* Four serial lines in the DZ chip */
- +static struct tty_driver serial_driver, callout_driver;
- +
- +static struct tty_struct *serial_table[DZ_NB_PORT];
- +static struct termios *serial_termios[DZ_NB_PORT];
- +static struct termios *serial_termios_locked[DZ_NB_PORT];
- +
- +static int serial_refcount;
-
- -#ifdef DEBUG_DZ
- /*
- - * debugging code to send out chars via prom
- + * tmp_buf is used as a temporary buffer by serial_write. We need to
- + * lock it in case the copy_from_user blocks while swapping in a page,
- + * and some other program tries to do a serial write at the same time.
- + * Since the lock will only come under contention when the system is
- + * swapping and available memory is low, it makes sense to share one
- + * buffer across all the serial ports, since it significantly saves
- + * memory if large numbers of serial ports are open.
- */
- -static void debug_console(const char *s, int count)
- -{
- - unsigned i;
- +static unsigned char *tmp_buf;
- +static DECLARE_MUTEX(tmp_buf_sem);
-
- - for (i = 0; i < count; i++) {
- - if (*s == 10)
- - prom_printf("%c", 13);
- - prom_printf("%c", *s++);
- - }
- -}
- +static char *dz_name __initdata = "DECstation DZ serial driver version ";
- +static char *dz_version __initdata = "1.03";
- +
- +static struct dz_serial *lines[DZ_NB_PORT];
- +static unsigned char tmp_buffer[256];
- +
- +#ifdef CONFIG_SERIAL_DEC_CONSOLE
- +static struct console dz_sercons;
- +#endif
- +#if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && \
- + !defined(MODULE)
- +static unsigned long break_pressed; /* break, really ... */
- #endif
-
- +static void change_speed (struct dz_serial *);
- +
- +static int baud_table[] = {
- + 0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800,
- + 9600, 0
- +};
- +
- /*
- * ------------------------------------------------------------
- * dz_in () and dz_out ()
- @@ -94,15 +120,16 @@ static inline unsigned short dz_in(struc
- {
- volatile unsigned short *addr =
- (volatile unsigned short *) (info->port + offset);
- +
- return *addr;
- }
-
- static inline void dz_out(struct dz_serial *info, unsigned offset,
- unsigned short value)
- {
- -
- volatile unsigned short *addr =
- (volatile unsigned short *) (info->port + offset);
- +
- *addr = value;
- }
-
- @@ -143,25 +170,24 @@ static void dz_start(struct tty_struct *
-
- tmp |= mask; /* set the TX flag */
- dz_out(info, DZ_TCR, tmp);
- -
- }
-
- /*
- * ------------------------------------------------------------
- - * Here starts the interrupt handling routines. All of the
- - * following subroutines are declared as inline and are folded
- - * into dz_interrupt. They were separated out for readability's
- - * sake.
- *
- - * Note: rs_interrupt() is a "fast" interrupt, which means that it
- + * Here starts the interrupt handling routines. All of the following
- + * subroutines are declared as inline and are folded into
- + * dz_interrupt(). They were separated out for readability's sake.
- + *
- + * Note: dz_interrupt() is a "fast" interrupt, which means that it
- * runs with interrupts turned off. People who may want to modify
- - * rs_interrupt() should try to keep the interrupt handler as fast as
- + * dz_interrupt() should try to keep the interrupt handler as fast as
- * possible. After you are done making modifications, it is not a bad
- * idea to do:
- *
- * gcc -S -DKERNEL -Wall -Wstrict-prototypes -O6 -fomit-frame-pointer dz.c
- *
- - * and look at the resulting assemble code in serial.s.
- + * and look at the resulting assemble code in dz.s.
- *
- * ------------------------------------------------------------
- */
- @@ -188,101 +214,97 @@ static inline void dz_sched_event(struct
- * This routine deals with inputs from any lines.
- * ------------------------------------------------------------
- */
- -static inline void receive_chars(struct dz_serial *info_in)
- +static inline void receive_chars(struct dz_serial *info_in,
- + struct pt_regs *regs)
- {
- -
- struct dz_serial *info;
- - struct tty_struct *tty = 0;
- + struct tty_struct *tty;
- struct async_icount *icount;
- - int ignore = 0;
- - unsigned short status, tmp;
- - unsigned char ch;
- -
- - /* this code is going to be a problem...
- - the call to tty_flip_buffer is going to need
- - to be rethought...
- - */
- - do {
- - status = dz_in(info_in, DZ_RBUF);
- - info = lines[LINE(status)];
- + int lines_rx[DZ_NB_PORT] = { [0 ... DZ_NB_PORT - 1] = 0 };
- + unsigned short status;
- + unsigned char ch, flag;
- + int i;
-
- - /* punt so we don't get duplicate characters */
- - if (!(status & DZ_DVAL))
- - goto ignore_char;
- -
- - ch = UCHAR(status); /* grab the char */
- -
- -#if 0
- - if (info->is_console) {
- - if (ch == 0)
- - return; /* it's a break ... */
- - }
- -#endif
- + while ((status = dz_in(info_in, DZ_RBUF)) & DZ_DVAL) {
- + info = lines[LINE(status)];
- + tty = info->tty; /* point to the proper dev */
-
- - tty = info->tty; /* now tty points to the proper dev */
- - icount = &info->icount;
- + ch = UCHAR(status); /* grab the char */
-
- - if (!tty)
- - break;
- - if (tty->flip.count >= TTY_FLIPBUF_SIZE)
- - break;
- + if (!tty && (!info->hook || !info->hook->rx_char))
- + continue;
-
- - *tty->flip.char_buf_ptr = ch;
- - *tty->flip.flag_buf_ptr = 0;
- + icount = &info->icount;
- icount->rx++;
-
- - /* keep track of the statistics */
- - if (status & (DZ_OERR | DZ_FERR | DZ_PERR)) {
- - if (status & DZ_PERR) /* parity error */
- - icount->parity++;
- - else if (status & DZ_FERR) /* frame error */
- - icount->frame++;
- - if (status & DZ_OERR) /* overrun error */
- - icount->overrun++;
- -
- - /* check to see if we should ignore the character
- - and mask off conditions that should be ignored
- + flag = 0;
- + if (status & DZ_FERR) { /* frame error */
- + /*
- + * There is no separate BREAK status bit, so
- + * treat framing errors as BREAKs for Magic SysRq
- + * and SAK; normally, otherwise.
- */
- -
- - if (status & info->ignore_status_mask) {
- - if (++ignore > 100)
- - break;
- - goto ignore_char;
- +#if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && \
- + !defined(MODULE)
- + if (info->line == dz_sercons.index) {
- + if (!break_pressed)
- + break_pressed = jiffies;
- + continue;
- }
- - /* mask off the error conditions we want to ignore */
- - tmp = status & info->read_status_mask;
- -
- - if (tmp & DZ_PERR) {
- - *tty->flip.flag_buf_ptr = TTY_PARITY;
- -#ifdef DEBUG_DZ
- - debug_console("PERR\n", 5);
- -#endif
- - } else if (tmp & DZ_FERR) {
- - *tty->flip.flag_buf_ptr = TTY_FRAME;
- -#ifdef DEBUG_DZ
- - debug_console("FERR\n", 5);
- #endif
- + flag = TTY_BREAK;
- + if (info->flags & DZ_SAK)
- + do_SAK(tty);
- + else
- + flag = TTY_FRAME;
- + } else if (status & DZ_OERR) /* overrun error */
- + flag = TTY_OVERRUN;
- + else if (status & DZ_PERR) /* parity error */
- + flag = TTY_PARITY;
- +
- +#if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && \
- + !defined(MODULE)
- + if (break_pressed && info->line == dz_sercons.index) {
- + if (time_before(jiffies, break_pressed + HZ * 5)) {
- + handle_sysrq(ch, regs, NULL, NULL);
- + break_pressed = 0;
- + continue;
- }
- - if (tmp & DZ_OERR) {
- -#ifdef DEBUG_DZ
- - debug_console("OERR\n", 5);
- + break_pressed = 0;
- + }
- #endif
- - if (tty->flip.count < TTY_FLIPBUF_SIZE) {
- - tty->flip.count++;
- - tty->flip.flag_buf_ptr++;
- - tty->flip.char_buf_ptr++;
- - *tty->flip.flag_buf_ptr = TTY_OVERRUN;
- - }
- - }
- +
- + if (info->hook && info->hook->rx_char) {
- + (*info->hook->rx_char)(ch, flag);
- + return;
- }
- - tty->flip.flag_buf_ptr++;
- - tty->flip.char_buf_ptr++;
- - tty->flip.count++;
- - ignore_char:
- - } while (status & DZ_DVAL);
-
- - if (tty)
- - tty_flip_buffer_push(tty);
- + /* keep track of the statistics */
- + switch (flag) {
- + case TTY_FRAME:
- + icount->frame++;
- + break;
- + case TTY_PARITY:
- + icount->parity++;
- + break;
- + case TTY_OVERRUN:
- + icount->overrun++;
- + break;
- + case TTY_BREAK:
- + icount->brk++;
- + break;
- + default:
- + break;
- + }
- +
- + if ((status & info->ignore_status_mask) == 0) {
- + tty_insert_flip_char(tty, ch, flag);
- + lines_rx[LINE(status)] = 1;
- + }
- + }
- + for (i = 0; i < DZ_NB_PORT; i++)
- + if (lines_rx[i])
- + tty_flip_buffer_push(lines[i]->tty);
- }
-
- /*
- @@ -292,20 +314,34 @@ static inline void receive_chars(struct
- * This routine deals with outputs to any lines.
- * ------------------------------------------------------------
- */
- -static inline void transmit_chars(struct dz_serial *info)
- +static inline void transmit_chars(struct dz_serial *info_in)
- {
- + struct dz_serial *info;
- + unsigned short status;
- unsigned char tmp;
-
- + status = dz_in(info_in, DZ_CSR);
- + info = lines[LINE(status)];
-
- + if (info->hook || !info->tty) {
- + unsigned short mask, tmp;
-
- - if (info->x_char) { /* XON/XOFF chars */
- + mask = 1 << info->line;
- + tmp = dz_in(info, DZ_TCR); /* read the TX flag */
- + tmp &= ~mask; /* clear the TX flag */
- + dz_out(info, DZ_TCR, tmp);
- + return;
- + }
- +
- + if (info->x_char) { /* XON/XOFF chars */
- dz_out(info, DZ_TDR, info->x_char);
- info->icount.tx++;
- info->x_char = 0;
- return;
- }
- /* if nothing to do or stopped or hardware stopped */
- - if ((info->xmit_cnt <= 0) || info->tty->stopped || info->tty->hw_stopped) {
- + if (info->xmit_cnt <= 0 ||
- + info->tty->stopped || info->tty->hw_stopped) {
- dz_stop(info->tty);
- return;
- }
- @@ -359,15 +395,14 @@ static inline void check_modem_status(st
- */
- static void dz_interrupt(int irq, void *dev, struct pt_regs *regs)
- {
- - struct dz_serial *info;
- + struct dz_serial *info = (struct dz_serial *)dev;
- unsigned short status;
-
- /* get the reason why we just got an irq */
- - status = dz_in((struct dz_serial *) dev, DZ_CSR);
- - info = lines[LINE(status)]; /* re-arrange info the proper port */
- + status = dz_in(info, DZ_CSR);
-
- if (status & DZ_RDONE)
- - receive_chars(info); /* the receive function */
- + receive_chars(info, regs);
-
- if (status & DZ_TRDY)
- transmit_chars(info);
- @@ -514,7 +549,7 @@ static void shutdown(struct dz_serial *i
-
-
- info->cflags &= ~DZ_CREAD; /* turn off receive enable flag */
- - dz_out(info, DZ_LPR, info->cflags);
- + dz_out(info, DZ_LPR, info->cflags | info->line);
-
- if (info->xmit_buf) { /* free Tx buffer */
- free_page((unsigned long) info->xmit_buf);
- @@ -545,18 +580,21 @@ static void change_speed(struct dz_seria
- {
- unsigned long flags;
- unsigned cflag;
- - int baud;
- + int baud, i;
-
- - if (!info->tty || !info->tty->termios)
- - return;
- + if (!info->hook) {
- + if (!info->tty || !info->tty->termios)
- + return;
- + cflag = info->tty->termios->c_cflag;
- + } else {
- + cflag = info->hook->cflags;
- + }
-
- save_flags(flags);
- cli();
-
- info->cflags = info->line;
-
- - cflag = info->tty->termios->c_cflag;
- -
- switch (cflag & CSIZE) {
- case CS5:
- info->cflags |= DZ_CS5;
- @@ -579,7 +617,16 @@ static void change_speed(struct dz_seria
- if (cflag & PARODD)
- info->cflags |= DZ_PARODD;
-
- - baud = tty_get_baud_rate(info->tty);
- + i = cflag & CBAUD;
- + if (i & CBAUDEX) {
- + i &= ~CBAUDEX;
- + if (!info->hook)
- + info->tty->termios->c_cflag &= ~CBAUDEX;
- + else
- + info->hook->cflags &= ~CBAUDEX;
- + }
- + baud = baud_table[i];
- +
- switch (baud) {
- case 50:
- info->cflags |= DZ_B50;
- @@ -629,16 +676,16 @@ static void change_speed(struct dz_seria
- }
-
- info->cflags |= DZ_RXENAB;
- - dz_out(info, DZ_LPR, info->cflags);
- + dz_out(info, DZ_LPR, info->cflags | info->line);
-
- /* setup accept flag */
- info->read_status_mask = DZ_OERR;
- - if (I_INPCK(info->tty))
- + if (info->tty && I_INPCK(info->tty))
- info->read_status_mask |= (DZ_FERR | DZ_PERR);
-
- /* characters to ignore */
- info->ignore_status_mask = 0;
- - if (I_IGNPAR(info->tty))
- + if (info->tty && I_IGNPAR(info->tty))
- info->ignore_status_mask |= (DZ_FERR | DZ_PERR);
-
- restore_flags(flags);
- @@ -694,7 +741,7 @@ static int dz_write(struct tty_struct *t
-
- down(&tmp_buf_sem);
- while (1) {
- - c = MIN(count, MIN(DZ_XMIT_SIZE - info->xmit_cnt - 1, DZ_XMIT_SIZE - info->xmit_head));
- + c = min(count, min(DZ_XMIT_SIZE - info->xmit_cnt - 1, DZ_XMIT_SIZE - info->xmit_head));
- if (c <= 0)
- break;
-
- @@ -707,7 +754,7 @@ static int dz_write(struct tty_struct *t
- save_flags(flags);
- cli();
-
- - c = MIN(c, MIN(DZ_XMIT_SIZE - info->xmit_cnt - 1, DZ_XMIT_SIZE - info->xmit_head));
- + c = min(c, min(DZ_XMIT_SIZE - info->xmit_cnt - 1, DZ_XMIT_SIZE - info->xmit_head));
- memcpy(info->xmit_buf + info->xmit_head, tmp_buf, c);
- info->xmit_head = ((info->xmit_head + c) & (DZ_XMIT_SIZE - 1));
- info->xmit_cnt += c;
- @@ -727,7 +774,7 @@ static int dz_write(struct tty_struct *t
- save_flags(flags);
- cli();
-
- - c = MIN(count, MIN(DZ_XMIT_SIZE - info->xmit_cnt - 1, DZ_XMIT_SIZE - info->xmit_head));
- + c = min(count, min(DZ_XMIT_SIZE - info->xmit_cnt - 1, DZ_XMIT_SIZE - info->xmit_head));
- if (c <= 0) {
- restore_flags(flags);
- break;
- @@ -845,7 +892,7 @@ static void dz_send_xchar(struct tty_str
-
- /*
- * ------------------------------------------------------------
- - * rs_ioctl () and friends
- + * dz_ioctl () and friends
- * ------------------------------------------------------------
- */
- static int get_serial_info(struct dz_serial *info,
- @@ -958,6 +1005,9 @@ static int dz_ioctl(struct tty_struct *t
- struct dz_serial *info = (struct dz_serial *) tty->driver_data;
- int retval;
-
- + if (info->hook)
- + return -ENODEV;
- +
- if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
- (cmd != TIOCSERCONFIG) && (cmd != TIOCSERGWILD) &&
- (cmd != TIOCSERSWILD) && (cmd != TIOCSERGSTRUCT)) {
- @@ -1252,19 +1302,14 @@ static int dz_open(struct tty_struct *tt
- int retval, line;
-
- line = MINOR(tty->device) - tty->driver.minor_start;
- -
- - /* The dz lines for the mouse/keyboard must be
- - * opened using their respective drivers.
- - */
- if ((line < 0) || (line >= DZ_NB_PORT))
- return -ENODEV;
- + info = lines[line];
-
- - if ((line == DZ_KEYBOARD) || (line == DZ_MOUSE))
- + if (info->hook)
- return -ENODEV;
-
- - info = lines[line];
- info->count++;
- -
- tty->driver_data = info;
- info->tty = tty;
-
- @@ -1285,14 +1330,21 @@ static int dz_open(struct tty_struct *tt
- else
- *tty->termios = info->callout_termios;
- change_speed(info);
- -
- }
- +#ifdef CONFIG_SERIAL_DEC_CONSOLE
- + if (dz_sercons.cflag && dz_sercons.index == line) {
- + tty->termios->c_cflag = dz_sercons.cflag;
- + dz_sercons.cflag = 0;
- + change_speed(info);
- + }
- +#endif
- +
- info->session = current->session;
- info->pgrp = current->pgrp;
- return 0;
- }
-
- -static void show_serial_version(void)
- +static void __init show_serial_version(void)
- {
- printk("%s%s\n", dz_name, dz_version);
- }
- @@ -1300,7 +1352,6 @@ static void show_serial_version(void)
- int __init dz_init(void)
- {
- int i;
- - long flags;
- struct dz_serial *info;
-
- /* Setup base handler, and timer table. */
- @@ -1311,9 +1362,9 @@ int __init dz_init(void)
- memset(&serial_driver, 0, sizeof(struct tty_driver));
- serial_driver.magic = TTY_DRIVER_MAGIC;
- #if (LINUX_VERSION_CODE > 0x2032D && defined(CONFIG_DEVFS_FS))
- - serial_driver.name = "ttyS";
- -#else
- serial_driver.name = "tts/%d";
- +#else
- + serial_driver.name = "ttyS";
- #endif
- serial_driver.major = TTY_MAJOR;
- serial_driver.minor_start = 64;
- @@ -1352,9 +1403,9 @@ int __init dz_init(void)
- */
- callout_driver = serial_driver;
- #if (LINUX_VERSION_CODE > 0x2032D && defined(CONFIG_DEVFS_FS))
- - callout_driver.name = "cua";
- -#else
- callout_driver.name = "cua/%d";
- +#else
- + callout_driver.name = "cua";
- #endif
- callout_driver.major = TTYAUX_MAJOR;
- callout_driver.subtype = SERIAL_TYPE_CALLOUT;
- @@ -1363,25 +1414,27 @@ int __init dz_init(void)
- panic("Couldn't register serial driver");
- if (tty_register_driver(&callout_driver))
- panic("Couldn't register callout driver");
- - save_flags(flags);
- - cli();
-
- for (i = 0; i < DZ_NB_PORT; i++) {
- info = &multi[i];
- lines[i] = info;
- - info->magic = SERIAL_MAGIC;
- -
- + info->tty = 0;
- + info->x_char = 0;
- if (mips_machtype == MACH_DS23100 ||
- mips_machtype == MACH_DS5100)
- info->port = (unsigned long) KN01_DZ11_BASE;
- else
- info->port = (unsigned long) KN02_DZ11_BASE;
- -
- info->line = i;
- - info->tty = 0;
- +
- + if (info->hook && info->hook->init_info) {
- + (*info->hook->init_info)(info);
- + continue;
- + }
- +
- + info->magic = SERIAL_MAGIC;
- info->close_delay = 50;
- info->closing_wait = 3000;
- - info->x_char = 0;
- info->event = 0;
- info->count = 0;
- info->blocked_open = 0;
- @@ -1393,25 +1446,16 @@ int __init dz_init(void)
- info->normal_termios = serial_driver.init_termios;
- init_waitqueue_head(&info->open_wait);
- init_waitqueue_head(&info->close_wait);
- -
- - /*
- - * If we are pointing to address zero then punt - not correctly
- - * set up in setup.c to handle this.
- - */
- - if (!info->port)
- - return 0;
- -
- - printk("ttyS%02d at 0x%08x (irq = %d)\n", info->line,
- - info->port, dec_interrupt[DEC_IRQ_DZ11]);
- -
- + printk("ttyS%02d at 0x%08x (irq = %d) is a DC7085 DZ\n",
- + info->line, info->port, dec_interrupt[DEC_IRQ_DZ11]);
- tty_register_devfs(&serial_driver, 0,
- - serial_driver.minor_start + info->line);
- + serial_driver.minor_start + info->line);
- tty_register_devfs(&callout_driver, 0,
- - callout_driver.minor_start + info->line);
- + callout_driver.minor_start + info->line);
- }
-
- - /* reset the chip */
- #ifndef CONFIG_SERIAL_DEC_CONSOLE
- + /* reset the chip */
- dz_out(info, DZ_CSR, DZ_CLR);
- while (dz_in(info, DZ_CSR) & DZ_CLR);
- iob();
- @@ -1420,43 +1464,104 @@ int __init dz_init(void)
- dz_out(info, DZ_CSR, DZ_MSE);
- #endif
-
- - /* order matters here... the trick is that flags
- - is updated... in request_irq - to immediatedly obliterate
- - it is unwise. */
- - restore_flags(flags);
- -
- -
- if (request_irq(dec_interrupt[DEC_IRQ_DZ11], dz_interrupt,
- - SA_INTERRUPT, "DZ", lines[0]))
- + 0, "DZ", lines[0]))
- panic("Unable to register DZ interrupt");
-
- + for (i = 0; i < DZ_NB_PORT; i++)
- + if (lines[i]->hook) {
- + startup(lines[i]);
- + if (lines[i]->hook->init_channel)
- + (*lines[i]->hook->init_channel)(lines[i]);
- + }
- +
- return 0;
- }
-
- -#ifdef CONFIG_SERIAL_DEC_CONSOLE
- -static void dz_console_put_char(unsigned char ch)
- +/*
- + * polling I/O routines
- + */
- +static int dz_poll_tx_char(void *handle, unsigned char ch)
- {
- unsigned long flags;
- - int loops = 2500;
- - unsigned short tmp = ch;
- - /* this code sends stuff out to serial device - spinning its
- - wheels and waiting. */
- + struct dz_serial *info = handle;
- + unsigned short csr, tcr, trdy, mask;
- + int loops = 10000;
- + int ret;
-
- - /* force the issue - point it at lines[3] */
- - dz_console = &multi[CONSOLE_LINE];
- + local_irq_save(flags);
- + csr = dz_in(info, DZ_CSR);
- + dz_out(info, DZ_CSR, csr & ~DZ_TIE);
- + tcr = dz_in(info, DZ_TCR);
- + tcr |= 1 << info->line;
- + mask = tcr;
- + dz_out(info, DZ_TCR, mask);
- + iob();
- + local_irq_restore(flags);
-
- - save_flags(flags);
- - cli();
- + while (loops--) {
- + trdy = dz_in(info, DZ_CSR);
- + if (!(trdy & DZ_TRDY))
- + continue;
- + trdy = (trdy & DZ_TLINE) >> 8;
- + if (trdy == info->line)
- + break;
- + mask &= ~(1 << trdy);
- + dz_out(info, DZ_TCR, mask);
- + iob();
- + udelay(2);
- + }
-
- + if (loops) {
- + dz_out(info, DZ_TDR, ch);
- + ret = 0;
- + } else
- + ret = -EAGAIN;
-
- - /* spin our wheels */
- - while (((dz_in(dz_console, DZ_CSR) & DZ_TRDY) != DZ_TRDY) && loops--);
- + dz_out(info, DZ_TCR, tcr);
- + dz_out(info, DZ_CSR, csr);
-
- - /* Actually transmit the character. */
- - dz_out(dz_console, DZ_TDR, tmp);
- + return ret;
- +}
-
- - restore_flags(flags);
- +static int dz_poll_rx_char(void *handle)
- +{
- + return -ENODEV;
- +}
- +
- +int register_dz_hook(unsigned int channel, struct dec_serial_hook *hook)
- +{
- + struct dz_serial *info = multi + channel;
- +
- + if (info->hook) {
- + printk("%s: line %d has already a hook registered\n",
- + __FUNCTION__, channel);
- +
- + return 0;
- + } else {
- + hook->poll_rx_char = dz_poll_rx_char;
- + hook->poll_tx_char = dz_poll_tx_char;
- + info->hook = hook;
- +
- + return 1;
- + }
- +}
- +
- +int unregister_dz_hook(unsigned int channel)
- +{
- + struct dz_serial *info = &multi[channel];
- +
- + if (info->hook) {
- + info->hook = NULL;
- + return 1;
- + } else {
- + printk("%s: trying to unregister hook on line %d,"
- + " but none is registered\n", __FUNCTION__, channel);
- + return 0;
- + }
- }
- +
- +#ifdef CONFIG_SERIAL_DEC_CONSOLE
- /*
- * -------------------------------------------------------------------
- * dz_console_print ()
- @@ -1465,17 +1570,19 @@ static void dz_console_put_char(unsigned
- * The console must be locked when we get here.
- * -------------------------------------------------------------------
- */
- -static void dz_console_print(struct console *cons,
- +static void dz_console_print(struct console *co,
- const char *str,
- unsigned int count)
- {
- + struct dz_serial *info = multi + co->index;
- +
- #ifdef DEBUG_DZ
- prom_printf((char *) str);
- #endif
- while (count--) {
- if (*str == '\n')
- - dz_console_put_char('\r');
- - dz_console_put_char(*str++);
- + dz_poll_tx_char(info, '\r');
- + dz_poll_tx_char(info, *str++);
- }
- }
-
- @@ -1486,12 +1593,12 @@ static kdev_t dz_console_device(struct c
-
- static int __init dz_console_setup(struct console *co, char *options)
- {
- + struct dz_serial *info = multi + co->index;
- int baud = 9600;
- int bits = 8;
- int parity = 'n';
- int cflag = CREAD | HUPCL | CLOCAL;
- char *s;
- - unsigned short mask, tmp;
-
- if (options) {
- baud = simple_strtoul(options, NULL, 10);
- @@ -1542,44 +1649,31 @@ static int __init dz_console_setup(struc
- }
- co->cflag = cflag;
-
- - /* TOFIX: force to console line */
- - dz_console = &multi[CONSOLE_LINE];
- if ((mips_machtype == MACH_DS23100) || (mips_machtype == MACH_DS5100))
- - dz_console->port = KN01_DZ11_BASE;
- + info->port = KN01_DZ11_BASE;
- else
- - dz_console->port = KN02_DZ11_BASE;
- - dz_console->line = CONSOLE_LINE;
- + info->port = KN02_DZ11_BASE;
- + info->line = co->index;
-
- - dz_out(dz_console, DZ_CSR, DZ_CLR);
- - while ((tmp = dz_in(dz_console, DZ_CSR)) & DZ_CLR);
- + dz_out(info, DZ_CSR, DZ_CLR);
- + while (dz_in(info, DZ_CSR) & DZ_CLR);
-
- /* enable scanning */
- - dz_out(dz_console, DZ_CSR, DZ_MSE);
- + dz_out(info, DZ_CSR, DZ_MSE);
-
- /* Set up flags... */
- - dz_console->cflags = 0;
- - dz_console->cflags |= DZ_B9600;
- - dz_console->cflags |= DZ_CS8;
- - dz_console->cflags |= DZ_PARENB;
- - dz_out(dz_console, DZ_LPR, dz_console->cflags);
- -
- - mask = 1 << dz_console->line;
- - tmp = dz_in(dz_console, DZ_TCR); /* read the TX flag */
- - if (!(tmp & mask)) {
- - tmp |= mask; /* set the TX flag */
- - dz_out(dz_console, DZ_TCR, tmp);
- - }
- + dz_out(info, DZ_LPR, cflag | info->line);
- +
- return 0;
- }
-
- -static struct console dz_sercons =
- -{
- - .name = "ttyS",
- - .write = dz_console_print,
- - .device = dz_console_device,
- - .setup = dz_console_setup,
- - .flags = CON_CONSDEV | CON_PRINTBUFFER,
- - .index = CONSOLE_LINE,
- +static struct console dz_sercons = {
- + .name = "ttyS",
- + .write = dz_console_print,
- + .device = dz_console_device,
- + .setup = dz_console_setup,
- + .flags = CON_PRINTBUFFER,
- + .index = -1,
- };
-
- void __init dz_serial_console_init(void)
- --- a/drivers/char/dz.h
- +++ b/drivers/char/dz.h
- @@ -10,6 +10,8 @@
- #ifndef DZ_SERIAL_H
- #define DZ_SERIAL_H
-
- +#include <asm/dec/serial.h>
- +
- #define SERIAL_MAGIC 0x5301
-
- /*
- @@ -17,6 +19,7 @@
- */
- #define DZ_TRDY 0x8000 /* Transmitter empty */
- #define DZ_TIE 0x4000 /* Transmitter Interrupt Enable */
- +#define DZ_TLINE 0x0300 /* Transmitter Line Number */
- #define DZ_RDONE 0x0080 /* Receiver data ready */
- #define DZ_RIE 0x0040 /* Receive Interrupt Enable */
- #define DZ_MSE 0x0020 /* Master Scan Enable */
- @@ -37,19 +40,30 @@
- #define UCHAR(x) (unsigned char)(x & DZ_RBUF_MASK)
-
- /*
- - * Definitions for the Transmit Register.
- + * Definitions for the Transmit Control Register.
- */
- #define DZ_LINE_KEYBOARD 0x0001
- #define DZ_LINE_MOUSE 0x0002
- #define DZ_LINE_MODEM 0x0004
- #define DZ_LINE_PRINTER 0x0008
-
- +#define DZ_MODEM_RTS 0x0800 /* RTS for the modem line (2) */
- #define DZ_MODEM_DTR 0x0400 /* DTR for the modem line (2) */
- +#define DZ_PRINT_RTS 0x0200 /* RTS for the printer line (3) */
- +#define DZ_PRINT_DTR 0x0100 /* DTR for the printer line (3) */
- +#define DZ_LNENB 0x000f /* Transmitter Line Enable */
-
- /*
- * Definitions for the Modem Status Register.
- */
- +#define DZ_MODEM_RI 0x0800 /* RI for the modem line (2) */
- +#define DZ_MODEM_CD 0x0400 /* CD for the modem line (2) */
- #define DZ_MODEM_DSR 0x0200 /* DSR for the modem line (2) */
- +#define DZ_MODEM_CTS 0x0100 /* CTS for the modem line (2) */
- +#define DZ_PRINT_RI 0x0008 /* RI for the printer line (2) */
- +#define DZ_PRINT_CD 0x0004 /* CD for the printer line (2) */
- +#define DZ_PRINT_DSR 0x0002 /* DSR for the printer line (2) */
- +#define DZ_PRINT_CTS 0x0001 /* CTS for the printer line (2) */
-
- /*
- * Definitions for the Transmit Data Register.
- @@ -115,9 +129,6 @@
-
- #define DZ_EVENT_WRITE_WAKEUP 0
-
- -#ifndef MIN
- -#define MIN(a,b) ((a) < (b) ? (a) : (b))
- -
- #define DZ_INITIALIZED 0x80000000 /* Serial port was initialized */
- #define DZ_CALLOUT_ACTIVE 0x40000000 /* Call out device is active */
- #define DZ_NORMAL_ACTIVE 0x20000000 /* Normal device is active */
- @@ -129,6 +140,7 @@
- #define DZ_CLOSING_WAIT_INF 0
- #define DZ_CLOSING_WAIT_NONE 65535
-
- +#define DZ_SAK 0x0004 /* Secure Attention Key (Orange book) */
- #define DZ_SPLIT_TERMIOS 0x0008 /* Separate termios for dialin/callout */
- #define DZ_SESSION_LOCKOUT 0x0100 /* Lock out cua opens based on session */
- #define DZ_PGRP_LOCKOUT 0x0200 /* Lock out cua opens based on pgrp */
- @@ -166,79 +178,9 @@ struct dz_serial {
- long session; /* Session of opening process */
- long pgrp; /* pgrp of opening process */
-
- + struct dec_serial_hook *hook; /* Hook on this channel. */
- unsigned char is_console; /* flag indicating a serial console */
- unsigned char is_initialized;
- };
-
- -static struct dz_serial multi[DZ_NB_PORT]; /* Four serial lines in the DZ chip */
- -static struct dz_serial *dz_console;
- -static struct tty_driver serial_driver, callout_driver;
- -
- -static struct tty_struct *serial_table[DZ_NB_PORT];
- -static struct termios *serial_termios[DZ_NB_PORT];
- -static struct termios *serial_termios_locked[DZ_NB_PORT];
- -
- -static int serial_refcount;
- -
- -/*
- - * tmp_buf is used as a temporary buffer by serial_write. We need to
- - * lock it in case the copy_from_user blocks while swapping in a page,
- - * and some other program tries to do a serial write at the same time.
- - * Since the lock will only come under contention when the system is
- - * swapping and available memory is low, it makes sense to share one
- - * buffer across all the serial ports, since it significantly saves
- - * memory if large numbers of serial ports are open.
- - */
- -static unsigned char *tmp_buf;
- -static DECLARE_MUTEX(tmp_buf_sem);
- -
- -static char *dz_name = "DECstation DZ serial driver version ";
- -static char *dz_version = "1.02";
- -
- -static inline unsigned short dz_in (struct dz_serial *, unsigned);
- -static inline void dz_out (struct dz_serial *, unsigned, unsigned short);
- -
- -static inline void dz_sched_event (struct dz_serial *, int);
- -static inline void receive_chars (struct dz_serial *);
- -static inline void transmit_chars (struct dz_serial *);
- -static inline void check_modem_status (struct dz_serial *);
- -
- -static void dz_stop (struct tty_struct *);
- -static void dz_start (struct tty_struct *);
- -static void dz_interrupt (int, void *, struct pt_regs *);
- -static void do_serial_bh (void);
- -static void do_softint (void *);
- -static void do_serial_hangup (void *);
- -static void change_speed (struct dz_serial *);
- -static void dz_flush_chars (struct tty_struct *);
- -static void dz_console_print (struct console *, const char *, unsigned int);
- -static void dz_flush_buffer (struct tty_struct *);
- -static void dz_throttle (struct tty_struct *);
- -static void dz_unthrottle (struct tty_struct *);
- -static void dz_send_xchar (struct tty_struct *, char);
- -static void shutdown (struct dz_serial *);
- -static void send_break (struct dz_serial *, int);
- -static void dz_set_termios (struct tty_struct *, struct termios *);
- -static void dz_close (struct tty_struct *, struct file *);
- -static void dz_hangup (struct tty_struct *);
- -static void show_serial_version (void);
- -
- -static int dz_write (struct tty_struct *, int, const unsigned char *, int);
- -static int dz_write_room (struct tty_struct *);
- -static int dz_chars_in_buffer (struct tty_struct *);
- -static int startup (struct dz_serial *);
- -static int get_serial_info (struct dz_serial *, struct serial_struct *);
- -static int set_serial_info (struct dz_serial *, struct serial_struct *);
- -static int get_lsr_info (struct dz_serial *, unsigned int *);
- -static int dz_ioctl (struct tty_struct *, struct file *, unsigned int, unsigned long);
- -static int block_til_ready (struct tty_struct *, struct file *, struct dz_serial *);
- -static int dz_open (struct tty_struct *, struct file *);
- -
- -#ifdef MODULE
- -int init_module (void)
- -void cleanup_module (void)
- -#endif
- -
- -#endif
- -
- #endif /* DZ_SERIAL_H */
- --- /dev/null
- +++ b/drivers/char/ibm_workpad_keymap.map
- @@ -0,0 +1,343 @@
- +# Keymap for IBM Workpad z50
- +# US Mapping
- +#
- +# by Michael Klar <wyldfier@iname.com>
- +#
- +# This is a great big mess on account of how the Caps Lock key is handled as
- +# LeftShift-RightShift. Right shift key had to be broken out, so don't use
- +# use this map file as a basis for other keyboards that don't do the same
- +# thing with Caps Lock.
- +#
- +# 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.
- +
- +keymaps 0-2,4-5,8,12,32-33,36-37
- +strings as usual
- +
- +keycode 0 = F1 F11 Console_13
- + shiftr keycode 0 = F11
- + shift shiftr keycode 0 = F11
- + control keycode 0 = F1
- + alt keycode 0 = Console_1
- + control alt keycode 0 = Console_1
- +keycode 1 = F3 F13 Console_15
- + shiftr keycode 1 = F13
- + shift shiftr keycode 1 = F13
- + control keycode 1 = F3
- + alt keycode 1 = Console_3
- + control alt keycode 1 = Console_3
- +keycode 2 = F5 F15 Console_17
- + shiftr keycode 2 = F15
- + shift shiftr keycode 2 = F15
- + control keycode 2 = F5
- + alt keycode 2 = Console_5
- + control alt keycode 2 = Console_5
- +keycode 3 = F7 F17 Console_19
- + shiftr keycode 3 = F17
- + shift shiftr keycode 3 = F17
- + control keycode 3 = F7
- + alt keycode 3 = Console_7
- + control alt keycode 3 = Console_7
- +keycode 4 = F9 F19 Console_21
- + shiftr keycode 4 = F19
- + shift shiftr keycode 4 = F19
- + control keycode 4 = F9
- + alt keycode 4 = Console_9
- + control alt keycode 4 = Console_9
- +#keycode 5 is contrast down
- +#keycode 6 is contrast up
- +keycode 7 = F11 F11 Console_23
- + shiftr keycode 7 = F11
- + shift shiftr keycode 7 = F11
- + control keycode 7 = F11
- + alt keycode 7 = Console_11
- + control alt keycode 7 = Console_11
- +keycode 8 = F2 F12 Console_14
- + shiftr keycode 8 = F12
- + shift shiftr keycode 8 = F12
- + control keycode 8 = F2
- + alt keycode 8 = Console_2
- + control alt keycode 8 = Console_2
- +keycode 9 = F4 F14 Console_16
- + shiftr keycode 9 = F14
- + shift shiftr keycode 9 = F14
- + control keycode 9 = F4
- + alt keycode 9 = Console_4
- + control alt keycode 9 = Console_4
- +keycode 10 = F6 F16 Console_18
- + shiftr keycode 10 = F16
- + shift shiftr keycode 10 = F16
- + control keycode 10 = F6
- + alt keycode 10 = Console_6
- + control alt keycode 10 = Console_6
- +keycode 11 = F8 F18 Console_20
- + shiftr keycode 11 = F18
- + shift shiftr keycode 11 = F18
- + control keycode 11 = F8
- + alt keycode 11 = Console_8
- + control alt keycode 11 = Console_8
- +keycode 12 = F10 F20 Console_22
- + shiftr keycode 12 = F20
- + shift shiftr keycode 12 = F20
- + control keycode 12 = F10
- + alt keycode 12 = Console_10
- + control alt keycode 12 = Console_10
- +#keycode 13 is brightness down
- +#keycode 14 is brightness up
- +keycode 15 = F12 F12 Console_24
- + shiftr keycode 15 = F12
- + shift shiftr keycode 15 = F12
- + control keycode 15 = F12
- + alt keycode 15 = Console_12
- + control alt keycode 15 = Console_12
- +keycode 16 = apostrophe quotedbl
- + shiftr keycode 16 = quotedbl
- + shift shiftr keycode 16 = quotedbl
- + control keycode 16 = Control_g
- + alt keycode 16 = Meta_apostrophe
- +keycode 17 = bracketleft braceleft
- + shiftr keycode 17 = braceleft
- + shift shiftr keycode 17 = braceleft
- + control keycode 17 = Escape
- + alt keycode 17 = Meta_bracketleft
- +keycode 18 = minus underscore backslash
- + shiftr keycode 18 = underscore
- + shift shiftr keycode 18 = underscore
- + control keycode 18 = Control_underscore
- + shift control keycode 18 = Control_underscore
- + shiftr control keycode 18 = Control_underscore
- + shift shiftr control keycode 18 = Control_underscore
- + alt keycode 18 = Meta_minus
- +keycode 19 = zero parenright braceright
- + shiftr keycode 19 = parenright
- + shift shiftr keycode 19 = parenright
- + alt keycode 19 = Meta_zero
- +keycode 20 = p
- + shiftr keycode 20 = +P
- + shift shiftr keycode 20 = +p
- +keycode 21 = semicolon colon
- + shiftr keycode 21 = colon
- + shift shiftr keycode 21 = colon
- + alt keycode 21 = Meta_semicolon
- +keycode 22 = Up Scroll_Backward
- + shiftr keycode 22 = Scroll_Backward
- + shift shiftr keycode 22 = Scroll_Backward
- + alt keycode 22 = Prior
- +keycode 23 = slash question
- + shiftr keycode 23 = question
- + shift shiftr keycode 23 = question
- + control keycode 23 = Delete
- + alt keycode 23 = Meta_slash
- +
- +keycode 27 = nine parenleft bracketright
- + shiftr keycode 27 = parenleft
- + shift shiftr keycode 27 = parenleft
- + alt keycode 27 = Meta_nine
- +keycode 28 = o
- + shiftr keycode 28 = +O
- + shift shiftr keycode 28 = +o
- +keycode 29 = l
- + shiftr keycode 29 = +L
- + shift shiftr keycode 29 = +l
- +keycode 30 = period greater
- + shiftr keycode 30 = greater
- + shift shiftr keycode 30 = greater
- + control keycode 30 = Compose
- + alt keycode 30 = Meta_period
- +
- +keycode 32 = Left Decr_Console
- + shiftr keycode 32 = Decr_Console
- + shift shiftr keycode 32 = Decr_Console
- + alt keycode 32 = Home
- +keycode 33 = bracketright braceright asciitilde
- + shiftr keycode 33 = braceright
- + shift shiftr keycode 33 = braceright
- + control keycode 33 = Control_bracketright
- + alt keycode 33 = Meta_bracketright
- +keycode 34 = equal plus
- + shiftr keycode 34 = plus
- + shift shiftr keycode 34 = plus
- + alt keycode 34 = Meta_equal
- +keycode 35 = eight asterisk bracketleft
- + shiftr keycode 35 = asterisk
- + shift shiftr keycode 35 = asterisk
- + control keycode 35 = Delete
- + alt keycode 35 = Meta_eight
- +keycode 36 = i
- + shiftr keycode 36 = +I
- + shift shiftr keycode 36 = +i
- +keycode 37 = k
- + shiftr keycode 37 = +K
- + shift shiftr keycode 37 = +k
- +keycode 38 = comma less
- + shiftr keycode 38 = less
- + shift shiftr keycode 38 = less
- + alt keycode 38 = Meta_comma
- +
- +keycode 40 = h
- + shiftr keycode 40 = +H
- + shift shiftr keycode 40 = +h
- +keycode 41 = y
- + shiftr keycode 41 = +Y
- + shift shiftr keycode 41 = +y
- +keycode 42 = six asciicircum
- + shiftr keycode 42 = asciicircum
- + shift shiftr keycode 42 = asciicircum
- + control keycode 42 = Control_asciicircum
- + alt keycode 42 = Meta_six
- +keycode 43 = seven ampersand braceleft
- + shiftr keycode 43 = ampersand
- + shift shiftr keycode 43 = ampersand
- + control keycode 43 = Control_underscore
- + alt keycode 43 = Meta_seven
- +keycode 44 = u
- + shiftr keycode 44 = +U
- + shift shiftr keycode 44 = +u
- +keycode 45 = j
- + shiftr keycode 45 = +J
- + shift shiftr keycode 45 = +j
- +keycode 46 = m
- + shiftr keycode 46 = +M
- + shift shiftr keycode 46 = +m
- +keycode 47 = n
- + shiftr keycode 47 = +N
- + shift shiftr keycode 47 = +n
- +
- +# This is the "Backspace" key:
- +keycode 49 = Delete Delete
- + shiftr keycode 49 = Delete
- + shift shiftr keycode 49 = Delete
- + control keycode 49 = BackSpace
- + alt keycode 49 = Meta_Delete
- +keycode 50 = Num_Lock
- + shift keycode 50 = Bare_Num_Lock
- + shiftr keycode 50 = Bare_Num_Lock
- + shift shiftr keycode 50 = Bare_Num_Lock
- +# This is the "Delete" key:
- +keycode 51 = Remove
- + control alt keycode 51 = Boot
- +
- +keycode 53 = backslash bar
- + shiftr keycode 53 = bar
- + shift shiftr keycode 53 = bar
- + control keycode 53 = Control_backslash
- + alt keycode 53 = Meta_backslash
- +keycode 54 = Return
- + alt keycode 54 = Meta_Control_m
- +keycode 55 = space space
- + shiftr keycode 55 = space
- + shift shiftr keycode 55 = space
- + control keycode 55 = nul
- + alt keycode 55 = Meta_space
- +keycode 56 = g
- + shiftr keycode 56 = +G
- + shift shiftr keycode 56 = +g
- +keycode 57 = t
- + shiftr keycode 57 = +T
- + shift shiftr keycode 57 = +t
- +keycode 58 = five percent
- + shiftr keycode 58 = percent
- + shift shiftr keycode 58 = percent
- + control keycode 58 = Control_bracketright
- + alt keycode 58 = Meta_five
- +keycode 59 = four dollar dollar
- + shiftr keycode 59 = dollar
- + shift shiftr keycode 59 = dollar
- + control keycode 59 = Control_backslash
- + alt keycode 59 = Meta_four
- +keycode 60 = r
- + shiftr keycode 60 = +R
- + shift shiftr keycode 60 = +r
- +keycode 61 = f
- + shiftr keycode 61 = +F
- + shift shiftr keycode 61 = +f
- + altgr keycode 61 = Hex_F
- +keycode 62 = v
- + shiftr keycode 62 = +V
- + shift shiftr keycode 62 = +v
- +keycode 63 = b
- + shiftr keycode 63 = +B
- + shift shiftr keycode 63 = +b
- + altgr keycode 63 = Hex_B
- +
- +keycode 67 = three numbersign
- + shiftr keycode 67 = numbersign
- + shift shiftr keycode 67 = numbersign
- + control keycode 67 = Escape
- + alt keycode 67 = Meta_three
- +keycode 68 = e
- + shiftr keycode 68 = +E
- + shift shiftr keycode 68 = +e
- + altgr keycode 68 = Hex_E
- +keycode 69 = d
- + shiftr keycode 69 = +D
- + shift shiftr keycode 69 = +d
- + altgr keycode 69 = Hex_D
- +keycode 70 = c
- + shiftr keycode 70 = +C
- + shift shiftr keycode 70 = +c
- + altgr keycode 70 = Hex_C
- +keycode 71 = Right Incr_Console
- + shiftr keycode 71 = Incr_Console
- + shift shiftr keycode 71 = Incr_Console
- + alt keycode 71 = End
- +
- +keycode 75 = two at at
- + shiftr keycode 75 = at
- + shift shiftr keycode 75 = at
- + control keycode 75 = nul
- + shift control keycode 75 = nul
- + shiftr control keycode 75 = nul
- + shift shiftr control keycode 75 = nul
- + alt keycode 75 = Meta_two
- +keycode 76 = w
- + shiftr keycode 76 = +W
- + shift shiftr keycode 76 = +w
- +keycode 77 = s
- + shiftr keycode 77 = +S
- + shift shiftr keycode 77 = +s
- +keycode 78 = x
- + shiftr keycode 78 = +X
- + shift shiftr keycode 78 = +x
- +keycode 79 = Down Scroll_Forward
- + shiftr keycode 79 = Scroll_Forward
- + shift shiftr keycode 79 = Scroll_Forward
- + alt keycode 79 = Next
- +keycode 80 = Escape Escape
- + shiftr keycode 80 = Escape
- + shift shiftr keycode 80 = Escape
- + alt keycode 80 = Meta_Escape
- +keycode 81 = Tab Tab
- + shiftr keycode 81 = Tab
- + shift shiftr keycode 81 = Tab
- + alt keycode 81 = Meta_Tab
- +keycode 82 = grave asciitilde
- + shiftr keycode 82 = asciitilde
- + shift shiftr keycode 82 = asciitilde
- + control keycode 82 = nul
- + alt keycode 82 = Meta_grave
- +keycode 83 = one exclam
- + shiftr keycode 83 = exclam
- + shift shiftr keycode 83 = exclam
- + alt keycode 83 = Meta_one
- +keycode 84 = q
- + shiftr keycode 84 = +Q
- + shift shiftr keycode 84 = +q
- +keycode 85 = a
- + shiftr keycode 85 = +A
- + shift shiftr keycode 85 = +a
- + altgr keycode 85 = Hex_A
- +keycode 86 = z
- + shiftr keycode 86 = +Z
- + shift shiftr keycode 86 = +z
- +
- +# This is the windows key:
- +keycode 88 = Decr_Console
- +keycode 89 = Shift
- +keycode 90 = Control
- +keycode 91 = Control
- +keycode 92 = Alt
- +keycode 93 = AltGr
- +keycode 94 = ShiftR
- + shift keycode 94 = Caps_Lock
- --- a/drivers/char/indydog.c
- +++ b/drivers/char/indydog.c
- @@ -1,5 +1,5 @@
- /*
- - * IndyDog 0.2 A Hardware Watchdog Device for SGI IP22
- + * IndyDog 0.3 A Hardware Watchdog Device for SGI IP22
- *
- * (c) Copyright 2002 Guido Guenther <agx@sigxcpu.org>, All Rights Reserved.
- *
- @@ -7,10 +7,10 @@
- * 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.
- - *
- + *
- * based on softdog.c by Alan Cox <alan@redhat.com>
- */
- -
- +
- #include <linux/module.h>
- #include <linux/config.h>
- #include <linux/types.h>
- @@ -19,13 +19,12 @@
- #include <linux/mm.h>
- #include <linux/miscdevice.h>
- #include <linux/watchdog.h>
- -#include <linux/smp_lock.h>
- #include <linux/init.h>
- #include <asm/uaccess.h>
- #include <asm/sgi/mc.h>
-
- -static unsigned long indydog_alive;
- -static int expect_close = 0;
- +#define PFX "indydog: "
- +static int indydog_alive;
-
- #ifdef CONFIG_WATCHDOG_NOWAYOUT
- static int nowayout = 1;
- @@ -33,10 +32,30 @@ static int nowayout = 1;
- static int nowayout = 0;
- #endif
-
- +#define WATCHDOG_TIMEOUT 30 /* 30 sec default timeout */
- +
- MODULE_PARM(nowayout,"i");
- MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
-
- -static inline void indydog_ping(void)
- +static void indydog_start(void)
- +{
- + u32 mc_ctrl0 = sgimc->cpuctrl0;
- +
- + mc_ctrl0 = sgimc->cpuctrl0 | SGIMC_CCTRL0_WDOG;
- + sgimc->cpuctrl0 = mc_ctrl0;
- +}
- +
- +static void indydog_stop(void)
- +{
- + u32 mc_ctrl0 = sgimc->cpuctrl0;
- +
- + mc_ctrl0 &= ~SGIMC_CCTRL0_WDOG;
- + sgimc->cpuctrl0 = mc_ctrl0;
- +
- + printk(KERN_INFO PFX "Stopped watchdog timer.\n");
- +}
- +
- +static void indydog_ping(void)
- {
- sgimc->watchdogt = 0;
- }
- @@ -46,18 +65,14 @@ static inline void indydog_ping(void)
- */
- static int indydog_open(struct inode *inode, struct file *file)
- {
- - u32 mc_ctrl0;
- -
- - if (test_and_set_bit(0,&indydog_alive))
- + if (indydog_alive)
- return -EBUSY;
-
- - if (nowayout) {
- + if (nowayout)
- MOD_INC_USE_COUNT;
- - }
-
- /* Activate timer */
- - mc_ctrl0 = sgimc->cpuctrl0 | SGIMC_CCTRL0_WDOG;
- - sgimc->cpuctrl0 = mc_ctrl0;
- + indydog_start();
- indydog_ping();
-
- indydog_alive = 1;
- @@ -69,63 +84,48 @@ static int indydog_open(struct inode *in
- static int indydog_release(struct inode *inode, struct file *file)
- {
- /* Shut off the timer.
- - * Lock it in if it's a module and we set nowayout. */
- - lock_kernel();
- - if (expect_close) {
- - u32 mc_ctrl0 = sgimc->cpuctrl0;
- + * Lock it in if it's a module and we defined ...NOWAYOUT */
- + if (!nowayout) {
- + u32 mc_ctrl0 = sgimc->cpuctrl0;
- mc_ctrl0 &= ~SGIMC_CCTRL0_WDOG;
- sgimc->cpuctrl0 = mc_ctrl0;
- printk(KERN_INFO "Stopped watchdog timer.\n");
- - } else
- - printk(KERN_CRIT "WDT device closed unexpectedly. WDT will not stop!\n");
- - clear_bit(0, &indydog_alive);
- - unlock_kernel();
- + }
- + indydog_alive = 0;
-
- return 0;
- }
-
- static ssize_t indydog_write(struct file *file, const char *data, size_t len, loff_t *ppos)
- {
- - /* Can't seek (pwrite) on this device */
- + /* Can't seek (pwrite) on this device */
- if (ppos != &file->f_pos)
- return -ESPIPE;
-
- - /*
- - * Refresh the timer.
- - */
- + /* Refresh the timer. */
- if (len) {
- - if (!nowayout) {
- - size_t i;
- -
- - /* In case it was set long ago */
- - expect_close = 0;
- -
- - for (i = 0; i != len; i++) {
- - char c;
- - if (get_user(c, data + i))
- - return -EFAULT;
- - if (c == 'V')
- - expect_close = 1;
- - }
- - }
- indydog_ping();
- - return 1;
- }
- - return 0;
- + return len;
- }
-
- static int indydog_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg)
- {
- + int options, retval = -EINVAL;
- static struct watchdog_info ident = {
- - options: WDIOF_MAGICCLOSE,
- - identity: "Hardware Watchdog for SGI IP22",
- + .options = WDIOF_KEEPALIVEPING |
- + WDIOF_MAGICCLOSE,
- + .firmware_version = 0,
- + .identity = "Hardware Watchdog for SGI IP22",
- };
- +
- switch (cmd) {
- default:
- return -ENOIOCTLCMD;
- case WDIOC_GETSUPPORT:
- - if(copy_to_user((struct watchdog_info *)arg, &ident, sizeof(ident)))
- + if (copy_to_user((struct watchdog_info *)arg,
- + &ident, sizeof(ident)))
- return -EFAULT;
- return 0;
- case WDIOC_GETSTATUS:
- @@ -134,31 +134,53 @@ static int indydog_ioctl(struct inode *i
- case WDIOC_KEEPALIVE:
- indydog_ping();
- return 0;
- + case WDIOC_GETTIMEOUT:
- + return put_user(WATCHDOG_TIMEOUT,(int *)arg);
- + case WDIOC_SETOPTIONS:
- + {
- + if (get_user(options, (int *)arg))
- + return -EFAULT;
- +
- + if (options & WDIOS_DISABLECARD) {
- + indydog_stop();
- + retval = 0;
- + }
- +
- + if (options & WDIOS_ENABLECARD) {
- + indydog_start();
- + retval = 0;
- + }
- +
- + return retval;
- + }
- }
- }
-
- static struct file_operations indydog_fops = {
- - owner: THIS_MODULE,
- - write: indydog_write,
- - ioctl: indydog_ioctl,
- - open: indydog_open,
- - release: indydog_release,
- + .owner = THIS_MODULE,
- + .write = indydog_write,
- + .ioctl = indydog_ioctl,
- + .open = indydog_open,
- + .release = indydog_release,
- };
-
- static struct miscdevice indydog_miscdev = {
- - minor: WATCHDOG_MINOR,
- - name: "watchdog",
- - fops: &indydog_fops,
- + .minor = WATCHDOG_MINOR,
- + .name = "watchdog",
- + .fops = &indydog_fops,
- };
-
- -static const char banner[] __initdata = KERN_INFO "Hardware Watchdog Timer for SGI IP22: 0.2\n";
- +static char banner[] __initdata =
- + KERN_INFO PFX "Hardware Watchdog Timer for SGI IP22: 0.3\n";
-
- static int __init watchdog_init(void)
- {
- int ret = misc_register(&indydog_miscdev);
- -
- - if (ret)
- + if (ret) {
- + printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",
- + WATCHDOG_MINOR, ret);
- return ret;
- + }
-
- printk(banner);
-
- @@ -172,4 +194,7 @@ static void __exit watchdog_exit(void)
-
- module_init(watchdog_init);
- module_exit(watchdog_exit);
- +
- +MODULE_AUTHOR("Guido Guenther <agx@sigxcpu.org>");
- +MODULE_DESCRIPTION("Hardware Watchdog Device for SGI IP22");
- MODULE_LICENSE("GPL");
- --- a/drivers/char/ip27-rtc.c
- +++ b/drivers/char/ip27-rtc.c
- @@ -44,6 +44,7 @@
- #include <asm/sn/klconfig.h>
- #include <asm/sn/sn0/ip27.h>
- #include <asm/sn/sn0/hub.h>
- +#include <asm/sn/sn_private.h>
-
- static int rtc_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg);
- @@ -209,11 +210,8 @@ static struct miscdevice rtc_dev=
-
- static int __init rtc_init(void)
- {
- - nasid_t nid;
- -
- - nid = get_nasid();
- rtc = (struct m48t35_rtc *)
- - (KL_CONFIG_CH_CONS_INFO(nid)->memory_base + IOC3_BYTEBUS_DEV0);
- + (KL_CONFIG_CH_CONS_INFO(master_nasid)->memory_base + IOC3_BYTEBUS_DEV0);
-
- printk(KERN_INFO "Real Time Clock Driver v%s\n", RTC_VERSION);
- if (misc_register(&rtc_dev)) {
- @@ -325,3 +323,7 @@ static void get_rtc_time(struct rtc_time
-
- rtc_tm->tm_mon--;
- }
- +
- +MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>");
- +MODULE_DESCRIPTION("SGI IP27 M48T35 RTC driver");
- +MODULE_LICENSE("GPL");
- --- a/drivers/char/Makefile
- +++ b/drivers/char/Makefile
- @@ -48,7 +48,12 @@ ifeq ($(ARCH),mips)
- KEYBD =
- endif
- ifeq ($(CONFIG_VR41XX_KIU),y)
- - KEYMAP =
- + ifeq ($(CONFIG_IBM_WORKPAD),y)
- + KEYMAP = ibm_workpad_keymap.o
- + endif
- + ifeq ($(CONFIG_VICTOR_MPC30X),y)
- + KEYMAP = victor_mpc30x_keymap.o
- + endif
- KEYBD = vr41xx_keyb.o
- endif
- endif
- @@ -251,7 +256,6 @@ obj-$(CONFIG_MK712_MOUSE) += mk712.o
- obj-$(CONFIG_RTC) += rtc.o
- obj-$(CONFIG_GEN_RTC) += genrtc.o
- obj-$(CONFIG_EFI_RTC) += efirtc.o
- -obj-$(CONFIG_SGI_DS1286) += ds1286.o
- obj-$(CONFIG_MIPS_RTC) += mips_rtc.o
- obj-$(CONFIG_SGI_IP27_RTC) += ip27-rtc.o
- ifeq ($(CONFIG_PPC),)
- @@ -259,6 +263,7 @@ ifeq ($(CONFIG_PPC),)
- endif
- obj-$(CONFIG_TOSHIBA) += toshiba.o
- obj-$(CONFIG_I8K) += i8k.o
- +obj-$(CONFIG_DS1286) += ds1286.o
- obj-$(CONFIG_DS1620) += ds1620.o
- obj-$(CONFIG_DS1742) += ds1742.o
- obj-$(CONFIG_INTEL_RNG) += i810_rng.o
- @@ -270,6 +275,7 @@ obj-$(CONFIG_BRIQ_PANEL) += briq_panel.o
-
- obj-$(CONFIG_ITE_GPIO) += ite_gpio.o
- obj-$(CONFIG_AU1X00_GPIO) += au1000_gpio.o
- +obj-$(CONFIG_AU1550_PSC_SPI) += au1550_psc_spi.o
- obj-$(CONFIG_AU1X00_USB_TTY) += au1000_usbtty.o
- obj-$(CONFIG_AU1X00_USB_RAW) += au1000_usbraw.o
- obj-$(CONFIG_COBALT_LCD) += lcd.o
- @@ -357,3 +363,9 @@ defkeymap.c: defkeymap.map
-
- qtronixmap.c: qtronixmap.map
- set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
- +
- +ibm_workpad_keymap.c: ibm_workpad_keymap.map
- + set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
- +
- +victor_mpc30x_keymap.c: victor_mpc30x_keymap.map
- + set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
- --- a/drivers/char/mips_rtc.c
- +++ b/drivers/char/mips_rtc.c
- @@ -53,14 +53,6 @@
- #include <asm/io.h>
- #include <asm/uaccess.h>
- #include <asm/system.h>
- -
- -/*
- - * Check machine
- - */
- -#if !defined(CONFIG_MIPS) || !defined(CONFIG_NEW_TIME_C)
- -#error "This driver is for MIPS machines with CONFIG_NEW_TIME_C defined"
- -#endif
- -
- #include <asm/time.h>
-
- static unsigned long rtc_status = 0; /* bitmapped status byte. */
- --- a/drivers/char/sb1250_duart.c
- +++ b/drivers/char/sb1250_duart.c
- @@ -328,10 +328,11 @@ static int duart_write(struct tty_struct
- if (c <= 0) break;
-
- if (from_user) {
- + spin_unlock_irqrestore(&us->outp_lock, flags);
- if (copy_from_user(us->outp_buf + us->outp_tail, buf, c)) {
- - spin_unlock_irqrestore(&us->outp_lock, flags);
- return -EFAULT;
- }
- + spin_lock_irqsave(&us->outp_lock, flags);
- } else {
- memcpy(us->outp_buf + us->outp_tail, buf, c);
- }
- @@ -498,9 +499,31 @@ static void duart_set_termios(struct tty
- duart_set_cflag(us->line, tty->termios->c_cflag);
- }
-
- +static int get_serial_info(uart_state_t *us, struct serial_struct * retinfo) {
- +
- + struct serial_struct tmp;
- +
- + memset(&tmp, 0, sizeof(tmp));
- +
- + tmp.type=PORT_SB1250;
- + tmp.line=us->line;
- + tmp.port=A_DUART_CHANREG(tmp.line,0);
- + tmp.irq=K_INT_UART_0 + tmp.line;
- + tmp.xmit_fifo_size=16; /* fixed by hw */
- + tmp.baud_base=5000000;
- + tmp.io_type=SERIAL_IO_MEM;
- +
- + if (copy_to_user(retinfo,&tmp,sizeof(*retinfo)))
- + return -EFAULT;
- +
- + return 0;
- +}
- +
- static int duart_ioctl(struct tty_struct *tty, struct file * file,
- unsigned int cmd, unsigned long arg)
- {
- + uart_state_t *us = (uart_state_t *) tty->driver_data;
- +
- /* if (serial_paranoia_check(info, tty->device, "rs_ioctl"))
- return -ENODEV;*/
- switch (cmd) {
- @@ -517,7 +540,7 @@ static int duart_ioctl(struct tty_struct
- printk("Ignoring TIOCMSET\n");
- break;
- case TIOCGSERIAL:
- - printk("Ignoring TIOCGSERIAL\n");
- + return get_serial_info(us,(struct serial_struct *) arg);
- break;
- case TIOCSSERIAL:
- printk("Ignoring TIOCSSERIAL\n");
- --- a/drivers/char/serial.c
- +++ b/drivers/char/serial.c
- @@ -62,6 +62,12 @@
- * Robert Schwebel <robert@schwebel.de>,
- * Juergen Beisert <jbeisert@eurodsn.de>,
- * Theodore Ts'o <tytso@mit.edu>
- + *
- + * 10/00: Added suport for MIPS Atlas board.
- + * 11/00: Hooks for serial kernel debug port support added.
- + * Kevin D. Kissell, kevink@mips.com and Carsten Langgaard,
- + * carstenl@mips.com
- + * Copyright (C) 2000 MIPS Technologies, Inc. All rights reserved.
- */
-
- static char *serial_version = "5.05c";
- @@ -413,6 +419,22 @@ static inline int serial_paranoia_check(
- return 0;
- }
-
- +#if defined(CONFIG_MIPS_ATLAS) || defined(CONFIG_MIPS_SEAD)
- +
- +#include <asm/mips-boards/atlas.h>
- +
- +static _INLINE_ unsigned int serial_in(struct async_struct *info, int offset)
- +{
- + return (*(volatile unsigned int *)(mips_io_port_base + ATLAS_UART_REGS_BASE + offset*8) & 0xff);
- +}
- +
- +static _INLINE_ void serial_out(struct async_struct *info, int offset, int value)
- +{
- + *(volatile unsigned int *)(mips_io_port_base + ATLAS_UART_REGS_BASE + offset*8) = value;
- +}
- +
- +#else
- +
- static _INLINE_ unsigned int serial_in(struct async_struct *info, int offset)
- {
- switch (info->io_type) {
- @@ -447,6 +469,8 @@ static _INLINE_ void serial_out(struct a
- outb(value, info->port+offset);
- }
- }
- +#endif
- +
-
- /*
- * We used to support using pause I/O for certain machines. We
- --- /dev/null
- +++ b/drivers/char/victor_mpc30x_keymap.map
- @@ -0,0 +1,102 @@
- +# Victor Interlink MP-C303/304 keyboard keymap
- +#
- +# Copyright (C) 2003 Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
- +#
- +# 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.
- +keymaps 0-1,4-5,8-9,12
- +alt_is_meta
- +strings as usual
- +compose as usual for "iso-8859-1"
- +
- +# First line
- +keycode 89 = Escape
- +keycode 9 = Delete
- +
- +# 2nd line
- +keycode 73 = one exclam
- +keycode 18 = two quotedbl
- +keycode 92 = three numbersign
- + control keycode 92 = Escape
- +keycode 53 = four dollar
- + control keycode 53 = Control_backslash
- +keycode 21 = five percent
- + control keycode 21 = Control_bracketright
- +keycode 50 = six ampersand
- + control keycode 50 = Control_underscore
- +keycode 48 = seven apostrophe
- +keycode 51 = eight parenleft
- +keycode 16 = nine parenright
- +keycode 80 = zero asciitilde
- + control keycode 80 = nul
- +keycode 49 = minus equal
- +keycode 30 = asciicircum asciitilde
- + control keycode 30 = Control_asciicircum
- +keycode 5 = backslash bar
- + control keycode 5 = Control_backslash
- +keycode 13 = BackSpace
- +# 3rd line
- +keycode 57 = Tab
- +keycode 74 = q
- +keycode 26 = w
- +keycode 81 = e
- +keycode 29 = r
- +keycode 37 = t
- +keycode 45 = y
- +keycode 72 = u
- +keycode 24 = i
- +keycode 32 = o
- +keycode 41 = p
- +keycode 1 = at grave
- + control keycode 1 = nul
- +keycode 54 = bracketleft braceleft
- +keycode 63 = Return
- + alt keycode 63 = Meta_Control_m
- +# 4th line
- +keycode 23 = Caps_Lock
- +keycode 34 = a
- +keycode 66 = s
- +keycode 52 = d
- +keycode 20 = f
- +keycode 84 = g
- +keycode 67 = h
- +keycode 64 = j
- +keycode 17 = k
- +keycode 83 = l
- +keycode 22 = semicolon plus
- +keycode 61 = colon asterisk
- + control keycode 61 = Control_g
- +keycode 65 = bracketright braceright
- + control keycode 65 = Control_bracketright
- +# 5th line
- +keycode 91 = Shift
- +keycode 76 = z
- +keycode 68 = x
- +keycode 28 = c
- +keycode 36 = v
- +keycode 44 = b
- +keycode 19 = n
- +keycode 27 = m
- +keycode 35 = comma less
- +keycode 3 = period greater
- + control keycode 3 = Compose
- +keycode 38 = slash question
- + control keycode 38 = Delete
- + shift control keycode 38 = Delete
- +keycode 6 = backslash underscore
- + control keycode 6 = Control_backslash
- +keycode 55 = Up
- + alt keycode 55 = PageUp
- +keycode 14 = Shift
- +# 6th line
- +keycode 56 = Control
- +keycode 42 = Alt
- +keycode 33 = space
- + control keycode 33 = nul
- +keycode 7 = Left
- + alt keycode 7 = Home
- +keycode 31 = Down
- + alt keycode 31 = PageDown
- +keycode 47 = Right
- + alt keycode 47 = End
- --- a/drivers/char/vr41xx_keyb.c
- +++ b/drivers/char/vr41xx_keyb.c
- @@ -308,7 +308,7 @@ void __devinit kbd_init_hw(void)
- if (found != 0) {
- kiu_base = VRC4173_KIU_OFFSET;
- mkiuintreg = VRC4173_MKIUINTREG_OFFSET;
- - vrc4173_clock_supply(VRC4173_KIU_CLOCK);
- + vrc4173_supply_clock(VRC4173_KIU_CLOCK);
- }
- }
- #endif
- @@ -325,7 +325,7 @@ void __devinit kbd_init_hw(void)
-
- if (current_cpu_data.cputype == CPU_VR4111 ||
- current_cpu_data.cputype == CPU_VR4121)
- - vr41xx_clock_supply(KIU_CLOCK);
- + vr41xx_supply_clock(KIU_CLOCK);
-
- kiu_writew(KIURST_KIURST, KIURST);
-
- --- a/drivers/i2c/Config.in
- +++ b/drivers/i2c/Config.in
- @@ -57,6 +57,10 @@ if [ "$CONFIG_I2C" != "n" ]; then
- if [ "$CONFIG_SGI_IP22" = "y" ]; then
- dep_tristate 'I2C SGI interfaces' CONFIG_I2C_ALGO_SGI $CONFIG_I2C
- fi
- +
- + if [ "$CONFIG_SOC_AU1550" = "y" -o "$CONFIG_SOC_AU1200" ]; then
- + dep_tristate 'Au1550/Au1200 SMBus interface' CONFIG_I2C_ALGO_AU1550 $CONFIG_I2C
- + fi
-
- # This is needed for automatic patch generation: sensors code starts here
- # This is needed for automatic patch generation: sensors code ends here
- --- /dev/null
- +++ b/drivers/i2c/i2c-algo-au1550.c
- @@ -0,0 +1,340 @@
- +/*
- + * i2c-algo-au1550.c: SMBus (i2c) driver algorithms for Alchemy PSC interface
- + * Copyright (C) 2004 Embedded Edge, LLC <dan@embeddededge.com>
- + *
- + * The documentation describes this as an SMBus controller, but it doesn't
- + * understand any of the SMBus protocol in hardware. It's really an I2C
- + * controller that could emulate most of the SMBus in software.
- + */
- +
- +#include <linux/kernel.h>
- +#include <linux/module.h>
- +#include <linux/init.h>
- +#include <linux/errno.h>
- +#include <linux/delay.h>
- +
- +#include <asm/au1000.h>
- +#include <asm/au1xxx_psc.h>
- +
- +#include <linux/i2c.h>
- +#include <linux/i2c-algo-au1550.h>
- +
- +static int
- +wait_xfer_done(struct i2c_algo_au1550_data *adap)
- +{
- + u32 stat;
- + int i;
- + volatile psc_smb_t *sp;
- +
- + sp = (volatile psc_smb_t *)(adap->psc_base);
- +
- + /* Wait for Tx FIFO Underflow.
- + */
- + for (i = 0; i < adap->xfer_timeout; i++) {
- + stat = sp->psc_smbevnt;
- + au_sync();
- + if ((stat & PSC_SMBEVNT_TU) != 0) {
- + /* Clear it. */
- + sp->psc_smbevnt = PSC_SMBEVNT_TU;
- + au_sync();
- + return 0;
- + }
- + udelay(1);
- + }
- +
- + return -ETIMEDOUT;
- +}
- +
- +static int
- +wait_ack(struct i2c_algo_au1550_data *adap)
- +{
- + u32 stat;
- + volatile psc_smb_t *sp;
- +
- + if (wait_xfer_done(adap))
- + return -ETIMEDOUT;
- +
- + sp = (volatile psc_smb_t *)(adap->psc_base);
- +
- + stat = sp->psc_smbevnt;
- + au_sync();
- +
- + if ((stat & (PSC_SMBEVNT_DN | PSC_SMBEVNT_AN | PSC_SMBEVNT_AL)) != 0)
- + return -ETIMEDOUT;
- +
- + return 0;
- +}
- +
- +static int
- +wait_master_done(struct i2c_algo_au1550_data *adap)
- +{
- + u32 stat;
- + int i;
- + volatile psc_smb_t *sp;
- +
- + sp = (volatile psc_smb_t *)(adap->psc_base);
- +
- + /* Wait for Master Done.
- + */
- + for (i = 0; i < adap->xfer_timeout; i++) {
- + stat = sp->psc_smbevnt;
- + au_sync();
- + if ((stat & PSC_SMBEVNT_MD) != 0)
- + return 0;
- + udelay(1);
- + }
- +
- + return -ETIMEDOUT;
- +}
- +
- +static int
- +do_address(struct i2c_algo_au1550_data *adap, unsigned int addr, int rd)
- +{
- + volatile psc_smb_t *sp;
- + u32 stat;
- +
- + sp = (volatile psc_smb_t *)(adap->psc_base);
- +
- + /* Reset the FIFOs, clear events.
- + */
- + sp->psc_smbpcr = PSC_SMBPCR_DC;
- + sp->psc_smbevnt = PSC_SMBEVNT_ALLCLR;
- + au_sync();
- + do {
- + stat = sp->psc_smbpcr;
- + au_sync();
- + } while ((stat & PSC_SMBPCR_DC) != 0);
- +
- + /* Write out the i2c chip address and specify operation
- + */
- + addr <<= 1;
- + if (rd)
- + addr |= 1;
- +
- + /* Put byte into fifo, start up master.
- + */
- + sp->psc_smbtxrx = addr;
- + au_sync();
- + sp->psc_smbpcr = PSC_SMBPCR_MS;
- + au_sync();
- + if (wait_ack(adap))
- + return -EIO;
- + return 0;
- +}
- +
- +static u32
- +wait_for_rx_byte(struct i2c_algo_au1550_data *adap, u32 *ret_data)
- +{
- + int j;
- + u32 data, stat;
- + volatile psc_smb_t *sp;
- +
- + if (wait_xfer_done(adap))
- + return -EIO;
- +
- + sp = (volatile psc_smb_t *)(adap->psc_base);
- +
- + j = adap->xfer_timeout * 100;
- + do {
- + j--;
- + if (j <= 0)
- + return -EIO;
- +
- + stat = sp->psc_smbstat;
- + au_sync();
- + if ((stat & PSC_SMBSTAT_RE) == 0)
- + j = 0;
- + else
- + udelay(1);
- + } while (j > 0);
- + data = sp->psc_smbtxrx;
- + au_sync();
- + *ret_data = data;
- +
- + return 0;
- +}
- +
- +static int
- +i2c_read(struct i2c_algo_au1550_data *adap, unsigned char *buf,
- + unsigned int len)
- +{
- + int i;
- + u32 data;
- + volatile psc_smb_t *sp;
- +
- + if (len == 0)
- + return 0;
- +
- + /* A read is performed by stuffing the transmit fifo with
- + * zero bytes for timing, waiting for bytes to appear in the
- + * receive fifo, then reading the bytes.
- + */
- +
- + sp = (volatile psc_smb_t *)(adap->psc_base);
- +
- + i = 0;
- + while (i < (len-1)) {
- + sp->psc_smbtxrx = 0;
- + au_sync();
- + if (wait_for_rx_byte(adap, &data))
- + return -EIO;
- +
- + buf[i] = data;
- + i++;
- + }
- +
- + /* The last byte has to indicate transfer done.
- + */
- + sp->psc_smbtxrx = PSC_SMBTXRX_STP;
- + au_sync();
- + if (wait_master_done(adap))
- + return -EIO;
- +
- + data = sp->psc_smbtxrx;
- + au_sync();
- + buf[i] = data;
- + return 0;
- +}
- +
- +static int
- +i2c_write(struct i2c_algo_au1550_data *adap, unsigned char *buf,
- + unsigned int len)
- +{
- + int i;
- + u32 data;
- + volatile psc_smb_t *sp;
- +
- + if (len == 0)
- + return 0;
- +
- + sp = (volatile psc_smb_t *)(adap->psc_base);
- +
- + i = 0;
- + while (i < (len-1)) {
- + data = buf[i];
- + sp->psc_smbtxrx = data;
- + au_sync();
- + if (wait_ack(adap))
- + return -EIO;
- + i++;
- + }
- +
- + /* The last byte has to indicate transfer done.
- + */
- + data = buf[i];
- + data |= PSC_SMBTXRX_STP;
- + sp->psc_smbtxrx = data;
- + au_sync();
- + if (wait_master_done(adap))
- + return -EIO;
- + return 0;
- +}
- +
- +static int
- +au1550_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num)
- +{
- + struct i2c_algo_au1550_data *adap = i2c_adap->algo_data;
- + struct i2c_msg *p;
- + int i, err = 0;
- +
- + for (i = 0; !err && i < num; i++) {
- + p = &msgs[i];
- + err = do_address(adap, p->addr, p->flags & I2C_M_RD);
- + if (err || !p->len)
- + continue;
- + if (p->flags & I2C_M_RD)
- + err = i2c_read(adap, p->buf, p->len);
- + else
- + err = i2c_write(adap, p->buf, p->len);
- + }
- +
- + /* Return the number of messages processed, or the error code.
- + */
- + if (err == 0)
- + err = num;
- + return err;
- +}
- +
- +static u32
- +au1550_func(struct i2c_adapter *adap)
- +{
- + return I2C_FUNC_I2C;
- +}
- +
- +static struct i2c_algorithm au1550_algo = {
- + .name = "Au1550 algorithm",
- + .id = I2C_ALGO_AU1550,
- + .master_xfer = au1550_xfer,
- + .functionality = au1550_func,
- +};
- +
- +/*
- + * registering functions to load algorithms at runtime
- + * Prior to calling us, the 50MHz clock frequency and routing
- + * must have been set up for the PSC indicated by the adapter.
- + */
- +int
- +i2c_au1550_add_bus(struct i2c_adapter *i2c_adap)
- +{
- + struct i2c_algo_au1550_data *adap = i2c_adap->algo_data;
- + volatile psc_smb_t *sp;
- + u32 stat;
- +
- + i2c_adap->algo = &au1550_algo;
- +
- + /* Now, set up the PSC for SMBus PIO mode.
- + */
- + sp = (volatile psc_smb_t *)(adap->psc_base);
- + sp->psc_ctrl = PSC_CTRL_DISABLE;
- + au_sync();
- + sp->psc_sel = PSC_SEL_PS_SMBUSMODE;
- + sp->psc_smbcfg = 0;
- + au_sync();
- + sp->psc_ctrl = PSC_CTRL_ENABLE;
- + au_sync();
- + do {
- + stat = sp->psc_smbstat;
- + au_sync();
- + } while ((stat & PSC_SMBSTAT_SR) == 0);
- +
- + sp->psc_smbcfg = (PSC_SMBCFG_RT_FIFO8 | PSC_SMBCFG_TT_FIFO8 |
- + PSC_SMBCFG_DD_DISABLE);
- +
- + /* Divide by 8 to get a 6.25 MHz clock. The later protocol
- + * timings are based on this clock.
- + */
- + sp->psc_smbcfg |= PSC_SMBCFG_SET_DIV(PSC_SMBCFG_DIV2);
- + sp->psc_smbmsk = PSC_SMBMSK_ALLMASK;
- + au_sync();
- +
- + /* Set the protocol timer values. See Table 71 in the
- + * Au1550 Data Book for standard timing values.
- + */
- + sp->psc_smbtmr = PSC_SMBTMR_SET_TH(2) | PSC_SMBTMR_SET_PS(15) | \
- + PSC_SMBTMR_SET_PU(11) | PSC_SMBTMR_SET_SH(11) | \
- + PSC_SMBTMR_SET_SU(11) | PSC_SMBTMR_SET_CL(15) | \
- + PSC_SMBTMR_SET_CH(11);
- + au_sync();
- +
- + sp->psc_smbcfg |= PSC_SMBCFG_DE_ENABLE;
- + do {
- + stat = sp->psc_smbstat;
- + au_sync();
- + } while ((stat & PSC_SMBSTAT_DR) == 0);
- +
- + return i2c_add_adapter(i2c_adap);
- +}
- +
- +
- +int
- +i2c_au1550_del_bus(struct i2c_adapter *adap)
- +{
- + return i2c_del_adapter(adap);
- +}
- +
- +EXPORT_SYMBOL(i2c_au1550_add_bus);
- +EXPORT_SYMBOL(i2c_au1550_del_bus);
- +
- +MODULE_AUTHOR("Dan Malek <dan@embeddededge.com>");
- +MODULE_DESCRIPTION("SMBus Au1550 algorithm");
- +MODULE_LICENSE("GPL");
- --- /dev/null
- +++ b/drivers/i2c/i2c-au1550.c
- @@ -0,0 +1,154 @@
- +/*
- + * i2c-au1550.c: SMBus (i2c) adapter for Alchemy PSC interface
- + * Copyright (C) 2004 Embedded Edge, LLC <dan@embeddededge.com>
- + *
- + * This is just a skeleton adapter to use with the Au1550 PSC
- + * algorithm. It was developed for the Pb1550, but will work with
- + * any Au1550 board that has a similar PSC configuration.
- + *
- + * 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.
- + *
- + * This program is distributed in the hope that it will be useful,
- + * but WITHOUT ANY WARRANTY; without even the implied warranty of
- + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- + * GNU General Public License for more details.
- + *
- + * You should have received a copy of the GNU General Public License
- + * along with this program; if not, write to the Free Software
- + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- + */
- +
- +#include <linux/config.h>
- +#include <linux/kernel.h>
- +#include <linux/module.h>
- +#include <linux/init.h>
- +#include <linux/errno.h>
- +
- +#include <asm/au1000.h>
- +#include <asm/au1xxx_psc.h>
- +#if defined( CONFIG_MIPS_PB1550 )
- + #include <asm/pb1550.h>
- +#endif
- +#if defined( CONFIG_MIPS_PB1200 )
- + #include <asm/pb1200.h>
- +#endif
- +#if defined( CONFIG_MIPS_DB1200 )
- + #include <asm/db1200.h>
- +#endif
- +#if defined( CONFIG_MIPS_FICMMP )
- + #include <asm/ficmmp.h>
- +#endif
- +
- +#include <linux/i2c.h>
- +#include <linux/i2c-algo-au1550.h>
- +
- +
- +
- +static int
- +pb1550_reg(struct i2c_client *client)
- +{
- + return 0;
- +}
- +
- +static int
- +pb1550_unreg(struct i2c_client *client)
- +{
- + return 0;
- +}
- +
- +static void
- +pb1550_inc_use(struct i2c_adapter *adap)
- +{
- +#ifdef MODULE
- + MOD_INC_USE_COUNT;
- +#endif
- +}
- +
- +static void
- +pb1550_dec_use(struct i2c_adapter *adap)
- +{
- +#ifdef MODULE
- + MOD_DEC_USE_COUNT;
- +#endif
- +}
- +
- +static struct i2c_algo_au1550_data pb1550_i2c_info = {
- + SMBUS_PSC_BASE, 200, 200
- +};
- +
- +static struct i2c_adapter pb1550_board_adapter = {
- + name: "pb1550 adapter",
- + id: I2C_HW_AU1550_PSC,
- + algo: NULL,
- + algo_data: &pb1550_i2c_info,
- + inc_use: pb1550_inc_use,
- + dec_use: pb1550_dec_use,
- + client_register: pb1550_reg,
- + client_unregister: pb1550_unreg,
- + client_count: 0,
- +};
- +
- +int __init
- +i2c_pb1550_init(void)
- +{
- + /* This is where we would set up a 50MHz clock source
- + * and routing. On the Pb1550, the SMBus is PSC2, which
- + * uses a shared clock with USB. This has been already
- + * configured by Yamon as a 48MHz clock, close enough
- + * for our work.
- + */
- + if (i2c_au1550_add_bus(&pb1550_board_adapter) < 0)
- + return -ENODEV;
- +
- + return 0;
- +}
- +
- +/* BIG hack to support the control interface on the Wolfson WM8731
- + * audio codec on the Pb1550 board. We get an address and two data
- + * bytes to write, create an i2c message, and send it across the
- + * i2c transfer function. We do this here because we have access to
- + * the i2c adapter structure.
- + */
- +static struct i2c_msg wm_i2c_msg; /* We don't want this stuff on the stack */
- +static u8 i2cbuf[2];
- +
- +int
- +pb1550_wm_codec_write(u8 addr, u8 reg, u8 val)
- +{
- + wm_i2c_msg.addr = addr;
- + wm_i2c_msg.flags = 0;
- + wm_i2c_msg.buf = i2cbuf;
- + wm_i2c_msg.len = 2;
- + i2cbuf[0] = reg;
- + i2cbuf[1] = val;
- +
- + return pb1550_board_adapter.algo->master_xfer(&pb1550_board_adapter, &wm_i2c_msg, 1);
- +}
- +
- +/* the next function is needed by DVB driver. */
- +int pb1550_i2c_xfer(struct i2c_msg msgs[], int num)
- +{
- + return pb1550_board_adapter.algo->master_xfer(&pb1550_board_adapter, msgs, num);
- +}
- +
- +EXPORT_SYMBOL(pb1550_wm_codec_write);
- +EXPORT_SYMBOL(pb1550_i2c_xfer);
- +
- +MODULE_AUTHOR("Dan Malek, Embedded Edge, LLC.");
- +MODULE_DESCRIPTION("SMBus adapter Alchemy pb1550");
- +MODULE_LICENSE("GPL");
- +
- +int
- +init_module(void)
- +{
- + return i2c_pb1550_init();
- +}
- +
- +void
- +cleanup_module(void)
- +{
- + i2c_au1550_del_bus(&pb1550_board_adapter);
- +}
- --- a/drivers/i2c/i2c-core.c
- +++ b/drivers/i2c/i2c-core.c
- @@ -1277,6 +1277,9 @@ static int __init i2c_init(void)
- #ifdef CONFIG_I2C_MAX1617
- extern int i2c_max1617_init(void);
- #endif
- +#ifdef CONFIG_I2C_ALGO_AU1550
- + extern int i2c_pb1550_init(void);
- +#endif
-
- #ifdef CONFIG_I2C_PROC
- extern int sensors_init(void);
- @@ -1332,6 +1335,10 @@ int __init i2c_init_all(void)
- i2c_max1617_init();
- #endif
-
- +#ifdef CONFIG_I2C_ALGO_AU1550
- + i2c_pb1550_init();
- +#endif
- +
- /* -------------- proc interface ---- */
- #ifdef CONFIG_I2C_PROC
- sensors_init();
- --- a/drivers/i2c/Makefile
- +++ b/drivers/i2c/Makefile
- @@ -6,7 +6,7 @@ O_TARGET := i2c.o
-
- export-objs := i2c-core.o i2c-algo-bit.o i2c-algo-pcf.o \
- i2c-algo-ite.o i2c-algo-sibyte.o i2c-algo-sgi.o \
- - i2c-proc.o
- + i2c-algo-au1550.o i2c-proc.o i2c-au1550.o
-
- obj-$(CONFIG_I2C) += i2c-core.o
- obj-$(CONFIG_I2C_CHARDEV) += i2c-dev.o
- @@ -25,6 +25,7 @@ obj-$(CONFIG_I2C_KEYWEST) += i2c-keywest
- obj-$(CONFIG_I2C_ALGO_SIBYTE) += i2c-algo-sibyte.o i2c-sibyte.o
- obj-$(CONFIG_I2C_MAX1617) += i2c-max1617.o
- obj-$(CONFIG_I2C_ALGO_SGI) += i2c-algo-sgi.o
- +obj-$(CONFIG_I2C_ALGO_AU1550) += i2c-algo-au1550.o i2c-au1550.o
-
- # This is needed for automatic patch generation: sensors code starts here
- # This is needed for automatic patch generation: sensors code ends here
- --- a/drivers/media/video/indycam.c
- +++ b/drivers/media/video/indycam.c
- @@ -50,13 +50,14 @@ static int indycam_attach(struct i2c_ada
- 0x80, /* INDYCAM_GAMMA */
- };
-
- - int err = 0;
- struct indycam *camera;
- struct i2c_client *client;
- + int err = 0;
-
- client = kmalloc(sizeof(*client), GFP_KERNEL);
- - if (!client)
- + if (!client)
- return -ENOMEM;
- +
- camera = kmalloc(sizeof(*camera), GFP_KERNEL);
- if (!camera) {
- err = -ENOMEM;
- @@ -67,7 +68,7 @@ static int indycam_attach(struct i2c_ada
- client->adapter = adap;
- client->addr = addr;
- client->driver = &i2c_driver_indycam;
- - strcpy(client->name, "IndyCam client");
- + strcpy(client->name, "IndyCam client");
- camera->client = client;
-
- err = i2c_attach_client(client);
- @@ -75,18 +76,18 @@ static int indycam_attach(struct i2c_ada
- goto out_free_camera;
-
- camera->version = i2c_smbus_read_byte_data(client, INDYCAM_VERSION);
- - if (camera->version != CAMERA_VERSION_INDY &&
- - camera->version != CAMERA_VERSION_MOOSE) {
- + if ((camera->version != CAMERA_VERSION_INDY) &&
- + (camera->version != CAMERA_VERSION_MOOSE)) {
- err = -ENODEV;
- goto out_detach_client;
- }
- - printk(KERN_INFO "Indycam v%d.%d detected.\n",
- + printk(KERN_INFO "IndyCam v%d.%d detected.\n",
- INDYCAM_VERSION_MAJOR(camera->version),
- INDYCAM_VERSION_MINOR(camera->version));
-
- err = i2c_master_send(client, initseq, sizeof(initseq));
- if (err)
- - printk(KERN_INFO "IndyCam initalization failed\n");
- + printk(KERN_ERR "IndyCam initalization failed.\n");
-
- MOD_INC_USE_COUNT;
- return 0;
- --- a/drivers/media/video/vino.c
- +++ b/drivers/media/video/vino.c
- @@ -5,6 +5,8 @@
- * License version 2 as published by the Free Software Foundation.
- *
- * Copyright (C) 2003 Ladislav Michl <ladis@linux-mips.org>
- + * Copyright (C) 2004 Mikael Nousiainen <tmnousia@cc.hut.fi>
- + *
- */
-
- #include <linux/module.h>
- @@ -37,13 +39,23 @@
- #define DEBUG(x...)
- #endif
-
- +/* Channels (who could have guessed) */
- +#define VINO_CHAN_NONE 0
- +#define VINO_CHAN_A 1
- +#define VINO_CHAN_B 2
- +
- /* VINO video size */
- #define VINO_PAL_WIDTH 768
- #define VINO_PAL_HEIGHT 576
- #define VINO_NTSC_WIDTH 646
- #define VINO_NTSC_HEIGHT 486
-
- -/* set this to some sensible values. note: VINO_MIN_WIDTH has to be 8*x */
- +/* Minimum value for Y-clipping (for smaller values the images
- + * will be corrupted) */
- +#define VINO_MIN_Y_CLIPPING 2
- +
- +/* Set these to some sensible values.
- + * Note: the picture width has to be divisible by 8 */
- #define VINO_MIN_WIDTH 32
- #define VINO_MIN_HEIGHT 32
-
- @@ -64,9 +76,7 @@ static int threshold_b = 512;
-
- struct vino_device {
- struct video_device vdev;
- -#define VINO_CHAN_A 1
- -#define VINO_CHAN_B 2
- - int chan;
- + int chan; /* VINO_CHAN_NONE, VINO_CHAN_A or VINO_CHAN_B */
- int alpha;
- /* clipping... */
- unsigned int left, right, top, bottom;
- @@ -106,7 +116,7 @@ struct vino_device {
-
- struct vino_client {
- struct i2c_client *driver;
- - int owner;
- + int owner; /* VINO_CHAN_NONE, VINO_CHAN_A or VINO_CHAN_B */
- };
-
- struct vino_video {
- @@ -362,6 +372,7 @@ static int set_scaling(struct vino_devic
- static int dma_setup(struct vino_device *v)
- {
- u32 ctrl, intr;
- + int ofs;
- struct sgi_vino_channel *ch;
-
- ch = (v->chan == VINO_CHAN_A) ? &vino->a : &vino->b;
- @@ -377,14 +388,24 @@ static int dma_setup(struct vino_device
- ch->line_size = v->line_size - 8;
- /* set the alpha register */
- ch->alpha = v->alpha;
- - /* set cliping registers */
- - ch->clip_start = VINO_CLIP_ODD(v->top) | VINO_CLIP_EVEN(v->top+1) |
- + /* Set the clipping registers, this is the constant source of fun :)
- + * Y clipping start has to be >= 2 and end has to be start + height/2
- + * The values of top and bottom are even so dividing is not a problem
- + *
- + * The docs say that clipping values for the even field should be
- + * odd_end + something_to_skip_vertical_blanking + some_lines and
- + * even_start + height/2, though the image is good this way also
- + *
- + * TODO: for analog sources (SAA7191), the clipping values are a bit
- + * different and that case isn't yet handled
- + */
- + ofs = VINO_MIN_Y_CLIPPING; /* Should depend on input source */
- + ch->clip_start = VINO_CLIP_ODD(ofs + v->top / 2) |
- + VINO_CLIP_EVEN(ofs + v->top / 2 + 1) |
- VINO_CLIP_X(v->left);
- - ch->clip_end = VINO_CLIP_ODD(v->bottom) | VINO_CLIP_EVEN(v->bottom+1) |
- + ch->clip_end = VINO_CLIP_ODD(ofs + v->bottom / 2 - 1) |
- + VINO_CLIP_EVEN(ofs + v->bottom / 2) |
- VINO_CLIP_X(v->right);
- - /* FIXME: end-of-field bug workaround
- - VINO_CLIP_X(VINO_PAL_WIDTH);
- - */
- /* init the frame rate and norm (full frame rate only for now...) */
- ch->frame_rate = VINO_FRAMERT_RT(0x1fff) |
- (get_capture_norm(v) == VIDEO_MODE_PAL ?
- @@ -510,6 +531,7 @@ static void field_done(struct vino_devic
- static void vino_interrupt(int irq, void *dev_id, struct pt_regs *regs)
- {
- u32 intr, ctrl;
- + int a_eof, b_eof;
-
- spin_lock(&Vino->vino_lock);
- ctrl = vino->control;
- @@ -525,12 +547,14 @@ static void vino_interrupt(int irq, void
- vino->control = ctrl;
- clear_eod(&Vino->chB);
- }
- + a_eof = intr & VINO_INTSTAT_A_EOF;
- + b_eof = intr & VINO_INTSTAT_B_EOF;
- vino->intr_status = ~intr;
- spin_unlock(&Vino->vino_lock);
- - /* FIXME: For now we are assuming that interrupt means that frame is
- - * done. That's not true, but we can live with such brokeness for
- - * a while ;-) */
- - field_done(&Vino->chA);
- + if (a_eof)
- + field_done(&Vino->chA);
- + if (b_eof)
- + field_done(&Vino->chB);
- }
-
- static int vino_grab(struct vino_device *v, int frame)
- --- a/drivers/mtd/devices/docprobe.c
- +++ b/drivers/mtd/devices/docprobe.c
- @@ -89,10 +89,10 @@ static unsigned long __initdata doc_loca
- 0xe4000000,
- #elif defined(CONFIG_MOMENCO_OCELOT)
- 0x2f000000,
- - 0xff000000,
- + 0xff000000,
- #elif defined(CONFIG_MOMENCO_OCELOT_G) || defined (CONFIG_MOMENCO_OCELOT_C)
- - 0xff000000,
- -##else
- + 0xff000000,
- +#else
- #warning Unknown architecture for DiskOnChip. No default probe locations defined
- #endif
- 0 };
- --- a/drivers/mtd/devices/ms02-nv.c
- +++ b/drivers/mtd/devices/ms02-nv.c
- @@ -1,10 +1,10 @@
- /*
- - * Copyright (c) 2001 Maciej W. Rozycki
- + * Copyright (c) 2001 Maciej W. Rozycki
- *
- - * 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.
- + * 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.
- *
- * $Id: ms02-nv.c,v 1.2 2003/01/24 14:05:17 dwmw2 Exp $
- */
- @@ -29,18 +29,18 @@
-
-
- static char version[] __initdata =
- - "ms02-nv.c: v.1.0.0 13 Aug 2001 Maciej W. Rozycki.\n";
- + "ms02-nv.c: v.1.0.0 13 Aug 2001 Maciej W. Rozycki.\n";
-
- -MODULE_AUTHOR("Maciej W. Rozycki <macro@ds2.pg.gda.pl>");
- +MODULE_AUTHOR("Maciej W. Rozycki <macro@linux-mips.org>");
- MODULE_DESCRIPTION("DEC MS02-NV NVRAM module driver");
- MODULE_LICENSE("GPL");
-
-
- /*
- * Addresses we probe for an MS02-NV at. Modules may be located
- - * at any 8MB boundary within a 0MB up to 112MB range or at any 32MB
- - * boundary within a 0MB up to 448MB range. We don't support a module
- - * at 0MB, though.
- + * at any 8MiB boundary within a 0MiB up to 112MiB range or at any 32MiB
- + * boundary within a 0MiB up to 448MiB range. We don't support a module
- + * at 0MiB, though.
- */
- static ulong ms02nv_addrs[] __initdata = {
- 0x07000000, 0x06800000, 0x06000000, 0x05800000, 0x05000000,
- @@ -130,7 +130,7 @@ static int __init ms02nv_init_one(ulong
-
- int ret = -ENODEV;
-
- - /* The module decodes 8MB of address space. */
- + /* The module decodes 8MiB of address space. */
- mod_res = kmalloc(sizeof(*mod_res), GFP_KERNEL);
- if (!mod_res)
- return -ENOMEM;
- @@ -233,7 +233,7 @@ static int __init ms02nv_init_one(ulong
- goto err_out_csr_res;
- }
-
- - printk(KERN_INFO "mtd%d: %s at 0x%08lx, size %uMB.\n",
- + printk(KERN_INFO "mtd%d: %s at 0x%08lx, size %uMiB.\n",
- mtd->index, ms02nv_name, addr, size >> 20);
-
- mp->next = root_ms02nv_mtd;
- @@ -293,12 +293,12 @@ static int __init ms02nv_init(void)
-
- switch (mips_machtype) {
- case MACH_DS5000_200:
- - csr = (volatile u32 *)KN02_CSR_ADDR;
- + csr = (volatile u32 *)KN02_CSR_BASE;
- if (*csr & KN02_CSR_BNK32M)
- stride = 2;
- break;
- case MACH_DS5000_2X0:
- - case MACH_DS5000:
- + case MACH_DS5900:
- csr = (volatile u32 *)KN03_MCR_BASE;
- if (*csr & KN03_MCR_BNK32M)
- stride = 2;
- --- a/drivers/mtd/devices/ms02-nv.h
- +++ b/drivers/mtd/devices/ms02-nv.h
- @@ -1,32 +1,96 @@
- /*
- - * Copyright (c) 2001 Maciej W. Rozycki
- + * Copyright (c) 2001, 2003 Maciej W. Rozycki
- *
- - * 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.
- + * DEC MS02-NV (54-20948-01) battery backed-up NVRAM module for
- + * DECstation/DECsystem 5000/2x0 and DECsystem 5900 and 5900/260
- + * systems.
- + *
- + * 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.
- + *
- + * $Id: ms02-nv.h,v 1.3 2003/08/19 09:25:36 dwmw2 Exp $
- */
-
- #include <linux/ioport.h>
- #include <linux/mtd/mtd.h>
-
- +/*
- + * Addresses are decoded as follows:
- + *
- + * 0x000000 - 0x3fffff SRAM
- + * 0x400000 - 0x7fffff CSR
- + *
- + * Within the SRAM area the following ranges are forced by the system
- + * firmware:
- + *
- + * 0x000000 - 0x0003ff diagnostic area, destroyed upon a reboot
- + * 0x000400 - ENDofRAM storage area, available to operating systems
- + *
- + * but we can't really use the available area right from 0x000400 as
- + * the first word is used by the firmware as a status flag passed
- + * from an operating system. If anything but the valid data magic
- + * ID value is found, the firmware considers the SRAM clean, i.e.
- + * containing no valid data, and disables the battery resulting in
- + * data being erased as soon as power is switched off. So the choice
- + * for the start address of the user-available is 0x001000 which is
- + * nicely page aligned. The area between 0x000404 and 0x000fff may
- + * be used by the driver for own needs.
- + *
- + * The diagnostic area defines two status words to be read by an
- + * operating system, a magic ID to distinguish a MS02-NV board from
- + * anything else and a status information providing results of tests
- + * as well as the size of SRAM available, which can be 1MiB or 2MiB
- + * (that's what the firmware handles; no idea if 2MiB modules ever
- + * existed).
- + *
- + * The firmware only handles the MS02-NV board if installed in the
- + * last (15th) slot, so for any other location the status information
- + * stored in the SRAM cannot be relied upon. But from the hardware
- + * point of view there is no problem using up to 14 such boards in a
- + * system -- only the 1st slot needs to be filled with a DRAM module.
- + * The MS02-NV board is ECC-protected, like other MS02 memory boards.
- + *
- + * The state of the battery as provided by the CSR is reflected on
- + * the two onboard LEDs. When facing the battery side of the board,
- + * with the LEDs at the top left and the battery at the bottom right
- + * (i.e. looking from the back side of the system box), their meaning
- + * is as follows (the system has to be powered on):
- + *
- + * left LED battery disable status: lit = enabled
- + * right LED battery condition status: lit = OK
- + */
- +
- /* MS02-NV iomem register offsets. */
- #define MS02NV_CSR 0x400000 /* control & status register */
-
- +/* MS02-NV CSR status bits. */
- +#define MS02NV_CSR_BATT_OK 0x01 /* battery OK */
- +#define MS02NV_CSR_BATT_OFF 0x02 /* battery disabled */
- +
- +
- /* MS02-NV memory offsets. */
- #define MS02NV_DIAG 0x0003f8 /* diagnostic status */
- #define MS02NV_MAGIC 0x0003fc /* MS02-NV magic ID */
- -#define MS02NV_RAM 0x000400 /* general-purpose RAM start */
- +#define MS02NV_VALID 0x000400 /* valid data magic ID */
- +#define MS02NV_RAM 0x001000 /* user-exposed RAM start */
-
- -/* MS02-NV diagnostic status constants. */
- -#define MS02NV_DIAG_SIZE_MASK 0xf0 /* RAM size mask */
- -#define MS02NV_DIAG_SIZE_SHIFT 0x10 /* RAM size shift (left) */
- +/* MS02-NV diagnostic status bits. */
- +#define MS02NV_DIAG_TEST 0x01 /* SRAM test done (?) */
- +#define MS02NV_DIAG_RO 0x02 /* SRAM r/o test done */
- +#define MS02NV_DIAG_RW 0x04 /* SRAM r/w test done */
- +#define MS02NV_DIAG_FAIL 0x08 /* SRAM test failed */
- +#define MS02NV_DIAG_SIZE_MASK 0xf0 /* SRAM size mask */
- +#define MS02NV_DIAG_SIZE_SHIFT 0x10 /* SRAM size shift (left) */
-
- /* MS02-NV general constants. */
- #define MS02NV_ID 0x03021966 /* MS02-NV magic ID value */
- +#define MS02NV_VALID_ID 0xbd100248 /* valid data magic ID value */
- #define MS02NV_SLOT_SIZE 0x800000 /* size of the address space
- decoded by the module */
-
- +
- typedef volatile u32 ms02nv_uint;
-
- struct ms02nv_private {
- --- a/drivers/mtd/maps/Config.in
- +++ b/drivers/mtd/maps/Config.in
- @@ -51,11 +51,26 @@ if [ "$CONFIG_MIPS" = "y" ]; then
- dep_tristate ' Pb1000 MTD support' CONFIG_MTD_PB1000 $CONFIG_MIPS_PB1000
- dep_tristate ' Pb1500 MTD support' CONFIG_MTD_PB1500 $CONFIG_MIPS_PB1500
- dep_tristate ' Pb1100 MTD support' CONFIG_MTD_PB1100 $CONFIG_MIPS_PB1100
- + dep_tristate ' Bosporus MTD support' CONFIG_MTD_BOSPORUS $CONFIG_MIPS_BOSPORUS
- + dep_tristate ' XXS1500 boot flash device' CONFIG_MTD_XXS1500 $CONFIG_MIPS_XXS1500
- + dep_tristate ' MTX-1 flash device' CONFIG_MTD_MTX1 $CONFIG_MIPS_MTX1
- if [ "$CONFIG_MTD_PB1500" = "y" -o "$CONFIG_MTD_PB1500" = "m" \
- -o "$CONFIG_MTD_PB1100" = "y" -o "$CONFIG_MTD_PB1100" = "m" ]; then
- bool ' Pb[15]00 boot flash device' CONFIG_MTD_PB1500_BOOT
- bool ' Pb[15]00 user flash device (2nd 32MiB bank)' CONFIG_MTD_PB1500_USER
- fi
- + tristate ' Db1x00 MTD support' CONFIG_MTD_DB1X00
- + if [ "$CONFIG_MTD_DB1X00" = "y" -o "$CONFIG_MTD_DB1X00" = "m" ]; then
- + bool ' Db1x00 boot flash device' CONFIG_MTD_DB1X00_BOOT
- + bool ' Db1x00 user flash device (2nd bank)' CONFIG_MTD_DB1X00_USER
- + fi
- + tristate ' Pb1550 MTD support' CONFIG_MTD_PB1550
- + if [ "$CONFIG_MTD_PB1550" = "y" -o "$CONFIG_MTD_PB1550" = "m" ]; then
- + bool ' Pb1550 Boot Flash' CONFIG_MTD_PB1550_BOOT
- + bool ' Pb1550 User Parameter Flash' CONFIG_MTD_PB1550_USER
- + fi
- + dep_tristate ' Hydrogen 3 MTD support' CONFIG_MTD_HYDROGEN3 $CONFIG_MIPS_HYDROGEN3
- + dep_tristate ' Mirage MTD support' CONFIG_MTD_MIRAGE $CONFIG_MIPS_MIRAGE
- dep_tristate ' Flash chip mapping on ITE QED-4N-S01B, Globespan IVR or custom board' CONFIG_MTD_CSTM_MIPS_IXX $CONFIG_MTD_CFI $CONFIG_MTD_JEDEC $CONFIG_MTD_PARTITIONS
- if [ "$CONFIG_MTD_CSTM_MIPS_IXX" = "y" -o "$CONFIG_MTD_CSTM_MIPS_IXX" = "m" ]; then
- hex ' Physical start address of flash mapping' CONFIG_MTD_CSTM_MIPS_IXX_START 0x8000000
- --- /dev/null
- +++ b/drivers/mtd/maps/db1x00-flash.c
- @@ -0,0 +1,283 @@
- +/*
- + * Flash memory access on Alchemy Db1xxx boards
- + *
- + * (C) 2003 Pete Popov <ppopov@pacbell.net>
- + *
- + */
- +
- +#include <linux/config.h>
- +#include <linux/module.h>
- +#include <linux/types.h>
- +#include <linux/kernel.h>
- +
- +#include <linux/mtd/mtd.h>
- +#include <linux/mtd/map.h>
- +#include <linux/mtd/partitions.h>
- +
- +#include <asm/io.h>
- +#include <asm/au1000.h>
- +#include <asm/db1x00.h>
- +
- +#ifdef DEBUG_RW
- +#define DBG(x...) printk(x)
- +#else
- +#define DBG(x...)
- +#endif
- +
- +static unsigned long window_addr;
- +static unsigned long window_size;
- +static unsigned long flash_size;
- +
- +__u8 physmap_read8(struct map_info *map, unsigned long ofs)
- +{
- + __u8 ret;
- + ret = __raw_readb(map->map_priv_1 + ofs);
- + DBG("read8 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret);
- + return ret;
- +}
- +
- +__u16 physmap_read16(struct map_info *map, unsigned long ofs)
- +{
- + __u16 ret;
- + ret = __raw_readw(map->map_priv_1 + ofs);
- + DBG("read16 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret);
- + return ret;
- +}
- +
- +__u32 physmap_read32(struct map_info *map, unsigned long ofs)
- +{
- + __u32 ret;
- + ret = __raw_readl(map->map_priv_1 + ofs);
- + DBG("read32 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret);
- + return ret;
- +}
- +
- +void physmap_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
- +{
- + DBG("physmap_copy from %x to %x\n", (unsigned)from, (unsigned)to);
- + memcpy_fromio(to, map->map_priv_1 + from, len);
- +}
- +
- +void physmap_write8(struct map_info *map, __u8 d, unsigned long adr)
- +{
- + DBG("write8 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d);
- + __raw_writeb(d, map->map_priv_1 + adr);
- + mb();
- +}
- +
- +void physmap_write16(struct map_info *map, __u16 d, unsigned long adr)
- +{
- + DBG("write16 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d);
- + __raw_writew(d, map->map_priv_1 + adr);
- + mb();
- +}
- +
- +void physmap_write32(struct map_info *map, __u32 d, unsigned long adr)
- +{
- + DBG("write32 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d);
- + __raw_writel(d, map->map_priv_1 + adr);
- + mb();
- +}
- +
- +void physmap_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len)
- +{
- + DBG("physmap_copy_to %x from %x\n", (unsigned)to, (unsigned)from);
- + memcpy_toio(map->map_priv_1 + to, from, len);
- +}
- +
- +static struct map_info db1x00_map = {
- + name: "Db1x00 flash",
- + read8: physmap_read8,
- + read16: physmap_read16,
- + read32: physmap_read32,
- + copy_from: physmap_copy_from,
- + write8: physmap_write8,
- + write16: physmap_write16,
- + write32: physmap_write32,
- + copy_to: physmap_copy_to,
- +};
- +
- +static unsigned char flash_buswidth = 4;
- +
- +/*
- + * The Db1x boards support different flash densities. We setup
- + * the mtd_partition structures below for default of 64Mbit
- + * flash densities, and override the partitions sizes, if
- + * necessary, after we check the board status register.
- + */
- +
- +#ifdef DB1X00_BOTH_BANKS
- +/* both banks will be used. Combine the first bank and the first
- + * part of the second bank together into a single jffs/jffs2
- + * partition.
- + */
- +static struct mtd_partition db1x00_partitions[] = {
- + {
- + name: "User FS",
- + size: 0x1c00000,
- + offset: 0x0000000
- + },{
- + name: "yamon",
- + size: 0x0100000,
- + offset: MTDPART_OFS_APPEND,
- + mask_flags: MTD_WRITEABLE
- + },{
- + name: "raw kernel",
- + size: (0x300000-0x40000), /* last 256KB is yamon env */
- + offset: MTDPART_OFS_APPEND,
- + }
- +};
- +#elif defined(DB1X00_BOOT_ONLY)
- +static struct mtd_partition db1x00_partitions[] = {
- + {
- + name: "User FS",
- + size: 0x00c00000,
- + offset: 0x0000000
- + },{
- + name: "yamon",
- + size: 0x0100000,
- + offset: MTDPART_OFS_APPEND,
- + mask_flags: MTD_WRITEABLE
- + },{
- + name: "raw kernel",
- + size: (0x300000-0x40000), /* last 256KB is yamon env */
- + offset: MTDPART_OFS_APPEND,
- + }
- +};
- +#elif defined(DB1X00_USER_ONLY)
- +static struct mtd_partition db1x00_partitions[] = {
- + {
- + name: "User FS",
- + size: 0x0e00000,
- + offset: 0x0000000
- + },{
- + name: "raw kernel",
- + size: MTDPART_SIZ_FULL,
- + offset: MTDPART_OFS_APPEND,
- + }
- +};
- +#else
- +#error MTD_DB1X00 define combo error /* should never happen */
- +#endif
- +
- +
- +#define NB_OF(x) (sizeof(x)/sizeof(x[0]))
- +
- +static struct mtd_partition *parsed_parts;
- +static struct mtd_info *mymtd;
- +
- +/*
- + * Probe the flash density and setup window address and size
- + * based on user CONFIG options. There are times when we don't
- + * want the MTD driver to be probing the boot or user flash,
- + * so having the option to enable only one bank is important.
- + */
- +int setup_flash_params()
- +{
- + switch ((bcsr->status >> 14) & 0x3) {
- + case 0: /* 64Mbit devices */
- + flash_size = 0x800000; /* 8MB per part */
- +#if defined(DB1X00_BOTH_BANKS)
- + window_addr = 0x1E000000;
- + window_size = 0x2000000;
- +#elif defined(DB1X00_BOOT_ONLY)
- + window_addr = 0x1F000000;
- + window_size = 0x1000000;
- +#else /* USER ONLY */
- + window_addr = 0x1E000000;
- + window_size = 0x1000000;
- +#endif
- + break;
- + case 1:
- + /* 128 Mbit devices */
- + flash_size = 0x1000000; /* 16MB per part */
- +#if defined(DB1X00_BOTH_BANKS)
- + window_addr = 0x1C000000;
- + window_size = 0x4000000;
- + /* USERFS from 0x1C00 0000 to 0x1FC0 0000 */
- + db1x00_partitions[0].size = 0x3C00000;
- +#elif defined(DB1X00_BOOT_ONLY)
- + window_addr = 0x1E000000;
- + window_size = 0x2000000;
- + /* USERFS from 0x1E00 0000 to 0x1FC0 0000 */
- + db1x00_partitions[0].size = 0x1C00000;
- +#else /* USER ONLY */
- + window_addr = 0x1C000000;
- + window_size = 0x2000000;
- + /* USERFS from 0x1C00 0000 to 0x1DE00000 */
- + db1x00_partitions[0].size = 0x1DE0000;
- +#endif
- + break;
- + case 2:
- + /* 256 Mbit devices */
- + flash_size = 0x4000000; /* 64MB per part */
- +#if defined(DB1X00_BOTH_BANKS)
- + return 1;
- +#elif defined(DB1X00_BOOT_ONLY)
- + /* Boot ROM flash bank only; no user bank */
- + window_addr = 0x1C000000;
- + window_size = 0x4000000;
- + /* USERFS from 0x1C00 0000 to 0x1FC00000 */
- + db1x00_partitions[0].size = 0x3C00000;
- +#else /* USER ONLY */
- + return 1;
- +#endif
- + break;
- + default:
- + return 1;
- + }
- + return 0;
- +}
- +
- +int __init db1x00_mtd_init(void)
- +{
- + struct mtd_partition *parts;
- + int nb_parts = 0;
- + char *part_type;
- +
- + /* Default flash buswidth */
- + db1x00_map.buswidth = flash_buswidth;
- +
- + if (setup_flash_params())
- + return -ENXIO;
- +
- + /*
- + * Static partition definition selection
- + */
- + part_type = "static";
- + parts = db1x00_partitions;
- + nb_parts = NB_OF(db1x00_partitions);
- + db1x00_map.size = window_size;
- +
- + /*
- + * Now let's probe for the actual flash. Do it here since
- + * specific machine settings might have been set above.
- + */
- + printk(KERN_NOTICE "Db1xxx flash: probing %d-bit flash bus\n",
- + db1x00_map.buswidth*8);
- + db1x00_map.map_priv_1 =
- + (unsigned long)ioremap(window_addr, window_size);
- + mymtd = do_map_probe("cfi_probe", &db1x00_map);
- + if (!mymtd) return -ENXIO;
- + mymtd->module = THIS_MODULE;
- +
- + add_mtd_partitions(mymtd, parts, nb_parts);
- + return 0;
- +}
- +
- +static void __exit db1x00_mtd_cleanup(void)
- +{
- + if (mymtd) {
- + del_mtd_partitions(mymtd);
- + map_destroy(mymtd);
- + if (parsed_parts)
- + kfree(parsed_parts);
- + }
- +}
- +
- +module_init(db1x00_mtd_init);
- +module_exit(db1x00_mtd_cleanup);
- +
- +MODULE_AUTHOR("Pete Popov");
- +MODULE_DESCRIPTION("Db1x00 mtd map driver");
- +MODULE_LICENSE("GPL");
- --- /dev/null
- +++ b/drivers/mtd/maps/hydrogen3-flash.c
- @@ -0,0 +1,189 @@
- +/*
- + * Flash memory access on Alchemy HydrogenIII boards
- + *
- + * (C) 2003 Pete Popov <ppopov@pacbell.net>
- + *
- + */
- +
- +#include <linux/config.h>
- +#include <linux/module.h>
- +#include <linux/types.h>
- +#include <linux/kernel.h>
- +
- +#include <linux/mtd/mtd.h>
- +#include <linux/mtd/map.h>
- +#include <linux/mtd/partitions.h>
- +
- +#include <asm/io.h>
- +#include <asm/au1000.h>
- +
- +#ifdef DEBUG_RW
- +#define DBG(x...) printk(x)
- +#else
- +#define DBG(x...)
- +#endif
- +
- +#define WINDOW_ADDR 0x1E000000
- +#define WINDOW_SIZE 0x02000000
- +
- +
- +__u8 physmap_read8(struct map_info *map, unsigned long ofs)
- +{
- + __u8 ret;
- + ret = __raw_readb(map->map_priv_1 + ofs);
- + DBG("read8 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret);
- + return ret;
- +}
- +
- +__u16 physmap_read16(struct map_info *map, unsigned long ofs)
- +{
- + __u16 ret;
- + ret = __raw_readw(map->map_priv_1 + ofs);
- + DBG("read16 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret);
- + return ret;
- +}
- +
- +__u32 physmap_read32(struct map_info *map, unsigned long ofs)
- +{
- + __u32 ret;
- + ret = __raw_readl(map->map_priv_1 + ofs);
- + DBG("read32 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret);
- + return ret;
- +}
- +
- +void physmap_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
- +{
- + DBG("physmap_copy from %x to %x\n", (unsigned)from, (unsigned)to);
- + memcpy_fromio(to, map->map_priv_1 + from, len);
- +}
- +
- +void physmap_write8(struct map_info *map, __u8 d, unsigned long adr)
- +{
- + DBG("write8 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d);
- + __raw_writeb(d, map->map_priv_1 + adr);
- + mb();
- +}
- +
- +void physmap_write16(struct map_info *map, __u16 d, unsigned long adr)
- +{
- + DBG("write16 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d);
- + __raw_writew(d, map->map_priv_1 + adr);
- + mb();
- +}
- +
- +void physmap_write32(struct map_info *map, __u32 d, unsigned long adr)
- +{
- + DBG("write32 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d);
- + __raw_writel(d, map->map_priv_1 + adr);
- + mb();
- +}
- +
- +void physmap_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len)
- +{
- + DBG("physmap_copy_to %x from %x\n", (unsigned)to, (unsigned)from);
- + memcpy_toio(map->map_priv_1 + to, from, len);
- +}
- +
- +static struct map_info hydrogen3_map = {
- + name: "HydrogenIII flash",
- + read8: physmap_read8,
- + read16: physmap_read16,
- + read32: physmap_read32,
- + copy_from: physmap_copy_from,
- + write8: physmap_write8,
- + write16: physmap_write16,
- + write32: physmap_write32,
- + copy_to: physmap_copy_to,
- +};
- +
- +static unsigned char flash_buswidth = 4;
- +
- +/* MTDPART_OFS_APPEND is vastly preferred to any attempt at statically lining
- + * up the offsets. */
- +static struct mtd_partition hydrogen3_partitions[] = {
- + {
- + name: "User FS",
- + size: 0x1c00000,
- + offset: 0x0000000
- + },{
- + name: "yamon",
- + size: 0x0100000,
- + offset: MTDPART_OFS_APPEND,
- + mask_flags: MTD_WRITEABLE
- + },{
- + name: "raw kernel",
- + size: 0x02c0000,
- + offset: MTDPART_OFS_APPEND
- + }
- +};
- +
- +#define NB_OF(x) (sizeof(x)/sizeof(x[0]))
- +
- +static struct mtd_partition *parsed_parts;
- +static struct mtd_info *mymtd;
- +
- +int __init hydrogen3_mtd_init(void)
- +{
- + struct mtd_partition *parts;
- + int nb_parts = 0;
- + char *part_type;
- +
- + /* Default flash buswidth */
- + hydrogen3_map.buswidth = flash_buswidth;
- +
- + /*
- + * Static partition definition selection
- + */
- + part_type = "static";
- + parts = hydrogen3_partitions;
- + nb_parts = NB_OF(hydrogen3_partitions);
- + hydrogen3_map.size = WINDOW_SIZE;
- +
- + /*
- + * Now let's probe for the actual flash. Do it here since
- + * specific machine settings might have been set above.
- + */
- + printk(KERN_NOTICE "HydrogenIII flash: probing %d-bit flash bus\n",
- + hydrogen3_map.buswidth*8);
- + hydrogen3_map.map_priv_1 =
- + (unsigned long)ioremap(WINDOW_ADDR, WINDOW_SIZE);
- + mymtd = do_map_probe("cfi_probe", &hydrogen3_map);
- + if (!mymtd) return -ENXIO;
- + mymtd->module = THIS_MODULE;
- +
- + add_mtd_partitions(mymtd, parts, nb_parts);
- + return 0;
- +}
- +
- +static void __exit hydrogen3_mtd_cleanup(void)
- +{
- + if (mymtd) {
- + del_mtd_partitions(mymtd);
- + map_destroy(mymtd);
- + if (parsed_parts)
- + kfree(parsed_parts);
- + }
- +}
- +
- +/*#ifndef MODULE
- +
- +static int __init _bootflashonly(char *str)
- +{
- + bootflashonly = simple_strtol(str, NULL, 0);
- + return 1;
- +}
- +
- +
- +__setup("bootflashonly=", _bootflashonly);
- +
- +#endif*/
- +
- +
- +module_init(hydrogen3_mtd_init);
- +module_exit(hydrogen3_mtd_cleanup);
- +
- +MODULE_PARM(bootflashonly, "i");
- +MODULE_PARM_DESC(bootflashonly, "1=use \"boot flash only\"");
- +MODULE_AUTHOR("Pete Popov");
- +MODULE_DESCRIPTION("HydrogenIII mtd map driver");
- +MODULE_LICENSE("GPL");
- --- a/drivers/mtd/maps/lasat.c
- +++ b/drivers/mtd/maps/lasat.c
- @@ -1,15 +1,6 @@
- /*
- * Flash device on lasat 100 and 200 boards
- *
- - * Presumably (C) 2002 Brian Murphy <brian@murphy.dk> or whoever he
- - * works for.
- - *
- - * This program is free software; you can redistribute it and/or
- - * modify it under the terms of the GNU General Public License version
- - * 2 as published by the Free Software Foundation.
- - *
- - * $Id: lasat.c,v 1.1 2003/01/24 14:26:38 dwmw2 Exp $
- - *
- */
-
- #include <linux/module.h>
- @@ -21,7 +12,6 @@
- #include <linux/mtd/partitions.h>
- #include <linux/config.h>
- #include <asm/lasat/lasat.h>
- -#include <asm/lasat/lasat_mtd.h>
-
- static struct mtd_info *mymtd;
-
- @@ -69,30 +59,33 @@ static void sp_copy_to(struct map_info *
- }
-
- static struct map_info sp_map = {
- - .name = "SP flash",
- - .buswidth = 4,
- - .read8 = sp_read8,
- - .read16 = sp_read16,
- - .read32 = sp_read32,
- - .copy_from = sp_copy_from,
- - .write8 = sp_write8,
- - .write16 = sp_write16,
- - .write32 = sp_write32,
- - .copy_to = sp_copy_to
- + name: "SP flash",
- + buswidth: 4,
- + read8: sp_read8,
- + read16: sp_read16,
- + read32: sp_read32,
- + copy_from: sp_copy_from,
- + write8: sp_write8,
- + write16: sp_write16,
- + write32: sp_write32,
- + copy_to: sp_copy_to
- };
-
- static struct mtd_partition partition_info[LASAT_MTD_LAST];
- -static char *lasat_mtd_partnames[] = {"Bootloader", "Service", "Normal", "Filesystem", "Config"};
- +static char *lasat_mtd_partnames[] = {"Bootloader", "Service", "Normal", "Config", "Filesystem"};
-
- static int __init init_sp(void)
- {
- int i;
- + int nparts = 0;
- /* this does not play well with the old flash code which
- * protects and uprotects the flash when necessary */
- printk(KERN_NOTICE "Unprotecting flash\n");
- *lasat_misc->flash_wp_reg |= 1 << lasat_misc->flash_wp_bit;
-
- - sp_map.map_priv_1 = lasat_flash_partition_start(LASAT_MTD_BOOTLOADER);
- + sp_map.map_priv_1 = ioremap_nocache(
- + lasat_flash_partition_start(LASAT_MTD_BOOTLOADER),
- + lasat_board_info.li_flash_size);
- sp_map.size = lasat_board_info.li_flash_size;
-
- printk(KERN_NOTICE "sp flash device: %lx at %lx\n",
- @@ -109,12 +102,15 @@ static int __init init_sp(void)
-
- for (i=0; i < LASAT_MTD_LAST; i++) {
- size = lasat_flash_partition_size(i);
- - partition_info[i].size = size;
- - partition_info[i].offset = offset;
- - offset += size;
- + if (size != 0) {
- + nparts++;
- + partition_info[i].size = size;
- + partition_info[i].offset = offset;
- + offset += size;
- + }
- }
-
- - add_mtd_partitions( mymtd, partition_info, LASAT_MTD_LAST );
- + add_mtd_partitions( mymtd, partition_info, nparts );
- return 0;
- }
-
- @@ -124,11 +120,11 @@ static int __init init_sp(void)
- static void __exit cleanup_sp(void)
- {
- if (mymtd) {
- - del_mtd_partitions(mymtd);
- - map_destroy(mymtd);
- + del_mtd_partitions(mymtd);
- + map_destroy(mymtd);
- }
- if (sp_map.map_priv_1) {
- - sp_map.map_priv_1 = 0;
- + sp_map.map_priv_1 = 0;
- }
- }
-
- --- a/drivers/mtd/maps/Makefile
- +++ b/drivers/mtd/maps/Makefile
- @@ -52,7 +52,13 @@ obj-$(CONFIG_MTD_PCI) += pci.o
- obj-$(CONFIG_MTD_PB1000) += pb1xxx-flash.o
- obj-$(CONFIG_MTD_PB1100) += pb1xxx-flash.o
- obj-$(CONFIG_MTD_PB1500) += pb1xxx-flash.o
- +obj-$(CONFIG_MTD_XXS1500) += xxs1500.o
- +obj-$(CONFIG_MTD_MTX1) += mtx-1.o
- obj-$(CONFIG_MTD_LASAT) += lasat.o
- +obj-$(CONFIG_MTD_DB1X00) += db1x00-flash.o
- +obj-$(CONFIG_MTD_PB1550) += pb1550-flash.o
- +obj-$(CONFIG_MTD_HYDROGEN3) += hydrogen3-flash.o
- +obj-$(CONFIG_MTD_BOSPORUS) += pb1xxx-flash.o
- obj-$(CONFIG_MTD_AUTCPU12) += autcpu12-nvram.o
- obj-$(CONFIG_MTD_EDB7312) += edb7312.o
- obj-$(CONFIG_MTD_IMPA7) += impa7.o
- @@ -61,5 +67,6 @@ obj-$(CONFIG_MTD_REDWOOD) += redwood.o
- obj-$(CONFIG_MTD_UCLINUX) += uclinux.o
- obj-$(CONFIG_MTD_NETtel) += nettel.o
- obj-$(CONFIG_MTD_SCB2_FLASH) += scb2_flash.o
- +obj-$(CONFIG_MTD_MIRAGE) += mirage-flash.o
-
- include $(TOPDIR)/Rules.make
- --- /dev/null
- +++ b/drivers/mtd/maps/mirage-flash.c
- @@ -0,0 +1,194 @@
- +/*
- + * Flash memory access on AMD Mirage board.
- + *
- + * (C) 2003 Embedded Edge
- + * based on mirage-flash.c:
- + * (C) 2003 Pete Popov <ppopov@pacbell.net>
- + *
- + */
- +
- +#include <linux/config.h>
- +#include <linux/module.h>
- +#include <linux/types.h>
- +#include <linux/kernel.h>
- +
- +#include <linux/mtd/mtd.h>
- +#include <linux/mtd/map.h>
- +#include <linux/mtd/partitions.h>
- +
- +#include <asm/io.h>
- +#include <asm/au1000.h>
- +//#include <asm/mirage.h>
- +
- +#ifdef DEBUG_RW
- +#define DBG(x...) printk(x)
- +#else
- +#define DBG(x...)
- +#endif
- +
- +static unsigned long window_addr;
- +static unsigned long window_size;
- +static unsigned long flash_size;
- +
- +__u8 physmap_read8(struct map_info *map, unsigned long ofs)
- +{
- + __u8 ret;
- + ret = __raw_readb(map->map_priv_1 + ofs);
- + DBG("read8 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret);
- + return ret;
- +}
- +
- +__u16 physmap_read16(struct map_info *map, unsigned long ofs)
- +{
- + __u16 ret;
- + ret = __raw_readw(map->map_priv_1 + ofs);
- + DBG("read16 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret);
- + return ret;
- +}
- +
- +__u32 physmap_read32(struct map_info *map, unsigned long ofs)
- +{
- + __u32 ret;
- + ret = __raw_readl(map->map_priv_1 + ofs);
- + DBG("read32 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret);
- + return ret;
- +}
- +
- +void physmap_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
- +{
- + DBG("physmap_copy from %x to %x\n", (unsigned)from, (unsigned)to);
- + memcpy_fromio(to, map->map_priv_1 + from, len);
- +}
- +
- +void physmap_write8(struct map_info *map, __u8 d, unsigned long adr)
- +{
- + DBG("write8 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d);
- + __raw_writeb(d, map->map_priv_1 + adr);
- + mb();
- +}
- +
- +void physmap_write16(struct map_info *map, __u16 d, unsigned long adr)
- +{
- + DBG("write16 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d);
- + __raw_writew(d, map->map_priv_1 + adr);
- + mb();
- +}
- +
- +void physmap_write32(struct map_info *map, __u32 d, unsigned long adr)
- +{
- + DBG("write32 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d);
- + __raw_writel(d, map->map_priv_1 + adr);
- + mb();
- +}
- +
- +void physmap_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len)
- +{
- + DBG("physmap_copy_to %x from %x\n", (unsigned)to, (unsigned)from);
- + memcpy_toio(map->map_priv_1 + to, from, len);
- +}
- +
- +static struct map_info mirage_map = {
- + name: "Mirage flash",
- + read8: physmap_read8,
- + read16: physmap_read16,
- + read32: physmap_read32,
- + copy_from: physmap_copy_from,
- + write8: physmap_write8,
- + write16: physmap_write16,
- + write32: physmap_write32,
- + copy_to: physmap_copy_to,
- +};
- +
- +static unsigned char flash_buswidth = 4;
- +
- +static struct mtd_partition mirage_partitions[] = {
- + {
- + name: "User FS",
- + size: 0x1c00000,
- + offset: 0x0000000
- + },{
- + name: "yamon",
- + size: 0x0100000,
- + offset: MTDPART_OFS_APPEND,
- + mask_flags: MTD_WRITEABLE
- + },{
- + name: "raw kernel",
- + size: (0x300000-0x40000), /* last 256KB is yamon env */
- + offset: MTDPART_OFS_APPEND,
- + }
- +};
- +
- +#define NB_OF(x) (sizeof(x)/sizeof(x[0]))
- +
- +static struct mtd_partition *parsed_parts;
- +static struct mtd_info *mymtd;
- +
- +/*
- + * Probe the flash density and setup window address and size
- + * based on user CONFIG options. There are times when we don't
- + * want the MTD driver to be probing the boot or user flash,
- + * so having the option to enable only one bank is important.
- + */
- +int setup_flash_params()
- +{
- + flash_size = 0x4000000; /* 64MB per part */
- + /* Boot ROM flash bank only; no user bank */
- + window_addr = 0x1C000000;
- + window_size = 0x4000000;
- + /* USERFS from 0x1C00 0000 to 0x1FC00000 */
- + mirage_partitions[0].size = 0x3C00000;
- + return 0;
- +}
- +
- +int __init mirage_mtd_init(void)
- +{
- + struct mtd_partition *parts;
- + int nb_parts = 0;
- + char *part_type;
- +
- + /* Default flash buswidth */
- + mirage_map.buswidth = flash_buswidth;
- +
- + if (setup_flash_params())
- + return -ENXIO;
- +
- + /*
- + * Static partition definition selection
- + */
- + part_type = "static";
- + parts = mirage_partitions;
- + nb_parts = NB_OF(mirage_partitions);
- + mirage_map.size = window_size;
- +
- + /*
- + * Now let's probe for the actual flash. Do it here since
- + * specific machine settings might have been set above.
- + */
- + printk(KERN_NOTICE "Mirage flash: probing %d-bit flash bus\n",
- + mirage_map.buswidth*8);
- + mirage_map.map_priv_1 =
- + (unsigned long)ioremap(window_addr, window_size);
- + mymtd = do_map_probe("cfi_probe", &mirage_map);
- + if (!mymtd) return -ENXIO;
- + mymtd->module = THIS_MODULE;
- +
- + add_mtd_partitions(mymtd, parts, nb_parts);
- + return 0;
- +}
- +
- +static void __exit mirage_mtd_cleanup(void)
- +{
- + if (mymtd) {
- + del_mtd_partitions(mymtd);
- + map_destroy(mymtd);
- + if (parsed_parts)
- + kfree(parsed_parts);
- + }
- +}
- +
- +module_init(mirage_mtd_init);
- +module_exit(mirage_mtd_cleanup);
- +
- +MODULE_AUTHOR("Embedded Edge");
- +MODULE_DESCRIPTION("Mirage mtd map driver");
- +MODULE_LICENSE("GPL");
- --- /dev/null
- +++ b/drivers/mtd/maps/mtx-1.c
- @@ -0,0 +1,181 @@
- +/*
- + * Flash memory access on 4G Systems MTX-1 board
- + *
- + * (C) 2003 Pete Popov <ppopov@mvista.com>
- + * Bruno Randolf <bruno.randolf@4g-systems.de>
- + */
- +
- +#include <linux/config.h>
- +#include <linux/module.h>
- +#include <linux/types.h>
- +#include <linux/kernel.h>
- +
- +#include <linux/mtd/mtd.h>
- +#include <linux/mtd/map.h>
- +#include <linux/mtd/partitions.h>
- +
- +#include <asm/io.h>
- +#include <asm/au1000.h>
- +
- +#ifdef DEBUG_RW
- +#define DBG(x...) printk(x)
- +#else
- +#define DBG(x...)
- +#endif
- +
- +#ifdef CONFIG_MIPS_MTX1
- +#define WINDOW_ADDR 0x1E000000
- +#define WINDOW_SIZE 0x2000000
- +#endif
- +
- +__u8 physmap_read8(struct map_info *map, unsigned long ofs)
- +{
- + __u8 ret;
- + ret = __raw_readb(map->map_priv_1 + ofs);
- + DBG("read8 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret);
- + return ret;
- +}
- +
- +__u16 physmap_read16(struct map_info *map, unsigned long ofs)
- +{
- + __u16 ret;
- + ret = __raw_readw(map->map_priv_1 + ofs);
- + DBG("read16 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret);
- + return ret;
- +}
- +
- +__u32 physmap_read32(struct map_info *map, unsigned long ofs)
- +{
- + __u32 ret;
- + ret = __raw_readl(map->map_priv_1 + ofs);
- + DBG("read32 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret);
- + return ret;
- +}
- +
- +void physmap_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
- +{
- + DBG("physmap_copy from %x to %x\n", (unsigned)from, (unsigned)to);
- + memcpy_fromio(to, map->map_priv_1 + from, len);
- +}
- +
- +void physmap_write8(struct map_info *map, __u8 d, unsigned long adr)
- +{
- + DBG("write8 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d);
- + __raw_writeb(d, map->map_priv_1 + adr);
- + mb();
- +}
- +
- +void physmap_write16(struct map_info *map, __u16 d, unsigned long adr)
- +{
- + DBG("write16 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d);
- + __raw_writew(d, map->map_priv_1 + adr);
- + mb();
- +}
- +
- +void physmap_write32(struct map_info *map, __u32 d, unsigned long adr)
- +{
- + DBG("write32 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d);
- + __raw_writel(d, map->map_priv_1 + adr);
- + mb();
- +}
- +
- +void physmap_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len)
- +{
- + DBG("physmap_copy_to %x from %x\n", (unsigned)to, (unsigned)from);
- + memcpy_toio(map->map_priv_1 + to, from, len);
- +}
- +
- +
- +
- +static struct map_info mtx1_map = {
- + name: "MTX-1 flash",
- + read8: physmap_read8,
- + read16: physmap_read16,
- + read32: physmap_read32,
- + copy_from: physmap_copy_from,
- + write8: physmap_write8,
- + write16: physmap_write16,
- + write32: physmap_write32,
- + copy_to: physmap_copy_to,
- +};
- +
- +
- +static unsigned long flash_size = 0x01000000;
- +static unsigned char flash_buswidth = 4;
- +static struct mtd_partition mtx1_partitions[] = {
- + {
- + name: "user fs",
- + size: 0x1c00000,
- + offset: 0,
- + },{
- + name: "yamon",
- + size: 0x0100000,
- + offset: MTDPART_OFS_APPEND,
- + mask_flags: MTD_WRITEABLE
- + },{
- + name: "raw kernel",
- + size: 0x02c0000,
- + offset: MTDPART_OFS_APPEND,
- + },{
- + name: "yamon env vars",
- + size: 0x0040000,
- + offset: MTDPART_OFS_APPEND,
- + mask_flags: MTD_WRITEABLE
- + }
- +};
- +
- +
- +#define NB_OF(x) (sizeof(x)/sizeof(x[0]))
- +
- +static struct mtd_partition *parsed_parts;
- +static struct mtd_info *mymtd;
- +
- +int __init mtx1_mtd_init(void)
- +{
- + struct mtd_partition *parts;
- + int nb_parts = 0;
- + char *part_type;
- +
- + /* Default flash buswidth */
- + mtx1_map.buswidth = flash_buswidth;
- +
- + /*
- + * Static partition definition selection
- + */
- + part_type = "static";
- + parts = mtx1_partitions;
- + nb_parts = NB_OF(mtx1_partitions);
- + mtx1_map.size = flash_size;
- +
- + /*
- + * Now let's probe for the actual flash. Do it here since
- + * specific machine settings might have been set above.
- + */
- + printk(KERN_NOTICE "MTX-1 flash: probing %d-bit flash bus\n",
- + mtx1_map.buswidth*8);
- + mtx1_map.map_priv_1 =
- + (unsigned long)ioremap(WINDOW_ADDR, WINDOW_SIZE);
- + mymtd = do_map_probe("cfi_probe", &mtx1_map);
- + if (!mymtd) return -ENXIO;
- + mymtd->module = THIS_MODULE;
- +
- + add_mtd_partitions(mymtd, parts, nb_parts);
- + return 0;
- +}
- +
- +static void __exit mtx1_mtd_cleanup(void)
- +{
- + if (mymtd) {
- + del_mtd_partitions(mymtd);
- + map_destroy(mymtd);
- + if (parsed_parts)
- + kfree(parsed_parts);
- + }
- +}
- +
- +module_init(mtx1_mtd_init);
- +module_exit(mtx1_mtd_cleanup);
- +
- +MODULE_AUTHOR("Pete Popov");
- +MODULE_DESCRIPTION("MTX-1 CFI map driver");
- +MODULE_LICENSE("GPL");
- --- /dev/null
- +++ b/drivers/mtd/maps/pb1550-flash.c
- @@ -0,0 +1,270 @@
- +/*
- + * Flash memory access on Alchemy Pb1550 board
- + *
- + * (C) 2004 Embedded Edge, LLC, based on pb1550-flash.c:
- + * (C) 2003 Pete Popov <ppopov@pacbell.net>
- + *
- + */
- +
- +#include <linux/config.h>
- +#include <linux/module.h>
- +#include <linux/types.h>
- +#include <linux/kernel.h>
- +
- +#include <linux/mtd/mtd.h>
- +#include <linux/mtd/map.h>
- +#include <linux/mtd/partitions.h>
- +
- +#include <asm/io.h>
- +#include <asm/au1000.h>
- +#include <asm/pb1550.h>
- +
- +#ifdef DEBUG_RW
- +#define DBG(x...) printk(x)
- +#else
- +#define DBG(x...)
- +#endif
- +
- +static unsigned long window_addr;
- +static unsigned long window_size;
- +
- +__u8 physmap_read8(struct map_info *map, unsigned long ofs)
- +{
- + __u8 ret;
- + ret = __raw_readb(map->map_priv_1 + ofs);
- + DBG("read8 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret);
- + return ret;
- +}
- +
- +__u16 physmap_read16(struct map_info *map, unsigned long ofs)
- +{
- + __u16 ret;
- + ret = __raw_readw(map->map_priv_1 + ofs);
- + DBG("read16 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret);
- + return ret;
- +}
- +
- +__u32 physmap_read32(struct map_info *map, unsigned long ofs)
- +{
- + __u32 ret;
- + ret = __raw_readl(map->map_priv_1 + ofs);
- + DBG("read32 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret);
- + return ret;
- +}
- +
- +void physmap_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
- +{
- + DBG("physmap_copy from %x to %x\n", (unsigned)from, (unsigned)to);
- + memcpy_fromio(to, map->map_priv_1 + from, len);
- +}
- +
- +void physmap_write8(struct map_info *map, __u8 d, unsigned long adr)
- +{
- + DBG("write8 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d);
- + __raw_writeb(d, map->map_priv_1 + adr);
- + mb();
- +}
- +
- +void physmap_write16(struct map_info *map, __u16 d, unsigned long adr)
- +{
- + DBG("write16 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d);
- + __raw_writew(d, map->map_priv_1 + adr);
- + mb();
- +}
- +
- +void physmap_write32(struct map_info *map, __u32 d, unsigned long adr)
- +{
- + DBG("write32 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d);
- + __raw_writel(d, map->map_priv_1 + adr);
- + mb();
- +}
- +
- +void physmap_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len)
- +{
- + DBG("physmap_copy_to %x from %x\n", (unsigned)to, (unsigned)from);
- + memcpy_toio(map->map_priv_1 + to, from, len);
- +}
- +
- +static struct map_info pb1550_map = {
- + name: "Pb1550 flash",
- + read8: physmap_read8,
- + read16: physmap_read16,
- + read32: physmap_read32,
- + copy_from: physmap_copy_from,
- + write8: physmap_write8,
- + write16: physmap_write16,
- + write32: physmap_write32,
- + copy_to: physmap_copy_to,
- +};
- +
- +static unsigned char flash_buswidth = 4;
- +
- +/*
- + * Support only 64MB NOR Flash parts
- + */
- +
- +#ifdef PB1550_BOTH_BANKS
- +/* both banks will be used. Combine the first bank and the first
- + * part of the second bank together into a single jffs/jffs2
- + * partition.
- + */
- +static struct mtd_partition pb1550_partitions[] = {
- + /* assume boot[2:0]:swap is '0000' or '1000', which translates to:
- + * 1C00 0000 1FFF FFFF CE0 64MB Boot NOR Flash
- + * 1800 0000 1BFF FFFF CE0 64MB Param NOR Flash
- + */
- + {
- + name: "User FS",
- + size: (0x1FC00000 - 0x18000000),
- + offset: 0x0000000
- + },{
- + name: "yamon",
- + size: 0x0100000,
- + offset: MTDPART_OFS_APPEND,
- + mask_flags: MTD_WRITEABLE
- + },{
- + name: "raw kernel",
- + size: (0x300000 - 0x40000), /* last 256KB is yamon env */
- + offset: MTDPART_OFS_APPEND,
- + }
- +};
- +#elif defined(PB1550_BOOT_ONLY)
- +static struct mtd_partition pb1550_partitions[] = {
- + /* assume boot[2:0]:swap is '0000' or '1000', which translates to:
- + * 1C00 0000 1FFF FFFF CE0 64MB Boot NOR Flash
- + */
- + {
- + name: "User FS",
- + size: 0x03c00000,
- + offset: 0x0000000
- + },{
- + name: "yamon",
- + size: 0x0100000,
- + offset: MTDPART_OFS_APPEND,
- + mask_flags: MTD_WRITEABLE
- + },{
- + name: "raw kernel",
- + size: (0x300000-0x40000), /* last 256KB is yamon env */
- + offset: MTDPART_OFS_APPEND,
- + }
- +};
- +#elif defined(PB1550_USER_ONLY)
- +static struct mtd_partition pb1550_partitions[] = {
- + /* assume boot[2:0]:swap is '0000' or '1000', which translates to:
- + * 1800 0000 1BFF FFFF CE0 64MB Param NOR Flash
- + */
- + {
- + name: "User FS",
- + size: (0x4000000 - 0x200000), /* reserve 2MB for raw kernel */
- + offset: 0x0000000
- + },{
- + name: "raw kernel",
- + size: MTDPART_SIZ_FULL,
- + offset: MTDPART_OFS_APPEND,
- + }
- +};
- +#else
- +#error MTD_PB1550 define combo error /* should never happen */
- +#endif
- +
- +#define NB_OF(x) (sizeof(x)/sizeof(x[0]))
- +
- +static struct mtd_partition *parsed_parts;
- +static struct mtd_info *mymtd;
- +
- +/*
- + * Probe the flash density and setup window address and size
- + * based on user CONFIG options. There are times when we don't
- + * want the MTD driver to be probing the boot or user flash,
- + * so having the option to enable only one bank is important.
- + */
- +int setup_flash_params()
- +{
- + u16 boot_swapboot;
- + boot_swapboot = (au_readl(MEM_STSTAT) & (0x7<<1)) |
- + ((bcsr->status >> 6) & 0x1);
- + printk("Pb1550 MTD: boot:swap %d\n", boot_swapboot);
- +
- + switch (boot_swapboot) {
- + case 0: /* 512Mbit devices, both enabled */
- + case 1:
- + case 8:
- + case 9:
- +#if defined(PB1550_BOTH_BANKS)
- + window_addr = 0x18000000;
- + window_size = 0x8000000;
- +#elif defined(PB1550_BOOT_ONLY)
- + window_addr = 0x1C000000;
- + window_size = 0x4000000;
- +#else /* USER ONLY */
- + window_addr = 0x1E000000;
- + window_size = 0x1000000;
- +#endif
- + break;
- + case 0xC:
- + case 0xD:
- + case 0xE:
- + case 0xF:
- + /* 64 MB Boot NOR Flash is disabled */
- + /* and the start address is moved to 0x0C00000 */
- + window_addr = 0x0C000000;
- + window_size = 0x4000000;
- + default:
- + printk("Pb1550 MTD: unsupported boot:swap setting\n");
- + return 1;
- + }
- + return 0;
- +}
- +
- +int __init pb1550_mtd_init(void)
- +{
- + struct mtd_partition *parts;
- + int nb_parts = 0;
- + char *part_type;
- +
- + /* Default flash buswidth */
- + pb1550_map.buswidth = flash_buswidth;
- +
- + if (setup_flash_params())
- + return -ENXIO;
- +
- + /*
- + * Static partition definition selection
- + */
- + part_type = "static";
- + parts = pb1550_partitions;
- + nb_parts = NB_OF(pb1550_partitions);
- + pb1550_map.size = window_size;
- +
- + /*
- + * Now let's probe for the actual flash. Do it here since
- + * specific machine settings might have been set above.
- + */
- + printk(KERN_NOTICE "Pb1550 flash: probing %d-bit flash bus\n",
- + pb1550_map.buswidth*8);
- + pb1550_map.map_priv_1 =
- + (unsigned long)ioremap(window_addr, window_size);
- + mymtd = do_map_probe("cfi_probe", &pb1550_map);
- + if (!mymtd) return -ENXIO;
- + mymtd->module = THIS_MODULE;
- +
- + add_mtd_partitions(mymtd, parts, nb_parts);
- + return 0;
- +}
- +
- +static void __exit pb1550_mtd_cleanup(void)
- +{
- + if (mymtd) {
- + del_mtd_partitions(mymtd);
- + map_destroy(mymtd);
- + if (parsed_parts)
- + kfree(parsed_parts);
- + }
- +}
- +
- +module_init(pb1550_mtd_init);
- +module_exit(pb1550_mtd_cleanup);
- +
- +MODULE_AUTHOR("Embedded Edge, LLC");
- +MODULE_DESCRIPTION("Pb1550 mtd map driver");
- +MODULE_LICENSE("GPL");
- --- a/drivers/mtd/maps/pb1xxx-flash.c
- +++ b/drivers/mtd/maps/pb1xxx-flash.c
- @@ -192,6 +192,34 @@ static struct mtd_partition pb1xxx_parti
- #else
- #error MTD_PB1500 define combo error /* should never happen */
- #endif
- +#elif defined(CONFIG_MTD_BOSPORUS)
- +static unsigned char flash_buswidth = 2;
- +static unsigned long flash_size = 0x02000000;
- +#define WINDOW_ADDR 0x1F000000
- +#define WINDOW_SIZE 0x2000000
- +static struct mtd_partition pb1xxx_partitions[] = {
- + {
- + name: "User FS",
- + size: 0x00400000,
- + offset: 0x00000000,
- + },{
- + name: "Yamon-2",
- + size: 0x00100000,
- + offset: 0x00400000,
- + },{
- + name: "Root FS",
- + size: 0x00700000,
- + offset: 0x00500000,
- + },{
- + name: "Yamon-1",
- + size: 0x00100000,
- + offset: 0x00C00000,
- + },{
- + name: "Kernel",
- + size: 0x00300000,
- + offset: 0x00D00000,
- + }
- +};
- #else
- #error Unsupported board
- #endif
- --- /dev/null
- +++ b/drivers/mtd/maps/xxs1500.c
- @@ -0,0 +1,186 @@
- +/*
- + * Flash memory access on MyCable XXS1500 board
- + *
- + * (C) 2003 Pete Popov <ppopov@mvista.com>
- + *
- + * $Id: xxs1500.c,v 1.1.2.1 2003/06/13 21:15:46 ppopov Exp $
- + */
- +
- +#include <linux/config.h>
- +#include <linux/module.h>
- +#include <linux/types.h>
- +#include <linux/kernel.h>
- +
- +#include <linux/mtd/mtd.h>
- +#include <linux/mtd/map.h>
- +#include <linux/mtd/partitions.h>
- +
- +#include <asm/io.h>
- +#include <asm/au1000.h>
- +
- +#ifdef DEBUG_RW
- +#define DBG(x...) printk(x)
- +#else
- +#define DBG(x...)
- +#endif
- +
- +#ifdef CONFIG_MIPS_XXS1500
- +#define WINDOW_ADDR 0x1F000000
- +#define WINDOW_SIZE 0x1000000
- +#endif
- +
- +__u8 physmap_read8(struct map_info *map, unsigned long ofs)
- +{
- + __u8 ret;
- + ret = __raw_readb(map->map_priv_1 + ofs);
- + DBG("read8 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret);
- + return ret;
- +}
- +
- +__u16 physmap_read16(struct map_info *map, unsigned long ofs)
- +{
- + __u16 ret;
- + ret = __raw_readw(map->map_priv_1 + ofs);
- + DBG("read16 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret);
- + return ret;
- +}
- +
- +__u32 physmap_read32(struct map_info *map, unsigned long ofs)
- +{
- + __u32 ret;
- + ret = __raw_readl(map->map_priv_1 + ofs);
- + DBG("read32 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret);
- + return ret;
- +}
- +
- +void physmap_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
- +{
- + DBG("physmap_copy from %x to %x\n", (unsigned)from, (unsigned)to);
- + memcpy_fromio(to, map->map_priv_1 + from, len);
- +}
- +
- +void physmap_write8(struct map_info *map, __u8 d, unsigned long adr)
- +{
- + DBG("write8 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d);
- + __raw_writeb(d, map->map_priv_1 + adr);
- + mb();
- +}
- +
- +void physmap_write16(struct map_info *map, __u16 d, unsigned long adr)
- +{
- + DBG("write16 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d);
- + __raw_writew(d, map->map_priv_1 + adr);
- + mb();
- +}
- +
- +void physmap_write32(struct map_info *map, __u32 d, unsigned long adr)
- +{
- + DBG("write32 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d);
- + __raw_writel(d, map->map_priv_1 + adr);
- + mb();
- +}
- +
- +void physmap_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len)
- +{
- + DBG("physmap_copy_to %x from %x\n", (unsigned)to, (unsigned)from);
- + memcpy_toio(map->map_priv_1 + to, from, len);
- +}
- +
- +
- +
- +static struct map_info xxs1500_map = {
- + name: "XXS1500 flash",
- + read8: physmap_read8,
- + read16: physmap_read16,
- + read32: physmap_read32,
- + copy_from: physmap_copy_from,
- + write8: physmap_write8,
- + write16: physmap_write16,
- + write32: physmap_write32,
- + copy_to: physmap_copy_to,
- +};
- +
- +
- +static unsigned long flash_size = 0x00800000;
- +static unsigned char flash_buswidth = 4;
- +static struct mtd_partition xxs1500_partitions[] = {
- + {
- + name: "kernel image",
- + size: 0x00200000,
- + offset: 0,
- + },{
- + name: "user fs 0",
- + size: (0x00C00000-0x200000),
- + offset: MTDPART_OFS_APPEND,
- + },{
- + name: "yamon",
- + size: 0x00100000,
- + offset: MTDPART_OFS_APPEND,
- + mask_flags: MTD_WRITEABLE
- + },{
- + name: "user fs 1",
- + size: 0x2c0000,
- + offset: MTDPART_OFS_APPEND,
- + },{
- + name: "yamon env vars",
- + size: 0x040000,
- + offset: MTDPART_OFS_APPEND,
- + mask_flags: MTD_WRITEABLE
- + }
- +};
- +
- +
- +#define NB_OF(x) (sizeof(x)/sizeof(x[0]))
- +
- +static struct mtd_partition *parsed_parts;
- +static struct mtd_info *mymtd;
- +
- +int __init xxs1500_mtd_init(void)
- +{
- + struct mtd_partition *parts;
- + int nb_parts = 0;
- + char *part_type;
- +
- + /* Default flash buswidth */
- + xxs1500_map.buswidth = flash_buswidth;
- +
- + /*
- + * Static partition definition selection
- + */
- + part_type = "static";
- + parts = xxs1500_partitions;
- + nb_parts = NB_OF(xxs1500_partitions);
- + xxs1500_map.size = flash_size;
- +
- + /*
- + * Now let's probe for the actual flash. Do it here since
- + * specific machine settings might have been set above.
- + */
- + printk(KERN_NOTICE "XXS1500 flash: probing %d-bit flash bus\n",
- + xxs1500_map.buswidth*8);
- + xxs1500_map.map_priv_1 =
- + (unsigned long)ioremap(WINDOW_ADDR, WINDOW_SIZE);
- + mymtd = do_map_probe("cfi_probe", &xxs1500_map);
- + if (!mymtd) return -ENXIO;
- + mymtd->module = THIS_MODULE;
- +
- + add_mtd_partitions(mymtd, parts, nb_parts);
- + return 0;
- +}
- +
- +static void __exit xxs1500_mtd_cleanup(void)
- +{
- + if (mymtd) {
- + del_mtd_partitions(mymtd);
- + map_destroy(mymtd);
- + if (parsed_parts)
- + kfree(parsed_parts);
- + }
- +}
- +
- +module_init(xxs1500_mtd_init);
- +module_exit(xxs1500_mtd_cleanup);
- +
- +MODULE_AUTHOR("Pete Popov");
- +MODULE_DESCRIPTION("XXS1500 CFI map driver");
- +MODULE_LICENSE("GPL");
- --- a/drivers/net/defxx.c
- +++ b/drivers/net/defxx.c
- @@ -10,24 +10,18 @@
- *
- * Abstract:
- * A Linux device driver supporting the Digital Equipment Corporation
- - * FDDI EISA and PCI controller families. Supported adapters include:
- + * FDDI TURBOchannel, EISA and PCI controller families. Supported
- + * adapters include:
- *
- - * DEC FDDIcontroller/EISA (DEFEA)
- - * DEC FDDIcontroller/PCI (DEFPA)
- + * DEC FDDIcontroller/TURBOchannel (DEFTA)
- + * DEC FDDIcontroller/EISA (DEFEA)
- + * DEC FDDIcontroller/PCI (DEFPA)
- *
- - * Maintainers:
- - * LVS Lawrence V. Stefani
- - *
- - * Contact:
- - * The author may be reached at:
- + * The original author:
- + * LVS Lawrence V. Stefani <lstefani@yahoo.com>
- *
- - * Inet: stefani@lkg.dec.com
- - * (NOTE! this address no longer works -jgarzik)
- - *
- - * Mail: Digital Equipment Corporation
- - * 550 King Street
- - * M/S: LKG1-3/M07
- - * Littleton, MA 01460
- + * Maintainers:
- + * macro Maciej W. Rozycki <macro@linux-mips.org>
- *
- * Credits:
- * I'd like to thank Patricia Cross for helping me get started with
- @@ -197,16 +191,16 @@
- * Sep 2000 tjeerd Fix leak on unload, cosmetic code cleanup
- * Feb 2001 Skb allocation fixes
- * Feb 2001 davej PCI enable cleanups.
- + * 04 Aug 2003 macro Converted to the DMA API.
- + * 14 Aug 2004 macro Fix device names reported.
- + * 26 Sep 2004 macro TURBOchannel support.
- */
-
- /* Include files */
-
- #include <linux/module.h>
- -
- #include <linux/kernel.h>
- -#include <linux/sched.h>
- #include <linux/string.h>
- -#include <linux/ptrace.h>
- #include <linux/errno.h>
- #include <linux/ioport.h>
- #include <linux/slab.h>
- @@ -215,19 +209,33 @@
- #include <linux/delay.h>
- #include <linux/init.h>
- #include <linux/netdevice.h>
- +#include <linux/fddidevice.h>
- +#include <linux/skbuff.h>
- +
- #include <asm/byteorder.h>
- #include <asm/bitops.h>
- #include <asm/io.h>
-
- -#include <linux/fddidevice.h>
- -#include <linux/skbuff.h>
- +#ifdef CONFIG_TC
- +#include <asm/dec/tc.h>
- +#else
- +static int search_tc_card(const char *name) { return -ENODEV; }
- +static void claim_tc_card(int slot) { }
- +static void release_tc_card(int slot) { }
- +static unsigned long get_tc_base_addr(int slot) { return 0; }
- +static unsigned long get_tc_irq_nr(int slot) { return -1; }
- +#endif
-
- #include "defxx.h"
-
- -/* Version information string - should be updated prior to each new release!!! */
- +/* Version information string should be updated prior to each new release! */
- +#define DRV_NAME "defxx"
- +#define DRV_VERSION "v1.07T"
- +#define DRV_RELDATE "2004/09/26"
-
- static char version[] __devinitdata =
- - "defxx.c:v1.05e 2001/02/03 Lawrence V. Stefani and others\n";
- + DRV_NAME ": " DRV_VERSION " " DRV_RELDATE
- + " Lawrence V. Stefani and others\n";
-
- #define DYNAMIC_BUFFERS 1
-
- @@ -243,7 +251,7 @@ static char version[] __devinitdata =
- static void dfx_bus_init(struct net_device *dev);
- static void dfx_bus_config_check(DFX_board_t *bp);
-
- -static int dfx_driver_init(struct net_device *dev);
- +static int dfx_driver_init(struct net_device *dev, const char *print_name);
- static int dfx_adap_init(DFX_board_t *bp, int get_buffers);
-
- static int dfx_open(struct net_device *dev);
- @@ -337,48 +345,84 @@ static inline void dfx_port_write_byte(
- int offset,
- u8 data
- )
- +{
- + if (bp->bus_type == DFX_BUS_TYPE_TC)
- + {
- + volatile u8 *addr = (void *)(bp->base_addr + offset);
-
- + *addr = data;
- + mb();
- + }
- + else
- {
- u16 port = bp->base_addr + offset;
-
- outb(data, port);
- }
- +}
-
- static inline void dfx_port_read_byte(
- DFX_board_t *bp,
- int offset,
- u8 *data
- )
- +{
- + if (bp->bus_type == DFX_BUS_TYPE_TC)
- + {
- + volatile u8 *addr = (void *)(bp->base_addr + offset);
-
- + mb();
- + *data = *addr;
- + }
- + else
- {
- u16 port = bp->base_addr + offset;
-
- *data = inb(port);
- }
- +}
-
- static inline void dfx_port_write_long(
- DFX_board_t *bp,
- int offset,
- u32 data
- )
- +{
- + if (bp->bus_type == DFX_BUS_TYPE_TC)
- + {
- + volatile u32 *addr = (void *)(bp->base_addr + offset);
-
- + *addr = data;
- + mb();
- + }
- + else
- {
- u16 port = bp->base_addr + offset;
-
- outl(data, port);
- }
- +}
-
- static inline void dfx_port_read_long(
- DFX_board_t *bp,
- int offset,
- u32 *data
- )
- +{
- + if (bp->bus_type == DFX_BUS_TYPE_TC)
- + {
- + volatile u32 *addr = (void *)(bp->base_addr + offset);
-
- + mb();
- + *data = *addr;
- + }
- + else
- {
- u16 port = bp->base_addr + offset;
-
- *data = inl(port);
- }
- +}
-
-
- /*
- @@ -393,8 +437,9 @@ static inline void dfx_port_read_long(
- * Condition code
- *
- * Arguments:
- - * pdev - pointer to pci device information (NULL for EISA)
- - * ioaddr - pointer to port (NULL for PCI)
- + * pdev - pointer to pci device information (NULL for EISA or TURBOchannel)
- + * bus_type - bus type (one of DFX_BUS_TYPE_*)
- + * handle - bus-specific data: slot (TC), pointer to port (EISA), NULL (PCI)
- *
- * Functional Description:
- *
- @@ -410,54 +455,68 @@ static inline void dfx_port_read_long(
- * initialized and the board resources are read and stored in
- * the device structure.
- */
- -static int __devinit dfx_init_one_pci_or_eisa(struct pci_dev *pdev, long ioaddr)
- +static int __devinit dfx_init_one_pci_or_eisa(struct pci_dev *pdev, u32 bus_type, long handle)
- {
- + static int version_disp;
- + char *print_name = DRV_NAME;
- struct net_device *dev;
- DFX_board_t *bp; /* board pointer */
- + long ioaddr; /* pointer to port */
- + unsigned long len; /* resource length */
- + int alloc_size; /* total buffer size used */
- int err;
-
- -#ifndef MODULE
- - static int version_disp;
- -
- - if (!version_disp) /* display version info if adapter is found */
- - {
- + if (!version_disp) { /* display version info if adapter is found */
- version_disp = 1; /* set display flag to TRUE so that */
- printk(version); /* we only display this string ONCE */
- }
- -#endif
-
- - /*
- - * init_fddidev() allocates a device structure with private data, clears the device structure and private data,
- - * and calls fddi_setup() and register_netdev(). Not much left to do for us here.
- - */
- - dev = init_fddidev(NULL, sizeof(*bp));
- + if (pdev != NULL)
- + print_name = pdev->slot_name;
- +
- + dev = alloc_fddidev(sizeof(*bp));
- if (!dev) {
- - printk (KERN_ERR "defxx: unable to allocate fddidev, aborting\n");
- + printk(KERN_ERR "%s: unable to allocate fddidev, aborting\n",
- + print_name);
- return -ENOMEM;
- }
-
- /* Enable PCI device. */
- - if (pdev != NULL) {
- + if (bus_type == DFX_BUS_TYPE_PCI) {
- err = pci_enable_device (pdev);
- if (err) goto err_out;
- ioaddr = pci_resource_start (pdev, 1);
- }
-
- SET_MODULE_OWNER(dev);
- + SET_NETDEV_DEV(dev, &pdev->dev);
-
- bp = dev->priv;
-
- - if (!request_region (ioaddr, pdev ? PFI_K_CSR_IO_LEN : PI_ESIC_K_CSR_IO_LEN, dev->name)) {
- - printk (KERN_ERR "%s: Cannot reserve I/O resource 0x%x @ 0x%lx, aborting\n",
- - dev->name, PFI_K_CSR_IO_LEN, ioaddr);
- + if (bus_type == DFX_BUS_TYPE_TC) {
- + /* TURBOchannel board */
- + bp->slot = handle;
- + claim_tc_card(bp->slot);
- + ioaddr = get_tc_base_addr(handle) + PI_TC_K_CSR_OFFSET;
- + len = PI_TC_K_CSR_LEN;
- + } else if (bus_type == DFX_BUS_TYPE_EISA) {
- + /* EISA board */
- + ioaddr = handle;
- + len = PI_ESIC_K_CSR_IO_LEN;
- + } else
- + /* PCI board */
- + len = PFI_K_CSR_IO_LEN;
- + dev->base_addr = ioaddr; /* save port (I/O) base address */
- +
- + if (!request_region(ioaddr, len, print_name)) {
- + printk(KERN_ERR "%s: Cannot reserve I/O resource "
- + "0x%lx @ 0x%lx, aborting\n", print_name, len, ioaddr);
- err = -EBUSY;
- goto err_out;
- }
-
- /* Initialize new device structure */
-
- - dev->base_addr = ioaddr; /* save port (I/O) base address */
- -
- dev->get_stats = dfx_ctl_get_stats;
- dev->open = dfx_open;
- dev->stop = dfx_close;
- @@ -465,37 +524,54 @@ static int __devinit dfx_init_one_pci_or
- dev->set_multicast_list = dfx_ctl_set_multicast_list;
- dev->set_mac_address = dfx_ctl_set_mac_address;
-
- - if (pdev == NULL) {
- - /* EISA board */
- - bp->bus_type = DFX_BUS_TYPE_EISA;
- + bp->bus_type = bus_type;
- + if (bus_type == DFX_BUS_TYPE_TC || bus_type == DFX_BUS_TYPE_EISA) {
- + /* TURBOchannel or EISA board */
- bp->next = root_dfx_eisa_dev;
- root_dfx_eisa_dev = dev;
- } else {
- /* PCI board */
- - bp->bus_type = DFX_BUS_TYPE_PCI;
- bp->pci_dev = pdev;
- pci_set_drvdata (pdev, dev);
- pci_set_master (pdev);
- }
-
- - if (dfx_driver_init(dev) != DFX_K_SUCCESS) {
- +
- + if (dfx_driver_init(dev, print_name) != DFX_K_SUCCESS) {
- err = -ENODEV;
- goto err_out_region;
- }
-
- + err = register_netdev(dev);
- + if (err)
- + goto err_out_kfree;
- +
- + printk("%s: registered as %s\n", print_name, dev->name);
- return 0;
-
- +err_out_kfree:
- + alloc_size = sizeof(PI_DESCR_BLOCK) +
- + PI_CMD_REQ_K_SIZE_MAX + PI_CMD_RSP_K_SIZE_MAX +
- +#ifndef DYNAMIC_BUFFERS
- + (bp->rcv_bufs_to_post * PI_RCV_DATA_K_SIZE_MAX) +
- +#endif
- + sizeof(PI_CONSUMER_BLOCK) +
- + (PI_ALIGN_K_DESC_BLK - 1);
- + if (bp->kmalloced)
- + pci_free_consistent(pdev, alloc_size,
- + bp->kmalloced, bp->kmalloced_dma);
- err_out_region:
- - release_region(ioaddr, pdev ? PFI_K_CSR_IO_LEN : PI_ESIC_K_CSR_IO_LEN);
- + release_region(ioaddr, len);
- err_out:
- - unregister_netdev(dev);
- - kfree(dev);
- + if (bp->bus_type == DFX_BUS_TYPE_TC)
- + release_tc_card(bp->slot);
- + free_netdev(dev);
- return err;
- }
-
- static int __devinit dfx_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
- {
- - return dfx_init_one_pci_or_eisa(pdev, 0);
- + return dfx_init_one_pci_or_eisa(pdev, DFX_BUS_TYPE_PCI, 0);
- }
-
- static int __init dfx_eisa_init(void)
- @@ -507,6 +583,7 @@ static int __init dfx_eisa_init(void)
-
- DBG_printk("In dfx_eisa_init...\n");
-
- +#ifdef CONFIG_EISA
- /* Scan for FDDI EISA controllers */
-
- for (i=0; i < DFX_MAX_EISA_SLOTS; i++) /* only scan for up to 16 EISA slots */
- @@ -517,9 +594,27 @@ static int __init dfx_eisa_init(void)
- {
- port = (i << 12); /* recalc base addr */
-
- - if (dfx_init_one_pci_or_eisa(NULL, port) == 0) rc = 0;
- + if (dfx_init_one_pci_or_eisa(NULL, DFX_BUS_TYPE_EISA, port) == 0) rc = 0;
- }
- }
- +#endif
- + return rc;
- +}
- +
- +static int __init dfx_tc_init(void)
- +{
- + int rc = -ENODEV;
- + int slot; /* TC slot number */
- +
- + DBG_printk("In dfx_tc_init...\n");
- +
- + /* Scan for FDDI TC controllers */
- + while ((slot = search_tc_card("PMAF-F")) >= 0) {
- + if (dfx_init_one_pci_or_eisa(NULL, DFX_BUS_TYPE_TC, slot) == 0)
- + rc = 0;
- + else
- + break;
- + }
- return rc;
- }
-
- @@ -583,8 +678,9 @@ static void __devinit dfx_bus_init(struc
-
- /* Initialize adapter based on bus type */
-
- - if (bp->bus_type == DFX_BUS_TYPE_EISA)
- - {
- + if (bp->bus_type == DFX_BUS_TYPE_TC) {
- + dev->irq = get_tc_irq_nr(bp->slot);
- + } else if (bp->bus_type == DFX_BUS_TYPE_EISA) {
- /* Get the interrupt level from the ESIC chip */
-
- dfx_port_read_byte(bp, PI_ESIC_K_IO_CONFIG_STAT_0, &val);
- @@ -766,6 +862,7 @@ static void __devinit dfx_bus_config_che
- *
- * Arguments:
- * dev - pointer to device information
- + * print_name - printable device name
- *
- * Functional Description:
- * This function allocates additional resources such as the host memory
- @@ -780,20 +877,21 @@ static void __devinit dfx_bus_config_che
- * or read adapter MAC address
- *
- * Assumptions:
- - * Memory allocated from kmalloc() call is physically contiguous, locked
- - * memory whose physical address equals its virtual address.
- + * Memory allocated from pci_alloc_consistent() call is physically
- + * contiguous, locked memory.
- *
- * Side Effects:
- * Adapter is reset and should be in DMA_UNAVAILABLE state before
- * returning from this routine.
- */
-
- -static int __devinit dfx_driver_init(struct net_device *dev)
- +static int __devinit dfx_driver_init(struct net_device *dev,
- + const char *print_name)
- {
- DFX_board_t *bp = dev->priv;
- int alloc_size; /* total buffer size needed */
- char *top_v, *curr_v; /* virtual addrs into memory block */
- - u32 top_p, curr_p; /* physical addrs into memory block */
- + dma_addr_t top_p, curr_p; /* physical addrs into memory block */
- u32 data; /* host data register value */
-
- DBG_printk("In dfx_driver_init...\n");
- @@ -837,26 +935,20 @@ static int __devinit dfx_driver_init(str
-
- /* Read the factory MAC address from the adapter then save it */
-
- - if (dfx_hw_port_ctrl_req(bp,
- - PI_PCTRL_M_MLA,
- - PI_PDATA_A_MLA_K_LO,
- - 0,
- - &data) != DFX_K_SUCCESS)
- - {
- - printk("%s: Could not read adapter factory MAC address!\n", dev->name);
- + if (dfx_hw_port_ctrl_req(bp, PI_PCTRL_M_MLA, PI_PDATA_A_MLA_K_LO, 0,
- + &data) != DFX_K_SUCCESS) {
- + printk("%s: Could not read adapter factory MAC address!\n",
- + print_name);
- return(DFX_K_FAILURE);
- - }
- + }
- memcpy(&bp->factory_mac_addr[0], &data, sizeof(u32));
-
- - if (dfx_hw_port_ctrl_req(bp,
- - PI_PCTRL_M_MLA,
- - PI_PDATA_A_MLA_K_HI,
- - 0,
- - &data) != DFX_K_SUCCESS)
- - {
- - printk("%s: Could not read adapter factory MAC address!\n", dev->name);
- + if (dfx_hw_port_ctrl_req(bp, PI_PCTRL_M_MLA, PI_PDATA_A_MLA_K_HI, 0,
- + &data) != DFX_K_SUCCESS) {
- + printk("%s: Could not read adapter factory MAC address!\n",
- + print_name);
- return(DFX_K_FAILURE);
- - }
- + }
- memcpy(&bp->factory_mac_addr[4], &data, sizeof(u16));
-
- /*
- @@ -867,28 +959,27 @@ static int __devinit dfx_driver_init(str
- */
-
- memcpy(dev->dev_addr, bp->factory_mac_addr, FDDI_K_ALEN);
- - if (bp->bus_type == DFX_BUS_TYPE_EISA)
- - printk("%s: DEFEA at I/O addr = 0x%lX, IRQ = %d, Hardware addr = %02X-%02X-%02X-%02X-%02X-%02X\n",
- - dev->name,
- - dev->base_addr,
- - dev->irq,
- - dev->dev_addr[0],
- - dev->dev_addr[1],
- - dev->dev_addr[2],
- - dev->dev_addr[3],
- - dev->dev_addr[4],
- - dev->dev_addr[5]);
- + if (bp->bus_type == DFX_BUS_TYPE_TC)
- + printk("%s: DEFTA at addr = 0x%lX, IRQ = %d, "
- + "Hardware addr = %02X-%02X-%02X-%02X-%02X-%02X\n",
- + print_name, dev->base_addr, dev->irq,
- + dev->dev_addr[0], dev->dev_addr[1],
- + dev->dev_addr[2], dev->dev_addr[3],
- + dev->dev_addr[4], dev->dev_addr[5]);
- + else if (bp->bus_type == DFX_BUS_TYPE_EISA)
- + printk("%s: DEFEA at I/O addr = 0x%lX, IRQ = %d, "
- + "Hardware addr = %02X-%02X-%02X-%02X-%02X-%02X\n",
- + print_name, dev->base_addr, dev->irq,
- + dev->dev_addr[0], dev->dev_addr[1],
- + dev->dev_addr[2], dev->dev_addr[3],
- + dev->dev_addr[4], dev->dev_addr[5]);
- else
- - printk("%s: DEFPA at I/O addr = 0x%lX, IRQ = %d, Hardware addr = %02X-%02X-%02X-%02X-%02X-%02X\n",
- - dev->name,
- - dev->base_addr,
- - dev->irq,
- - dev->dev_addr[0],
- - dev->dev_addr[1],
- - dev->dev_addr[2],
- - dev->dev_addr[3],
- - dev->dev_addr[4],
- - dev->dev_addr[5]);
- + printk("%s: DEFPA at I/O addr = 0x%lX, IRQ = %d, "
- + "Hardware addr = %02X-%02X-%02X-%02X-%02X-%02X\n",
- + print_name, dev->base_addr, dev->irq,
- + dev->dev_addr[0], dev->dev_addr[1],
- + dev->dev_addr[2], dev->dev_addr[3],
- + dev->dev_addr[4], dev->dev_addr[5]);
-
- /*
- * Get memory for descriptor block, consumer block, and other buffers
- @@ -903,14 +994,15 @@ static int __devinit dfx_driver_init(str
- #endif
- sizeof(PI_CONSUMER_BLOCK) +
- (PI_ALIGN_K_DESC_BLK - 1);
- - bp->kmalloced = top_v = (char *) kmalloc(alloc_size, GFP_KERNEL);
- - if (top_v == NULL)
- - {
- - printk("%s: Could not allocate memory for host buffers and structures!\n", dev->name);
- + bp->kmalloced = top_v = pci_alloc_consistent(bp->pci_dev, alloc_size,
- + &bp->kmalloced_dma);
- + if (top_v == NULL) {
- + printk("%s: Could not allocate memory for host buffers "
- + "and structures!\n", print_name);
- return(DFX_K_FAILURE);
- - }
- + }
- memset(top_v, 0, alloc_size); /* zero out memory before continuing */
- - top_p = virt_to_bus(top_v); /* get physical address of buffer */
- + top_p = bp->kmalloced_dma; /* get physical address of buffer */
-
- /*
- * To guarantee the 8K alignment required for the descriptor block, 8K - 1
- @@ -924,7 +1016,7 @@ static int __devinit dfx_driver_init(str
- * for allocating the needed memory.
- */
-
- - curr_p = (u32) (ALIGN(top_p, PI_ALIGN_K_DESC_BLK));
- + curr_p = ALIGN(top_p, PI_ALIGN_K_DESC_BLK);
- curr_v = top_v + (curr_p - top_p);
-
- /* Reserve space for descriptor block */
- @@ -965,14 +1057,20 @@ static int __devinit dfx_driver_init(str
-
- /* Display virtual and physical addresses if debug driver */
-
- - DBG_printk("%s: Descriptor block virt = %0lX, phys = %0X\n", dev->name, (long)bp->descr_block_virt, bp->descr_block_phys);
- - DBG_printk("%s: Command Request buffer virt = %0lX, phys = %0X\n", dev->name, (long)bp->cmd_req_virt, bp->cmd_req_phys);
- - DBG_printk("%s: Command Response buffer virt = %0lX, phys = %0X\n", dev->name, (long)bp->cmd_rsp_virt, bp->cmd_rsp_phys);
- - DBG_printk("%s: Receive buffer block virt = %0lX, phys = %0X\n", dev->name, (long)bp->rcv_block_virt, bp->rcv_block_phys);
- - DBG_printk("%s: Consumer block virt = %0lX, phys = %0X\n", dev->name, (long)bp->cons_block_virt, bp->cons_block_phys);
- + DBG_printk("%s: Descriptor block virt = %0lX, phys = %0X\n",
- + print_name,
- + (long)bp->descr_block_virt, bp->descr_block_phys);
- + DBG_printk("%s: Command Request buffer virt = %0lX, phys = %0X\n",
- + print_name, (long)bp->cmd_req_virt, bp->cmd_req_phys);
- + DBG_printk("%s: Command Response buffer virt = %0lX, phys = %0X\n",
- + print_name, (long)bp->cmd_rsp_virt, bp->cmd_rsp_phys);
- + DBG_printk("%s: Receive buffer block virt = %0lX, phys = %0X\n",
- + print_name, (long)bp->rcv_block_virt, bp->rcv_block_phys);
- + DBG_printk("%s: Consumer block virt = %0lX, phys = %0X\n",
- + print_name, (long)bp->cons_block_virt, bp->cons_block_phys);
-
- return(DFX_K_SUCCESS);
- - }
- +}
-
-
- /*
- @@ -1218,7 +1316,9 @@ static int dfx_open(struct net_device *d
-
- /* Register IRQ - support shared interrupts by passing device ptr */
-
- - ret = request_irq(dev->irq, (void *)dfx_interrupt, SA_SHIRQ, dev->name, dev);
- + ret = request_irq(dev->irq, (void *)dfx_interrupt,
- + (bp->bus_type == DFX_BUS_TYPE_TC) ? 0 : SA_SHIRQ,
- + dev->name, dev);
- if (ret) {
- printk(KERN_ERR "%s: Requested IRQ %d is busy\n", dev->name, dev->irq);
- return ret;
- @@ -1737,7 +1837,7 @@ static void dfx_interrupt(int irq, void
- dfx_port_write_long(bp, PFI_K_REG_MODE_CTRL,
- (PFI_MODE_M_PDQ_INT_ENB + PFI_MODE_M_DMA_ENB));
- }
- - else
- + else if (bp->bus_type == DFX_BUS_TYPE_EISA)
- {
- /* Disable interrupts at the ESIC */
-
- @@ -1755,6 +1855,13 @@ static void dfx_interrupt(int irq, void
- tmp |= PI_CONFIG_STAT_0_M_INT_ENB;
- dfx_port_write_byte(bp, PI_ESIC_K_IO_CONFIG_STAT_0, tmp);
- }
- + else {
- + /* TC doesn't share interrupts so no need to disable them */
- +
- + /* Call interrupt service routine for this adapter */
- +
- + dfx_int_common(dev);
- + }
-
- spin_unlock(&bp->lock);
- }
- @@ -2663,12 +2770,12 @@ static int dfx_hw_dma_uninit(DFX_board_t
-
- static void my_skb_align(struct sk_buff *skb, int n)
- {
- - u32 x=(u32)skb->data; /* We only want the low bits .. */
- - u32 v;
- + unsigned long x = (unsigned long)skb->data;
- + unsigned long v;
-
- - v=(x+n-1)&~(n-1); /* Where we want to be */
- + v = ALIGN(x, n); /* Where we want to be */
-
- - skb_reserve(skb, v-x);
- + skb_reserve(skb, v - x);
- }
-
-
- @@ -2745,7 +2852,10 @@ static int dfx_rcv_init(DFX_board_t *bp,
- */
-
- my_skb_align(newskb, 128);
- - bp->descr_block_virt->rcv_data[i+j].long_1 = virt_to_bus(newskb->data);
- + bp->descr_block_virt->rcv_data[i + j].long_1 =
- + (u32)pci_map_single(bp->pci_dev, newskb->data,
- + NEW_SKB_SIZE,
- + PCI_DMA_FROMDEVICE);
- /*
- * p_rcv_buff_va is only used inside the
- * kernel so we put the skb pointer here.
- @@ -2859,9 +2969,17 @@ static void dfx_rcv_queue_process(
-
- my_skb_align(newskb, 128);
- skb = (struct sk_buff *)bp->p_rcv_buff_va[entry];
- + pci_unmap_single(bp->pci_dev,
- + bp->descr_block_virt->rcv_data[entry].long_1,
- + NEW_SKB_SIZE,
- + PCI_DMA_FROMDEVICE);
- skb_reserve(skb, RCV_BUFF_K_PADDING);
- bp->p_rcv_buff_va[entry] = (char *)newskb;
- - bp->descr_block_virt->rcv_data[entry].long_1 = virt_to_bus(newskb->data);
- + bp->descr_block_virt->rcv_data[entry].long_1 =
- + (u32)pci_map_single(bp->pci_dev,
- + newskb->data,
- + NEW_SKB_SIZE,
- + PCI_DMA_FROMDEVICE);
- } else
- skb = NULL;
- } else
- @@ -2934,7 +3052,7 @@ static void dfx_rcv_queue_process(
- * is contained in a single physically contiguous buffer
- * in which the virtual address of the start of packet
- * (skb->data) can be converted to a physical address
- - * by using virt_to_bus().
- + * by using pci_map_single().
- *
- * Since the adapter architecture requires a three byte
- * packet request header to prepend the start of packet,
- @@ -3082,12 +3200,13 @@ static int dfx_xmt_queue_pkt(
- * skb->data.
- * 6. The physical address of the start of packet
- * can be determined from the virtual address
- - * by using virt_to_bus() and is only 32-bits
- + * by using pci_map_single() and is only 32-bits
- * wide.
- */
-
- p_xmt_descr->long_0 = (u32) (PI_XMT_DESCR_M_SOP | PI_XMT_DESCR_M_EOP | ((skb->len) << PI_XMT_DESCR_V_SEG_LEN));
- - p_xmt_descr->long_1 = (u32) virt_to_bus(skb->data);
- + p_xmt_descr->long_1 = (u32)pci_map_single(bp->pci_dev, skb->data,
- + skb->len, PCI_DMA_TODEVICE);
-
- /*
- * Verify that descriptor is actually available
- @@ -3171,6 +3290,7 @@ static int dfx_xmt_done(DFX_board_t *bp)
- {
- XMT_DRIVER_DESCR *p_xmt_drv_descr; /* ptr to transmit driver descriptor */
- PI_TYPE_2_CONSUMER *p_type_2_cons; /* ptr to rcv/xmt consumer block register */
- + u8 comp; /* local transmit completion index */
- int freed = 0; /* buffers freed */
-
- /* Service all consumed transmit frames */
- @@ -3188,7 +3308,11 @@ static int dfx_xmt_done(DFX_board_t *bp)
- bp->xmt_total_bytes += p_xmt_drv_descr->p_skb->len;
-
- /* Return skb to operating system */
- -
- + comp = bp->rcv_xmt_reg.index.xmt_comp;
- + pci_unmap_single(bp->pci_dev,
- + bp->descr_block_virt->xmt_data[comp].long_1,
- + p_xmt_drv_descr->p_skb->len,
- + PCI_DMA_TODEVICE);
- dev_kfree_skb_irq(p_xmt_drv_descr->p_skb);
-
- /*
- @@ -3297,6 +3421,7 @@ static void dfx_xmt_flush( DFX_board_t *
- {
- u32 prod_cons; /* rcv/xmt consumer block longword */
- XMT_DRIVER_DESCR *p_xmt_drv_descr; /* ptr to transmit driver descriptor */
- + u8 comp; /* local transmit completion index */
-
- /* Flush all outstanding transmit frames */
-
- @@ -3307,7 +3432,11 @@ static void dfx_xmt_flush( DFX_board_t *
- p_xmt_drv_descr = &(bp->xmt_drv_descr_blk[bp->rcv_xmt_reg.index.xmt_comp]);
-
- /* Return skb to operating system */
- -
- + comp = bp->rcv_xmt_reg.index.xmt_comp;
- + pci_unmap_single(bp->pci_dev,
- + bp->descr_block_virt->xmt_data[comp].long_1,
- + p_xmt_drv_descr->p_skb->len,
- + PCI_DMA_TODEVICE);
- dev_kfree_skb(p_xmt_drv_descr->p_skb);
-
- /* Increment transmit error counter */
- @@ -3337,12 +3466,36 @@ static void dfx_xmt_flush( DFX_board_t *
-
- static void __devexit dfx_remove_one_pci_or_eisa(struct pci_dev *pdev, struct net_device *dev)
- {
- - DFX_board_t *bp = dev->priv;
- + DFX_board_t *bp = dev->priv;
- + unsigned long len; /* resource length */
- + int alloc_size; /* total buffer size used */
-
- + if (bp->bus_type == DFX_BUS_TYPE_TC) {
- + /* TURBOchannel board */
- + len = PI_TC_K_CSR_LEN;
- + } else if (bp->bus_type == DFX_BUS_TYPE_EISA) {
- + /* EISA board */
- + len = PI_ESIC_K_CSR_IO_LEN;
- + } else {
- + len = PFI_K_CSR_IO_LEN;
- + }
- unregister_netdev(dev);
- - release_region(dev->base_addr, pdev ? PFI_K_CSR_IO_LEN : PI_ESIC_K_CSR_IO_LEN );
- - if (bp->kmalloced) kfree(bp->kmalloced);
- - kfree(dev);
- + release_region(dev->base_addr, len);
- +
- + if (bp->bus_type == DFX_BUS_TYPE_TC)
- + release_tc_card(bp->slot);
- +
- + alloc_size = sizeof(PI_DESCR_BLOCK) +
- + PI_CMD_REQ_K_SIZE_MAX + PI_CMD_RSP_K_SIZE_MAX +
- +#ifndef DYNAMIC_BUFFERS
- + (bp->rcv_bufs_to_post * PI_RCV_DATA_K_SIZE_MAX) +
- +#endif
- + sizeof(PI_CONSUMER_BLOCK) +
- + (PI_ALIGN_K_DESC_BLK - 1);
- + if (bp->kmalloced)
- + pci_free_consistent(pdev, alloc_size, bp->kmalloced,
- + bp->kmalloced_dma);
- + free_netdev(dev);
- }
-
- static void __devexit dfx_remove_one (struct pci_dev *pdev)
- @@ -3353,21 +3506,22 @@ static void __devexit dfx_remove_one (st
- pci_set_drvdata(pdev, NULL);
- }
-
- -static struct pci_device_id dfx_pci_tbl[] __devinitdata = {
- +static struct pci_device_id dfx_pci_tbl[] = {
- { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_FDDI, PCI_ANY_ID, PCI_ANY_ID, },
- { 0, }
- };
- MODULE_DEVICE_TABLE(pci, dfx_pci_tbl);
-
- static struct pci_driver dfx_driver = {
- - name: "defxx",
- - probe: dfx_init_one,
- - remove: __devexit_p(dfx_remove_one),
- - id_table: dfx_pci_tbl,
- + .name = "defxx",
- + .probe = dfx_init_one,
- + .remove = __devexit_p(dfx_remove_one),
- + .id_table = dfx_pci_tbl,
- };
-
- static int dfx_have_pci;
- static int dfx_have_eisa;
- +static int dfx_have_tc;
-
-
- static void __exit dfx_eisa_cleanup(void)
- @@ -3388,12 +3542,7 @@ static void __exit dfx_eisa_cleanup(void
-
- static int __init dfx_init(void)
- {
- - int rc_pci, rc_eisa;
- -
- -/* when a module, this is printed whether or not devices are found in probe */
- -#ifdef MODULE
- - printk(version);
- -#endif
- + int rc_pci, rc_eisa, rc_tc;
-
- rc_pci = pci_module_init(&dfx_driver);
- if (rc_pci >= 0) dfx_have_pci = 1;
- @@ -3401,20 +3550,27 @@ static int __init dfx_init(void)
- rc_eisa = dfx_eisa_init();
- if (rc_eisa >= 0) dfx_have_eisa = 1;
-
- - return ((rc_eisa < 0) ? 0 : rc_eisa) + ((rc_pci < 0) ? 0 : rc_pci);
- + rc_tc = dfx_tc_init();
- + if (rc_tc >= 0) dfx_have_tc = 1;
- +
- + return ((rc_tc < 0) ? 0 : rc_tc) +
- + ((rc_eisa < 0) ? 0 : rc_eisa) +
- + ((rc_pci < 0) ? 0 : rc_pci);
- }
-
- static void __exit dfx_cleanup(void)
- {
- if (dfx_have_pci)
- pci_unregister_driver(&dfx_driver);
- - if (dfx_have_eisa)
- + if (dfx_have_eisa || dfx_have_tc)
- dfx_eisa_cleanup();
- -
- }
-
- module_init(dfx_init);
- module_exit(dfx_cleanup);
- +MODULE_AUTHOR("Lawrence V. Stefani");
- +MODULE_DESCRIPTION("DEC FDDIcontroller EISA/PCI (DEFEA/DEFPA) driver "
- + DRV_VERSION " " DRV_RELDATE);
- MODULE_LICENSE("GPL");
-
-
- --- a/drivers/net/defxx.h
- +++ b/drivers/net/defxx.h
- @@ -12,17 +12,11 @@
- * Contains all definitions specified by port specification and required
- * by the defxx.c driver.
- *
- - * Maintainers:
- - * LVS Lawrence V. Stefani
- - *
- - * Contact:
- - * The author may be reached at:
- + * The original author:
- + * LVS Lawrence V. Stefani <lstefani@yahoo.com>
- *
- - * Inet: stefani@lkg.dec.com
- - * Mail: Digital Equipment Corporation
- - * 550 King Street
- - * M/S: LKG1-3/M07
- - * Littleton, MA 01460
- + * Maintainers:
- + * macro Maciej W. Rozycki <macro@linux-mips.org>
- *
- * Modification History:
- * Date Name Description
- @@ -30,6 +24,7 @@
- * 09-Sep-96 LVS Added group_prom field. Moved read/write I/O
- * macros to DEFXX.C.
- * 12-Sep-96 LVS Removed packet request header pointers.
- + * 04 Aug 2003 macro Converted to the DMA API.
- */
-
- #ifndef _DEFXX_H_
- @@ -1467,6 +1462,11 @@ typedef union
-
- #endif /* #ifndef BIG_ENDIAN */
-
- +/* Define TC PDQ CSR offset and length */
- +
- +#define PI_TC_K_CSR_OFFSET 0x100000
- +#define PI_TC_K_CSR_LEN 0x80 /* 128 bytes */
- +
- /* Define EISA controller register offsets */
-
- #define PI_ESIC_K_BURST_HOLDOFF 0x040
- @@ -1634,6 +1634,7 @@ typedef union
-
- #define DFX_BUS_TYPE_PCI 0 /* type code for DEC FDDIcontroller/PCI */
- #define DFX_BUS_TYPE_EISA 1 /* type code for DEC FDDIcontroller/EISA */
- +#define DFX_BUS_TYPE_TC 2 /* type code for DEC FDDIcontroller/TURBOchannel */
-
- #define DFX_FC_PRH2_PRH1_PRH0 0x54003820 /* Packet Request Header bytes + FC */
- #define DFX_PRH0_BYTE 0x20 /* Packet Request Header byte 0 */
- @@ -1704,17 +1705,19 @@ typedef struct DFX_board_tag
- {
- /* Keep virtual and physical pointers to locked, physically contiguous memory */
-
- - char *kmalloced; /* kfree this on unload */
- + char *kmalloced; /* pci_free_consistent this on unload */
- + dma_addr_t kmalloced_dma;
- + /* DMA handle for the above */
- PI_DESCR_BLOCK *descr_block_virt; /* PDQ descriptor block virt address */
- - u32 descr_block_phys; /* PDQ descriptor block phys address */
- + dma_addr_t descr_block_phys; /* PDQ descriptor block phys address */
- PI_DMA_CMD_REQ *cmd_req_virt; /* Command request buffer virt address */
- - u32 cmd_req_phys; /* Command request buffer phys address */
- + dma_addr_t cmd_req_phys; /* Command request buffer phys address */
- PI_DMA_CMD_RSP *cmd_rsp_virt; /* Command response buffer virt address */
- - u32 cmd_rsp_phys; /* Command response buffer phys address */
- + dma_addr_t cmd_rsp_phys; /* Command response buffer phys address */
- char *rcv_block_virt; /* LLC host receive queue buf blk virt */
- - u32 rcv_block_phys; /* LLC host receive queue buf blk phys */
- + dma_addr_t rcv_block_phys; /* LLC host receive queue buf blk phys */
- PI_CONSUMER_BLOCK *cons_block_virt; /* PDQ consumer block virt address */
- - u32 cons_block_phys; /* PDQ consumer block phys address */
- + dma_addr_t cons_block_phys; /* PDQ consumer block phys address */
-
- /* Keep local copies of Type 1 and Type 2 register data */
-
- @@ -1758,8 +1761,9 @@ typedef struct DFX_board_tag
-
- struct net_device *dev; /* pointer to device structure */
- struct net_device *next;
- - u32 bus_type; /* bus type (0 == PCI, 1 == EISA) */
- - u16 base_addr; /* base I/O address (same as dev->base_addr) */
- + u32 bus_type; /* bus type (0 == PCI, 1 == EISA, 2 == TC) */
- + long base_addr; /* base I/O address (same as dev->base_addr) */
- + int slot; /* TC slot number */
- struct pci_dev * pci_dev;
- u32 full_duplex_enb; /* FDDI Full Duplex enable (1 == on, 2 == off) */
- u32 req_ttrt; /* requested TTRT value (in 80ns units) */
- --- a/drivers/net/hamradio/hdlcdrv.c
- +++ b/drivers/net/hamradio/hdlcdrv.c
- @@ -587,6 +587,8 @@ static int hdlcdrv_close(struct net_devi
- return -EINVAL;
- s = (struct hdlcdrv_state *)dev->priv;
-
- + netif_stop_queue(dev);
- +
- if (s->ops && s->ops->close)
- i = s->ops->close(dev);
- if (s->skb)
- --- a/drivers/net/irda/au1k_ir.c
- +++ b/drivers/net/irda/au1k_ir.c
- @@ -81,10 +81,6 @@ static char version[] __devinitdata =
-
- #define RUN_AT(x) (jiffies + (x))
-
- -#if defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100)
- -static BCSR * const bcsr = (BCSR *)0xAE000000;
- -#endif
- -
- static spinlock_t ir_lock = SPIN_LOCK_UNLOCKED;
-
- /*
- --- a/drivers/net/sgiseeq.c
- +++ b/drivers/net/sgiseeq.c
- @@ -24,16 +24,16 @@
- #include <asm/io.h>
- #include <asm/system.h>
- #include <asm/bitops.h>
- +#include <asm/paccess.h>
- #include <asm/page.h>
- #include <asm/pgtable.h>
- +#include <asm/sgi/mc.h>
- #include <asm/sgi/hpc3.h>
- #include <asm/sgi/ip22.h>
- #include <asm/sgialib.h>
-
- #include "sgiseeq.h"
-
- -static char *version = "sgiseeq.c: David S. Miller (dm@engr.sgi.com)\n";
- -
- static char *sgiseeqstr = "SGI Seeq8003";
-
- /*
- @@ -113,9 +113,9 @@ static struct net_device *root_sgiseeq_d
-
- static inline void hpc3_eth_reset(struct hpc3_ethregs *hregs)
- {
- - hregs->rx_reset = HPC3_ERXRST_CRESET | HPC3_ERXRST_CLRIRQ;
- + hregs->reset = HPC3_ERST_CRESET | HPC3_ERST_CLRIRQ;
- udelay(20);
- - hregs->rx_reset = 0;
- + hregs->reset = 0;
- }
-
- static inline void reset_hpc3_and_seeq(struct hpc3_ethregs *hregs,
- @@ -238,7 +238,6 @@ void sgiseeq_dump_rings(void)
-
- #define TSTAT_INIT_SEEQ (SEEQ_TCMD_IPT|SEEQ_TCMD_I16|SEEQ_TCMD_IC|SEEQ_TCMD_IUF)
- #define TSTAT_INIT_EDLC ((TSTAT_INIT_SEEQ) | SEEQ_TCMD_RB2)
- -#define RDMACFG_INIT (HPC3_ERXDCFG_FRXDC | HPC3_ERXDCFG_FEOP | HPC3_ERXDCFG_FIRQ)
-
- static int init_seeq(struct net_device *dev, struct sgiseeq_private *sp,
- struct sgiseeq_regs *sregs)
- @@ -260,8 +259,6 @@ static int init_seeq(struct net_device *
- sregs->tstat = TSTAT_INIT_SEEQ;
- }
-
- - hregs->rx_dconfig |= RDMACFG_INIT;
- -
- hregs->rx_ndptr = PHYSADDR(&sp->srings.rx_desc[0]);
- hregs->tx_ndptr = PHYSADDR(&sp->srings.tx_desc[0]);
-
- @@ -432,7 +429,7 @@ static void sgiseeq_interrupt(int irq, v
- spin_lock(&sp->tx_lock);
-
- /* Ack the IRQ and set software state. */
- - hregs->rx_reset = HPC3_ERXRST_CLRIRQ;
- + hregs->reset = HPC3_ERST_CLRIRQ;
-
- /* Always check for received packets. */
- sgiseeq_rx(dev, sp, hregs, sregs);
- @@ -616,7 +613,7 @@ static inline void setup_rx_ring(struct
-
- #define ALIGNED(x) ((((unsigned long)(x)) + 0xf) & ~(0xf))
-
- -int sgiseeq_init(struct hpc3_regs* regs, int irq)
- +int sgiseeq_init(struct hpc3_regs* hpcregs, int irq, int has_eeprom)
- {
- struct net_device *dev;
- struct sgiseeq_private *sp;
- @@ -629,7 +626,7 @@ int sgiseeq_init(struct hpc3_regs* regs,
- goto err_out;
- }
- /* Make private data page aligned */
- - sp = (struct sgiseeq_private *) get_zeroed_page(GFP_KERNEL);
- + sp = (struct sgiseeq_private *) get_zeroed_page(GFP_KERNEL);
- if (!sp) {
- printk(KERN_ERR "Sgiseeq: Page alloc failed, aborting.\n");
- err = -ENOMEM;
- @@ -644,7 +641,9 @@ int sgiseeq_init(struct hpc3_regs* regs,
-
- #define EADDR_NVOFS 250
- for (i = 0; i < 3; i++) {
- - unsigned short tmp = ip22_nvram_read(EADDR_NVOFS / 2 + i);
- + unsigned short tmp = has_eeprom ?
- + ip22_eeprom_read(&hpcregs->eeprom, EADDR_NVOFS / 2+i) :
- + ip22_nvram_read(EADDR_NVOFS / 2+i);
-
- dev->dev_addr[2 * i] = tmp >> 8;
- dev->dev_addr[2 * i + 1] = tmp & 0xff;
- @@ -654,8 +653,8 @@ int sgiseeq_init(struct hpc3_regs* regs,
- gpriv = sp;
- gdev = dev;
- #endif
- - sp->sregs = (struct sgiseeq_regs *) &hpc3c0->eth_ext[0];
- - sp->hregs = &hpc3c0->ethregs;
- + sp->sregs = (struct sgiseeq_regs *) &hpcregs->eth_ext[0];
- + sp->hregs = &hpcregs->ethregs;
- sp->name = sgiseeqstr;
- sp->mode = SEEQ_RCMD_RBCAST;
-
- @@ -672,6 +671,11 @@ int sgiseeq_init(struct hpc3_regs* regs,
- setup_rx_ring(sp->srings.rx_desc, SEEQ_RX_BUFFERS);
- setup_tx_ring(sp->srings.tx_desc, SEEQ_TX_BUFFERS);
-
- + /* Setup PIO and DMA transfer timing */
- + sp->hregs->pconfig = 0x161;
- + sp->hregs->dconfig = HPC3_EDCFG_FIRQ | HPC3_EDCFG_FEOP |
- + HPC3_EDCFG_FRXDC | HPC3_EDCFG_PTO | 0x026;
- +
- /* Reset the chip. */
- hpc3_eth_reset(sp->hregs);
-
- @@ -699,7 +703,7 @@ int sgiseeq_init(struct hpc3_regs* regs,
- goto err_out_free_irq;
- }
-
- - printk(KERN_INFO "%s: SGI Seeq8003 ", dev->name);
- + printk(KERN_INFO "%s: %s ", dev->name, sgiseeqstr);
- for (i = 0; i < 6; i++)
- printk("%2.2x%c", dev->dev_addr[i], i == 5 ? '\n' : ':');
-
- @@ -721,10 +725,22 @@ err_out:
-
- static int __init sgiseeq_probe(void)
- {
- - printk(version);
- + unsigned int tmp, ret1, ret2 = 0;
-
- /* On board adapter on 1st HPC is always present */
- - return sgiseeq_init(hpc3c0, SGI_ENET_IRQ);
- + ret1 = sgiseeq_init(hpc3c0, SGI_ENET_IRQ, 0);
- + /* Let's see if second HPC is there */
- + if (!(ip22_is_fullhouse()) &&
- + get_dbe(tmp, (unsigned int *)&hpc3c1->pbdma[1]) == 0) {
- + sgimc->giopar |= SGIMC_GIOPAR_MASTEREXP1 |
- + SGIMC_GIOPAR_EXP164 |
- + SGIMC_GIOPAR_HPC264;
- + hpc3c1->pbus_piocfg[0][0] = 0x3ffff;
- + /* interrupt/config register on Challenge S Mezz board */
- + hpc3c1->pbus_extregs[0][0] = 0x30;
- + ret2 = sgiseeq_init(hpc3c1, SGI_GIO_0_IRQ, 1);
- + }
- + return (ret1 & ret2) ? ret1 : 0;
- }
-
- static void __exit sgiseeq_exit(void)
- @@ -747,4 +763,6 @@ static void __exit sgiseeq_exit(void)
- module_init(sgiseeq_probe);
- module_exit(sgiseeq_exit);
-
- +MODULE_DESCRIPTION("SGI Seeq 8003 driver");
- +MODULE_AUTHOR("David S. Miller");
- MODULE_LICENSE("GPL");
- --- a/drivers/pci/pci.c
- +++ b/drivers/pci/pci.c
- @@ -1281,11 +1281,17 @@ static int __devinit pci_scan_bridge(str
- {
- unsigned int buses;
- unsigned short cr;
- + unsigned short bctl;
- struct pci_bus *child;
- int is_cardbus = (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS);
-
- pci_read_config_dword(dev, PCI_PRIMARY_BUS, &buses);
- DBG("Scanning behind PCI bridge %s, config %06x, pass %d\n", dev->slot_name, buses & 0xffffff, pass);
- + /* Disable MasterAbortMode during probing to avoid reporting
- + of bus errors (in some architectures) */
- + pci_read_config_word(dev, PCI_BRIDGE_CONTROL, &bctl);
- + pci_write_config_word(dev, PCI_BRIDGE_CONTROL,
- + bctl & ~PCI_BRIDGE_CTL_MASTER_ABORT);
- if ((buses & 0xffff00) && !pcibios_assign_all_busses()) {
- /*
- * Bus already configured by firmware, process it in the first
- @@ -1351,6 +1357,7 @@ static int __devinit pci_scan_bridge(str
- pci_write_config_byte(dev, PCI_SUBORDINATE_BUS, max);
- pci_write_config_word(dev, PCI_COMMAND, cr);
- }
- + pci_write_config_word(dev, PCI_BRIDGE_CONTROL, bctl);
- sprintf(child->name, (is_cardbus ? "PCI CardBus #%02x" : "PCI Bus #%02x"), child->number);
- return max;
- }
- --- a/drivers/pcmcia/au1000_db1x00.c
- +++ b/drivers/pcmcia/au1000_db1x00.c
- @@ -1,6 +1,6 @@
- /*
- *
- - * Alchemy Semi Db1x00 boards specific pcmcia routines.
- + * AMD Alchemy DUAL-SLOT Db1x00 boards' specific pcmcia routines.
- *
- * Copyright 2002 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
- @@ -54,9 +54,20 @@
- #include <asm/au1000.h>
- #include <asm/au1000_pcmcia.h>
-
- +#if defined(CONFIG_MIPS_PB1200)
- +#include <asm/pb1200.h>
- +#elif defined(CONFIG_MIPS_DB1200)
- +#include <asm/db1200.h>
- +#else
- #include <asm/db1x00.h>
- +#endif
-
- -static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR;
- +#define PCMCIA_MAX_SOCK 1
- +#define PCMCIA_NUM_SOCKS (PCMCIA_MAX_SOCK+1)
- +
- +/* VPP/VCC */
- +#define SET_VCC_VPP(VCC, VPP, SLOT)\
- + ((((VCC)<<2) | ((VPP)<<0)) << ((SLOT)*8))
-
- static int db1x00_pcmcia_init(struct pcmcia_init *init)
- {
- @@ -76,7 +87,7 @@ static int
- db1x00_pcmcia_socket_state(unsigned sock, struct pcmcia_state *state)
- {
- u32 inserted;
- - unsigned char vs;
- + u16 vs;
-
- if(sock > PCMCIA_MAX_SOCK) return -1;
-
- @@ -87,11 +98,11 @@ db1x00_pcmcia_socket_state(unsigned sock
-
- if (sock == 0) {
- vs = bcsr->status & 0x3;
- - inserted = !(bcsr->status & (1<<4));
- + inserted = BOARD_CARD_INSERTED(0);
- }
- else {
- vs = (bcsr->status & 0xC)>>2;
- - inserted = !(bcsr->status & (1<<5));
- + inserted = BOARD_CARD_INSERTED(1);
- }
-
- DEBUG(KERN_DEBUG "db1x00 socket %d: inserted %d, vs %d\n",
- @@ -144,16 +155,9 @@ static int db1x00_pcmcia_get_irq_info(st
- if(info->sock > PCMCIA_MAX_SOCK) return -1;
-
- if(info->sock == 0)
- -#ifdef CONFIG_MIPS_DB1550
- - info->irq = AU1000_GPIO_3;
- + info->irq = BOARD_PC0_INT;
- else
- - info->irq = AU1000_GPIO_5;
- -#else
- - info->irq = AU1000_GPIO_2;
- - else
- - info->irq = AU1000_GPIO_5;
- -#endif
- -
- + info->irq = BOA