From nobody Mon Nov 28 07:15:58 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NLGwG3Xc0z4jM69; Mon, 28 Nov 2022 07:15:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NLGwG1rTwz4QgC; Mon, 28 Nov 2022 07:15:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669619758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dQxatkFjRYNI9Lak62GfjFe55LtbuH5lL3fKPpiV+NE=; b=QN8HFHB2Gj01G/fdhshC2x7PP4GU+BeQExe+F9WnVrDKT6o5lWxjQc+WevAZbaIPLPZN3Q rNT+N5a0YCJD67em6CTpGHl21XjzN41nihNOl6hMuUnkfusrt0KTwWNKpyI5lwnJM7bneg Xj6s7FUZdgZ6bITSpABi/BgF73nRfgAVN3D/g25q+Vxtt7/9xGciP+nueueegB851N2h2P Y9/JVifpgQM0UChxfYHKLMi2bNFFBWVbLLsmg44k/OliH5kk3aJ/iNSQ+BQNQfzVNYf5/R JGDWgw1JGzwbn74HllxeJSGRpIsDRY+T7S+qZYehhAs+gFMJ0J66ZS8zSt5dyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669619758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dQxatkFjRYNI9Lak62GfjFe55LtbuH5lL3fKPpiV+NE=; b=xWOkIKy+6mo7ZaawTrp54XAFuYnSb283wVgOAByx4LBjLpvZ8bDCzJNLroaNAGI0HpU9bg iT52R6SUQY+XMOGyOmsbKIGc18ClzEKPhFuWbe/+rC62MlCGsVZklI1aAlwvW57wNKjn1l JOpi9Ha9AmxcGIa4JmaMlQT66PoDODiWdgLelRZnchbsLfR/xALm5J/ednTjz3oA6YK+bF lpmf5GdTDowEZnD7eubMzw4wB+0bjywetZFXtz2a0Gvyo5g/jnqvkHQCoXcyFH5/nAfDDX MnaRdINIpm8ERX3X11jRVy2SgNN3CdzyNYlooVtzuSMzjwm05gdQuYCEF1Ahow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669619758; a=rsa-sha256; cv=none; b=l3NjV8VXOcFI1uy9qgZs9aaKmWjgJYMDrLW4WpRauFTAa54nbrXeR7P4zlVmQHcwSMut0y AD3bjUCA4Wv4d9oDoDJi/HBVmyQ7eWi9kqDHFomLMc8i0UL7yRgwnySWnJmUl/1eqDLjcq 8UJJzZe6K2D3hWDwntnzDVCI34nk86XgSL8TPY2IPFNqOu8y9UAx/yIuzUVLNm7zqxONTX 7KceO0oHJ+NYxBTkyDbeIpBboe6IKYHt4Fz0rDHc+GuGEZvI9c1RHTnHfZBi2HIbuf5cY8 KYFLOQXCZWamNYqTbP+0DtfATAYSkVvbtHvCE5tSk7nN8q6Kc3b4+DEzPq1lpQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NLGwG0rlYzTxm; Mon, 28 Nov 2022 07:15:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AS7FwoJ015991; Mon, 28 Nov 2022 07:15:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AS7Fwgc015990; Mon, 28 Nov 2022 07:15:58 GMT (envelope-from git) Date: Mon, 28 Nov 2022 07:15:58 GMT Message-Id: <202211280715.2AS7Fwgc015990@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Oskar Holmlund Subject: git: 74a8d66c2885 - main - AM335x: Fix compatible name In the DTS import from Linux 5.14 the compatible strings has changed for the driver am335x_ecap.c && am335x_ehrpwm.c List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oh X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74a8d66c28859e725a2e0396f7a9be2714438013 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by oh: URL: https://cgit.FreeBSD.org/src/commit/?id=74a8d66c28859e725a2e0396f7a9be2714438013 commit 74a8d66c28859e725a2e0396f7a9be2714438013 Author: Oskar Holmlund AuthorDate: 2022-11-28 07:13:18 +0000 Commit: Oskar Holmlund CommitDate: 2022-11-28 07:13:18 +0000 AM335x: Fix compatible name In the DTS import from Linux 5.14 the compatible strings has changed for the driver am335x_ecap.c && am335x_ehrpwm.c Approved by: manu (mentor) Differential revision: https://reviews.freebsd.org/D37502 --- sys/arm/ti/am335x/am335x_ecap.c | 9 ++++++++- sys/arm/ti/am335x/am335x_ehrpwm.c | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/arm/ti/am335x/am335x_ecap.c b/sys/arm/ti/am335x/am335x_ecap.c index c074f576da2d..c7f5a670b0a9 100644 --- a/sys/arm/ti/am335x/am335x_ecap.c +++ b/sys/arm/ti/am335x/am335x_ecap.c @@ -81,6 +81,13 @@ struct am335x_ecap_softc { int sc_mem_rid; }; +static struct ofw_compat_data compat_data[] = { + {"ti,am3352-ecap", true}, + {"ti,am33xx-ecap", true}, + {NULL, false}, +}; +SIMPLEBUS_PNP_INFO(compat_data); + static device_method_t am335x_ecap_methods[] = { DEVMETHOD(device_probe, am335x_ecap_probe), DEVMETHOD(device_attach, am335x_ecap_attach), @@ -142,7 +149,7 @@ am335x_ecap_probe(device_t dev) if (!ofw_bus_status_okay(dev)) return (ENXIO); - if (!ofw_bus_is_compatible(dev, "ti,am33xx-ecap")) + if (!ofw_bus_search_compatible(dev, compat_data)->ocd_data) return (ENXIO); device_set_desc(dev, "AM335x eCAP"); diff --git a/sys/arm/ti/am335x/am335x_ehrpwm.c b/sys/arm/ti/am335x/am335x_ehrpwm.c index 5144607ae5e5..359f54aac5f5 100644 --- a/sys/arm/ti/am335x/am335x_ehrpwm.c +++ b/sys/arm/ti/am335x/am335x_ehrpwm.c @@ -193,6 +193,7 @@ struct am335x_ehrpwm_softc { }; static struct ofw_compat_data compat_data[] = { + {"ti,am3352-ehrpwm", true}, {"ti,am33xx-ehrpwm", true}, {NULL, false}, };