diff mbox series

[master/scarthgap,v2] hwspinlocktest: Update hwspinlock recipe remote repo url

Message ID 20250912181407.2647500-1-jm@ti.com
State Under Review
Delegated to: Ryan Eatmon
Headers show
Series [master/scarthgap,v2] hwspinlocktest: Update hwspinlock recipe remote repo url | expand

Commit Message

Judith Mendez Sept. 12, 2025, 6:14 p.m. UTC 
The hwspinlock module is now moved to git.ti.com. A new
fork has been created and support added for am62*/j722s platforms.

Migrate to new forked repo and remove patches that have already been
integrated to master.

Signed-off-by: Judith Mendez <jm@ti.com>
---
 ...test-Remove-hwspin_lock_get_id-calls.patch | 69 -------------------
 .../0002-Add-support-for-AM62-SoCs.patch      | 31 ---------
 .../hwspinlocktest/hwspinlocktest_0.1.bb      |  6 +-
 3 files changed, 2 insertions(+), 104 deletions(-)
 delete mode 100644 meta-arago-test/recipes-kernel/hwspinlocktest/files/0001-omap_hwspinlock_test-Remove-hwspin_lock_get_id-calls.patch
 delete mode 100644 meta-arago-test/recipes-kernel/hwspinlocktest/files/0002-Add-support-for-AM62-SoCs.patch

Comments

PRC Automation Sept. 12, 2025, 6:15 p.m. UTC | #1 
meta-arago / na / 20250912181407.2647500-1-jm

PRC Results: FAIL

=========================================================
  check-yocto-patches: PASS
=========================================================
Patches
----------------------------------------
WARN - [master/scarthgap][PATCH v2] hwspinlocktest: Update hwspinlock recipe remote repo url
    WARN: Revised patch missing a comment. (REVISION-1)
        patch



=========================================================
  apply-yocto-patch: FAIL
=========================================================
master
=====================
Summary:
- Patch Series: [master/scarthgap][PATCH v2] hwspinlocktest: Update hwspinlock recipe remote repo url
- Submitter: From: Judith Mendez <jm@ti.com>
-From: Ryan Eatmon <reatmon@ti.com>
-From: Judith Mendez <jm@ti.com>
- Date: Date: Fri, 12 Sep 2025 13:14:07 -0500
-Date: Fri, 11 Apr 2025 13:49:11 -0500
-Date: Mon, 18 Nov 2024 14:57:45 -0600
- Num Patches: 1
- Mailing List (public inbox) Commit SHA: d84184bddaac3349212c367e72b8a48731b1de49

Applied to:
- Repository: lcpd-prc-meta-arago
- Base Branch: master-wip
- Commit Author: Thorsten Lannynd <t-lannynd@ti.com>
- Commit Subject: chromium: Replace /dev/video* with Chromium naming convention
- Commit SHA: e3ad867e65837c5892885b41510d09699b5a4b62

Patches
----------------------------------------
All patches applied

scarthgap
=====================
Summary:
- Patch Series: [master/scarthgap][PATCH v2] hwspinlocktest: Update hwspinlock recipe remote repo url
- Submitter: From: Judith Mendez <jm@ti.com>
-From: Ryan Eatmon <reatmon@ti.com>
-From: Judith Mendez <jm@ti.com>
- Date: Date: Fri, 12 Sep 2025 13:14:07 -0500
-Date: Fri, 11 Apr 2025 13:49:11 -0500
-Date: Mon, 18 Nov 2024 14:57:45 -0600
- Num Patches: 1
- Mailing List (public inbox) Commit SHA: d84184bddaac3349212c367e72b8a48731b1de49

Applied to:
- Repository: lcpd-prc-meta-arago
- Base Branch: scarthgap
- Commit Author: LCPD Automation Script <lcpdbld@list.ti.com>
- Commit Subject: CI/CD Auto-Merger: cicd.scarthgap.202509111148
- Commit SHA: 67c473bc6d88a2cce13b2e8c36fcb79cb0015339

