summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/block/ata_piix.c10
-rw-r--r--drivers/block/ata_piix.h15
-rw-r--r--drivers/hwmon/ds1722.c3
-rw-r--r--drivers/input/keyboard.c1
-rw-r--r--drivers/input/pc_keyb.c1
-rw-r--r--drivers/input/ps2mult.c1
-rw-r--r--drivers/input/ps2ser.c1
-rw-r--r--drivers/mtd/nand/mxc_nand.c2
-rw-r--r--drivers/net/e1000.c12
-rw-r--r--drivers/pcmcia/ti_pci1410a.c62
10 files changed, 37 insertions, 71 deletions
diff --git a/drivers/block/ata_piix.c b/drivers/block/ata_piix.c
index 549de3123..c81d11a6c 100644
--- a/drivers/block/ata_piix.c
+++ b/drivers/block/ata_piix.c
@@ -310,7 +310,7 @@ sata_bus_softreset (int num)
}
if (status & ATA_BUSY)
- printf ("ata%u is slow to respond,plz be patient\n", port);
+ printf ("ata%u is slow to respond,plz be patient\n", num);
while ((status & ATA_BUSY)) {
msleep (100);
@@ -318,7 +318,7 @@ sata_bus_softreset (int num)
}
if (status & ATA_BUSY) {
- printf ("ata%u failed to respond : ", port);
+ printf ("ata%u failed to respond : ", num);
printf ("bus reset failed\n");
return 1;
}
@@ -389,11 +389,11 @@ sata_identify (int num, int dev)
return;
}
- sata_cpy (sata_dev_desc[devno].revision, iop->fw_rev,
+ sata_cpy ((unsigned char *)sata_dev_desc[devno].revision, iop->fw_rev,
sizeof (sata_dev_desc[devno].revision));
- sata_cpy (sata_dev_desc[devno].vendor, iop->model,
+ sata_cpy ((unsigned char *)sata_dev_desc[devno].vendor, iop->model,
sizeof (sata_dev_desc[devno].vendor));
- sata_cpy (sata_dev_desc[devno].product, iop->serial_no,
+ sata_cpy ((unsigned char *)sata_dev_desc[devno].product, iop->serial_no,
sizeof (sata_dev_desc[devno].product));
strswab (sata_dev_desc[devno].revision);
strswab (sata_dev_desc[devno].vendor);
diff --git a/drivers/block/ata_piix.h b/drivers/block/ata_piix.h
index 11885af20..9157cf82c 100644
--- a/drivers/block/ata_piix.h
+++ b/drivers/block/ata_piix.h
@@ -37,20 +37,7 @@ struct sata_port {
/***********SATA LIBRARY SPECIFIC DEFINITIONS AND DECLARATIONS**************/
#ifdef SATA_DECL /*SATA library specific declarations */
-#define ata_id_has_lba48(id) ((id)[83] & (1 << 10))
-#define ata_id_has_lba(id) ((id)[49] & (1 << 9))
-#define ata_id_has_dma(id) ((id)[49] & (1 << 8))
-#define ata_id_u32(id,n) \
- (((u32) (id)[(n) + 1] << 16) | ((u32) (id)[(n)]))
-#define ata_id_u64(id,n) \
- (((u64) (id)[(n) + 3] << 48) | \
- ((u64) (id)[(n) + 2] << 32) | \
- ((u64) (id)[(n) + 1] << 16) | \
- ((u64) (id)[(n) + 0]) )
-#endif
-
-#ifdef SATA_DECL /*SATA library specific declarations */
-static inline void
+inline void
ata_dump_id (u16 * id)
{
PRINTF ("49 = 0x%04x "
diff --git a/drivers/hwmon/ds1722.c b/drivers/hwmon/ds1722.c
index 7e2f1ed4f..a46cd4dfb 100644
--- a/drivers/hwmon/ds1722.c
+++ b/drivers/hwmon/ds1722.c
@@ -1,6 +1,7 @@
#include <common.h>
-#include <ssi.h>
+#include <asm/ic/ssi.h>
+#include <ds1722.h>
static void ds1722_select(int dev)
{
diff --git a/drivers/input/keyboard.c b/drivers/input/keyboard.c
index a5fbd5f50..614592ef3 100644
--- a/drivers/input/keyboard.c
+++ b/drivers/input/keyboard.c
@@ -3,7 +3,6 @@
* (C) Copyright 2004
* DENX Software Engineering
* Wolfgang Denk, wd@denx.de
- * All rights reserved.
*
* Keyboard driver
*
diff --git a/drivers/input/pc_keyb.c b/drivers/input/pc_keyb.c
index 25ad3e406..1606ab33f 100644
--- a/drivers/input/pc_keyb.c
+++ b/drivers/input/pc_keyb.c
@@ -3,7 +3,6 @@
* (C) Copyright 2004
* DENX Software Engineering
* Wolfgang Denk, wd@denx.de
- * All rights reserved.
*
* PS/2 keyboard driver
*
diff --git a/drivers/input/ps2mult.c b/drivers/input/ps2mult.c
index ecd585323..ab749336b 100644
--- a/drivers/input/ps2mult.c
+++ b/drivers/input/ps2mult.c
@@ -3,7 +3,6 @@
* (C) Copyright 2004
* DENX Software Engineering
* Wolfgang Denk, wd@denx.de
- * All rights reserved.
*
* PS/2 multiplexer driver
*
diff --git a/drivers/input/ps2ser.c b/drivers/input/ps2ser.c
index 1a5e2d43d..1b20a76c4 100644
--- a/drivers/input/ps2ser.c
+++ b/drivers/input/ps2ser.c
@@ -3,7 +3,6 @@
* (C) Copyright 2004-2009
* DENX Software Engineering
* Wolfgang Denk, wd@denx.de
- * All rights reserved.
*
* Simple 16550A serial driver
*
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 647be0b7e..eb0323f21 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2004-2007 Freescale Semiconductor, Inc.
* Copyright 2008 Sascha Hauer, kernel@pengutronix.de
* Copyright 2009 Ilya Yanok, <yanok@emcraft.com>
*
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index b8dd9f2fe..7f9f783c4 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -50,7 +50,8 @@ tested on both gig copper and gig fiber boards
#define bus_to_phys(devno, a) pci_mem_to_phys(devno, a)
#define mdelay(n) udelay((n)*1000)
-#define E1000_DEFAULT_PBA 0x000a0026
+#define E1000_DEFAULT_PCI_PBA 0x00000030
+#define E1000_DEFAULT_PCIE_PBA 0x000a0026
/* NIC specific static variables go here */
@@ -1349,9 +1350,16 @@ e1000_reset_hw(struct e1000_hw *hw)
uint32_t ctrl_ext;
uint32_t icr;
uint32_t manc;
+ uint32_t pba = 0;
DEBUGFUNC();
+ /* get the correct pba value for both PCI and PCIe*/
+ if (hw->mac_type < e1000_82571)
+ pba = E1000_DEFAULT_PCI_PBA;
+ else
+ pba = E1000_DEFAULT_PCIE_PBA;
+
/* For 82542 (rev 2.0), disable MWI before issuing a device reset */
if (hw->mac_type == e1000_82542_rev2_0) {
DEBUGOUT("Disabling MWI on 82542 rev 2.0\n");
@@ -1419,7 +1427,7 @@ e1000_reset_hw(struct e1000_hw *hw)
if (hw->mac_type == e1000_82542_rev2_0) {
pci_write_config_word(hw->pdev, PCI_COMMAND, hw->pci_cmd_word);
}
- E1000_WRITE_REG(hw, PBA, E1000_DEFAULT_PBA);
+ E1000_WRITE_REG(hw, PBA, pba);
}
/******************************************************************************
diff --git a/drivers/pcmcia/ti_pci1410a.c b/drivers/pcmcia/ti_pci1410a.c
index 6ab97597f..4ac2e0fd0 100644
--- a/drivers/pcmcia/ti_pci1410a.c
+++ b/drivers/pcmcia/ti_pci1410a.c
@@ -68,13 +68,12 @@
int pcmcia_on(int ide_base_bus);
-static int pcmcia_off(void);
static int hardware_disable(int slot);
static int hardware_enable(int slot);
static int voltage_set(int slot, int vcc, int vpp);
static void print_funcid(int func);
-static void print_fixed(volatile uchar *p);
-static int identify(volatile uchar *p);
+static void print_fixed(volatile char *p);
+static int identify(volatile char *p);
static int check_ide_device(int slot, int ide_base_bus);
@@ -86,33 +85,6 @@ const char *indent = "\t ";
/* ------------------------------------------------------------------------- */
-int do_pinit(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
-{
-#ifndef CONFIG_SYS_FIRST_PCMCIA_BUS
-# define CONFIG_SYS_FIRST_PCMCIA_BUS 0
-#endif
-
- int rcode = 0;
-
- if (argc != 2) {
- printf ("Usage: pinit {on | off}\n");
- return 1;
- }
- if (strcmp(argv[1],"on") == 0) {
- rcode = pcmcia_on(CONFIG_SYS_FIRST_PCMCIA_BUS);
- } else if (strcmp(argv[1],"off") == 0) {
- rcode = pcmcia_off();
- } else {
- printf ("Usage: pinit {on | off}\n");
- return 1;
- }
-
- return rcode;
-}
-
-/* ------------------------------------------------------------------------- */
-
-
static struct pci_device_id supported[] = {
{ PCI_VENDOR_ID_TI, 0xac50 }, /* Ti PCI1410A */
{ PCI_VENDOR_ID_TI, 0xac56 }, /* Ti PCI1510 */
@@ -245,7 +217,8 @@ int pcmcia_on(int ide_base_bus)
/* ------------------------------------------------------------------------- */
-static int pcmcia_off (void)
+#if defined(CONFIG_CMD_PCMCIA)
+int pcmcia_off (void)
{
int slot = 0;
@@ -285,6 +258,7 @@ static int pcmcia_off (void)
return 0;
}
+#endif
/* ------------------------------------------------------------------------- */
@@ -294,9 +268,9 @@ static int pcmcia_off (void)
int ide_devices_found;
static int check_ide_device(int slot, int ide_base_bus)
{
- volatile uchar *ident = NULL;
- volatile uchar *feature_p[MAX_FEATURES];
- volatile uchar *p, *start;
+ volatile char *ident = NULL;
+ volatile char *feature_p[MAX_FEATURES];
+ volatile char *p, *start;
int n_features = 0;
uchar func_id = ~0;
uchar code, len;
@@ -314,7 +288,7 @@ static int check_ide_device(int slot, int ide_base_bus)
return 1;
}
- start = p = (volatile uchar *) pcmcia_cis_ptr;
+ start = p = (volatile char *) pcmcia_cis_ptr;
while ((p - start) < MAX_TUPEL_SZ) {
@@ -417,7 +391,7 @@ static int voltage_set(int slot, int vcc, int vpp)
socket_control |= 0x30;
break;
case 0:
- default:
+ default: ;
}
switch (vpp) {
@@ -431,7 +405,7 @@ static int voltage_set(int slot, int vcc, int vpp)
socket_control |= 0x3;
break;
case 0:
- default:
+ default: ;
}
writel(socket_control, reg);
@@ -537,7 +511,7 @@ static void print_funcid(int func)
/* ------------------------------------------------------------------------- */
-static void print_fixed(volatile uchar *p)
+static void print_fixed(volatile char *p)
{
if (p == NULL)
return;
@@ -605,17 +579,17 @@ static void print_fixed(volatile uchar *p)
#define MAX_IDENT_CHARS 64
#define MAX_IDENT_FIELDS 4
-static uchar *known_cards[] = {
+static char *known_cards[] = {
"ARGOSY PnPIDE D5",
NULL
};
-static int identify(volatile uchar *p)
+static int identify(volatile char *p)
{
- uchar id_str[MAX_IDENT_CHARS];
- uchar data;
- uchar *t;
- uchar **card;
+ char id_str[MAX_IDENT_CHARS];
+ char data;
+ char *t;
+ char **card;
int i, done;
if (p == NULL)
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-13 15:48:16 +0000