CVS commit: src/sys/arch/arm/ti

2021-01-29 Thread Rin Okuyama 
Module Name:src
Committed By:   rin
Date:   Fri Jan 29 13:07:32 UTC 2021

Modified Files:
src/sys/arch/arm/ti: ti_gpio.c

Log Message:
Sort headers. No binary changes.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/ti/ti_gpio.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.10 src/sys/arch/arm/ti/ti_gpio.c:1.11
--- src/sys/arch/arm/ti/ti_gpio.c:1.10	Wed Jan 27 03:10:20 2021
+++ src/sys/arch/arm/ti/ti_gpio.c	Fri Jan 29 13:07:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_gpio.c,v 1.10 2021/01/27 03:10:20 thorpej Exp $ */
+/* $NetBSD: ti_gpio.c,v 1.11 2021/01/29 13:07:32 rin Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared McNeill 
@@ -27,17 +27,17 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ti_gpio.c,v 1.10 2021/01/27 03:10:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_gpio.c,v 1.11 2021/01/29 13:07:32 rin Exp $");
 
 #include 
+#include 
 #include 
 #include 
+#include 
 #include 
-#include 
-#include 
 #include 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 #include

CVS commit: src/sys/arch/arm/ti

2021-01-26 Thread Jason R Thorpe 
Module Name:src
Committed By:   thorpej
Date:   Wed Jan 27 02:12:16 UTC 2021

Modified Files:
src/sys/arch/arm/ti: ti_gpio.c ti_iic.c ti_omapintc.c ti_omaptimer.c
ti_sdhc.c

Log Message:
Use DEVICE_COMPAT_EOL.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/ti/ti_gpio.c \
src/sys/arch/arm/ti/ti_sdhc.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/ti/ti_iic.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/ti/ti_omapintc.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/ti/ti_omaptimer.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.8 src/sys/arch/arm/ti/ti_gpio.c:1.9
--- src/sys/arch/arm/ti/ti_gpio.c:1.8	Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/ti/ti_gpio.c	Wed Jan 27 02:12:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_gpio.c,v 1.8 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: ti_gpio.c,v 1.9 2021/01/27 02:12:16 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ti_gpio.c,v 1.8 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_gpio.c,v 1.9 2021/01/27 02:12:16 thorpej Exp $");
 
 #include 
 #include 
@@ -102,7 +102,7 @@ static const u_int ti_gpio_regmap[TI_NGP
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "ti,omap3-gpio",	.value = TI_GPIO_OMAP3 },
 	{ .compat = "ti,omap4-gpio",	.value = TI_GPIO_OMAP4 },
-	{ }
+	DEVICE_COMPAT_EOL
 };
 
 struct ti_gpio_intr {
Index: src/sys/arch/arm/ti/ti_sdhc.c
diff -u src/sys/arch/arm/ti/ti_sdhc.c:1.8 src/sys/arch/arm/ti/ti_sdhc.c:1.9
--- src/sys/arch/arm/ti/ti_sdhc.c:1.8	Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/ti/ti_sdhc.c	Wed Jan 27 02:12:16 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ti_sdhc.c,v 1.8 2021/01/25 14:20:39 thorpej Exp $	*/
+/*	$NetBSD: ti_sdhc.c,v 1.9 2021/01/27 02:12:16 thorpej Exp $	*/
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ti_sdhc.c,v 1.8 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_sdhc.c,v 1.9 2021/01/27 02:12:16 thorpej Exp $");
 
 #include 
 #include 
@@ -95,7 +95,7 @@ static const struct device_compatible_en
 	{ .compat = "ti,omap4-hsmmc",
 	  .data = _hsmmc_config },
 
-	{ }
+	DEVICE_COMPAT_EOL
 };
 
 enum {

Index: src/sys/arch/arm/ti/ti_iic.c
diff -u src/sys/arch/arm/ti/ti_iic.c:1.11 src/sys/arch/arm/ti/ti_iic.c:1.12
--- src/sys/arch/arm/ti/ti_iic.c:1.11	Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/ti/ti_iic.c	Wed Jan 27 02:12:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_iic.c,v 1.11 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: ti_iic.c,v 1.12 2021/01/27 02:12:16 thorpej Exp $ */
 
 /*
  * Copyright (c) 2013 Manuel Bouyer.  All rights reserved.
@@ -50,7 +50,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ti_iic.c,v 1.11 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_iic.c,v 1.12 2021/01/27 02:12:16 thorpej Exp $");
 
 #include 
 #include 
@@ -150,7 +150,7 @@ static const struct device_compatible_en
 	/* compatible			type */
 	{ .compat = "ti,omap3-i2c",	.value = TI_IIC_OMAP3 },
 	{ .compat = "ti,omap4-i2c",	.value = TI_IIC_OMAP4 },
-	{ }
+	DEVICE_COMPAT_EOL
 };
 
 /* operation in progress */

