Merge remote-tracking branch 'xilinx/master' into master_2024.1

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

6 files changed, 346 insertions, 98 deletions

diff --git a/meta-xilinx-core/recipes-kernel/dp/files/0001-Support-both-pre-6.4.0-and-current-i2c-probing.patch b/meta-xilinx-core/recipes-kernel/dp/files/0001-Support-both-pre-6.4.0-and-current-i2c-probing.patch
new file mode 100644
index 00000000..dde59936
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/dp/files/0001-Support-both-pre-6.4.0-and-current-i2c-probing.patch
@@ -0,0 +1,343 @@
+From adc957ce85d431da42dc42ed4074322d6c94932f Mon Sep 17 00:00:00 2001
+From: Mark Hatle <mark.hatle@amd.com>
+Date: Thu, 16 May 2024 20:31:29 -0600
+Subject: [PATCH] Support both pre 6.4.0 and current i2c probing
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+---
+ dp/xfmc/dp141.c                          | 13 +++++++++++++
+ dp/xfmc/fmc.c                            | 13 +++++++++++++
+ dp/xfmc/fmc64.c                          | 14 ++++++++++++++
+ dp/xfmc/fmc65.c                          | 13 +++++++++++++
+ dp/xfmc/idt.c                            | 21 +++++++++++++++++----
+ dp/xfmc/mcdp6000.c                       | 13 +++++++++++++
+ dp/xfmc/tipower.c                        | 13 +++++++++++++
+ 7 files changed, 96 insertions(+), 4 deletions(-)
+
+diff --git a/dp/xfmc/dp141.c b/dp/xfmc/dp141.c
+index dfdb6f4..5fddd2b
+--- a/dp/xfmc/dp141.c
++++ b/dp/xfmc/dp141.c
+@@ -14,6 +14,7 @@
+ #include <linux/module.h>
+ #include <linux/regmap.h>
+ #include <linux/slab.h>
++#include <linux/version.h>
+ 
+ /**************************** Type Definitions *******************************/
+ 
+@@ -105,7 +106,12 @@ static const struct i2c_device_id dp141_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, dp141_id);
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int dp141_probe(struct i2c_client *client)
++#else
++static int dp141_probe(struct i2c_client *client,
++                        const struct i2c_device_id *id)
++#endif
+ {
+        int ret;
+ 
+@@ -134,9 +140,16 @@ err_regmap:
+        return ret;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+ static void dp141_remove(struct i2c_client *client)
+ {
+ }
++#else
++static int dp141_remove(struct i2c_client *client)
++{
++       return 0;
++}
++#endif
+ 
+ static struct i2c_driver dp141_i2c_driver = {
+        .driver = {
+diff --git a/dp/xfmc/fmc.c b/dp/xfmc/fmc.c
+index 3447785..2ed136c
+--- a/dp/xfmc/fmc.c
++++ b/dp/xfmc/fmc.c
+@@ -14,6 +14,7 @@
+ #include <linux/module.h>
+ #include <linux/regmap.h>
+ #include <linux/slab.h>
++#include <linux/version.h>
+ 
+ /**************************** Type Definitions *******************************/
+ 
+@@ -93,7 +94,12 @@ static const struct i2c_device_id fmc_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, fmc_id);
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int fmc_probe(struct i2c_client *client)
++#else
++static int fmc_probe(struct i2c_client *client,
++                    const struct i2c_device_id *id)
++#endif
+ {
+        int ret;
+ 
+@@ -121,9 +127,16 @@ err_regmap:
+        return ret;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+ static void fmc_remove(struct i2c_client *client)
+ {
+ }
++#else
++static int fmc_remove(struct i2c_client *client)
++{
++       return 0;
++}
++#endif
+ 
+ static struct i2c_driver fmc_i2c_driver = {
+        .driver = {
+diff --git a/dp/xfmc/fmc64.c b/dp/xfmc/fmc64.c
+index 6f5562c..a0bad7a
+--- a/dp/xfmc/fmc64.c
++++ b/dp/xfmc/fmc64.c
+@@ -14,6 +14,8 @@
+ #include <linux/module.h>
+ #include <linux/regmap.h>
+ #include <linux/slab.h>
++#include <linux/version.h>
++
+ /**************************** Type Definitions *******************************/
+ static const struct regmap_config fmc64_regmap_config = {
+        .reg_bits = 16,
+@@ -89,7 +91,12 @@ static const struct i2c_device_id fmc64_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, fmc64_id);
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int fmc64_probe(struct i2c_client *client)
++#else
++static int fmc64_probe(struct i2c_client *client,
++                      const struct i2c_device_id *id)
++#endif
+ {
+        int ret;
+ 
+@@ -118,9 +125,16 @@ err_regmap:
+        return ret;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+ static void fmc64_remove(struct i2c_client *client)
+ {
+ }
++#else
++static int fmc64_remove(struct i2c_client *client)
++{
++       return 0;
++}
++#endif
+ 
+ static struct i2c_driver fmc64_i2c_driver = {
+        .driver = {
+diff --git a/dp/xfmc/fmc65.c b/dp/xfmc/fmc65.c
+index 9f091f9..ce7f884
+--- a/dp/xfmc/fmc65.c
++++ b/dp/xfmc/fmc65.c
+@@ -14,6 +14,7 @@
+ #include <linux/module.h>
+ #include <linux/regmap.h>
+ #include <linux/slab.h>
++#include <linux/version.h>
+ 
+ /**************************** Type Definitions *******************************/
+ 
+@@ -91,7 +92,12 @@ static const struct i2c_device_id fmc65_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, fmc65_id);
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int fmc65_probe(struct i2c_client *client)
++#else
++static int fmc65_probe(struct i2c_client *client,
++                      const struct i2c_device_id *id)
++#endif
+ {
+        int ret;
+ 
+@@ -120,9 +126,16 @@ err_regmap:
+        return ret;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+ static void fmc65_remove(struct i2c_client *client)
+ {
+ }
++#else
++static int fmc65_remove(struct i2c_client *client)
++{
++       return 0;
++}
++#endif
+ 
+ static struct i2c_driver fmc65_i2c_driver = {
+        .driver = {
+diff --git a/dp/xfmc/idt.c b/dp/xfmc/idt.c
+index 348c863..f332277
+--- a/dp/xfmc/idt.c
++++ b/dp/xfmc/idt.c
+@@ -17,6 +17,7 @@
+ #include <linux/of_gpio.h>
+ #include <linux/regmap.h>
+ #include <linux/slab.h>
++#include <linux/version.h>
+ 
+ #define IDT_8T49N24X_REVID 0x0    /**< Device Revision */
+ #define IDT_8T49N24X_DEVID 0x0607 /**< Device ID Code */
+@@ -38,8 +39,8 @@
+ #define IDT_8T49N24X_P_MAX pow(2, 22)  //!< Maximum P divider value
+ #define IDT_8T49N24X_M_MAX pow(2, 24)  //!< Maximum M multiplier value
+ 
+-#define TRUE 1
+-#define FALSE 0
++#define IDT_TRUE 1
++#define IDT_FALSE 0
+ #define XPAR_IIC_0_BASEADDR 0xA0080000
+ #define I2C_IDT8N49_ADDR 0x7C
+ /*
+@@ -455,7 +456,7 @@ int IDT_8T49N24x_Init(void)
+        int ret = 0;
+ 
+        msleep_range(30);
+-       ret = idt_enable(FALSE);
++       ret = idt_enable(IDT_FALSE);
+        if (ret)
+                dev_dbg(&idt->client->dev,
+                        "IDT_8T49N24x_enable 0  I2C progmming failed\n");
+@@ -468,7 +469,7 @@ int IDT_8T49N24x_Init(void)
+ 
+        msleep_range(30);
+        /* enable DPLL and APLL calibration. */
+-       ret = idt_enable(TRUE);
++       ret = idt_enable(IDT_TRUE);
+        if (ret)
+                dev_dbg(&idt->client->dev,
+                        "IDT_8T49N24x_enable 1 I2C progmming failed\n");
+@@ -489,7 +490,12 @@ static const struct i2c_device_id idt_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, idt_id);
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int idt_probe(struct i2c_client *client)
++#else
++static int idt_probe(struct i2c_client *client,
++                    const struct i2c_device_id *id)
++#endif
+ {
+        int ret;
+ 
+@@ -517,9 +523,16 @@ err_regmap:
+        return ret;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+ static void idt_remove(struct i2c_client *client)
+ {
+ }
++#else
++static int idt_remove(struct i2c_client *client)
++{
++       return 0;
++}
++#endif
+ 
+ static struct i2c_driver idt_i2c_driver = {
+        .driver = {
+diff --git a/dp/xfmc/mcdp6000.c b/dp/xfmc/mcdp6000.c
+index 5a7c5b2..f13979b
+--- a/dp/xfmc/mcdp6000.c
++++ b/dp/xfmc/mcdp6000.c
+@@ -14,6 +14,7 @@
+ #include <linux/module.h>
+ #include <linux/regmap.h>
+ #include <linux/slab.h>
++#include <linux/version.h>
+ 
+ #define SWAP_BYTES(u32Value) ((u32Value & 0x000000FF) << 24)\
+ |((u32Value & 0x0000FF00) << 8) \
+@@ -363,7 +364,12 @@ static const struct i2c_device_id mcdp6000_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, mcdp6000_id);
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int mcdp6000_probe(struct i2c_client *client)
++#else
++static int mcdp6000_probe(struct i2c_client *client,
++                         const struct i2c_device_id *id)
++#endif
+ {
+        int ret;
+ 
+@@ -393,9 +399,16 @@ err_regmap:
+        return ret;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+ static void mcdp6000_remove(struct i2c_client *client)
+ {
+ }
++#else
++static int mcdp6000_remove(struct i2c_client *client)
++{
++       return 0;
++}
++#endif
+ 
+ static struct i2c_driver mcdp6000_i2c_driver = {
+        .driver = {
+diff --git a/dp/xfmc/tipower.c b/dp/xfmc/tipower.c
+index 46c3de1..6d247a8
+--- a/dp/xfmc/tipower.c
++++ b/dp/xfmc/tipower.c
+@@ -14,6 +14,7 @@
+ #include <linux/module.h>
+ #include <linux/regmap.h>
+ #include <linux/slab.h>
++#include <linux/version.h>
+ 
+ /**************************** Type Definitions *******************************/
+ 
+@@ -131,7 +132,12 @@ static const struct i2c_device_id tipower_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, tipower_id);
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
+ static int tipower_probe(struct i2c_client *client)
++#else
++static int tipower_probe(struct i2c_client *client,
++                        const struct i2c_device_id *id)
++#endif
+ {
+        int ret;
+ 
+@@ -162,9 +168,16 @@ err_regmap:
+        return ret;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+ static void tipower_remove(struct i2c_client *client)
+ {
+ }
++#else
++static int tipower_remove(struct i2c_client *client)
++{
++       return 0;
++}
++#endif
+ 
+ static struct i2c_driver tipower_i2c_driver = {
+        .driver = {
+-- 
+2.34.1
+
diff --git a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2022.1.bb b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2022.1.bb
deleted file mode 100755
index 31c810ba..00000000
--- a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2022.1.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "Xilinx DisplayPort Linux Kernel module"
-DESCRIPTION = "Out-of-tree DisplayPort(DP) kernel modules provider for aarch64 devices"
-SECTION = "kernel/modules"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
-
-XLNX_DP_VERSION = "5.10.0"
-PV = "${XLNX_DP_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}" 
-
-S = "${WORKDIR}/git"
-
-BRANCH ?= "xlnx_rel_v2022.1"
-REPO   ?= "git://github.com/xilinx/dp-modules.git;protocol=https"
-SRCREV ?= "9a025fdb7134a8af12de8d69f5a428c8284ae9b3"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-
-inherit module
-
-EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:zynqmp = "zynqmp"
-COMPATIBLE_MACHINE:versal = "versal"
diff --git a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2022.2.bb b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2022.2.bb
deleted file mode 100644
index dda6ec31..00000000
--- a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2022.2.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "Xilinx DisplayPort Linux Kernel module"
-DESCRIPTION = "Out-of-tree DisplayPort(DP) kernel modules provider for aarch64 devices"
-SECTION = "kernel/modules"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
-
-XLNX_DP_VERSION = "5.10.0"
-PV = "${XLNX_DP_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}" 
-
-S = "${WORKDIR}/git"
-
-BRANCH ?= "xlnx_rel_v2022.2"
-REPO   ?= "git://github.com/xilinx/dp-modules.git;protocol=https"
-SRCREV ?= "c57b2ce95ee6c86f35caecbc7007644ff8f6d337"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-
-inherit module
-
-EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:zynqmp = "zynqmp"
-COMPATIBLE_MACHINE:versal = "versal"
diff --git a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2023.1.bb b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2023.1.bb
deleted file mode 100644
index 28770994..00000000
--- a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2023.1.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "Xilinx DisplayPort Linux Kernel module"
-DESCRIPTION = "Out-of-tree DisplayPort(DP) kernel modules provider for aarch64 devices"
-SECTION = "kernel/modules"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
-
-XLNX_DP_VERSION = "6.1.0"
-PV = "${XLNX_DP_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-
-S = "${WORKDIR}/git"
-
-BRANCH ?= "xlnx_rel_v2023.1"
-REPO   ?= "git://github.com/xilinx/dp-modules.git;protocol=https"
-SRCREV ?= "5b0969ac09f301c33bccc140c8f60e832f5cf222"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-
-inherit module
-
-EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:zynqmp = "zynqmp"
-COMPATIBLE_MACHINE:versal = "versal"
diff --git a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2023.2.bb b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2023.2.bb
deleted file mode 100644
index d1c6bd3d..00000000
--- a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2023.2.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "Xilinx DisplayPort Linux Kernel module"
-DESCRIPTION = "Out-of-tree DisplayPort(DP) kernel modules provider for aarch64 devices"
-SECTION = "kernel/modules"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
-
-XLNX_DP_VERSION = "6.1.0"
-PV = "${XLNX_DP_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
-
-S = "${WORKDIR}/git"
-
-BRANCH ?= "xlnx_rel_v2023.2"
-REPO   ?= "git://github.com/xilinx/dp-modules.git;protocol=https"
-SRCREV ?= "5b0969ac09f301c33bccc140c8f60e832f5cf222"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-
-inherit module
-
-EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:zynqmp = "zynqmp"
-COMPATIBLE_MACHINE:versal = "versal"
diff --git a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2024.1.bb b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_6.6.10.bb
index 503cee02..3aaac030 100644
--- a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2024.1.bb
+++ b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_6.6.10.bb
@@ -4,8 +4,7 @@ SECTION = "kernel/modules"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
 
-XLNX_DP_VERSION = "6.1.0"
-PV = "${XLNX_DP_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
+PV .= "+git"
 
 S = "${WORKDIR}/git"
 
@@ -16,6 +15,8 @@ SRCREV ?= "e20942b256e6fb18eaef919c7441f65ad8afcf43"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
 
+SRC_URI += "file://0001-Support-both-pre-6.4.0-and-current-i2c-probing.patch"
+
 inherit module
 
 EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"