Date: Wed, 1 Mar 2017 21:11:37 +0000 (UTC) From: Ian Lepore <ian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314512 - stable/11/sys/arm/ti/am335x Message-ID: <201703012111.v21LBbaT018990@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ian Date: Wed Mar 1 21:11:36 2017 New Revision: 314512 URL: https://svnweb.freebsd.org/changeset/base/314512 Log: MFC r312859: Configure the timer capture pin to input mode in the timer control register, in addition to configuring it as input with the pinmux driver. There was a control register bit commented as "no desc in datasheet". A later revision of the manual reveals the bit to be an input/output control for the timer pin. In addition to configuring capture or pulse mode, you apparently have to separately configure the pin direction in the timer control register. Before this change, the timer block was apparently driving a signal onto a pad configured by pinmux as input. Capture mode still accidentally worked for me during testing because I was using a very strong signal source that just out-muscled the weaker drive from the misconfigured pin. Modified: stable/11/sys/arm/ti/am335x/am335x_dmtpps.c stable/11/sys/arm/ti/am335x/am335x_dmtreg.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/arm/ti/am335x/am335x_dmtpps.c ============================================================================== --- stable/11/sys/arm/ti/am335x/am335x_dmtpps.c Wed Mar 1 21:05:24 2017 (r314511) +++ stable/11/sys/arm/ti/am335x/am335x_dmtpps.c Wed Mar 1 21:11:36 2017 (r314512) @@ -463,6 +463,14 @@ dmtpps_attach(device_t dev) sc->tmr_num = ti_hwmods_get_unit(dev, "timer"); snprintf(sc->tmr_name, sizeof(sc->tmr_name), "DMTimer%d", sc->tmr_num); + /* + * Configure the timer pulse/capture pin to input/capture mode. This is + * required in addition to configuring the pin as input with the pinmux + * controller (which was done via fdt data or tunable at probe time). + */ + sc->tclr = DMT_TCLR_GPO_CFG; + DMTIMER_WRITE4(sc, DMT_TCLR, sc->tclr); + /* Set up timecounter hardware, start it. */ DMTIMER_WRITE4(sc, DMT_TSICR, DMT_TSICR_RESET); while (DMTIMER_READ4(sc, DMT_TIOCP_CFG) & DMT_TIOCP_RESET) Modified: stable/11/sys/arm/ti/am335x/am335x_dmtreg.h ============================================================================== --- stable/11/sys/arm/ti/am335x/am335x_dmtreg.h Wed Mar 1 21:05:24 2017 (r314511) +++ stable/11/sys/arm/ti/am335x/am335x_dmtreg.h Wed Mar 1 21:11:36 2017 (r314512) @@ -62,7 +62,7 @@ #define DMT_TCLR_TRGMODE_BOTH (2 << 10) /* Trigger on match + ovflow */ #define DMT_TCLR_PWM_PTOGGLE (1 << 12) /* PWM toggles */ #define DMT_TCLR_CAP_MODE_2ND (1 << 13) /* Capture second event mode */ -#define DMT_TCLR_GPO_CFG (1 << 14) /* (no descr in datasheet) */ +#define DMT_TCLR_GPO_CFG (1 << 14) /* Tmr pin conf, 0=out, 1=in */ #define DMT_TCRR 0x3C /* Counter Register */ #define DMT_TLDR 0x40 /* Load Reg */ #define DMT_TTGR 0x44 /* Trigger Reg */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703012111.v21LBbaT018990>