Adapt to MI mk48txx(4) changes.
Tested on SS1+ (mainbus), but not tested on sun4/sun4m (obio). XXX maybe this file should be split into mainbus and obio attachments XXX and moved into sys/arch/sparc/dev or sys/dev/sun.
This commit is contained in:
tsutsui
parent
4b29327094
commit
deb5638bdc
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: mkclock.c,v 1.7 2003/07/15 00:05:07 lukem Exp $ */
|
||||
/* $NetBSD: mkclock.c,v 1.8 2003/11/01 22:59:24 tsutsui Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2002 The NetBSD Foundation, Inc.
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: mkclock.c,v 1.7 2003/07/15 00:05:07 lukem Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: mkclock.c,v 1.8 2003/11/01 22:59:24 tsutsui Exp $");
|
||||
|
||||
#include "opt_sparc_arch.h"
|
||||
|
||||
|
|
@ -60,6 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: mkclock.c,v 1.7 2003/07/15 00:05:07 lukem Exp $");
|
|||
|
||||
#include <dev/clock_subr.h>
|
||||
#include <dev/ic/mk48txxreg.h>
|
||||
#include <dev/ic/mk48txxvar.h>
|
||||
|
||||
/* Location and size of the MK48xx TOD clock, if present */
|
||||
static bus_space_handle_t mk_nvram_base;
|
||||
|
|
@ -73,12 +74,12 @@ static int clockmatch_obio(struct device *, struct cfdata *, void *);
|
|||
static void clockattach_mainbus(struct device *, struct device *, void *);
|
||||
static void clockattach_obio(struct device *, struct device *, void *);
|
||||
|
||||
static void clockattach(int, bus_space_tag_t, bus_space_handle_t);
|
||||
static void clockattach(struct mk48txx_softc *, int);
|
||||
|
||||
CFATTACH_DECL(clock_mainbus, sizeof(struct device),
|
||||
CFATTACH_DECL(clock_mainbus, sizeof(struct mk48txx_softc),
|
||||
clockmatch_mainbus, clockattach_mainbus, NULL, NULL);
|
||||
|
||||
CFATTACH_DECL(clock_obio, sizeof(struct device),
|
||||
CFATTACH_DECL(clock_obio, sizeof(struct mk48txx_softc),
|
||||
clockmatch_obio, clockattach_obio, NULL, NULL);
|
||||
|
||||
/* Imported from clock.c: */
|
||||
|
|
@ -138,9 +139,10 @@ clockattach_mainbus(parent, self, aux)
|
|||
struct device *parent, *self;
|
||||
void *aux;
|
||||
{
|
||||
struct mk48txx_softc *sc = (void *)self;
|
||||
struct mainbus_attach_args *ma = aux;
|
||||
bus_space_tag_t bt = ma->ma_bustag;
|
||||
bus_space_handle_t bh;
|
||||
|
||||
sc->sc_bst = ma->ma_bustag;
|
||||
|
||||
/*
|
||||
* We ignore any existing virtual address as we need to map
|
||||
|
|
@ -150,16 +152,16 @@ clockattach_mainbus(parent, self, aux)
|
|||
* of reloading the cpu type, Ethernet address, etc, by hand from
|
||||
* the console FORTH interpreter. I intend not to enjoy it again.
|
||||
*/
|
||||
if (bus_space_map(bt,
|
||||
if (bus_space_map(sc->sc_bst,
|
||||
ma->ma_paddr,
|
||||
ma->ma_size,
|
||||
BUS_SPACE_MAP_LINEAR,
|
||||
&bh) != 0) {
|
||||
&sc->sc_bsh) != 0) {
|
||||
printf("%s: can't map register\n", self->dv_xname);
|
||||
return;
|
||||
}
|
||||
|
||||
clockattach(ma->ma_node, bt, bh);
|
||||
clockattach(sc, ma->ma_node);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -167,9 +169,8 @@ clockattach_obio(parent, self, aux)
|
|||
struct device *parent, *self;
|
||||
void *aux;
|
||||
{
|
||||
struct mk48txx_softc *sc = (void *)self;
|
||||
union obio_attach_args *uoba = aux;
|
||||
bus_space_tag_t bt;
|
||||
bus_space_handle_t bh;
|
||||
int node;
|
||||
|
||||
if (uoba->uoba_isobio4 == 0) {
|
||||
|
|
@ -177,10 +178,10 @@ clockattach_obio(parent, self, aux)
|
|||
struct sbus_attach_args *sa = &uoba->uoba_sbus;
|
||||
|
||||
node = sa->sa_node;
|
||||
bt = sa->sa_bustag;
|
||||
if (sbus_bus_map(bt,
|
||||
sc->sc_bst = sa->sa_bustag;
|
||||
if (sbus_bus_map(sc->sc_bst,
|
||||
sa->sa_slot, sa->sa_offset, sa->sa_size,
|
||||
BUS_SPACE_MAP_LINEAR, &bh) != 0) {
|
||||
BUS_SPACE_MAP_LINEAR, &sc->sc_bsh) != 0) {
|
||||
printf("%s: can't map register\n", self->dv_xname);
|
||||
return;
|
||||
}
|
||||
|
|
@ -193,39 +194,39 @@ clockattach_obio(parent, self, aux)
|
|||
* the device address space length to 2048.
|
||||
*/
|
||||
node = 0;
|
||||
bt = oba->oba_bustag;
|
||||
if (bus_space_map(bt,
|
||||
sc->sc_bst = oba->oba_bustag;
|
||||
if (bus_space_map(sc->sc_bst,
|
||||
oba->oba_paddr,
|
||||
2048, /* size */
|
||||
BUS_SPACE_MAP_LINEAR, /* flags */
|
||||
&bh) != 0) {
|
||||
&sc->sc_bsh) != 0) {
|
||||
printf("%s: can't map register\n", self->dv_xname);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
clockattach(node, bt, bh);
|
||||
clockattach(sc, node);
|
||||
}
|
||||
|
||||
static void
|
||||
clockattach(node, bt, bh)
|
||||
clockattach(sc, node)
|
||||
struct mk48txx_softc *sc;
|
||||
int node;
|
||||
bus_space_tag_t bt;
|
||||
bus_space_handle_t bh;
|
||||
{
|
||||
char *model;
|
||||
|
||||
if (CPU_ISSUN4)
|
||||
model = "mk48t02"; /* Hard-coded sun4 clock */
|
||||
sc->sc_model = "mk48t02"; /* Hard-coded sun4 clock */
|
||||
else if (node != 0)
|
||||
model = PROM_getpropstring(node, "model");
|
||||
sc->sc_model = PROM_getpropstring(node, "model");
|
||||
else
|
||||
panic("clockattach: node == 0");
|
||||
|
||||
/* Our TOD clock year 0 represents 1968 */
|
||||
todr_handle = mk48txx_attach(bt, bh, model, 1968, NULL, NULL);
|
||||
if (todr_handle == NULL)
|
||||
panic("Cannot attach %s tod clock", model);
|
||||
sc->sc_year0 = 1968;
|
||||
mk48txx_attach(sc);
|
||||
|
||||
/* XXX this should be done by todr_attach() */
|
||||
todr_handle = &sc->sc_handle;
|
||||
|
||||
printf("\n");
|
||||
|
||||
|
|
@ -233,9 +234,9 @@ clockattach(node, bt, bh)
|
|||
* Store NVRAM base address and size in globals for use
|
||||
* by mk_nvram_wenable().
|
||||
*/
|
||||
mk_nvram_base = bh;
|
||||
mk_nvram_base = sc->sc_bsh;
|
||||
if (mk48txx_get_nvram_size(todr_handle, &mk_nvram_size) != 0)
|
||||
panic("Cannot get nvram size on %s", model);
|
||||
panic("Cannot get nvram size on %s", sc->sc_model);
|
||||
|
||||
/* Establish clock write-enable method */
|
||||
todr_handle->todr_setwen = mk_clk_wenable;
|
||||
|
|
|
|||
Loading…
Reference in New Issue