Revert "[nrf noup] dts: choose a crypto accelerator for entropy"

This reverts commit 4943716.

Signed-off-by: Carles Cufi <[email protected]>

Author: carlescufi

dts/arm/nordic/nrf52840.dtsi

@@ -8,7 +8,7 @@
 / {
 	chosen {
 		zephyr,bt-hci = &bt_hci_controller;
-		zephyr,entropy = &cryptocell;
+		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
 
@@ -562,7 +562,7 @@
 			reg = <0x5002a000 0x1000>, <0x5002b000 0x1000>;
 			reg-names = "wrapper", "core";
 			interrupts = <42 NRF_DEFAULT_IRQ_PRIORITY>;
-			status = "okay";
+			status = "disabled";
 		};
 	};
 };

dts/arm/nordic/nrf5340_cpuapp.dtsi

@@ -34,7 +34,7 @@
 	};
 
 	chosen {
-		zephyr,entropy = &cryptocell;
+		zephyr,entropy = &rng_hci;
 		zephyr,flash-controller = &flash_controller;
 	};
 
@@ -103,7 +103,7 @@
 			reg = <0x50844000 0x1000>, <0x50845000 0x1000>;
 			reg-names = "wrapper", "core";
 			interrupts = <68 NRF_DEFAULT_IRQ_PRIORITY>;
-			status = "okay";
+			status = "disabled";
 		};
 	};
 

dts/arm/nordic/nrf54l15_cpuapp.dtsi

@@ -18,7 +18,6 @@ nvic: &cpuapp_nvic {};
 / {
 	chosen {
 		zephyr,bt-hci = &bt_hci_controller;
-		zephyr,entropy = &psa_rng;
 	};
 
 	soc {
@@ -29,7 +28,7 @@ nvic: &cpuapp_nvic {};
 
 	psa_rng: psa-rng {
 		compatible = "zephyr,psa-crypto-rng";
-		status = "okay";
+		status = "disabled";
 	};
 };
 

dts/arm/nordic/nrf91.dtsi

@@ -28,7 +28,6 @@
 	};
 
 	chosen {
-		zephyr,entropy = &cryptocell;
 		zephyr,flash-controller = &flash_controller;
 	};
 
@@ -52,7 +51,7 @@
 			reg = <0x50840000 0x1000>, <0x50841000 0x1000>;
 			reg-names = "wrapper", "core";
 			interrupts = <64 NRF_DEFAULT_IRQ_PRIORITY>;
-			status = "okay";
+			status = "disabled";
 		};
 
 		ctrlap: ctrlap@50006000 {

soc/nordic/common/Kconfig.peripherals

@@ -13,12 +13,10 @@ config HAS_HW_NRF_BPROT
 	def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_BPROT))
 
 config HAS_HW_NRF_CC310
-	def_bool $(dt_compat_enabled,$(DT_COMPAT_ARM_CRYPTOCELL_310)) || \
-		 ($(dt_nodelabel_enabled,psa_rng) && SOC_SERIES_NRF91X)
+	def_bool $(dt_compat_enabled,$(DT_COMPAT_ARM_CRYPTOCELL_310))
 
 config HAS_HW_NRF_CC312
-	def_bool $(dt_compat_enabled,$(DT_COMPAT_ARM_CRYPTOCELL_312)) || \
-		 ($(dt_nodelabel_enabled,psa_rng) && SOC_NRF5340_CPUAPP)
+	def_bool $(dt_compat_enabled,$(DT_COMPAT_ARM_CRYPTOCELL_312))
 
 config HAS_HW_NRF_CCM
 	def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_CCM))