Patches
----------------------------------------
FAIL - [master/scarthgap][PATCH v2] hwspinlocktest: Update hwspinlock recipe remote repo url
    error: patch failed: meta-arago-test/recipes-kernel/hwspinlocktest/hwspinlocktest_0.1.bb:6
    error: meta-arago-test/recipes-kernel/hwspinlocktest/hwspinlocktest_0.1.bb: patch does not apply
    Applying: hwspinlocktest: Update hwspinlock recipe remote repo url
    Patch failed at 0001 hwspinlocktest: Update hwspinlock recipe remote repo url
Ryan Eatmon Sept. 12, 2025, 8:57 p.m. UTC | #2 
This patch does not apply to scarthgap.  Kudos for developing it against 
master!  Master introduced a number of new requirements that scarthgap 
does not support so the recipes have diverged.

Can you spin new version for scarthgap only.  This patch is fine for the 
master patch.


On 9/12/2025 1:14 PM, Judith Mendez wrote:
> The hwspinlock module is now moved to git.ti.com. A new
> fork has been created and support added for am62*/j722s platforms.
> 
> Migrate to new forked repo and remove patches that have already been
> integrated to master.
> 
> Signed-off-by: Judith Mendez <jm@ti.com>
> ---
>   ...test-Remove-hwspin_lock_get_id-calls.patch | 69 -------------------
>   .../0002-Add-support-for-AM62-SoCs.patch      | 31 ---------
>   .../hwspinlocktest/hwspinlocktest_0.1.bb      |  6 +-
>   3 files changed, 2 insertions(+), 104 deletions(-)
>   delete mode 100644 meta-arago-test/recipes-kernel/hwspinlocktest/files/0001-omap_hwspinlock_test-Remove-hwspin_lock_get_id-calls.patch
>   delete mode 100644 meta-arago-test/recipes-kernel/hwspinlocktest/files/0002-Add-support-for-AM62-SoCs.patch
> 
> diff --git a/meta-arago-test/recipes-kernel/hwspinlocktest/files/0001-omap_hwspinlock_test-Remove-hwspin_lock_get_id-calls.patch b/meta-arago-test/recipes-kernel/hwspinlocktest/files/0001-omap_hwspinlock_test-Remove-hwspin_lock_get_id-calls.patch
> deleted file mode 100644
> index d4448397..00000000
> --- a/meta-arago-test/recipes-kernel/hwspinlocktest/files/0001-omap_hwspinlock_test-Remove-hwspin_lock_get_id-calls.patch
> +++ /dev/null
> @@ -1,69 +0,0 @@
> -From fb986ed355cd488da64da9eb94d0f260bb329d5b Mon Sep 17 00:00:00 2001
> -From: Ryan Eatmon <reatmon@ti.com>
> -Date: Fri, 11 Apr 2025 13:49:11 -0500
> -Subject: [PATCH] omap_hwspinlock_test: Remove hwspin_lock_get_id() calls
> -
> -The hwspin_lock_get_id() function was removed in the most recent
> -kernel [1].  We can safely stop using this function even for older kernels,
> -so go ahead and take these changes.
> -
> -[1] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=fec04edb74126f21ac628c7be763c97deb49f69d
> -
> -Upstream-Status: Inactive-Upstream [private repo]
> -
> -Signed-off-by: Ryan Eatmon <reatmon@ti.com>
> ----
> - omap_hwspinlock_test.c | 12 ++++++------
> - 1 file changed, 6 insertions(+), 6 deletions(-)
> -
> -diff --git a/omap_hwspinlock_test.c b/omap_hwspinlock_test.c
> -index b180138..f3e0912 100644
> ---- a/omap_hwspinlock_test.c
> -+++ b/omap_hwspinlock_test.c
> -@@ -26,12 +26,12 @@ struct hwspinlock_data {
> -	const unsigned int max_locks;
> - };
> -
> --static int hwspin_lock_test(struct hwspinlock *hwlock)
> -+static int hwspin_lock_test(struct hwspinlock *hwlock, int lock_num)
> - {
> -	int i;
> -	int ret;
> -
> --	pr_err("\nTesting lock %d\n", hwspin_lock_get_id(hwlock));
> -+	pr_err("\nTesting lock %d\n", lock_num);
> -	for (i = 0; i < count; i++) {
> -		ret = hwspin_trylock(hwlock);
> -		if (ret) {
> -@@ -82,7 +82,7 @@ static int hwspin_lock_test_all_locks(unsigned int max_locks)
> -			continue;
> -		}
> -
> --		ret1 = hwspin_lock_test(hwlock);
> -+		ret1 = hwspin_lock_test(hwlock, i);
> -		if (ret1) {
> -			pr_err("hwspinlock tests failed on lock %d\n", i);
> -			ret = ret1;
> -@@ -147,17 +147,17 @@ static int hwspin_lock_test_all_phandle_locks(unsigned int max_locks)
> -			continue;
> -		}
> -
> --		ret1 = hwspin_lock_test(hwlock);
> -+		ret1 = hwspin_lock_test(hwlock, i);
> -		if (ret1) {
> -			pr_err("hwspinlock test failed on DT lock %d, ret = %d\n",
> --			       hwspin_lock_get_id(hwlock), ret1);
> -+			       hwlock_id, ret1);
> -			ret = ret1;
> -		}
> -
> -		ret1 = hwspin_lock_free(hwlock);
> -		if (ret1) {
> -			pr_err("hwspin_lock_free failed on lock %d\n",
> --			       hwspin_lock_get_id(hwlock));
> -+			       hwlock_id);
> -			ret = ret1;
> -		}
> -	}
> ---
> -2.17.1
> diff --git a/meta-arago-test/recipes-kernel/hwspinlocktest/files/0002-Add-support-for-AM62-SoCs.patch b/meta-arago-test/recipes-kernel/hwspinlocktest/files/0002-Add-support-for-AM62-SoCs.patch
> deleted file mode 100644
> index 30d9886a..00000000
> --- a/meta-arago-test/recipes-kernel/hwspinlocktest/files/0002-Add-support-for-AM62-SoCs.patch
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -From 5ea20dff1aba059cc49e11031f731a422f3fd114 Mon Sep 17 00:00:00 2001
> -From: Judith Mendez <jm@ti.com>
> -Date: Mon, 18 Nov 2024 14:57:45 -0600
> -Subject: [PATCH 2/2] Add support for AM62* SoCs
> -
> -The K3 AM62* SoCs have a hwspinlock IP in MAIN domain.
> -Extend the test to add the desired SoC compatible so that
> -the test can be exercised on these new SoC families.
> -
> -Upstream-Status: Inactive-Upstream [private repo]
> -Signed-off-by: Judith Mendez <jm@ti.com>
> ----
> - omap_hwspinlock_test.c | 3 +++
> - 1 file changed, 3 insertions(+)
> -
> -diff --git a/omap_hwspinlock_test.c b/omap_hwspinlock_test.c
> -index b180138..46fcc08 100644
> ---- a/omap_hwspinlock_test.c
> -+++ b/omap_hwspinlock_test.c
> -@@ -199,6 +199,9 @@ static const struct hwspinlock_data soc_data[] = {
> -	{ "ti,j7200",	256, },
> -	{ "ti,am642",	256, },
> -	{ "ti,j721s2",	256, },
> -+	{ "ti,am625",	256, },
> -+	{ "ti,am62a7",	256, },
> -+	{ "ti,am62p5",	256, },
> -	{ /* sentinel */ },
> - };
> -
> ---
> -2.47.0
> diff --git a/meta-arago-test/recipes-kernel/hwspinlocktest/hwspinlocktest_0.1.bb b/meta-arago-test/recipes-kernel/hwspinlocktest/hwspinlocktest_0.1.bb
> index 454f0131..61842ffb 100644
> --- a/meta-arago-test/recipes-kernel/hwspinlocktest/hwspinlocktest_0.1.bb
> +++ b/meta-arago-test/recipes-kernel/hwspinlocktest/hwspinlocktest_0.1.bb
> @@ -6,13 +6,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=bfa02c83df161e37647ee23a2c7eacd4"
>   inherit module
>   
>   SRC_URI = "\
> -    git://github.com/sumananna/omap-hwspinlock-test;protocol=https;branch=master \
> +    git://github.com/TexasInstruments/omap-hwspinlock-test;protocol=https;branch=master \
>       file://0001-Fix-Makefile-for-to-build-with-yocto.patch \
> -    file://0002-Add-support-for-AM62-SoCs.patch \
> -    file://0001-omap_hwspinlock_test-Remove-hwspin_lock_get_id-calls.patch \
>   "
>   
> -SRCREV = "20f15e79a3a0197e06328c252d23aec225de21ed"
> +SRCREV = "a8297c7a2ca9e127929095045228dd4761121d56"
>   
>   # The inherit of module.bbclass will automatically name module packages with
>   # "kernel-module-" prefix as required by the oe-core build environment.
Judith Mendez Sept. 12, 2025, 9:17 p.m. UTC | #3 
Hi Ryan,

