From nobody Fri Mar 17 11:34:34 2023 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 4PdMVL3pxfz3yG07; Fri, 17 Mar 2023 11:34:34 +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 4PdMVL2P0Sz3Qv7; Fri, 17 Mar 2023 11:34:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679052874; 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=gHz7Go+PW7QjljTqo4gemZylUORZCPUJJgwE0UyY09k=; b=aohVnuyDHxQphvuhGWpns0na+qKAQLfOwjR4Mlu1p3nHa72jFLj/zrfVttI3TMfuNgcMQJ YOwf8lr9ZGhlugzpUX7X+I3M1OtacnhaPz3aDDRJbXHsUtswgr2QLtwsih04N6dJK+gI1T RIELW3d31UsOIOh4EDGRXR+oo3B8hOJvug3XyDiVv4kTxaxyvM2UhsqNNjTTiiKLR8wDF4 Zf68XgM72Wg+ZDG6VFwdrdVq9BJbPVreNgPR/AEwYFA1BzFIqKc+hOJFKMpeS9lwtIrpud IHjlKtf0xLSLk3Toq1hD3mgbByo6IZBT8ydj0q7FQ9TGpHQRGAYQHEVT5zzt5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679052874; 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=gHz7Go+PW7QjljTqo4gemZylUORZCPUJJgwE0UyY09k=; b=I0uExcR5jixDKTX4fSNhE8xkYxFT4BZ3g2Ccc7sZS3Bue3M4X4+9sKUWa1d0mjdqg2mR8Z RgFiZwwjScIW7EiTycz7IVC+DK3T7sSpE1erbitdinTY9fM5tdEQTf81kDVqLezQyWMPjQ cmKFiFvEq1Gpuro6qJESWsTBg9pIuLrV+Fx0p76VuiShh8PNpgEHikQw5Ik+kDC+kdzeij ccwVKSBCTKC4xtSD5BM2zCqCOjLl052b40u8gBDQ9yzmHh3PbCnqHof+Dtbq29CWLumUiq VM3q1tSXtKugDCKvFMj7sl6lwSkOOH4IMdggWZv/oq+hC7pAmuGmVP/+CUVjrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679052874; a=rsa-sha256; cv=none; b=IsQMKjZvONGxXUR2odepwtk9PFCYRdRbrVWwazSLLTrYVuvnzKnCEVWxTNvdhbnNVd5YI1 VfLSqnPVqU4HKL1owqbjpe0hsIgGall8nKL3H7fbVHV2CQ88V7FGiAqXEJx6VCrUZnIG6P cRF/Pz3gcD6yVo4mM0RYlaLP3V19quIfohN/N5N6sTdTw8wNVNtNKH1KwiBE3uUYMNdi8S mQ22pKMh9xgwB5b9jmrP5pG69svoH3gTh9E3FyF9N+agGZcHSLHtU+p8bFhE8b1k0H9yHB p7UHF+1ipWRoqpJSXD7G7XkDkU2W0LYWh1HsO1N4cp8xiOTnogfQkVGbgfKMJA== 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 4PdMVL1KplzPRT; Fri, 17 Mar 2023 11:34:34 +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 32HBYYmw082105; Fri, 17 Mar 2023 11:34:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32HBYYkB082104; Fri, 17 Mar 2023 11:34:34 GMT (envelope-from git) Date: Fri, 17 Mar 2023 11:34:34 GMT Message-Id: <202303171134.32HBYYkB082104@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 8574d32f226a - main - arm: imx: Rename video related devices 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8574d32f226a5fc5b3d453d46745a8681ddbb465 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=8574d32f226a5fc5b3d453d46745a8681ddbb465 commit 8574d32f226a5fc5b3d453d46745a8681ddbb465 Author: Emmanuel Vadot AuthorDate: 2023-03-16 09:30:57 +0000 Commit: Emmanuel Vadot CommitDate: 2023-03-17 12:34:46 +0000 arm: imx: Rename video related devices device 'hdmi' is too generic (and will be used later in a new device) so rename the arm IMX devices to some proper name. Sponsored by: Beckhoff Automation GmbH & Co. KG Reviewed by: andrew Differential Revision: https://reviews.freebsd.org/D39118 --- sys/arm/conf/GENERIC | 5 +++++ sys/arm/freescale/imx/files.imx6 | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC index 84f81a2f142c..024ff2a13ab4 100644 --- a/sys/arm/conf/GENERIC +++ b/sys/arm/conf/GENERIC @@ -247,6 +247,11 @@ device videomode device hdmi device vchiq +# IMX6 HDMI Controller +device dwc_hdmi +device imx6_hdmi +device imx6_ipu + # Pinmux device fdt_pinctrl diff --git a/sys/arm/freescale/imx/files.imx6 b/sys/arm/freescale/imx/files.imx6 index 926c2b25f4b9..2cf2524d2ae5 100644 --- a/sys/arm/freescale/imx/files.imx6 +++ b/sys/arm/freescale/imx/files.imx6 @@ -23,10 +23,10 @@ arm/freescale/imx/imx6_audmux.c optional sound arm/freescale/imx/imx6_ssi.c optional sound fslsdma arm/freescale/imx/imx6_ahci.c optional ahci -dev/hdmi/dwc_hdmi.c optional hdmi -arm/freescale/imx/imx6_hdmi.c optional hdmi +dev/hdmi/dwc_hdmi.c optional vt dwc_hdmi +arm/freescale/imx/imx6_hdmi.c optional vt imx6_hdmi -arm/freescale/imx/imx6_ipu.c optional vt +arm/freescale/imx/imx6_ipu.c optional vt imx6_ipu # # Optional devices.