From bcd95cb9c43aeb706ee03cb30f104ec8d171c91b Mon Sep 17 00:00:00 2001
From: Christian Marangi <ansuelsmth@gmail.com>
Date: Mon, 28 Oct 2024 14:01:52 +0100
Subject: [PATCH] airoha: an7581: replace TRNG patch with upstream version

Replace TRNG patch with upstream version.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---
 ...oha-add-support-for-Airoha-EN7581-TRNG.patch} | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
 rename target/linux/airoha/patches-6.6/{102-hwrng-add-support-for-Airoha-EN7581-TRNG.patch => 030-v6.13-hwrng-airoha-add-support-for-Airoha-EN7581-TRNG.patch} (96%)

diff --git a/target/linux/airoha/patches-6.6/102-hwrng-add-support-for-Airoha-EN7581-TRNG.patch b/target/linux/airoha/patches-6.6/030-v6.13-hwrng-airoha-add-support-for-Airoha-EN7581-TRNG.patch
similarity index 96%
rename from target/linux/airoha/patches-6.6/102-hwrng-add-support-for-Airoha-EN7581-TRNG.patch
rename to target/linux/airoha/patches-6.6/030-v6.13-hwrng-airoha-add-support-for-Airoha-EN7581-TRNG.patch
index 1c99369fcb..e21fb5649e 100644
--- a/target/linux/airoha/patches-6.6/102-hwrng-add-support-for-Airoha-EN7581-TRNG.patch
+++ b/target/linux/airoha/patches-6.6/030-v6.13-hwrng-airoha-add-support-for-Airoha-EN7581-TRNG.patch
@@ -1,7 +1,7 @@
-From 9dbd16ac89e00bd8640ecac3971b0943410b5cec Mon Sep 17 00:00:00 2001
+From 5c5db81bff81a0fcd9ad998543d4241cbfe4742f Mon Sep 17 00:00:00 2001
 From: Christian Marangi <ansuelsmth@gmail.com>
-Date: Sat, 6 Jul 2024 01:15:24 +0200
-Subject: [PATCH 2/2] hwrng: add support for Airoha EN7581 TRNG
+Date: Thu, 17 Oct 2024 14:44:38 +0200
+Subject: [PATCH 2/2] hwrng: airoha - add support for Airoha EN7581 TRNG
 
 Add support for Airoha TRNG. The Airoha SoC provide a True RNG module
 that can output 4 bytes of raw data at times.
@@ -17,6 +17,8 @@ mutually exclusive, running as TRNG doesn't permit to also run it as
 DRBG.
 
 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
+Reviewed-by: Martin Kaiser <martin@kaiser.cx>
+Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
 ---
  drivers/char/hw_random/Kconfig       |  13 ++
  drivers/char/hw_random/Makefile      |   1 +
@@ -65,13 +67,13 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/mod_devicetable.h>
-+#include <linux/err.h>
++#include <linux/bitfield.h>
++#include <linux/delay.h>
++#include <linux/hw_random.h>
++#include <linux/interrupt.h>
 +#include <linux/io.h>
 +#include <linux/iopoll.h>
-+#include <linux/interrupt.h>
-+#include <linux/hw_random.h>
 +#include <linux/platform_device.h>
-+#include <linux/delay.h>
 +
 +#define TRNG_IP_RDY			0x800
 +#define   CNT_TRANS			GENMASK(15, 8)
-- 
2.30.2