Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't assume all com ports run at "COM_FREQ", or a multiple thereof. 

Use a board-specific property instead.
This commit is contained in:
scw 2002-08-23 11:42:13 +00:00
parent 19c988633d
commit f384fe8ba7
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/arch/powerpc/ibm4xx/dev/com_opb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: com_opb.c,v 1.3 2002/08/14 12:31:38 simonb Exp $ */
/* $NetBSD: com_opb.c,v 1.4 2002/08/23 11:42:13 scw Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@ -39,9 +39,12 @@
#include <sys/device.h>
#include <sys/tty.h>
#include <sys/systm.h>
#include <sys/properties.h>
#include <lib/libkern/libkern.h>
#include <machine/cpu.h>
#include <powerpc/ibm4xx/dev/opbvar.h>
#include <dev/ic/comreg.h>
@ -77,18 +80,20 @@ com_opb_attach(struct device *parent, struct device *self, void *aux)
struct com_opb_softc *msc = (void *)self;
struct com_softc *sc = &msc->sc_com;
struct opb_attach_args *oaa = aux;
int addr = oaa->opb_addr;
int irq = oaa->opb_irq;
sc->sc_iot = oaa->opb_bt;
sc->sc_iobase = sc->sc_ioh = addr;
/* UART is clocked externally @ 11.0592MHz == COM_FREQ*6 */
sc->sc_frequency = COM_FREQ * 6;
sc->sc_iobase = oaa->opb_addr;
bus_space_map(sc->sc_iot, oaa->opb_addr, COM_NPORTS, 0,
&sc->sc_ioh);
if (board_info_get("com-opb-frequency", &sc->sc_frequency,
sizeof(sc->sc_frequency)) == -1)
panic("com_opb_attach: no com-opb-frequency property");
/* XXX console check */
/* XXX map */
com_attach_subr(sc);
intr_establish(irq, IST_LEVEL, IPL_SERIAL, comintr, sc);
intr_establish(oaa->opb_irq, IST_LEVEL, IPL_SERIAL, comintr, sc);
}

17
sys/arch/walnut/walnut/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.9 2002/08/13 05:52:11 simonb Exp $ */
/* $NetBSD: machdep.c,v 1.10 2002/08/23 11:42:14 scw Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@ -107,6 +107,11 @@
#include <ddb/db_extern.h>
#endif
#include "com.h"
#if NCOM > 0
#include <dev/ic/comreg.h> /* For COM_FREQ */
#endif
/*
* Global variables used here and there
*/
@ -490,7 +495,14 @@ cpu_startup(void)
if (board_info_set("processor-frequency", &board_data.processor_speed,
sizeof(&board_data.processor_speed), PROP_CONST, 0))
panic("setting processor-frequency");
#if NCOM > 0
{
unsigned int comfreq = COM_FREQ * 6;
if (board_info_set("com-opb-frequency", &comfreq,
sizeof(&comfreq), PROP_CONST, 0))
panic("setting com-opb-frequency");
}
#endif
}
@ -524,7 +536,6 @@ softnet(void)
}
#include "com.h"
/*
* Soft tty interrupts.
*/