Index: src/sys/arch/arm/ti/ti_omapintc.c
diff -u src/sys/arch/arm/ti/ti_omapintc.c:1.6 src/sys/arch/arm/ti/ti_omapintc.c:1.7
--- src/sys/arch/arm/ti/ti_omapintc.c:1.6	Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/ti/ti_omapintc.c	Wed Jan 27 02:12:16 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ti_omapintc.c,v 1.6 2021/01/25 14:20:39 thorpej Exp $	*/
+/*	$NetBSD: ti_omapintc.c,v 1.7 2021/01/27 02:12:16 thorpej Exp $	*/
 /*
  * Define the SDP2430 specific information and then include the generic OMAP
  * interrupt header.
@@ -29,7 +29,7 @@
 #define _INTR_PRIVATE
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ti_omapintc.c,v 1.6 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_omapintc.c,v 1.7 2021/01/27 02:12:16 thorpej Exp $");
 
 #include 
 #include 
@@ -61,7 +61,7 @@ static const struct device_compatible_en
 	/* compatible			number of banks */
 	{ .compat = "ti,omap3-intc",	.value = 3 },
 	{ .compat = "ti,am33xx-intc",	.value = 4 },
-	{ }
+	DEVICE_COMPAT_EOL
 };
 
 #define	INTC_READ(sc, g, o)		\

Index: src/sys/arch/arm/ti/ti_omaptimer.c
diff -u src/sys/arch/arm/ti/ti_omaptimer.c:1.7 src/sys/arch/arm/ti/ti_omaptimer.c:1.8
--- src/sys/arch/arm/ti/ti_omaptimer.c:1.7	Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/ti/ti_omaptimer.c	Wed Jan 27 02:12:16 2021
@@ -1,7 +1,7 @@
-/*	$NetBSD: ti_omaptimer.c,v 1.7 2021/01/25 14:20:39 thorpej Exp $	*/
+/*	$NetBSD: ti_omaptimer.c,v 1.8 2021/01/27 02:12:16 thorpej Exp $	*/
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ti_omaptimer.c,v 1.7 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_omaptimer.c,v 1.8 2021/01/27

CVS commit: src/sys/arch/arm/ti

2021-01-15 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Fri Jan 15 23:19:33 UTC 2021

Modified Files:
src/sys/arch/arm/ti: if_cpsw.c ti_com.c ti_ehci.c ti_gpio.c ti_iic.c
ti_motg.c ti_omaptimer.c ti_sdhc.c

Log Message:
use fdtbus_intr_establish_xname


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/ti/if_cpsw.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/ti/ti_com.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/ti/ti_ehci.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/ti/ti_gpio.c \
src/sys/arch/arm/ti/ti_sdhc.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/ti/ti_iic.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/ti/ti_motg.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/ti/ti_omaptimer.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/if_cpsw.c
diff -u src/sys/arch/arm/ti/if_cpsw.c:1.12 src/sys/arch/arm/ti/if_cpsw.c:1.13
--- src/sys/arch/arm/ti/if_cpsw.c:1.12	Tue Feb  4 05:15:45 2020
+++ src/sys/arch/arm/ti/if_cpsw.c	Fri Jan 15 23:19:33 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_cpsw.c,v 1.12 2020/02/04 05:15:45 thorpej Exp $	*/
+/*	$NetBSD: if_cpsw.c,v 1.13 2021/01/15 23:19:33 jmcneill Exp $	*/
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -53,7 +53,7 @@
  */
 
 #include 
-__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.12 2020/02/04 05:15:45 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.13 2021/01/15 23:19:33 jmcneill Exp $");
 
 #include 
 #include 