On 9/12/25 3:57 PM, Ryan Eatmon wrote:
> 
> This patch does not apply to scarthgap.  Kudos for developing it against 
> master!  Master introduced a number of new requirements that scarthgap 
> does not support so the recipes have diverged.
> 
> Can you spin new version for scarthgap only.  This patch is fine for the 
> master patch.

Sure, will send v3 for scarthgap only, thanks.

~ Judith

> 
> 
> On 9/12/2025 1:14 PM, Judith Mendez wrote:
>> The hwspinlock module is now moved to git.ti.com. A new
>> fork has been created and support added for am62*/j722s platforms.
>>
>> Migrate to new forked repo and remove patches that have already been
>> integrated to master.
>>
>> Signed-off-by: Judith Mendez <jm@ti.com>
>> ---
>>   ...test-Remove-hwspin_lock_get_id-calls.patch | 69 -------------------
>>   .../0002-Add-support-for-AM62-SoCs.patch      | 31 ---------
>>   .../hwspinlocktest/hwspinlocktest_0.1.bb      |  6 +-
>>   3 files changed, 2 insertions(+), 104 deletions(-)
>>   delete mode 100644 meta-arago-test/recipes-kernel/hwspinlocktest/ 
>> files/0001-omap_hwspinlock_test-Remove-hwspin_lock_get_id-calls.patch
>>   delete mode 100644 meta-arago-test/recipes-kernel/hwspinlocktest/ 
>> files/0002-Add-support-for-AM62-SoCs.patch
>>
>> diff --git a/meta-arago-test/recipes-kernel/hwspinlocktest/files/0001- 
>> omap_hwspinlock_test-Remove-hwspin_lock_get_id-calls.patch b/meta- 
>> arago-test/recipes-kernel/hwspinlocktest/files/0001- 
>> omap_hwspinlock_test-Remove-hwspin_lock_get_id-calls.patch
>> deleted file mode 100644
>> index d4448397..00000000
>> --- a/meta-arago-test/recipes-kernel/hwspinlocktest/files/0001- 
>> omap_hwspinlock_test-Remove-hwspin_lock_get_id-calls.patch
>> +++ /dev/null
>> @@ -1,69 +0,0 @@
>> -From fb986ed355cd488da64da9eb94d0f260bb329d5b Mon Sep 17 00:00:00 2001
>> -From: Ryan Eatmon <reatmon@ti.com>
>> -Date: Fri, 11 Apr 2025 13:49:11 -0500
>> -Subject: [PATCH] omap_hwspinlock_test: Remove hwspin_lock_get_id() calls
>> -
>> -The hwspin_lock_get_id() function was removed in the most recent
>> -kernel [1].  We can safely stop using this function even for older 
>> kernels,
>> -so go ahead and take these changes.
>> -
>> -[1] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux- 
>> next.git/commit/?id=fec04edb74126f21ac628c7be763c97deb49f69d
>> -
>> -Upstream-Status: Inactive-Upstream [private repo]
>> -
>> -Signed-off-by: Ryan Eatmon <reatmon@ti.com>
>> ----
>> - omap_hwspinlock_test.c | 12 ++++++------
>> - 1 file changed, 6 insertions(+), 6 deletions(-)
>> -
>> -diff --git a/omap_hwspinlock_test.c b/omap_hwspinlock_test.c
>> -index b180138..f3e0912 100644
>> ---- a/omap_hwspinlock_test.c
>> -+++ b/omap_hwspinlock_test.c
>> -@@ -26,12 +26,12 @@ struct hwspinlock_data {
>> -    const unsigned int max_locks;
>> - };
>> -
>> --static int hwspin_lock_test(struct hwspinlock *hwlock)
>> -+static int hwspin_lock_test(struct hwspinlock *hwlock, int lock_num)
>> - {
>> -    int i;
>> -    int ret;
>> -
>> --    pr_err("\nTesting lock %d\n", hwspin_lock_get_id(hwlock));
>> -+    pr_err("\nTesting lock %d\n", lock_num);
>> -    for (i = 0; i < count; i++) {
>> -        ret = hwspin_trylock(hwlock);
>> -        if (ret) {
>> -@@ -82,7 +82,7 @@ static int hwspin_lock_test_all_locks(unsigned int 
>> max_locks)
>> -            continue;
>> -        }
>> -
>> --        ret1 = hwspin_lock_test(hwlock);
>> -+        ret1 = hwspin_lock_test(hwlock, i);
>> -        if (ret1) {
>> -            pr_err("hwspinlock tests failed on lock %d\n", i);
>> -            ret = ret1;
>> -@@ -147,17 +147,17 @@ static int 
>> hwspin_lock_test_all_phandle_locks(unsigned int max_locks)
>> -            continue;
>> -        }
>> -
>> --        ret1 = hwspin_lock_test(hwlock);
>> -+        ret1 = hwspin_lock_test(hwlock, i);
>> -        if (ret1) {
>> -            pr_err("hwspinlock test failed on DT lock %d, ret = %d\n",
>> --                   hwspin_lock_get_id(hwlock), ret1);
>> -+                   hwlock_id, ret1);
>> -            ret = ret1;
>> -        }
>> -
>> -        ret1 = hwspin_lock_free(hwlock);
>> -        if (ret1) {
>> -            pr_err("hwspin_lock_free failed on lock %d\n",
>> --                   hwspin_lock_get_id(hwlock));
>> -+                   hwlock_id);
>> -            ret = ret1;
>> -        }
>> -    }
>> ---
>> -2.17.1
>> diff --git a/meta-arago-test/recipes-kernel/hwspinlocktest/files/0002- 
>> Add-support-for-AM62-SoCs.patch b/meta-arago-test/recipes-kernel/ 
>> hwspinlocktest/files/0002-Add-support-for-AM62-SoCs.patch
>> deleted file mode 100644
>> index 30d9886a..00000000
>> --- a/meta-arago-test/recipes-kernel/hwspinlocktest/files/0002-Add- 
>> support-for-AM62-SoCs.patch
>> +++ /dev/null
>> @@ -1,31 +0,0 @@
>> -From 5ea20dff1aba059cc49e11031f731a422f3fd114 Mon Sep 17 00:00:00 2001
>> -From: Judith Mendez <jm@ti.com>
>> -Date: Mon, 18 Nov 2024 14:57:45 -0600
>> -Subject: [PATCH 2/2] Add support for AM62* SoCs
>> -
>> -The K3 AM62* SoCs have a hwspinlock IP in MAIN domain.
>> -Extend the test to add the desired SoC compatible so that
>> -the test can be exercised on these new SoC families.
>> -
>> -Upstream-Status: Inactive-Upstream [private repo]
>> -Signed-off-by: Judith Mendez <jm@ti.com>
>> ----
>> - omap_hwspinlock_test.c | 3 +++
>> - 1 file changed, 3 insertions(+)
>> -
>> -diff --git a/omap_hwspinlock_test.c b/omap_hwspinlock_test.c
>> -index b180138..46fcc08 100644
>> ---- a/omap_hwspinlock_test.c
>> -+++ b/omap_hwspinlock_test.c
>> -@@ -199,6 +199,9 @@ static const struct hwspinlock_data soc_data[] = {
>> -    { "ti,j7200",    256, },
>> -    { "ti,am642",    256, },
>> -    { "ti,j721s2",    256, },
>> -+    { "ti,am625",    256, },
>> -+    { "ti,am62a7",    256, },
>> -+    { "ti,am62p5",    256, },
>> -    { /* sentinel */ },
>> - };
>> -
>> ---
>> -2.47.0
>> diff --git a/meta-arago-test/recipes-kernel/hwspinlocktest/ 
>> hwspinlocktest_0.1.bb b/meta-arago-test/recipes-kernel/hwspinlocktest/ 
>> hwspinlocktest_0.1.bb
>> index 454f0131..61842ffb 100644
>> --- a/meta-arago-test/recipes-kernel/hwspinlocktest/hwspinlocktest_0.1.bb
>> +++ b/meta-arago-test/recipes-kernel/hwspinlocktest/hwspinlocktest_0.1.bb
>> @@ -6,13 +6,11 @@ LIC_FILES_CHKSUM = "file:// 
>> LICENSE;md5=bfa02c83df161e37647ee23a2c7eacd4"
>>   inherit module
>>   SRC_URI = "\
>> -    git://github.com/sumananna/omap-hwspinlock- 
>> test;protocol=https;branch=master \
>> +    git://github.com/TexasInstruments/omap-hwspinlock- 
>> test;protocol=https;branch=master \
>>       file://0001-Fix-Makefile-for-to-build-with-yocto.patch \
>> -    file://0002-Add-support-for-AM62-SoCs.patch \
>> -    file://0001-omap_hwspinlock_test-Remove-hwspin_lock_get_id- 
>> calls.patch \
>>   "
>> -SRCREV = "20f15e79a3a0197e06328c252d23aec225de21ed"
>> +SRCREV = "a8297c7a2ca9e127929095045228dd4761121d56"
>>   # The inherit of module.bbclass will automatically name module 
>> packages with
>>   # "kernel-module-" prefix as required by the oe-core build environment.
>
diff mbox series

