diff options
| author | Mateusz Guzik <mjg@FreeBSD.org> | 2020-09-01 21:17:24 +0000 |
|---|---|---|
| committer | Mateusz Guzik <mjg@FreeBSD.org> | 2020-09-01 21:17:24 +0000 |
| commit | 654548838bebbda54247e122f932b01c3d5c51b3 (patch) | |
| tree | 6cd157488289d99da8fca93f57b2d58efd58d5da /sys/arm/broadcom | |
| parent | 543769bf83775641c1a7f3d3d86744c7e1f5af4e (diff) | |
Notes
Diffstat (limited to 'sys/arm/broadcom')
| -rw-r--r-- | sys/arm/broadcom/bcm2835/bcm2835_audio.c | 3 | ||||
| -rw-r--r-- | sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c | 3 | ||||
| -rw-r--r-- | sys/arm/broadcom/bcm2835/bcm2835_fb.c | 1 | ||||
| -rw-r--r-- | sys/arm/broadcom/bcm2835/bcm2835_gpio.c | 1 | ||||
| -rw-r--r-- | sys/arm/broadcom/bcm2835/bcm2835_intr.c | 2 | ||||
| -rw-r--r-- | sys/arm/broadcom/bcm2835/bcm2835_machdep.c | 2 | ||||
| -rw-r--r-- | sys/arm/broadcom/bcm2835/bcm2835_mbox.c | 7 | ||||
| -rw-r--r-- | sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h | 2 | ||||
| -rw-r--r-- | sys/arm/broadcom/bcm2835/bcm2835_pwm.c | 1 | ||||
| -rw-r--r-- | sys/arm/broadcom/bcm2835/bcm2835_sdhost.c | 5 | ||||
| -rw-r--r-- | sys/arm/broadcom/bcm2835/bcm2835_systimer.c | 1 | ||||
| -rw-r--r-- | sys/arm/broadcom/bcm2835/bcm2838_pci.c | 2 | ||||
| -rw-r--r-- | sys/arm/broadcom/bcm2835/bcm2838_xhci.c | 1 |
13 files changed, 4 insertions, 27 deletions
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_audio.c b/sys/arm/broadcom/bcm2835/bcm2835_audio.c index 0610efc9fbfe..ae2c9a14fc62 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_audio.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_audio.c @@ -412,7 +412,7 @@ bcm2835_audio_update_params(struct bcm2835_audio_info *sc, uint32_t fmt, uint32_ static bool bcm2835_audio_buffer_should_sleep(struct bcm2835_audio_chinfo *ch) { - + if (ch->playback_state != PLAYBACK_PLAYING) return (true); @@ -953,7 +953,6 @@ static device_method_t bcm2835_audio_methods[] = { DEVMETHOD(device_probe, bcm2835_audio_probe), DEVMETHOD(device_attach, bcm2835_audio_attach), DEVMETHOD(device_detach, bcm2835_audio_detach), - { 0, 0 } }; diff --git a/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c b/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c index 15c1106cf36f..1c767ad629d6 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c @@ -642,8 +642,6 @@ bcm2835_cpufreq_get_temperature(struct bcm2835_cpufreq_softc *sc) return (value); } - - static int sysctl_bcm2835_cpufreq_arm_freq(SYSCTL_HANDLER_ARGS) { @@ -1022,7 +1020,6 @@ sysctl_bcm2835_devcpu_temperature(SYSCTL_HANDLER_ARGS) return (EINVAL); } - static void bcm2835_cpufreq_init(void *arg) { diff --git a/sys/arm/broadcom/bcm2835/bcm2835_fb.c b/sys/arm/broadcom/bcm2835/bcm2835_fb.c index c536aa89cfcc..40c4a29c3e95 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_fb.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_fb.c @@ -191,7 +191,6 @@ static device_method_t bcm_fb_methods[] = { /* Device interface */ DEVMETHOD(device_probe, bcm_fb_probe), DEVMETHOD(device_attach, bcm_fb_attach), - { 0, 0 } }; diff --git a/sys/arm/broadcom/bcm2835/bcm2835_gpio.c b/sys/arm/broadcom/bcm2835/bcm2835_gpio.c index bbac2788a3e6..61513df9c008 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_gpio.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_gpio.c @@ -598,7 +598,6 @@ bcm_gpio_sysctl_init(struct bcm_gpio_softc *sc) pin_tree = SYSCTL_CHILDREN(pin_node); for (i = 0; i < sc->sc_gpio_npins; i++) { - snprintf(pinbuf, sizeof(pinbuf), "%d", i); pinN_node = SYSCTL_ADD_NODE(ctx, pin_tree, OID_AUTO, pinbuf, CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "GPIO Pin"); diff --git a/sys/arm/broadcom/bcm2835/bcm2835_intr.c b/sys/arm/broadcom/bcm2835/bcm2835_intr.c index 24bb7014db55..93c044fe6419 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_intr.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_intr.c @@ -28,7 +28,6 @@ * SUCH DAMAGE. */ - #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); @@ -439,7 +438,6 @@ static device_method_t bcm_intc_methods[] = { DEVMETHOD(pic_post_filter, bcm_intc_post_filter), DEVMETHOD(pic_post_ithread, bcm_intc_post_ithread), DEVMETHOD(pic_pre_ithread, bcm_intc_pre_ithread), - { 0, 0 } }; diff --git a/sys/arm/broadcom/bcm2835/bcm2835_machdep.c b/sys/arm/broadcom/bcm2835/bcm2835_machdep.c index 5604695a84ce..683fb4986a41 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_machdep.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_machdep.c @@ -119,8 +119,6 @@ bcm2836_devmap_init(platform_t plat) } #endif - - static void bcm2835_cpu_reset(platform_t plat) { diff --git a/sys/arm/broadcom/bcm2835/bcm2835_mbox.c b/sys/arm/broadcom/bcm2835/bcm2835_mbox.c index 9d71399de861..d31989b7ddeb 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_mbox.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_mbox.c @@ -535,18 +535,18 @@ bcm2835_mbox_fb_get_bpp(struct bcm2835_fb_config *fb) { int err; struct msg_fb_get_bpp msg; - + memset(&msg, 0, sizeof(msg)); msg.hdr.buf_size = sizeof(msg); msg.hdr.code = BCM2835_MBOX_CODE_REQ; BCM2835_MBOX_INIT_TAG(&msg.bpp, GET_DEPTH); msg.bpp.tag_hdr.val_len = 0; msg.end_tag = 0; - + err = bcm2835_mbox_property(&msg, sizeof(msg)); if (err == 0) fb->bpp = msg.bpp.body.resp.bpp; - + return (err); } @@ -592,4 +592,3 @@ bcm2835_mbox_fb_init(struct bcm2835_fb_config *fb) return (err); } - diff --git a/sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h b/sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h index 92496c5aae92..df8c96d68f25 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h +++ b/sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h @@ -60,8 +60,6 @@ struct bcm2835_mbox_tag_hdr { #define BCM2835_MBOX_TAG_FIRMWARE_REVISION 0x00000001 - - #define BCM2835_MBOX_POWER_ID_EMMC 0x00000000 #define BCM2835_MBOX_POWER_ID_UART0 0x00000001 #define BCM2835_MBOX_POWER_ID_UART1 0x00000002 diff --git a/sys/arm/broadcom/bcm2835/bcm2835_pwm.c b/sys/arm/broadcom/bcm2835/bcm2835_pwm.c index db18a67b0b29..348c1435f85d 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_pwm.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_pwm.c @@ -490,7 +490,6 @@ bcm_pwm_get_node(device_t bus, device_t dev) return (ofw_bus_get_node(bus)); } - static device_method_t bcm_pwm_methods[] = { /* Device interface */ DEVMETHOD(device_probe, bcm_pwm_probe), diff --git a/sys/arm/broadcom/bcm2835/bcm2835_sdhost.c b/sys/arm/broadcom/bcm2835/bcm2835_sdhost.c index c92231223528..5eb94c6f360f 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_sdhost.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_sdhost.c @@ -105,10 +105,8 @@ __FBSDID("$FreeBSD$"); #include <arm/broadcom/bcm2835/bcm2835_mbox_prop.h> #include "bcm2835_vcbus.h" - /* #define SDHOST_DEBUG */ - /* Registers */ #define HC_COMMAND 0x00 /* Command and flags */ #define HC_ARGUMENT 0x04 @@ -233,7 +231,6 @@ static void bcm_sdhost_intr(void *); static int bcm_sdhost_get_ro(device_t, device_t); - static inline uint32_t RD4(struct bcm_sdhost_softc *sc, bus_size_t off) { @@ -301,7 +298,6 @@ bcm_sdhost_print_regs(struct bcm_sdhost_softc *sc, struct sdhci_slot *slot, { if (bcm2835_sdhost_debug > 0 || error > 0) { - printf("%s: sc=%p slot=%p\n", __func__, sc, slot); printf("HC_COMMAND: 0x%08x\n", @@ -334,7 +330,6 @@ bcm_sdhost_print_regs(struct bcm_sdhost_softc *sc, struct sdhci_slot *slot, RD4(sc, HC_BLOCKCOUNT)); } else { - /* printf("%04d | HC_COMMAND: 0x%08x HC_ARGUMENT: 0x%08x " "HC_HOSTSTATUS: 0x%08x HC_HOSTCONFIG: 0x%08x\n", diff --git a/sys/arm/broadcom/bcm2835/bcm2835_systimer.c b/sys/arm/broadcom/bcm2835/bcm2835_systimer.c index a7c54fd6773c..c5c3435b6ef7 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_systimer.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_systimer.c @@ -138,7 +138,6 @@ bcm_systimer_start(struct eventtimer *et, sbintime_t first, sbintime_t period) register_t s; if (first != 0) { - count = ((uint32_t)et->et_frequency * first) >> 32; s = intr_disable(); diff --git a/sys/arm/broadcom/bcm2835/bcm2838_pci.c b/sys/arm/broadcom/bcm2835/bcm2838_pci.c index 576d3998f30b..a9e32b1a454e 100644 --- a/sys/arm/broadcom/bcm2835/bcm2838_pci.c +++ b/sys/arm/broadcom/bcm2835/bcm2838_pci.c @@ -124,7 +124,6 @@ static struct ofw_compat_data compat_data[] = { {"brcm,bcm2711-pcie", 1}, {"brcm,bcm7211-pcie", 1}, {"brcm,bcm7445-pcie", 1}, - {NULL, 0} }; @@ -740,4 +739,3 @@ DEFINE_CLASS_1(pcib, bcm_pcib_driver, bcm_pcib_methods, static devclass_t bcm_pcib_devclass; DRIVER_MODULE(bcm_pcib, simplebus, bcm_pcib_driver, bcm_pcib_devclass, 0, 0); - diff --git a/sys/arm/broadcom/bcm2835/bcm2838_xhci.c b/sys/arm/broadcom/bcm2835/bcm2838_xhci.c index 29bc73691a47..5805254c0623 100644 --- a/sys/arm/broadcom/bcm2835/bcm2838_xhci.c +++ b/sys/arm/broadcom/bcm2835/bcm2838_xhci.c @@ -214,4 +214,3 @@ DEFINE_CLASS_1(bcm_xhci, bcm_xhci_driver, bcm_xhci_methods, static devclass_t xhci_devclass; DRIVER_MODULE(bcm_xhci, pci, bcm_xhci_driver, xhci_devclass, 0, 0); MODULE_DEPEND(bcm_xhci, usb, 1, 1, 1); - |
