summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAhmad Fatoum <ahmad@a3f.at>2020-03-30 16:39:12 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2020-05-08 14:52:41 +0200
commitf3121d6fc82cd5097f7d8cc7a5935d7b0acc310a (patch)
tree60b962ba384bf43dd01607769d65e0c1d986b462
parent9afc50ad2f2a9224614b51526b01974ab8e82b61 (diff)
downloadbarebox-f3121d6fc82cd5097f7d8cc7a5935d7b0acc310a.tar.gz
barebox-f3121d6fc82cd5097f7d8cc7a5935d7b0acc310a.tar.xz
nvmem: bsec: remove wrongly named bsec_field type
BSEC_SMC_READ_SHADOW and BSEC_SMC_WRITE_SHADOW aren't fields, but operations to apply on fields. Rename it accordingly and fix up instances where it was used wrongly. Signed-off-by: Ahmad Fatoum <ahmad@a3f.at> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/mach-stm32mp/include/mach/bsec.h6
-rw-r--r--drivers/nvmem/bsec.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-stm32mp/include/mach/bsec.h b/arch/arm/mach-stm32mp/include/mach/bsec.h
index 559faaa2ba..d3cb91b1fd 100644
--- a/arch/arm/mach-stm32mp/include/mach/bsec.h
+++ b/arch/arm/mach-stm32mp/include/mach/bsec.h
@@ -17,7 +17,7 @@ enum bsec_smc {
};
/* Service for BSEC */
-enum bsec_field {
+enum bsec_op {
BSEC_SMC_READ_SHADOW = 1,
BSEC_SMC_PROG_OTP = 2,
BSEC_SMC_WRITE_SHADOW = 3,
@@ -26,13 +26,13 @@ enum bsec_field {
BSEC_SMC_WRITE_ALL = 6,
};
-static inline enum bsec_smc bsec_read_field(enum bsec_field field, unsigned *val)
+static inline enum bsec_smc bsec_read_field(unsigned field, unsigned *val)
{
return stm32mp_smc(STM32_SMC_BSEC, BSEC_SMC_READ_SHADOW,
field, 0, val);
}
-static inline enum bsec_smc bsec_write_field(enum bsec_field field, unsigned val)
+static inline enum bsec_smc bsec_write_field(unsigned field, unsigned val)
{
return stm32mp_smc(STM32_SMC_BSEC, BSEC_SMC_WRITE_SHADOW,
field, val, NULL);
diff --git a/drivers/nvmem/bsec.c b/drivers/nvmem/bsec.c
index 209c50dc70..836e62ecbc 100644
--- a/drivers/nvmem/bsec.c
+++ b/drivers/nvmem/bsec.c
@@ -33,7 +33,7 @@ struct stm32_bsec_data {
int num_regs;
};
-static int bsec_smc(struct bsec_priv *priv, u8 op, enum bsec_field field,
+static int bsec_smc(struct bsec_priv *priv, enum bsec_op op, u32 field,
unsigned data2, unsigned *val)
{
enum bsec_smc ret = stm32mp_smc(priv->svc_id, op, field / 4, data2, val);