diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/mg_disk_prv.h | 1 | ||||
| -rw-r--r-- | drivers/mtd/cfi_mtd.c | 4 | ||||
| -rw-r--r-- | drivers/net/mpc5xxx_fec.c | 11 | ||||
| -rw-r--r-- | drivers/qe/qe.c | 11 | ||||
| -rw-r--r-- | drivers/rtc/s3c44b0_rtc.c | 1 | ||||
| -rw-r--r-- | drivers/serial/serial_lpc2292.c | 1 |
6 files changed, 18 insertions, 11 deletions
diff --git a/drivers/block/mg_disk_prv.h b/drivers/block/mg_disk_prv.h index 8f22e28..43e90ea 100644 --- a/drivers/block/mg_disk_prv.h +++ b/drivers/block/mg_disk_prv.h @@ -142,4 +142,3 @@ struct mg_host { #endif /* CONFIG_MG_DEBUG */ #endif - diff --git a/drivers/mtd/cfi_mtd.c b/drivers/mtd/cfi_mtd.c index cf82d92..9ac1c86 100644 --- a/drivers/mtd/cfi_mtd.c +++ b/drivers/mtd/cfi_mtd.c @@ -32,6 +32,7 @@ extern flash_info_t flash_info[]; static struct mtd_info cfi_mtd_info[CONFIG_SYS_MAX_FLASH_BANKS]; +static char cfi_mtd_names[CONFIG_SYS_MAX_FLASH_BANKS][16]; static int cfi_mtd_erase(struct mtd_info *mtd, struct erase_info *instr) { @@ -180,7 +181,8 @@ int cfi_mtd_init(void) if (error) continue; - mtd->name = CFI_MTD_DEV_NAME; + sprintf(cfi_mtd_names[i], "nor%d", i); + mtd->name = cfi_mtd_names[i]; mtd->type = MTD_NORFLASH; mtd->flags = MTD_CAP_NORFLASH; mtd->size = fi->size; diff --git a/drivers/net/mpc5xxx_fec.c b/drivers/net/mpc5xxx_fec.c index 0f1d1af..1876b76 100644 --- a/drivers/net/mpc5xxx_fec.c +++ b/drivers/net/mpc5xxx_fec.c @@ -42,6 +42,8 @@ typedef struct { int fec5xxx_miiphy_read(char *devname, uint8 phyAddr, uint8 regAddr, uint16 * retVal); int fec5xxx_miiphy_write(char *devname, uint8 phyAddr, uint8 regAddr, uint16 data); +static int mpc5xxx_fec_init_phy(struct eth_device *dev, bd_t * bis); + /********************************************************************/ #if (DEBUG & 0x2) static void mpc5xxx_fec_phydump (char *devname) @@ -249,6 +251,8 @@ static int mpc5xxx_fec_init(struct eth_device *dev, bd_t * bis) printf ("mpc5xxx_fec_init... Begin\n"); #endif + mpc5xxx_fec_init_phy(dev, bis); + /* * Initialize RxBD/TxBD rings */ @@ -387,6 +391,11 @@ static int mpc5xxx_fec_init_phy(struct eth_device *dev, bd_t * bis) { mpc5xxx_fec_priv *fec = (mpc5xxx_fec_priv *)dev->priv; const uint8 phyAddr = CONFIG_PHY_ADDR; /* Only one PHY */ + static int initialized = 0; + + if(initialized) + return 0; + initialized = 1; #if (DEBUG & 0x1) printf ("mpc5xxx_fec_init_phy... Begin\n"); @@ -937,8 +946,6 @@ int mpc5xxx_fec_initialize(bd_t * bis) mpc5xxx_fec_set_hwaddr(fec, env_enetaddr); } - mpc5xxx_fec_init_phy(dev, bis); - return 1; } diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c index ea5a14b..f114fe0 100644 --- a/drivers/qe/qe.c +++ b/drivers/qe/qe.c @@ -162,12 +162,13 @@ void qe_init(uint qe_base) qe_immr = (qe_map_t *)qe_base; #ifdef CONFIG_SYS_QE_FW_ADDR - /* Upload microcode to IRAM for those SOCs which do not have ROM in QE. - */ - qe_upload_firmware((const struct qe_firmware *) CONFIG_SYS_QE_FW_ADDR); + /* + * Upload microcode to IRAM for those SOCs which do not have ROM in QE. + */ + qe_upload_firmware((const struct qe_firmware *) CONFIG_SYS_QE_FW_ADDR); - /* enable the microcode in IRAM */ - out_be32(&qe_immr->iram.iready,QE_IRAM_READY); + /* enable the microcode in IRAM */ + out_be32(&qe_immr->iram.iready,QE_IRAM_READY); #endif gd->mp_alloc_base = QE_DATAONLY_BASE; diff --git a/drivers/rtc/s3c44b0_rtc.c b/drivers/rtc/s3c44b0_rtc.c index 489536f..bfb744a 100644 --- a/drivers/rtc/s3c44b0_rtc.c +++ b/drivers/rtc/s3c44b0_rtc.c @@ -99,4 +99,3 @@ void rtc_reset (void) BCDSEC = 0; RTCCON &= 1; } - diff --git a/drivers/serial/serial_lpc2292.c b/drivers/serial/serial_lpc2292.c index 87b7d5f..e3a60b6 100644 --- a/drivers/serial/serial_lpc2292.c +++ b/drivers/serial/serial_lpc2292.c @@ -102,4 +102,3 @@ int serial_tstc (void) { return (GET8(U0LSR) & 1); } - |