3 files changed, 7 insertions, 23 deletions
diff --git a/arch/arm/mach-imx/mx7/Makefile b/arch/arm/mach-imx/mx7/Makefile
index f1436e2d0d7..fec228a616a 100644
--- a/arch/arm/mach-imx/mx7/Makefile
+++ b/arch/arm/mach-imx/mx7/Makefile
@@ -3,5 +3,5 @@
 # (C) Copyright 2015 Freescale Semiconductor, Inc.
 #
 
-obj-y	:= soc.o clock.o clock_slice.o ddr.o snvs.o
+obj-y	:= soc.o clock.o clock_slice.o ddr.o
 obj-$(CONFIG_ARMV7_PSCI)  += psci-mx7.o psci-suspend.o
diff --git a/arch/arm/mach-imx/mx7/snvs.c b/arch/arm/mach-imx/mx7/snvs.c
deleted file mode 100644
index 359bbbb41c7..00000000000
--- a/arch/arm/mach-imx/mx7/snvs.c
+++ /dev/null
@@ -1,21 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2018 Linaro
- */
-
-#include <asm/io.h>
-#include <asm/arch/imx-regs.h>
-#include <linux/bitops.h>
-
-#define SNVS_HPCOMR		0x04
-#define SNVS_HPCOMR_NPSWA_EN	BIT(31)
-
-void init_snvs(void)
-{
-	u32 val;
-
-	/* Ensure SNVS HPCOMR sets NPSWA_EN to allow unpriv access to SNVS LP */
-	val = readl(SNVS_BASE_ADDR + SNVS_HPCOMR);
-	val |= SNVS_HPCOMR_NPSWA_EN;
-	writel(val, SNVS_BASE_ADDR + SNVS_HPCOMR);
-}
diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c
index 1b891a2db3d..e504c1fd52a 100644
--- a/arch/arm/mach-imx/mx7/soc.c
+++ b/arch/arm/mach-imx/mx7/soc.c
@@ -127,10 +127,15 @@ static void isolate_resource(void)
 #endif
 
 #if defined(CONFIG_IMX_HAB)
-struct imx_sec_config_fuse_t const imx_sec_config_fuse = {
+struct imx_fuse const imx_sec_config_fuse = {
 	.bank = 1,
 	.word = 3,
 };
+
+struct imx_fuse const imx_field_return_fuse = {
+	.bank = 8,
+	.word = 3,
+};
 #endif
 
 static bool is_mx7d(void)