rng: stm32: rename STM32 RNG driver

Rename the RNG driver as it is usable by other STM32 platforms
than the STM32MP1x ones. Rename CONFIG_RNG_STM32MP1 to
CONFIG_RNG_STM32

Signed-off-by: Gatien Chevallier <gatien.chevallier@foss.st.com>
Reviewed-by: Grzegorz Szymaszek <gszymaszek@short.pl>
Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 19991916209022dae777859a05de995f9850956b..db4279a355b4b2fe953ed742a7619e9494a0ba2e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -621,7 +621,7 @@ F:  drivers/ram/stm32mp1/
 F:     drivers/remoteproc/stm32_copro.c
 F:     drivers/reset/stm32-reset.c
 F:     drivers/rng/optee_rng.c
-F:     drivers/rng/stm32mp1_rng.c
+F:     drivers/rng/stm32_rng.c
 F:     drivers/rtc/stm32_rtc.c
 F:     drivers/serial/serial_stm32.*
 F:     drivers/spi/stm32_qspi.c

diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig
index dc491cf19aa9a9e7df10e510170562197c76aaae..ffc25ab9a247cfe562532c9516f3e1b32a180089 100644 (file)
--- a/configs/stm32mp15_basic_defconfig
+++ b/configs/stm32mp15_basic_defconfig
@@ -150,7 +150,7 @@ CONFIG_DM_REGULATOR_STM32_VREFBUF=y
 CONFIG_DM_REGULATOR_STPMIC1=y
 CONFIG_REMOTEPROC_STM32_COPRO=y
 CONFIG_DM_RNG=y
-CONFIG_RNG_STM32MP1=y
+CONFIG_RNG_STM32=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_STM32=y
 CONFIG_SERIAL_RX_BUFFER=y

diff --git a/configs/stm32mp15_defconfig b/configs/stm32mp15_defconfig
index 4f7dca4f2ab0741c00be9b674df56245d5ffc8c6..56c209648101fec776caea3ffddb9c489b66d28f 100644 (file)
--- a/configs/stm32mp15_defconfig
+++ b/configs/stm32mp15_defconfig
@@ -123,7 +123,7 @@ CONFIG_DM_REGULATOR_SCMI=y
 CONFIG_REMOTEPROC_STM32_COPRO=y
 CONFIG_RESET_SCMI=y
 CONFIG_DM_RNG=y
-CONFIG_RNG_STM32MP1=y
+CONFIG_RNG_STM32=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_STM32=y
 CONFIG_SERIAL_RX_BUFFER=y

diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig
index 6f4876f099ea911f43c8cd6065d6156134d7a79e..13cf81f95a5668525ce484390e53ae6f5150afb6 100644 (file)
--- a/configs/stm32mp15_trusted_defconfig
+++ b/configs/stm32mp15_trusted_defconfig
@@ -123,7 +123,7 @@ CONFIG_DM_REGULATOR_STPMIC1=y
 CONFIG_REMOTEPROC_STM32_COPRO=y
 CONFIG_RESET_SCMI=y
 CONFIG_DM_RNG=y
-CONFIG_RNG_STM32MP1=y
+CONFIG_RNG_STM32=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_STM32=y
 CONFIG_SERIAL_RX_BUFFER=y

diff --git a/drivers/rng/Kconfig b/drivers/rng/Kconfig
index 5deb5db5b711dbc5b89dbaf4cbed548696671680..24666bff987e81ba37f3cc1f12748dc2dc117378 100644 (file)
--- a/drivers/rng/Kconfig
+++ b/drivers/rng/Kconfig
@@ -48,11 +48,11 @@ config RNG_OPTEE
          accessible to normal world but reserved and used by the OP-TEE
          to avoid the weakness of a software PRNG.
 
-config RNG_STM32MP1
-       bool "Enable random number generator for STM32MP1"
-       depends on ARCH_STM32MP
+config RNG_STM32
+       bool "Enable random number generator for STM32"
+       depends on ARCH_STM32 || ARCH_STM32MP
        help
-         Enable STM32MP1 rng driver.
+         Enable STM32 rng driver.
 
 config RNG_ROCKCHIP
        bool "Enable random number generator for rockchip crypto rng"

diff --git a/drivers/rng/Makefile b/drivers/rng/Makefile
index 78f61051acfd4c5978af6952ea3ebc1134ded9a1..192f911e15521930c793a002347663bf59bc3971 100644 (file)
--- a/drivers/rng/Makefile
+++ b/drivers/rng/Makefile
@@ -9,7 +9,7 @@ obj-$(CONFIG_RNG_SANDBOX) += sandbox_rng.o
 obj-$(CONFIG_RNG_MSM) += msm_rng.o
 obj-$(CONFIG_RNG_NPCM) += npcm_rng.o
 obj-$(CONFIG_RNG_OPTEE) += optee_rng.o
-obj-$(CONFIG_RNG_STM32MP1) += stm32mp1_rng.o
+obj-$(CONFIG_RNG_STM32) += stm32_rng.o
 obj-$(CONFIG_RNG_ROCKCHIP) += rockchip_rng.o
 obj-$(CONFIG_RNG_IPROC200) += iproc_rng200.o
 obj-$(CONFIG_RNG_SMCCC_TRNG) += smccc_trng.o

diff --git a/drivers/rng/stm32mp1_rng.c b/drivers/rng/stm32_rng.c
similarity index 100%
rename from drivers/rng/stm32mp1_rng.c
rename to drivers/rng/stm32_rng.c