@@ -398,6 +398,7 @@ cpsw_attach(device_t parent, device_t se
 	bus_addr_t addr;
 	bus_size_t size;
 	int error, slave, len;
+	char xname[16];
 	u_int i;
 
 	KERNHIST_INIT(cpswhist, 4096);
@@ -462,10 +463,21 @@ cpsw_attach(device_t parent, device_t se
 		memcpy(sc->sc_enaddr, macaddr, ETHER_ADDR_LEN);
 	}
 
-	sc->sc_rxthih = fdtbus_intr_establish(phandle, CPSW_INTROFF_RXTH, IPL_VM, FDT_INTR_FLAGS, cpsw_rxthintr, sc);
-	sc->sc_rxih = fdtbus_intr_establish(phandle, CPSW_INTROFF_RX, IPL_VM, FDT_INTR_FLAGS, cpsw_rxintr, sc);
-	sc->sc_txih = fdtbus_intr_establish(phandle, CPSW_INTROFF_TX, IPL_VM, FDT_INTR_FLAGS, cpsw_txintr, sc);
-	sc->sc_miscih = fdtbus_intr_establish(phandle, CPSW_INTROFF_MISC, IPL_VM, FDT_INTR_FLAGS, cpsw_miscintr, sc);
+	snprintf(xname, sizeof(xname), "%s rxth", device_xname(self));
+	sc->sc_rxthih = fdtbus_intr_establish_xname(phandle, CPSW_INTROFF_RXTH,
+	IPL_VM, FDT_INTR_FLAGS, cpsw_rxthintr, sc, xname);
+
+	snprintf(xname, sizeof(xname), "%s rx", device_xname(self));
+	sc->sc_rxih = fdtbus_intr_establish_xname(phandle, CPSW_INTROFF_RX,
+	IPL_VM, FDT_INTR_FLAGS, cpsw_rxintr, sc, xname);
+
+	snprintf(xname, sizeof(xname), "%s tx", device_xname(self));
+	sc->sc_txih = fdtbus_intr_establish_xname(phandle, CPSW_INTROFF_TX,
+	IPL_VM, FDT_INTR_FLAGS, cpsw_txintr, sc, xname);
+
+	snprintf(xname, sizeof(xname), "%s misc", device_xname(self));
+	sc->sc_miscih = fdtbus_intr_establish_xname(phandle, CPSW_INTROFF_MISC,
+	IPL_VM, FDT_INTR_FLAGS, cpsw_miscintr, sc, xname);
 
 	sc->sc_bst = faa->faa_bst;
 	sc->sc_bss = size;

Index: src/sys/arch/arm/ti/ti_com.c
diff -u src/sys/arch/arm/ti/ti_com.c:1.9 src/sys/arch/arm/ti/ti_com.c:1.10
--- src/sys/arch/arm/ti/ti_com.c:1.9	Mon Sep 28 11:54:23 2020
+++ src/sys/arch/arm/ti/ti_com.c	Fri Jan 15 23:19:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_com.c,v 1.9 2020/09/28 11:54:23 jmcneill Exp $ */
+/* $NetBSD: ti_com.c,v 1.10 2021/01/15 23:19:33 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill 
@@ -28,7 +28,7 @@
 
 #include 
 
-__KERNEL_RCSID(1, "$NetBSD: ti_com.c,v 1.9 2020/09/28 11:54:23 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: ti_com.c,v 1.10 2021/01/15 23:19:33 jmcneill Exp $");
 
 #include 
 #include 
@@ -118,8 +118,8 @@ ti_com_attach(device_t parent, device_t 
 		return;
 	}
 
-	ssc->ssc_ih = fdtbus_intr_establish(phandle, 0, IPL_SERIAL,
-	FDT_INTR_MPSAFE, comintr, sc);
+	ssc->ssc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_SERIAL,
+	FDT_INTR_MPSAFE, comintr, sc, device_xname(self));
 	if (ssc->ssc_ih == NULL) {
 		aprint_error_dev(self, "failed to establish interrupt on %s\n",
 		intrstr);

Index: src/sys/arch/arm/ti/ti_ehci.c
diff -u src/sys/arch/arm/ti/ti_ehci.c:1.1 src/sys/arch/arm/ti/ti_ehci.c:1.2
--- src/sys/arch/arm/ti/ti_ehci.c:1.1	Wed Oct 30 21:41:40 2019
+++ src/sys/arch/arm/ti/ti_ehci.c	Fri Jan 15 23:19:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_ehci.c,v 1.1 2019/10/30 21:41:40 jmcneill Exp $ */
+/* $NetBSD: ti_ehci.c,v 1.2 2021/01/15 23:19:33 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015-2019 Jared McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ti_ehci.c,v 1.1 2019/10/30 21:41:40 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_ehci.c,v 1.2 2021/01/15 23:19:33 jmcneill Exp $");
 
 #include 
 #include 
@@ -136,8 +136,8 @@ ti_ehci_attach(device_t parent, device_t
 		return;
 	}
 
-	ih = fdtbus_intr_establish(phandle, 0, IPL_USB, FDT_INTR_MPSAFE,
-	ehci_intr, sc);

CVS commit: src/sys/arch/arm/ti

2020-08-15 Thread Taylor R Campbell 
Module Name:src
Committed By:   riastradh
Date:   Sun Aug 16 03:48:59 UTC 2020

Modified Files:
src/sys/arch/arm/ti: ti_iic.c

Log Message:
Initialize the i2c controller before using it.

Fixes mutex uninitialized panic in LOCKDEBUG.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 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_iic.c
diff -u src/sys/arch/arm/ti/ti_iic.c:1.6 src/sys/arch/arm/ti/ti_iic.c:1.7
--- src/sys/arch/arm/ti/ti_iic.c:1.6	Wed Jun  3 16:00:00 2020
+++ src/sys/arch/arm/ti/ti_iic.c	Sun Aug 16 03:48:59 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_iic.c,v 1.6 2020/06/03 16:00:00 jmcneill Exp $ */
+/* $NetBSD: ti_iic.c,v 1.7 2020/08/16 03:48:59 riastradh Exp $ */
 
 /*
  * Copyright (c) 2013 Manuel Bouyer.  All rights reserved.
@@ -50,7 +50,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ti_iic.c,v 1.6 2020/06/03 16:00:00 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_iic.c,v 1.7 2020/08/16 03:48:59 riastradh Exp $");
 
 #include 
 #include 
@@ -265,6 +265,7 @@ ti_iic_attach(device_t parent, device_t 
 	mutex_init(>sc_lock, MUTEX_DEFAULT, IPL_NONE);
 	mutex_init(>sc_mtx, MUTEX_DEFAULT, IPL_NET);
 	cv_init(>sc_cv, "tiiic");
+	iic_tag_init(>sc_ic);
 	sc->sc_ic.ic_cookie = sc;
 	sc->sc_ic.ic_acquire_bus = ti_iic_acquire_bus;
 	sc->sc_ic.ic_release_bus = ti_iic_release_bus;

CVS commit: src/sys/arch/arm/ti

2020-06-03 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Wed Jun  3 19:16:23 UTC 2020

Modified Files:
src/sys/arch/arm/ti: ti_motg.c

Log Message:
PR# port-evbarm/55263: BeagleBone Black too many interrupts on CPU when
using 5V DC power cable

Handle vbus status change events, and don't busy spin in the hard intr
handler when we see a vbus error (this will always be set when VBUS is not
present).


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/ti/ti_motg.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_motg.c
diff -u src/sys/arch/arm/ti/ti_motg.c:1.1 src/sys/arch/arm/ti/ti_motg.c:1.2
--- src/sys/arch/arm/ti/ti_motg.c:1.1	Sun Oct 27 16:31:26 2019
+++ src/sys/arch/arm/ti/ti_motg.c	Wed Jun  3 19:16:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_motg.c,v 1.1 2019/10/27 16:31:26 jmcneill Exp $ */
+/* $NetBSD: ti_motg.c,v 1.2 2020/06/03 19:16:23 jmcneill Exp $ */
 /*
  * Copyright (c) 2013 Manuel Bouyer.  All rights reserved.
  *
@@ -24,7 +24,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ti_motg.c,v 1.1 2019/10/27 16:31:26 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_motg.c,v 1.2 2020/06/03 19:16:23 jmcneill Exp $");
 
 #include 
 #include 
@@ -187,8 +187,7 @@ ti_motg_intr(void *v)
 {
 	struct ti_motg_softc *sc = v;
 	uint32_t stat, stat0, stat1;
-	int rv = 0;
-	int i;
+	int rv;
 
 	MOTGHIST_FUNC(); MOTGHIST_CALLED();
 
@@ -198,34 +197,18 @@ ti_motg_intr(void *v)
 	stat1 = TIOTG_USBC_READ4(sc, USBCTRL_IRQ_STAT1);
 	DPRINTF("USB %jd 0x%jx 0x%jx stat %jd",
 	sc->sc_ctrlport, stat0, stat1, stat);
-	/* try to deal with vbus errors */
-	if (stat1 & MUSB2_MASK_IVBUSERR ) {
-		stat1 &= ~MUSB2_MASK_IVBUSERR;
-		for (i = 0; i < 1000; i++) {
-			TIOTG_USBC_WRITE4(sc, USBCTRL_IRQ_STAT1,
-			MUSB2_MASK_IVBUSERR);
-			motg_intr_vbus(>sc_motg, stat & 0x1);
-			delay(1000);
-			stat = TIOTG_USBC_READ4(sc, USBCTRL_STAT);
-			if (stat & 0x1)
-break;
-		}
-	}
+
 	if (stat0) {
 		TIOTG_USBC_WRITE4(sc, USBCTRL_IRQ_STAT0, stat0);
 	}
 	if (stat1) {
 		TIOTG_USBC_WRITE4(sc, USBCTRL_IRQ_STAT1, stat1);
 	}
-	if ((stat & 0x1) == 0) {
-		mutex_spin_exit(>sc_motg.sc_intr_lock);
-		aprint_error_dev(sc->sc_motg.sc_dev, ": vbus error\n");
-		return 1;
-	}
-	if (stat0 != 0 || stat1 != 0) {
-		rv = motg_intr(>sc_motg, ((stat0 >> 16) & 0x),
-			stat0 & 0x, stat1 & 0xff);
+	if (stat1 & USBCTRL_IRQ_STAT1_DRVVBUS) {
+		motg_intr_vbus(>sc_motg, stat & 0x1);
 	}
+	rv = motg_intr(>sc_motg, ((stat0 >> 16) & 0x),
+		stat0 & 0x, stat1 & 0xff);
 	mutex_spin_exit(>sc_motg.sc_intr_lock);
 	return rv;
 }

CVS commit: src/sys/arch/arm/ti

2020-06-03 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Wed Jun  3 18:26:06 UTC 2020

Modified Files:
src/sys/arch/arm/ti: ti_dpll_clock.c

Log Message:
Fix dpll clock setting on am335x


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/ti/ti_dpll_clock.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_dpll_clock.c
diff -u src/sys/arch/arm/ti/ti_dpll_clock.c:1.2 src/sys/arch/arm/ti/ti_dpll_clock.c:1.3
--- src/sys/arch/arm/ti/ti_dpll_clock.c:1.2	Tue Oct 29 22:19:13 2019
+++ src/sys/arch/arm/ti/ti_dpll_clock.c	Wed Jun  3 18:26:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_dpll_clock.c,v 1.2 2019/10/29 22:19:13 jmcneill Exp $ */
+/* $NetBSD: ti_dpll_clock.c,v 1.3 2020/06/03 18:26:06 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ti_dpll_clock.c,v 1.2 2019/10/29 22:19:13 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_dpll_clock.c,v 1.3 2020/06/03 18:26:06 jmcneill Exp $");
 
 #include 
 #include 
@@ -267,7 +267,7 @@ am3_dpll_clock_set_rate(void *priv, stru
 	control |= __SHIFTIN(AM3_DPLL_EN_NM_BYPASS, AM3_DPLL_EN);
 	WR4(sc, REG_CONTROL, control);
 
-	while ((RD4(sc, REG_IDLEST) & AM3_ST_MN_BYPASS) != 0)
+	while (RD4(sc, REG_IDLEST) != AM3_ST_MN_BYPASS)
 		;
 
 	mult_div1 = __SHIFTIN(mult, DPLL_MULT);
@@ -278,7 +278,7 @@ am3_dpll_clock_set_rate(void *priv, stru
 	control |= __SHIFTIN(AM3_DPLL_EN_LOCK, AM3_DPLL_EN);
 	WR4(sc, REG_CONTROL, control);
 
-	while ((RD4(sc, REG_IDLEST) & AM3_ST_DPLL_CLK) != 0)
+	while (RD4(sc, REG_IDLEST) != AM3_ST_DPLL_CLK)
 		;
 
 	return 0;

CVS commit: src/sys/arch/arm/ti

2020-06-03 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Wed Jun  3 18:02:03 UTC 2020

Modified Files:
src/sys/arch/arm/ti: ti_cpufreq.c

Log Message:
Fix SoC revision detection. BeagleBone Black reports 1GHz as a supported
frequency again.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/ti/ti_cpufreq.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_cpufreq.c
diff -u src/sys/arch/arm/ti/ti_cpufreq.c:1.2 src/sys/arch/arm/ti/ti_cpufreq.c:1.3
--- src/sys/arch/arm/ti/ti_cpufreq.c:1.2	Tue Oct 29 10:54:10 2019
+++ src/sys/arch/arm/ti/ti_cpufreq.c	Wed Jun  3 18:02:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_cpufreq.c,v 1.2 2019/10/29 10:54:10 jmcneill Exp $ */
+/* $NetBSD: ti_cpufreq.c,v 1.3 2020/06/03 18:02:03 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared McNeill 
@@ -29,7 +29,7 @@
 #include "opt_soc.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ti_cpufreq.c,v 1.2 2019/10/29 10:54:10 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_cpufreq.c,v 1.3 2020/06/03 18:02:03 jmcneill Exp $");
 
 #include 
 #include 
@@ -62,7 +62,7 @@ am33xx_opp_supported(const int opp_table
 	int len;
 
 	syscon_lock(ti_opp_syscon);
-	rev = __SHIFTOUT(syscon_read_4(ti_opp_syscon, AM33XX_REV_OFFSET), AM33XX_REV_MASK);
+	rev = __BIT(__SHIFTOUT(syscon_read_4(ti_opp_syscon, AM33XX_REV_OFFSET), AM33XX_REV_MASK));
 	efuse = __SHIFTOUT(syscon_read_4(ti_opp_syscon, AM33XX_EFUSE_OFFSET), AM33XX_EFUSE_MASK);
 	syscon_unlock(ti_opp_syscon);

CVS commit: src/sys/arch/arm/ti

2020-06-03 Thread Jared D. McNeill 
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 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__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 
 #include 
@@ -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 
-__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 
 #include 
@@ -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);

CVS commit: src/sys/arch/arm/ti

2020-06-03 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Wed Jun  3 15:59:22 UTC 2020

Modified Files:
src/sys/arch/arm/ti: ti_rng.c

Log Message:
Add a line break before rnd_attach_source so the "entropy: ready" announcement 
does not get mixed with device prints


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/ti/ti_rng.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_rng.c
diff -u src/sys/arch/arm/ti/ti_rng.c:1.3 src/sys/arch/arm/ti/ti_rng.c:1.4
--- src/sys/arch/arm/ti/ti_rng.c:1.3	Thu Apr 30 03:40:53 2020
+++ src/sys/arch/arm/ti/ti_rng.c	Wed Jun  3 15:59:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_rng.c,v 1.3 2020/04/30 03:40:53 riastradh Exp $ */
+/* $NetBSD: ti_rng.c,v 1.4 2020/06/03 15:59:22 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill 
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ti_rng.c,v 1.3 2020/04/30 03:40:53 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_rng.c,v 1.4 2020/06/03 15:59:22 jmcneill Exp $");
 
 #include 
 #include 
@@ -112,12 +112,12 @@ ti_rng_attach(device_t parent, device_t 
 		TRNG_CONTROL_ENABLE);
 	}
 
+	aprint_naive("\n");
+	aprint_normal(": RNG\n");
+
 	rndsource_setcb(>sc_rndsource, ti_rng_callback, sc);
 	rnd_attach_source(>sc_rndsource, device_xname(self), RND_TYPE_RNG,
 	RND_FLAG_COLLECT_VALUE|RND_FLAG_HASCB);
-
-	aprint_naive("\n");
-	aprint_normal(": RNG\n");
 }
 
 static void

CVS commit: src/sys/arch/arm/ti

2020-06-03 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Wed Jun  3 14:56:10 UTC 2020

Modified Files:
src/sys/arch/arm/ti: am3_prcm.c ti_prcm.c

Log Message:
Catch up to clock changes in last dts import.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/ti/am3_prcm.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/ti/ti_prcm.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/am3_prcm.c
diff -u src/sys/arch/arm/ti/am3_prcm.c:1.12 src/sys/arch/arm/ti/am3_prcm.c:1.13
--- src/sys/arch/arm/ti/am3_prcm.c:1.12	Fri Nov 29 20:54:00 2019
+++ src/sys/arch/arm/ti/am3_prcm.c	Wed Jun  3 14:56:09 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: am3_prcm.c,v 1.12 2019/11/29 20:54:00 jmcneill Exp $ */
+/* $NetBSD: am3_prcm.c,v 1.13 2020/06/03 14:56:09 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill 
@@ -28,7 +28,7 @@
 
 #include 
 
-__KERNEL_RCSID(1, "$NetBSD: am3_prcm.c,v 1.12 2019/11/29 20:54:00 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: am3_prcm.c,v 1.13 2020/06/03 14:56:09 jmcneill Exp $");
 
 #include 
 #include 
@@ -65,6 +65,11 @@ __KERNEL_RCSID(1, "$NetBSD: am3_prcm.c,v
 
 #define	DPLL_DISP_RATE29700
 
+struct am3_prcm_softc {
+	struct ti_prcm_softc	sc_prcm;	/* must be first */
+	bus_addr_t		sc_regbase;
+};
+
 static int am3_prcm_match(device_t, cfdata_t, void *);
 static void am3_prcm_attach(device_t, device_t, void *);
 
