Skip to content

Commit

Permalink
drivers: firewall: stm32_etzpc: remove header file
Browse files Browse the repository at this point in the history
Remove stm32_etzpc.h header file that is not required since the
declared and defined resources are used internally in stm32_etzpc.c

By the way, also remove inclusion of stm32mp15-etzpc.h DT bindings
header file from stm32_rng.c where it is not needed.

Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
  • Loading branch information
etienne-lms committed Feb 5, 2025
1 parent 10e9def commit 747fd18
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 44 deletions.
1 change: 0 additions & 1 deletion core/arch/arm/plat-stm32mp1/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
#include <drivers/gic.h>
#include <drivers/pinctrl.h>
#include <drivers/stm32_bsec.h>
#include <drivers/stm32_etzpc.h>
#include <drivers/stm32_gpio.h>
#include <drivers/stm32_iwdg.h>
#include <drivers/stm32_uart.h>
Expand Down
14 changes: 11 additions & 3 deletions core/drivers/firewall/stm32_etzpc.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include <drivers/clk_dt.h>
#include <drivers/firewall.h>
#include <drivers/firewall_device.h>
#include <drivers/stm32_etzpc.h>
#include <drivers/stm32mp_dt_bindings.h>
#ifdef CFG_STM32MP15
#include <drivers/stm32mp1_rcc.h>
Expand Down Expand Up @@ -67,6 +66,15 @@
#define TZMA_PM_LOCK_BIT BIT(15)
#define TZMA_PM_VALUE_MASK GENMASK_32(9, 0)

/* ETZPC DECPROT bit field values */
enum etzpc_decprot_attributes {
ETZPC_DECPROT_S_RW = 0,
ETZPC_DECPROT_NS_R_S_W = 1,
ETZPC_DECPROT_MCU_ISOLATION = 2,
ETZPC_DECPROT_NS_RW = 3,
ETZPC_DECPROT_MAX = 4,
};

/*
* struct stm32_etzpc_platdata - Driver data set at initialization
*
Expand Down Expand Up @@ -218,7 +226,7 @@ static void etzpc_configure_decprot(uint32_t decprot_id,
etzpc_unlock(exceptions);
}

enum etzpc_decprot_attributes etzpc_get_decprot(uint32_t decprot_id)
static enum etzpc_decprot_attributes etzpc_get_decprot(uint32_t decprot_id)
{
size_t offset = U(4) * (decprot_id / IDS_PER_DECPROT_REGS);
uint32_t shift = (decprot_id % IDS_PER_DECPROT_REGS) << DECPROT_SHIFT;
Expand Down Expand Up @@ -260,7 +268,7 @@ static bool decprot_is_locked(uint32_t decprot_id)
return io_read32(base + offset + ETZPC_DECPROT_LOCK0) & mask;
}

void etzpc_configure_tzma(uint32_t tzma_id, uint16_t tzma_value)
static void etzpc_configure_tzma(uint32_t tzma_id, uint16_t tzma_value)
{
size_t offset = sizeof(uint32_t) * tzma_id;
vaddr_t base = etzpc_device->pdata.base.va;
Expand Down
4 changes: 0 additions & 4 deletions core/drivers/stm32_rng.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
#include <drivers/clk.h>
#include <drivers/clk_dt.h>
#include <drivers/rstctrl.h>
#if defined(CFG_STM32MP15)
#include <drivers/stm32_etzpc.h>
#include <dt-bindings/firewall/stm32mp15-etzpc.h>
#endif /* defined(CFG_STM32MP15) */
#include <io.h>
#include <kernel/delay.h>
#include <kernel/dt.h>
Expand Down
36 changes: 0 additions & 36 deletions core/include/drivers/stm32_etzpc.h

This file was deleted.

0 comments on commit 747fd18

Please sign in to comment.