[PATCH v3 1/7] rng: stm32: rename STM32 RNG driver

[Patrice CHOTARD]

On 9/27/23 08:52, Patrice CHOTARD wrote:
> 
> 
> On 9/19/23 17:27, Gatien Chevallier wrote:
>> 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 at foss.st.com>
>> Reviewed-by: Grzegorz Szymaszek <gszymaszek at short.pl>
>> Reviewed-by: Patrick Delaunay <patrick.delaunay at foss.st.com>
>> ---
>>
>> Changes in V2:
>> 	- Added ARCH_STM32 in the "depends on" section of the
>> 	  RNG_STM32 configuration field.
>> 	- Added Grzegorz's tag and discarded Patrick's and
>> 	  Heinrich's as there's a modification
>>
>> Changes in V2:
>> 	- Added Patrick's tag. Discarded Heinrich's as patch's
>> 	  content has changed.
>> 	 
>>  MAINTAINERS                                 | 2 +-
>>  configs/stm32mp15_basic_defconfig           | 2 +-
>>  configs/stm32mp15_defconfig                 | 2 +-
>>  configs/stm32mp15_trusted_defconfig         | 2 +-
>>  drivers/rng/Kconfig                         | 8 ++++----
>>  drivers/rng/Makefile                        | 2 +-
>>  drivers/rng/{stm32mp1_rng.c => stm32_rng.c} | 0
>>  7 files changed, 9 insertions(+), 9 deletions(-)
>>  rename drivers/rng/{stm32mp1_rng.c => stm32_rng.c} (100%)
>>
>> diff --git a/MAINTAINERS b/MAINTAINERS
>> index 0a10a436bc..a3bffa63d5 100644
>> --- 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 9ea5aaa714..29b869cf34 100644
>> --- 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 4d0a81f8a8..b061a83f9d 100644
>> --- 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 0a7d862485..b51eefe652 100644
>> --- 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 5deb5db5b7..24666bff98 100644
>> --- 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 78f61051ac..192f911e15 100644
>> --- 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
> 
> Reviewed-by: Patrice Chotard <patrice.chotard at foss.st.com>
> 
> Thanks
> Patrice
Apply on stm32/next

Patrice