From nobody Wed Oct 18 14:31:42 2023 X-Original-To: dev-commits-src-branches@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 4S9YFW1dlkz4x5ys; Wed, 18 Oct 2023 14:31:43 +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 4S9YFW0dc1z3Mxh; Wed, 18 Oct 2023 14:31:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639503; 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=+GDShvnS1GsCRMXYOxXkhUdU9dQJhaBa9Xlq0UwK2R8=; b=CgqPL831SxDRzHa1962datgAYeMiCgoENwo0bSgegV0I5UJM2FFl9UQsIgHqLVs5nc4lO1 qLGCDjvtKQnbFjX1IrSvmNn2Jo6KxAT4z0ES1EAvsHbqmovX9Cx4BFwFGb273EcqbsnsL/ wosI/vZkJiOY8hP6P9H36EkHKoxdaWxe82Gjgm4kb5ZiYd7SeuDNfY8f3MNZNYeb5l75kS pMbHNOYv8vu4oGbuAEFNbxGxdHPhTEkD6MJCp+K+L5S5pnb5xaxhIP3xhyy9U4zL23S8hW Kph5u1Y71ry3IPrjihDMDo8OMIIUXSUW+lZjOLnL/23VrBCTp3sk3ZLN+zzzuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639503; a=rsa-sha256; cv=none; b=M7ByEqAmZZNciOhAi87UKbDMZ36mejt4tCrYNvuorqQh9lTfg3c0yCwRW91fT8LgCkNtc/ AHyNkayvxe0Nrq/2H09cuIZtNa+x8NVQvj982Ao7b1uBVHByiAw0XflnUbKrjGV9OpNq6A Ydgnrc9hTvOaYjpDpYdokNIYTLpVYpRDaZZtMiO8/nqqlmzou5BXTJr9Kuayr8prdi4/qL qVvRI2g2jQIEyRFDQzrhQgG/TWEcn1lxmLnDsuo3aO3Psbs/FoKV5lVLnEsgIQHeUFuonb L21pZ3hbCGcuD2dW/2qTda5dHqujxbROfSL8tViXm9BQD1e092lttscDZBOfbA== 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=1697639503; 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=+GDShvnS1GsCRMXYOxXkhUdU9dQJhaBa9Xlq0UwK2R8=; b=P/0P2dg8eXrE4TzZdPQzjgQnYZwure1W6oIEne+bey41i3q18opdsnxOnXvPwVbqRD7uX/ S71BwpiXfqVMpTYA9RjqQDuuPHYufpcZMzsx1cltBAWfVYhIuNgrurAYpQCrktn9YiyfEH A/A3Tka/uLVXjFnwYFvPphWV3L5/InVfCmPH4LgZ+pKxPvin3F3YdN0U4maTYIDDeRD4WR Mn8yRNjg1DjWcTkn6BgS4ZSJnANtL3NZFOxOpQnnTyOR7IvbYOKssQPCBnSYKniSTPFyYo TSOFjmxY9k90sQSKvDELwBVbmyDy3MataFm0+bB+QTX/M4lpf4Ub7pjN+XBJGw== 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 4S9YFV6Rr2z18tx; Wed, 18 Oct 2023 14:31:42 +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 39IEVgK4089338; Wed, 18 Oct 2023 14:31:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEVgDY089335; Wed, 18 Oct 2023 14:31:42 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:31:42 GMT Message-Id: <202310181431.39IEVgDY089335@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 770b790eabac - stable/14 - if_cgem: Cleanup compatible and add new ones List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 770b790eabac42e6c22886439d1d776cbf0ff455 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=770b790eabac42e6c22886439d1d776cbf0ff455 commit 770b790eabac42e6c22886439d1d776cbf0ff455 Author: Emmanuel Vadot AuthorDate: 2023-09-12 14:49:37 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:31:11 +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 (cherry picked from commit bdbbbbb32104569fccd786d9cc07d17f6231a713) --- 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 } };