@@ -133,7 +138,17 @@ static const char * const compatible[] =
 	NULL
 };
 
-CFATTACH_DECL_NEW(am3_prcm, sizeof(struct ti_prcm_softc),
+static const char * const cm_compatible[] = {
+	"ti,omap4-cm",
+	NULL
+};
+
+static const char * const clkctrl_compatible[] = {
+	"ti,clkctrl",
+	NULL
+};
+
+CFATTACH_DECL_NEW(am3_prcm, sizeof(struct am3_prcm_softc),
 	am3_prcm_match, am3_prcm_attach, NULL, NULL);
 
 static struct ti_prcm_clk am3_prcm_clks[] = {
@@ -146,6 +161,7 @@ static struct ti_prcm_clk am3_prcm_clks[
 	TI_PRCM_FIXED_FACTOR("PERIPH_CLK", 1, 1, "FIXED_48MHZ"),
 	TI_PRCM_FIXED_FACTOR("MMC_CLK", 1, 1, "FIXED_96MHZ"),
 
+	AM3_PRCM_HWMOD_WKUP("uart0", 0xb4, "PERIPH_CLK"),
 	AM3_PRCM_HWMOD_PER("uart1", 0x6c, "PERIPH_CLK"),
 	AM3_PRCM_HWMOD_PER("uart2", 0x70, "PERIPH_CLK"),
 	AM3_PRCM_HWMOD_PER("uart3", 0x74, "PERIPH_CLK"),
@@ -187,6 +203,53 @@ static struct ti_prcm_clk am3_prcm_clks[
 	AM3_PRCM_HWMOD_PER_DISP("lcdc", 0x18, "DISPLAY_CLK"),
 };
 
+static struct clk *
+am3_prcm_clock_decode(device_t dev, int cc_phandle, const void *data, size_t len)
+{
+	struct am3_prcm_softc * const sc = device_private(dev);
+	const u_int *cells = data;
+	bus_addr_t regbase;
+	u_int n;
+
+	if (len != 8)
+		return NULL;
+
+	bus_size_t regoff = be32toh(cells[0]);
+	const u_int clock_index = be32toh(cells[1]);
+
+	/* XXX not sure how to handle this yet */
+	if (clock_index != 0)
+		return NULL;
+
+	/*
+	 * Register offset in specifier is relative to base address of the
+	 * clock node. Translate this to an address relative to the start
+	 * of PRCM space.
+	 */
+	if (fdtbus_get_reg(cc_phandle, 0, , NULL) != 0)
+		return NULL;
+	regoff += (regbase - sc->sc_regbase);
+
+	/*
+	 * Look for a matching hwmod.
+	 */
+	for (n = 0; n < sc->sc_prcm.sc_nclks; n++) {
+		struct ti_prcm_clk *tclk = >sc_prcm.sc_clks[n];
+		if (tclk->type != TI_PRCM_HWMOD)
+			continue;
+
+		if (tclk->u.hwmod.reg == regoff)
+			return >base;
+	}
+
+	/* Not found */
+	return NULL;
+}
+
+static const struct fdtbus_clock_controller_func am3_prcm_clock_fdt_funcs = {
+	.decode = am3_prcm_clock_decode
+};
+
 static int
 am3_prcm_match(device_t parent, cfdata_t cf, void *aux)
 {
@@ -198,24 +261,43 @@ am3_prcm_match(device_t parent, cfdata_t
 static void
 am3_prcm_attach(device_t parent, device_t self, void *aux)
 {
-	struct ti_prcm_softc * const sc = device_private(self);
+	struct am3_prcm_softc * const sc = device_private(self);
 	struct fdt_attach_args * const faa = aux;
-	int clocks;
+	const int phandle = faa->faa_phandle;
+	int clocks, child, cm_child;
 
-	sc->sc_dev = self;
-	sc->sc_phandle = faa->faa_phandle;
-	sc->sc_bst = faa->faa_bst;
+	if (fdtbus_get_reg(phandle, 0, >sc_regbase, NULL) != 0) {
+		aprint_error(": couldn't get registers\n");
+		return;
+	}
 
-	sc->sc_clks = am3_prcm_clks;
-	sc->sc_nclks = __arraycount(am3_prcm_clks);
+	sc->sc_prcm.sc_dev = self;
+	sc->sc_prcm.sc_phandle = phandle;
+	sc->sc_prcm.sc_bst = faa->faa_bst;
+	sc->sc_prcm.sc_clks = am3_prcm_clks;
+	sc->sc_prcm.sc_nclks = __arraycount(am3_prcm_clks);
 
-	if (ti_prcm_attach(sc) != 0)
+	if (ti_prcm_attach(>sc_prcm) != 0)
 		return;
 
 	aprint_naive("\n");
 	aprint_normal(": AM3xxx PRCM\n");
 
-	clocks = of_find_firstchild_byname(sc->sc_phandle, "clocks");
+	for (child = OF_child(phandle); child; child = OF_peer(child)) {
+		if (of_match_compatible(child, cm_compatible) == 0)
+			continue;
+
+		for (cm_child =	OF_child(child); cm_child; cm_child = OF_peer(cm_child)) {
+			if (of_match_compatible(cm_child, clkctrl_compatible) ==

CVS commit: src/sys/arch/arm/ti

2017-12-19 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Tue Dec 19 09:15:23 UTC 2017

Modified Files:
src/sys/arch/arm/ti: ti_platform.c

Log Message:
Remove duplicate DEVMAP_* macros


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/ti/ti_platform.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_platform.c
diff -u src/sys/arch/arm/ti/ti_platform.c:1.1 src/sys/arch/arm/ti/ti_platform.c:1.2
--- src/sys/arch/arm/ti/ti_platform.c:1.1	Thu Oct 26 01:16:32 2017
+++ src/sys/arch/arm/ti/ti_platform.c	Tue Dec 19 09:15:23 2017
@@ -1,9 +1,9 @@
-/* $NetBSD: ti_platform.c,v 1.1 2017/10/26 01:16:32 jakllsch Exp $ */
+/* $NetBSD: ti_platform.c,v 1.2 2017/12/19 09:15:23 skrll Exp $ */
 
 #include "opt_fdt_arm.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ti_platform.c,v 1.1 2017/10/26 01:16:32 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_platform.c,v 1.2 2017/12/19 09:15:23 skrll Exp $");
 
 #include 
 
@@ -14,18 +14,6 @@ __KERNEL_RCSID(0, "$NetBSD: ti_platform.
 
 #include 
 
-#define DEVMAP_ALIGN(a) ((a) & ~L1_S_OFFSET)
-#define DEVMAP_SIZE(s)	roundup2((s), L1_S_SIZE)
-#define DEVMAP_ENTRY(va, pa, sz)			\
-	{		\
-		.pd_va = DEVMAP_ALIGN(va),		\
-		.pd_pa = DEVMAP_ALIGN(pa),		\
-		.pd_size = DEVMAP_SIZE(sz),		\
-		.pd_prot = VM_PROT_READ|VM_PROT_WRITE,	\
-		.pd_cache = PTE_NOCACHE			\
-	}
-#define	DEVMAP_ENTRY_END	{ 0 }
-
 extern struct bus_space armv7_generic_bs_tag;
 extern struct bus_space armv7_generic_a4x_bs_tag;
 extern struct arm32_bus_dma_tag armv7_generic_dma_tag;

CVS commit: src/sys/arch/arm/ti

2017-10-26 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Thu Oct 26 10:56:57 UTC 2017

Modified Files:
src/sys/arch/arm/ti: ti_com.c

Log Message:
UART frequency comes from 'clock-frequency' property here


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/ti/ti_com.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_com.c
diff -u src/sys/arch/arm/ti/ti_com.c:1.1 src/sys/arch/arm/ti/ti_com.c:1.2
--- src/sys/arch/arm/ti/ti_com.c:1.1	Thu Oct 26 01:16:32 2017
+++ src/sys/arch/arm/ti/ti_com.c	Thu Oct 26 10:56:57 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_com.c,v 1.1 2017/10/26 01:16:32 jakllsch Exp $ */
+/* $NetBSD: ti_com.c,v 1.2 2017/10/26 10:56:57 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill 
@@ -28,7 +28,7 @@
 
 #include 
 
-__KERNEL_RCSID(1, "$NetBSD: ti_com.c,v 1.1 2017/10/26 01:16:32 jakllsch Exp $");
+__KERNEL_RCSID(1, "$NetBSD: ti_com.c,v 1.2 2017/10/26 10:56:57 jmcneill Exp $");
 
 #include 
 #include 
@@ -54,9 +54,6 @@ static const char * const compatible[] =
 struct ti_com_softc {
 	struct com_softc ssc_sc;
 	void *ssc_ih;
-
-	struct clk *ssc_clk;
-	struct fdtbus_reset *ssc_rst;
 };
 
 CFATTACH_DECL_NEW(ti_com, sizeof(struct ti_com_softc),
@@ -76,6 +73,7 @@ ti_com_attach(device_t parent, device_t 
 	struct ti_com_softc * const ssc = device_private(self);
 	struct com_softc * const sc = >ssc_sc;
 	struct fdt_attach_args * const faa = aux;
+	const int phandle = faa->faa_phandle;
 	bus_space_handle_t bsh;
 	bus_space_tag_t bst;
 	char intrstr[128];
@@ -83,7 +81,7 @@ ti_com_attach(device_t parent, device_t 
 	bus_size_t size;
 	int error;
 
-	if (fdtbus_get_reg(faa->faa_phandle, 0, , ) != 0) {
+	if (fdtbus_get_reg(phandle, 0, , ) != 0) {
 		aprint_error(": couldn't get registers\n");
 		return;
 	}
@@ -92,19 +90,11 @@ ti_com_attach(device_t parent, device_t 
 
 	sc->sc_dev = self;
 
-	ssc->ssc_clk = fdtbus_clock_get_index(faa->faa_phandle, 0);
-	ssc->ssc_rst = fdtbus_reset_get_index(faa->faa_phandle, 0);
-
-#if 0
-	if (ssc->ssc_clk == NULL) {
-		aprint_error(": couldn't get frequency\n");
+	if (of_getprop_uint32(phandle, "clock-frequency", >sc_frequency) != 0) {
+		aprint_error(": missing 'clock-frequency' property\n");
 		return;
 	}
 
-	sc->sc_frequency = clk_get_rate(ssc->ssc_clk);
-#else
-	sc->sc_frequency = 4800;
-#endif
 	sc->sc_type = COM_TYPE_NORMAL;
 
 	error = bus_space_map(bst, addr, size, 0, );
@@ -118,12 +108,12 @@ ti_com_attach(device_t parent, device_t 
 	com_attach_subr(sc);
 	aprint_naive("\n");
 
-	if (!fdtbus_intr_str(faa->faa_phandle, 0, intrstr, sizeof(intrstr))) {
+	if (!fdtbus_intr_str(phandle, 0, intrstr, sizeof(intrstr))) {
 		aprint_error_dev(self, "failed to decode interrupt\n");
 		return;
 	}
 
-	ssc->ssc_ih = fdtbus_intr_establish(faa->faa_phandle, 0, IPL_SERIAL,
+	ssc->ssc_ih = fdtbus_intr_establish(phandle, 0, IPL_SERIAL,
 	FDT_INTR_MPSAFE, comintr, sc);
 	if (ssc->ssc_ih == NULL) {
 		aprint_error_dev(self, "failed to establish interrupt on %s\n",