d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make framebuffer driver compatible with upstream DT

Browse Source 
- Add compatibility string
- Add simplebus as possible parent bus
This commit is contained in:
gonzo 2016-10-12 03:03:05 +00:00
parent e2cbaf0cb1
commit 9c68f3796b
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/arm/broadcom/bcm2835/bcm2835_fb.c
View File

@ -111,6 +111,12 @@ struct bcmsc_softc {
static struct bcmsc_softc bcmsc;
static struct ofw_compat_data compat_data[] = {
{"broadcom,bcm2835-fb", 1},
{"brcm,bcm2708-fb", 1},
{NULL, 0}
};
static int bcm_fb_probe(device_t);
static int bcm_fb_attach(device_t);
static void bcmfb_update_margins(video_adapter_t *adp);
@ -121,8 +127,9 @@ bcm_fb_probe(device_t dev)
{
int error;
if (!ofw_bus_is_compatible(dev, "broadcom,bcm2835-fb"))
if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0)
return (ENXIO);
device_set_desc(dev, "BCM2835 framebuffer device");
error = sc_probe_unit(device_get_unit(dev),
device_get_flags(dev) | SC_AUTODETECT_KBD);
@ -196,6 +203,7 @@ static driver_t bcm_fb_driver = {
};
DRIVER_MODULE(bcm2835fb, ofwbus, bcm_fb_driver, bcm_fb_devclass, 0, 0);
DRIVER_MODULE(bcm2835fb, simplebus, bcm_fb_driver, bcm_fb_devclass, 0, 0);
/*
* Video driver routines and glue.

10
sys/arm/broadcom/bcm2835/bcm2835_fbd.c
View File

@ -65,6 +65,12 @@ struct bcmsc_softc {
device_t dev;
};
static struct ofw_compat_data compat_data[] = {
{"broadcom,bcm2835-fb", 1},
{"brcm,bcm2708-fb", 1},
{NULL, 0}
};
static int bcm_fb_probe(device_t);
static int bcm_fb_attach(device_t);
@ -191,7 +197,8 @@ bcm_fb_sysctl_init(struct bcmsc_softc *sc)
static int
bcm_fb_probe(device_t dev)
{
if (!ofw_bus_is_compatible(dev, "broadcom,bcm2835-fb"))
if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0)
return (ENXIO);
device_set_desc(dev, "BCM2835 VT framebuffer driver");
@ -265,3 +272,4 @@ static driver_t bcm_fb_driver = {
};
DRIVER_MODULE(bcm2835fb, ofwbus, bcm_fb_driver, bcm_fb_devclass, 0, 0);
DRIVER_MODULE(bcm2835fb, simplebus, bcm_fb_driver, bcm_fb_devclass, 0, 0);