Add an OFW SPI compatible bus. Fix the spibus probe to return
BUS_PROBE_GENERIC and not BUS_PROBE_SPECIFIC (0) so the OFW SPI bus can attach when enabled. Export the spibus devclass_t and driver_t declarations. Submitted by: ray Approved by: adrian (mentor)
This commit is contained in:
Luiz Otavio O Souza
parent
07897970fb
commit
585300e937
@ -2177,6 +2177,7 @@ dev/sound/midi/mpu_if.m optional sound
|
||||
dev/sound/midi/mpufoi_if.m optional sound
|
||||
dev/sound/midi/sequencer.c optional sound
|
||||
dev/sound/midi/synth_if.m optional sound
|
||||
dev/spibus/ofw_spibus.c optional fdt spibus
|
||||
dev/spibus/spibus.c optional spibus \
|
||||
dependency "spibus_if.h"
|
||||
dev/spibus/spibus_if.m optional spibus
|
||||
|
||||
192
sys/dev/spibus/ofw_spibus.c
Normal file
192
sys/dev/spibus/ofw_spibus.c
Normal file
@ -0,0 +1,192 @@
|
||||
/*-
|
||||
* Copyright (c) 2009, Nathan Whitehorn <nwhitehorn@FreeBSD.org>
|
||||
* Copyright (c) 2013 The FreeBSD Foundation
|
||||
* All rights reserved.
|
||||
*
|
||||
* Portions of this software were developed by Oleksandr Rybalko
|
||||
* under sponsorship from the FreeBSD Foundation.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice unmodified, this list of conditions, and the following
|
||||
* disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
||||
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__FBSDID("$FreeBSD$");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/bus.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/libkern.h>
|
||||
#include <sys/lock.h>
|
||||
#include <sys/module.h>
|
||||
#include <sys/mutex.h>
|
||||
|
||||
#include <dev/fdt/fdt_common.h>
|
||||
#include <dev/spibus/spi.h>
|
||||
#include <dev/spibus/spibusvar.h>
|
||||
#include <dev/ofw/ofw_bus.h>
|
||||
#include <dev/ofw/ofw_bus_subr.h>
|
||||
#include <dev/ofw/openfirm.h>
|
||||
|
||||
#include "spibus_if.h"
|
||||
|
||||
struct ofw_spibus_devinfo {
|
||||
struct spibus_ivar opd_dinfo;
|
||||
struct ofw_bus_devinfo opd_obdinfo;
|
||||
};
|
||||
|
||||
/* Methods */
|
||||
static device_probe_t ofw_spibus_probe;
|
||||
static device_attach_t ofw_spibus_attach;
|
||||
static device_t ofw_spibus_add_child(device_t dev, u_int order,
|
||||
const char *name, int unit);
|
||||
static const struct ofw_bus_devinfo *ofw_spibus_get_devinfo(device_t bus,
|
||||
device_t dev);
|
||||
|
||||
static int
|
||||
ofw_spibus_probe(device_t dev)
|
||||
{
|
||||
|
||||
if (ofw_bus_get_node(dev) == -1)
|
||||
return (ENXIO);
|
||||
device_set_desc(dev, "OFW SPI bus");
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
static int
|
||||
ofw_spibus_attach(device_t dev)
|
||||
{
|
||||
struct spibus_softc *sc = device_get_softc(dev);
|
||||
struct ofw_spibus_devinfo *dinfo;
|
||||
phandle_t child;
|
||||
pcell_t paddr;
|
||||
device_t childdev;
|
||||
|
||||
sc->dev = dev;
|
||||
|
||||
bus_generic_probe(dev);
|
||||
bus_enumerate_hinted_children(dev);
|
||||
|
||||
/*
|
||||
* Attach those children represented in the device tree.
|
||||
*/
|
||||
for (child = OF_child(ofw_bus_get_node(dev)); child != 0;
|
||||
child = OF_peer(child)) {
|
||||
/*
|
||||
* Try to get the CS number first from the spi-chipselect
|
||||
* property, then try the reg property.
|
||||
*/
|
||||
if (OF_getencprop(child, "spi-chipselect", &paddr,
|
||||
sizeof(paddr)) == -1) {
|
||||
if (OF_getencprop(child, "reg", &paddr,
|
||||
sizeof(paddr)) == -1)
|
||||
continue;
|
||||
}
|
||||
|
||||
/*
|
||||
* Now set up the SPI and OFW bus layer devinfo and add it
|
||||
* to the bus.
|
||||
*/
|
||||
dinfo = malloc(sizeof(struct ofw_spibus_devinfo), M_DEVBUF,
|
||||
M_NOWAIT | M_ZERO);
|
||||
if (dinfo == NULL)
|
||||
continue;
|
||||
dinfo->opd_dinfo.cs = paddr;
|
||||
if (ofw_bus_gen_setup_devinfo(&dinfo->opd_obdinfo, child) !=
|
||||
0) {
|
||||
free(dinfo, M_DEVBUF);
|
||||
continue;
|
||||
}
|
||||
childdev = device_add_child(dev, NULL, -1);
|
||||
device_set_ivars(childdev, dinfo);
|
||||
}
|
||||
|
||||
return (bus_generic_attach(dev));
|
||||
}
|
||||
|
||||
static device_t
|
||||
ofw_spibus_add_child(device_t dev, u_int order, const char *name, int unit)
|
||||
{
|
||||
device_t child;
|
||||
struct ofw_spibus_devinfo *devi;
|
||||
|
||||
child = device_add_child_ordered(dev, order, name, unit);
|
||||
if (child == NULL)
|
||||
return (child);
|
||||
devi = malloc(sizeof(struct ofw_spibus_devinfo), M_DEVBUF,
|
||||
M_NOWAIT | M_ZERO);
|
||||
if (devi == NULL) {
|
||||
device_delete_child(dev, child);
|
||||
return (0);
|
||||
}
|
||||
|
||||
/*
|
||||
* NULL all the OFW-related parts of the ivars for non-OFW
|
||||
* children.
|
||||
*/
|
||||
devi->opd_obdinfo.obd_node = -1;
|
||||
devi->opd_obdinfo.obd_name = NULL;
|
||||
devi->opd_obdinfo.obd_compat = NULL;
|
||||
devi->opd_obdinfo.obd_type = NULL;
|
||||
devi->opd_obdinfo.obd_model = NULL;
|
||||
|
||||
device_set_ivars(child, devi);
|
||||
|
||||
return (child);
|
||||
}
|
||||
|
||||
static const struct ofw_bus_devinfo *
|
||||
ofw_spibus_get_devinfo(device_t bus, device_t dev)
|
||||
{
|
||||
struct ofw_spibus_devinfo *dinfo;
|
||||
|
||||
dinfo = device_get_ivars(dev);
|
||||
return (&dinfo->opd_obdinfo);
|
||||
}
|
||||
|
||||
static device_method_t ofw_spibus_methods[] = {
|
||||
/* Device interface */
|
||||
DEVMETHOD(device_probe, ofw_spibus_probe),
|
||||
DEVMETHOD(device_attach, ofw_spibus_attach),
|
||||
|
||||
/* Bus interface */
|
||||
DEVMETHOD(bus_child_pnpinfo_str, ofw_bus_gen_child_pnpinfo_str),
|
||||
DEVMETHOD(bus_add_child, ofw_spibus_add_child),
|
||||
|
||||
/* ofw_bus interface */
|
||||
DEVMETHOD(ofw_bus_get_devinfo, ofw_spibus_get_devinfo),
|
||||
DEVMETHOD(ofw_bus_get_compat, ofw_bus_gen_get_compat),
|
||||
DEVMETHOD(ofw_bus_get_model, ofw_bus_gen_get_model),
|
||||
DEVMETHOD(ofw_bus_get_name, ofw_bus_gen_get_name),
|
||||
DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node),
|
||||
DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type),
|
||||
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t ofwspibus_devclass;
|
||||
|
||||
DEFINE_CLASS_1(spibus, ofw_spibus_driver, ofw_spibus_methods,
|
||||
sizeof(struct spibus_softc), spibus_driver);
|
||||
DRIVER_MODULE(ofw_spibus, spi, ofw_spibus_driver, ofwspibus_devclass, 0, 0);
|
||||
MODULE_VERSION(ofw_spibus, 1);
|
||||
MODULE_DEPEND(ofw_spibus, spibus, 1, 1, 1);
|
||||
@ -23,7 +23,7 @@ static int
|
||||
spibus_probe(device_t dev)
|
||||
{
|
||||
device_set_desc(dev, "spibus bus");
|
||||
return (0);
|
||||
return (BUS_PROBE_GENERIC);
|
||||
}
|
||||
|
||||
static int
|
||||
@ -185,7 +185,7 @@ static device_method_t spibus_methods[] = {
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static driver_t spibus_driver = {
|
||||
driver_t spibus_driver = {
|
||||
"spibus",
|
||||
spibus_methods,
|
||||
sizeof(struct spibus_softc)
|
||||
|
||||
@ -26,3 +26,6 @@ spibus_get_ ## A(device_t dev, T *t) \
|
||||
}
|
||||
|
||||
SPIBUS_ACCESSOR(cs, CS, uint32_t)
|
||||
|
||||
extern driver_t spibus_driver;
|
||||
extern devclass_t spibus_devclass;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user