2007-09-12 Daniel Hellstrom <daniel@gaisler.com>

* leon_smc91111/leon_smc91111.c: LEON2 SMC91111 initialization: PIO
	Interrupt initialization fix and speed rate defaulted to 100Mbit/s
	for boards with 50MHz system clock or greater now all defaults to
	100Mbit/s
This commit is contained in:
Joel Sherrill
2007-09-12 15:39:42 +00:00
parent 7459fbf9f5
commit 47b29ac00e
2 changed files with 10 additions and 6 deletions

View File

@@ -1,3 +1,10 @@
2007-09-12 Daniel Hellstrom <daniel@gaisler.com>
* leon_smc91111/leon_smc91111.c: LEON2 SMC91111 initialization: PIO
Interrupt initialization fix and speed rate defaulted to 100Mbit/s
for boards with 50MHz system clock or greater now all defaults to
100Mbit/s
2007-09-07 Daniel Hellstrom <daniel@gaisler.com> 2007-09-07 Daniel Hellstrom <daniel@gaisler.com>
* leon_smc91111/leon_smc91111.c, rasta/rasta.c: Remove warnings. * leon_smc91111/leon_smc91111.c, rasta/rasta.c: Remove warnings.

View File

@@ -33,7 +33,7 @@ scmv91111_configuration_t leon_scmv91111_configuration = {
SMC91111_BASE_ADDR, /* base address */ SMC91111_BASE_ADDR, /* base address */
SMC91111_BASE_IRQ, /* vector number */ SMC91111_BASE_IRQ, /* vector number */
SMC91111_BASE_PIO, /* PIO */ SMC91111_BASE_PIO, /* PIO */
10, /* 10b */ 100, /* 100b */
1, /* fulldx */ 1, /* fulldx */
1 /* autoneg */ 1 /* autoneg */
}; };
@@ -49,16 +49,13 @@ int _rtems_smc91111_driver_attach(
int rtems_smc91111_driver_attach_leon2(struct rtems_bsdnet_ifconfig *config) int rtems_smc91111_driver_attach_leon2(struct rtems_bsdnet_ifconfig *config)
{ {
if (LEON_REG.Scaler_Reload >= 49)
leon_scmv91111_configuration.ctl_rspeed = 100;
/* activate io area */ /* activate io area */
printk("Activating Leon2 io port\n"); printk("Activating Leon2 io port\n");
/*configure pio */ /*configure pio */
*((volatile unsigned int *)0x80000000) |= 0x10f80000; *((volatile unsigned int *)0x80000000) |= 0x10f80000;
*((volatile unsigned int *)0x800000A8) |= *((volatile unsigned int *)0x800000A8) |=
(0xe0 | leon_scmv91111_configuration.vector) (0xe0 | leon_scmv91111_configuration.pio)
<< (8 * (leon_scmv91111_configuration.pio - 4)); << (8 * ((leon_scmv91111_configuration.vector & 0x0f) - 4));
return _rtems_smc91111_driver_attach(config,&leon_scmv91111_configuration); return _rtems_smc91111_driver_attach(config,&leon_scmv91111_configuration);