summaryrefslogtreecommitdiff
path: root/linux-2.6.10
diff options
context:
space:
mode:
authorThierry Carre2009-03-17 15:56:40 +0100
committerThierry Carre2009-03-17 15:56:40 +0100
commitf075d06a10ba064ce571cc35123d31c73ceca250 (patch)
tree70c58075fa8d4c153cfd33993764df5a94c1a70d /linux-2.6.10
parent75dbc17aeb45c249e6c710790a6bcf19ea46cd1d (diff)
parent27ff1ccefcd34a1e9071cfbe93323f0d8918de1f (diff)
[PLC-Polux] Merge 3-9-dev into 3-10-dev
Diffstat (limited to 'linux-2.6.10')
-rw-r--r--linux-2.6.10/Makefile2
-rw-r--r--linux-2.6.10/arch/arm/mach-spc2XXc/core.c2
-rw-r--r--linux-2.6.10/arch/arm/mach-spc2XXc/time.c4
-rw-r--r--linux-2.6.10/drivers/char/watchdog/spr200_wd.c2
-rw-r--r--linux-2.6.10/drivers/net/ks8001/KS8001.c18
-rw-r--r--linux-2.6.10/drivers/net/ks8001/KS8001_mii.h1
6 files changed, 17 insertions, 12 deletions
diff --git a/linux-2.6.10/Makefile b/linux-2.6.10/Makefile
index ac1a43a01e..bea29c2154 100644
--- a/linux-2.6.10/Makefile
+++ b/linux-2.6.10/Makefile
@@ -2,7 +2,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 10
-EXTRAVERSION = -spk2xx
+EXTRAVERSION =
NAME=Woozy Numbat
# *DOCUMENTATION*
diff --git a/linux-2.6.10/arch/arm/mach-spc2XXc/core.c b/linux-2.6.10/arch/arm/mach-spc2XXc/core.c
index c8797cb426..e31e13525c 100644
--- a/linux-2.6.10/arch/arm/mach-spc2XXc/core.c
+++ b/linux-2.6.10/arch/arm/mach-spc2XXc/core.c
@@ -383,6 +383,7 @@ void __init spc2XXc_init_irq(void)
} /* spc2XXc_init_irq */
+int wd_auto_trigger = 1;
unsigned int wd_trigger_count = 0;
/**
* Function: wd_trigger
@@ -454,6 +455,7 @@ MACHINE_END
EXPORT_SYMBOL(SDRAM_size);
EXPORT_SYMBOL(DMA_zone_base);
+EXPORT_SYMBOL(wd_auto_trigger);
EXPORT_SYMBOL(wd_trigger);
EXPORT_SYMBOL(wd_trigger_count);
diff --git a/linux-2.6.10/arch/arm/mach-spc2XXc/time.c b/linux-2.6.10/arch/arm/mach-spc2XXc/time.c
index 83465cecf5..08ef5b1204 100644
--- a/linux-2.6.10/arch/arm/mach-spc2XXc/time.c
+++ b/linux-2.6.10/arch/arm/mach-spc2XXc/time.c
@@ -30,6 +30,7 @@
#include <asm/irq.h>
#include <asm/mach/time.h>
#include <asm/system.h>
+#include <asm/arch/system.h>
#define GPIO (CSP_PIO_PTR)CSP_PIO_BASE
#define GPIO_NUM 0
@@ -37,8 +38,6 @@
//#define TIME_COEF (1000000ull)/(TIMER_CLK/PRESCALER)
#define TIME_COEF (1000*1000)/(TIMER_CLK/PRESCALER)
-int wd_auto_trigger = 1;
-
/**
* Function: spc2XXc_gettimeoffset
* Parameters: void
@@ -153,3 +152,4 @@ struct sys_timer spc2XXc_timer = {
.init = spc2XXc_timer_init,
.offset = spc2XXc_gettimeoffset,
}; /* spc2XXc_timer */
+
diff --git a/linux-2.6.10/drivers/char/watchdog/spr200_wd.c b/linux-2.6.10/drivers/char/watchdog/spr200_wd.c
index 9598e51fed..5409f084d2 100644
--- a/linux-2.6.10/drivers/char/watchdog/spr200_wd.c
+++ b/linux-2.6.10/drivers/char/watchdog/spr200_wd.c
@@ -106,7 +106,7 @@ static int spr200wd_readproc_watchdog(char *buf, char **start, off_t offset, int
char *p;
p = buf;
- p += sprintf(p,"%u\n",wd_trigger_count);
+ p += sprintf(p,"%s(%u)\n",wd_auto_trigger?"UNUSED":"USED", wd_trigger_count);
*eof = 1;
return p-buf+1;
diff --git a/linux-2.6.10/drivers/net/ks8001/KS8001.c b/linux-2.6.10/drivers/net/ks8001/KS8001.c
index 1413ba828c..0c23f78acd 100644
--- a/linux-2.6.10/drivers/net/ks8001/KS8001.c
+++ b/linux-2.6.10/drivers/net/ks8001/KS8001.c
@@ -368,7 +368,7 @@ static int ks8001_restore_mac_register (struct net_device *dev)
* Parameters : dev->network device structure
* Return value : error code.
*/
-static void ks8001_an_complete (struct net_device *dev)
+static void ks8001_an_complete (struct net_device *dev)
{
Private* pr = (Private*)dev->priv;
Synopsys *tc = &pr->synopsys;
@@ -378,7 +378,7 @@ static void ks8001_an_complete (struct net_device *dev)
int fd_used;
//Check the duplex mode (result of the Autonegotiation)
- if(pr->phy_oui==OUI_ICS && pr->phy_model==ICS_MODEL_1893BF) //using QPDSR instead of BMCR
+ if(pr->phy_oui==OUI_ICS && ((pr->phy_model==ICS_MODEL_1893BF) || (pr->phy_model==ICS_MODEL_1893CF))) //using QPDSR instead of BMCR
{
data = SynopsysMiiRead(tc, MII_QPDSR);
s100_used = data & QPDSR_SPEED100;
@@ -473,7 +473,7 @@ static int ks8001_autonegotiate (struct net_device *dev, int wait)
volatile uint32_t data;
//As we get no interrupt from the phy, we have to poll the status register
- if(pr->phy_oui == OUI_ICS && pr->phy_model == ICS_MODEL_1893BF) //using QPDSR instead of BMCR
+ if(pr->phy_oui == OUI_ICS && ((pr->phy_model == ICS_MODEL_1893BF) || (pr->phy_model==ICS_MODEL_1893CF))) //using QPDSR instead of BMCR
{
do
{
@@ -534,7 +534,7 @@ static void ks8001_setup_ethernet_address (struct net_device *dev)
debugp(DRV_NAME ": hardware ethernet addr =%02X:%02X:%02X:%02X:%02X:%02X\n",(data2) & 0xFF, (data2>>8) & 0xFF,
(data2>>16) & 0xFF, (data2>>24) & 0xFF,
(data) & 0xFF, (data>>8) & 0xFF);
-}//ks8001_setup_ethernet_address
+}//ks8001_setup_ethernet_address
/**
* Function : ks8001_on_link_up
@@ -623,7 +623,7 @@ static int ks8001_scan_link (struct net_device *dev)
SynopsysMiiRead(tc, MII_BMSR); //TODO:Dummy Read
- if(pr->phy_oui == OUI_ICS && pr->phy_model == ICS_MODEL_1893BF)
+ if(pr->phy_oui == OUI_ICS && ((pr->phy_model == ICS_MODEL_1893BF) || (pr->phy_model==ICS_MODEL_1893CF)))
return SynopsysMiiRead (tc, MII_QPDSR) & QPDSR_LSTATUS;
else
return SynopsysMiiRead (tc, MII_BMSR) & BMSR_LSTATUS;
@@ -1166,6 +1166,8 @@ static int ks8001_open (struct net_device *dev)
pr->phy_rev = (pr->phy_id >> 0) & 0x0000000f;
if(pr->phy_oui == OUI_ICS && pr->phy_model == ICS_MODEL_1893BF)
printk(DRV_NAME ": PHY for %s is ICS1893BF rev %u\n", dev->name, pr->phy_rev);
+ else if(pr->phy_oui == OUI_ICS && pr->phy_model == ICS_MODEL_1893CF)
+ printk(DRV_NAME ": PHY for %s is ICS1893CF rev %u\n", dev->name, pr->phy_rev);
else if(pr->phy_oui == OUI_JVA && pr->phy_model == ICS_MODEL_1893BF)
printk(DRV_NAME ": PHY for %s is ICS_NO rev %u\n", dev->name, pr->phy_rev);
else if(pr->phy_oui == OUI_MICREL && pr->phy_model == MICREL_MODEL_KS8721)
@@ -1262,7 +1264,7 @@ static int ks8001_try_init (struct net_device *dev)
macBase = configBase + MAC_OFFSET; // MAC address offset
dmaBase = configBase + DMA_OFFSET; // DMA address offset
- //Try to find valid PHY address
+ //Try to find valid PHY address
for(i = 1; i < 32; i++)
{
SynopsysInit(&pr->synopsys, configBase, macBase, dmaBase, i);
@@ -1413,7 +1415,7 @@ static int ks8001_readproc_internals (char *buf, char **start, off_t offset,
p = buf;
p += sprintf (p, "TBD\n");
- /*
+ /*
* DISPLAY_INTRN(dma_isr);
* DISPLAY_INTRN(dma_poll_rx);
* DISPLAY_INTRN(dma_poll_tx);
@@ -1559,7 +1561,7 @@ static int ks8001_readproc_regs_qpdsr (char *buf, char **start, off_t offset,
* if (priv->phy_oui==OUI_ICS && priv->phy_model==ICS_MODEL_1893BF)
* {
* reg = mdio_read(dev, PHY_ADDR, MII_QPDSR);
- *
+ *
* p += sprintf(p,"PHY Quick Poll Status Register: 0x%4.4x\n", reg);
* p += sprintf(p,"17.15 Reg Rate ................ %d Mbit/s\n", (reg & QPDSR_SPEED100)?100:10);
* p += sprintf(p,"17.14 Mode .................... %s\n", (reg & QPDSR_FULLDPLX)?"full duplex":"half duplex");
diff --git a/linux-2.6.10/drivers/net/ks8001/KS8001_mii.h b/linux-2.6.10/drivers/net/ks8001/KS8001_mii.h
index b9afef2732..61fbe55dbc 100644
--- a/linux-2.6.10/drivers/net/ks8001/KS8001_mii.h
+++ b/linux-2.6.10/drivers/net/ks8001/KS8001_mii.h
@@ -5,6 +5,7 @@
#define OUI_ICS (0x00057D) //00A0BE
#define OUI_JVA (0x00BEEF)
#define ICS_MODEL_1893BF (0x04)
+#define ICS_MODEL_1893CF (0x05)
//specific regs
#define MII_NEXTPAGE (0x07) //Autonegotiation Next Page
#define MII_NEXTPAGELPA (0x08) //Autonegotiation Next Page Link Partner