From nobody Mon Sep 18 13:24:54 2023 X-Original-To: dev-commits-src-all@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 4Rq5BH0Gk7z4tCCy; Mon, 18 Sep 2023 13:24:55 +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 4Rq5BG6xSvz4SXV; Mon, 18 Sep 2023 13:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695043495; 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=vNwC9szYXwZF2sdeJaJbAoDjis82NlZepDUtMOedcrU=; b=LrL79uYSY1mTxGsDqgYrMEmJGlKarv0Gir1/TcbWQ/YSADZ3p3W9aou+KqFdk00pxwJQhV fdi8a2pY9IhiCEGA90m22OOu/ImUHEMQQFsvUeB+jkuRSzur5Ptqof4cIB7OPYAtXeQ5/y 52AVYUP6HWLfBT+wQ3rio+D+VfsSErssEpvKogklbCpT5t9cobhlzj0HkdCP/p3lvKs6Mq FFt5dfj9S8RALK0yuEryc3R8xyPMp5gVSMFgmxdMRfCyXfm4lLiVGDlNq0MmPJtLNgf2CV 1rcXnpcXmmLspcN+qD2V6QfTHRB+1m20brjsEJztfpfqibfzTPATh1FzuvznKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695043495; a=rsa-sha256; cv=none; b=sTh3zARtOGOgAaxHmG58s7WrRVfjunyyACRBIeRP/UNv34RG8+pbO50trlJL+wb95N8dwk LqMgr/qlrPfAsepwC6G2vKiFUacAUxd+b5nsAnpZiKE7bmDehF56ZKviGtjxa/D+7sK5zy pmWNoYzn7rxPjgKDhpzwfwbXIG/12ZImaCfPjJQ+K8db3V2b9/q6atTaxBTDSXbVxYukdn Nnftytaz99JigJDG2zzamhHzx0YdlYjV+L5WwnN8FN8Vope8hZaRBAEn7k3UL3GButp7cG gCKpOUfbQ8Cn6PUWI8JLFFQJoshPcVlfRpuSU+HIbogpEespnycPXl7NPUSnVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695043495; 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=vNwC9szYXwZF2sdeJaJbAoDjis82NlZepDUtMOedcrU=; b=uSVEcQA/jaKHKy4Tj+9LDvjAyHGFmdU3r8pNi1rc0xpJPbgIxx3aRWLWgicWozt+mgwOBz ZLJE43OnlJsgskz7wO+jHmGEK6zhDznPIpjU93NYhBvWfqCX7EKAhm6YUTckBKBUun0BL8 eeQbaeFob2eO3vHtLL/nrYCHcfvjYOSGOH6/SkyNMKh6KORkZP0L/Phk13zt04G+bhE+Ad BkwqojC/+wGs36h4nK0oSfjrIZhCT2qv3ffcesCFrlyK2WsHSURL0vvhdqPbFdrPYZLa9/ 7aWIgXLJ7ljsMYnnm6GRcTDqKEJW83mW6VHAvLa6zdgio6Om+v+ypXpn3KLOVQ== 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 4Rq5BG62FmzYNn; Mon, 18 Sep 2023 13:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38IDOs9J097326; Mon, 18 Sep 2023 13:24:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38IDOsbc097323; Mon, 18 Sep 2023 13:24:54 GMT (envelope-from git) Date: Mon, 18 Sep 2023 13:24:54 GMT Message-Id: <202309181324.38IDOsbc097323@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: bdbbbbb32104 - main - if_cgem: Cleanup compatible and add new ones List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: bdbbbbb32104569fccd786d9cc07d17f6231a713 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=bdbbbbb32104569fccd786d9cc07d17f6231a713 commit bdbbbbb32104569fccd786d9cc07d17f6231a713 Author: Emmanuel Vadot AuthorDate: 2023-09-12 14:49:37 +0000 Commit: Emmanuel Vadot CommitDate: 2023-09-18 13:24:24 +0000 if_cgem: Cleanup compatible and add new ones - Remove cdns,gem, it's the generic binding but for all platform that include this one we need specific drivers setup so remove it. - Remove cdns,macb, it's the generic binding for Atmel AT91 which we don't suport - Remove cadence,gem, it's not an official binding and seems to be only used in some obscure ARM11 SoC. - Note that the cdns,zynq* are deprecated - Add the new Xilinx compatible for zynq and zynqmp Reviewed-by: mhorne Tested-by: skibo, Milan Obuch Differential Revision: https://reviews.freebsd.org/D41856 Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/dev/cadence/if_cgem.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/dev/cadence/if_cgem.c b/sys/dev/cadence/if_cgem.c index 1aa5d4955d93..43e35b2bf849 100644 --- a/sys/dev/cadence/if_cgem.c +++ b/sys/dev/cadence/if_cgem.c @@ -106,14 +106,13 @@ #define HWQUIRK_PCLK 8 static struct ofw_compat_data compat_data[] = { - { "cdns,zynq-gem", HWQUIRK_RXHANGWAR | HWQUIRK_TXCLK }, - { "cdns,zynqmp-gem", HWQUIRK_NEEDNULLQS | HWQUIRK_TXCLK }, + { "cdns,zynq-gem", HWQUIRK_RXHANGWAR | HWQUIRK_TXCLK }, /* Deprecated */ + { "cdns,zynqmp-gem", HWQUIRK_NEEDNULLQS | HWQUIRK_TXCLK }, /* Deprecated */ + { "xlnx,zynq-gem", HWQUIRK_RXHANGWAR | HWQUIRK_TXCLK }, + { "xlnx,zynqmp-gem", HWQUIRK_NEEDNULLQS | HWQUIRK_TXCLK }, { "microchip,mpfs-mss-gem", HWQUIRK_NEEDNULLQS | HWQUIRK_TXCLK }, { "sifive,fu540-c000-gem", HWQUIRK_PCLK }, { "sifive,fu740-c000-gem", HWQUIRK_PCLK }, - { "cdns,gem", HWQUIRK_NONE }, - { "cdns,macb", HWQUIRK_NONE }, - { "cadence,gem", HWQUIRK_NONE }, { NULL, 0 } };