Module Name: src
Committed By: jmcneill
Date: Wed Jun 3 16:00:00 UTC 2020
Modified Files:
src/sys/arch/arm/ti: ti_gpio.c ti_iic.c
Log Message:
If we can't find a hwmod name, use the device type and mmio address
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/ti/ti_gpio.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/ti/ti_iic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/ti/ti_gpio.c
diff -u src/sys/arch/arm/ti/ti_gpio.c:1.3 src/sys/arch/arm/ti/ti_gpio.c:1.4
--- src/sys/arch/arm/ti/ti_gpio.c:1.3 Sun Nov 3 11:34:40 2019
+++ src/sys/arch/arm/ti/ti_gpio.c Wed Jun 3 16:00:00 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_gpio.c,v 1.3 2019/11/03 11:34:40 jmcneill Exp $ */
+/* $NetBSD: ti_gpio.c,v 1.4 2020/06/03 16:00:00 jmcneill Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ti_gpio.c,v 1.3 2019/11/03 11:34:40 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_gpio.c,v 1.4 2020/06/03 16:00:00 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -518,6 +518,8 @@ ti_gpio_attach(device_t parent, device_t
sc->sc_modname = fdtbus_get_string(phandle, "ti,hwmods");
if (sc->sc_modname == NULL)
sc->sc_modname = fdtbus_get_string(OF_parent(phandle), "ti,hwmods");
+ if (sc->sc_modname == NULL)
+ sc->sc_modname = kmem_asprintf("gpio@%" PRIxBUSADDR, addr);
aprint_naive("\n");
aprint_normal(": GPIO (%s)\n", sc->sc_modname);
Index: src/sys/arch/arm/ti/ti_iic.c
diff -u src/sys/arch/arm/ti/ti_iic.c:1.5 src/sys/arch/arm/ti/ti_iic.c:1.6
--- src/sys/arch/arm/ti/ti_iic.c:1.5 Thu May 14 08:34:20 2020
+++ src/sys/arch/arm/ti/ti_iic.c Wed Jun 3 16:00:00 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_iic.c,v 1.5 2020/05/14 08:34:20 msaitoh Exp $ */
+/* $NetBSD: ti_iic.c,v 1.6 2020/06/03 16:00:00 jmcneill Exp $ */
/*
* Copyright (c) 2013 Manuel Bouyer. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ti_iic.c,v 1.5 2020/05/14 08:34:20 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_iic.c,v 1.6 2020/06/03 16:00:00 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -292,7 +292,11 @@ ti_iic_attach(device_t parent, device_t
sc->sc_rxthres = sc->sc_txthres = fifo >> 1;
aprint_naive("\n");
- aprint_normal(": I2C controller (%s), %d-bytes FIFO\n", modname, fifo);
+ if (modname != NULL)
+ aprint_normal(": I2C controller (%s), %d-bytes FIFO\n", modname, fifo);
+ else
+ aprint_normal(": I2C controller (i2c@%" PRIxBUSADDR "), %d-bytes FIFO\n",
+ addr, fifo);
ti_iic_reset(sc);
ti_iic_flush(sc);