Patch

diff --git a/meta-arago-test/recipes-kernel/hwspinlocktest/files/0001-omap_hwspinlock_test-Remove-hwspin_lock_get_id-calls.patch b/meta-arago-test/recipes-kernel/hwspinlocktest/files/0001-omap_hwspinlock_test-Remove-hwspin_lock_get_id-calls.patch
deleted file mode 100644
index d4448397..00000000
--- a/meta-arago-test/recipes-kernel/hwspinlocktest/files/0001-omap_hwspinlock_test-Remove-hwspin_lock_get_id-calls.patch
+++ /dev/null
@@ -1,69 +0,0 @@ 
-From fb986ed355cd488da64da9eb94d0f260bb329d5b Mon Sep 17 00:00:00 2001
-From: Ryan Eatmon <reatmon@ti.com>
-Date: Fri, 11 Apr 2025 13:49:11 -0500
-Subject: [PATCH] omap_hwspinlock_test: Remove hwspin_lock_get_id() calls
-
-The hwspin_lock_get_id() function was removed in the most recent
-kernel [1].  We can safely stop using this function even for older kernels,
-so go ahead and take these changes.
-
-[1] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=fec04edb74126f21ac628c7be763c97deb49f69d
-
-Upstream-Status: Inactive-Upstream [private repo]
-
-Signed-off-by: Ryan Eatmon <reatmon@ti.com>
----
- omap_hwspinlock_test.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/omap_hwspinlock_test.c b/omap_hwspinlock_test.c
-index b180138..f3e0912 100644
---- a/omap_hwspinlock_test.c
-+++ b/omap_hwspinlock_test.c
-@@ -26,12 +26,12 @@ struct hwspinlock_data {
-	const unsigned int max_locks;
- };
-
--static int hwspin_lock_test(struct hwspinlock *hwlock)
-+static int hwspin_lock_test(struct hwspinlock *hwlock, int lock_num)
- {
-	int i;
-	int ret;
-
--	pr_err("\nTesting lock %d\n", hwspin_lock_get_id(hwlock));
-+	pr_err("\nTesting lock %d\n", lock_num);
-	for (i = 0; i < count; i++) {
-		ret = hwspin_trylock(hwlock);
-		if (ret) {
-@@ -82,7 +82,7 @@ static int hwspin_lock_test_all_locks(unsigned int max_locks)
-			continue;
-		}
-
--		ret1 = hwspin_lock_test(hwlock);
-+		ret1 = hwspin_lock_test(hwlock, i);
-		if (ret1) {
-			pr_err("hwspinlock tests failed on lock %d\n", i);
-			ret = ret1;
-@@ -147,17 +147,17 @@ static int hwspin_lock_test_all_phandle_locks(unsigned int max_locks)
-			continue;
-		}
-
--		ret1 = hwspin_lock_test(hwlock);
-+		ret1 = hwspin_lock_test(hwlock, i);
-		if (ret1) {
-			pr_err("hwspinlock test failed on DT lock %d, ret = %d\n",
--			       hwspin_lock_get_id(hwlock), ret1);
-+			       hwlock_id, ret1);
-			ret = ret1;
-		}
-
-		ret1 = hwspin_lock_free(hwlock);
-		if (ret1) {
-			pr_err("hwspin_lock_free failed on lock %d\n",
--			       hwspin_lock_get_id(hwlock));
-+			       hwlock_id);
-			ret = ret1;
-		}
-	}
---
-2.17.1
diff --git a/meta-arago-test/recipes-kernel/hwspinlocktest/files/0002-Add-support-for-AM62-SoCs.patch b/meta-arago-test/recipes-kernel/hwspinlocktest/files/0002-Add-support-for-AM62-SoCs.patch
deleted file mode 100644
index 30d9886a..00000000
--- a/meta-arago-test/recipes-kernel/hwspinlocktest/files/0002-Add-support-for-AM62-SoCs.patch
+++ /dev/null
@@ -1,31 +0,0 @@ 
-From 5ea20dff1aba059cc49e11031f731a422f3fd114 Mon Sep 17 00:00:00 2001
-From: Judith Mendez <jm@ti.com>
-Date: Mon, 18 Nov 2024 14:57:45 -0600
-Subject: [PATCH 2/2] Add support for AM62* SoCs
-
-The K3 AM62* SoCs have a hwspinlock IP in MAIN domain.
-Extend the test to add the desired SoC compatible so that
-the test can be exercised on these new SoC families.
-
-Upstream-Status: Inactive-Upstream [private repo]
-Signed-off-by: Judith Mendez <jm@ti.com>
----
- omap_hwspinlock_test.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/omap_hwspinlock_test.c b/omap_hwspinlock_test.c
-index b180138..46fcc08 100644
---- a/omap_hwspinlock_test.c
-+++ b/omap_hwspinlock_test.c
-@@ -199,6 +199,9 @@ static const struct hwspinlock_data soc_data[] = {
-	{ "ti,j7200",	256, },
-	{ "ti,am642",	256, },
-	{ "ti,j721s2",	256, },
-+	{ "ti,am625",	256, },
-+	{ "ti,am62a7",	256, },
-+	{ "ti,am62p5",	256, },
-	{ /* sentinel */ },
- };
-
---
-2.47.0
diff --git a/meta-arago-test/recipes-kernel/hwspinlocktest/hwspinlocktest_0.1.bb b/meta-arago-test/recipes-kernel/hwspinlocktest/hwspinlocktest_0.1.bb
index 454f0131..61842ffb 100644
--- a/meta-arago-test/recipes-kernel/hwspinlocktest/hwspinlocktest_0.1.bb
+++ b/meta-arago-test/recipes-kernel/hwspinlocktest/hwspinlocktest_0.1.bb
@@ -6,13 +6,11 @@  LIC_FILES_CHKSUM = "file://LICENSE;md5=bfa02c83df161e37647ee23a2c7eacd4"
 inherit module
 
 SRC_URI = "\
-    git://github.com/sumananna/omap-hwspinlock-test;protocol=https;branch=master \
+    git://github.com/TexasInstruments/omap-hwspinlock-test;protocol=https;branch=master \
     file://0001-Fix-Makefile-for-to-build-with-yocto.patch \
-    file://0002-Add-support-for-AM62-SoCs.patch \
-    file://0001-omap_hwspinlock_test-Remove-hwspin_lock_get_id-calls.patch \
 "
 
-SRCREV = "20f15e79a3a0197e06328c252d23aec225de21ed"
+SRCREV = "a8297c7a2ca9e127929095045228dd4761121d56"
 
 # The inherit of module.bbclass will automatically name module packages with
 # "kernel-module-" prefix as required by the oe-core build environment.