git: bdbbbbb32104 - main - if_cgem: Cleanup compatible and add new ones

The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/src/commit/?id=bdbbbbb32104569fccd786d9cc07d17f6231a713

commit bdbbbbb32104569fccd786d9cc07d17f6231a713
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2023-09-12 14:49:37 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
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 <bsd@dino.sk>
    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 }
 };