ARM: mach-at91: armv7: Remove default reset driver

This commit removes the default reset driver for armv7, since
it is no longer needed due to the presence of the SYSRESET driver.

Signed-off-by: Sergiu Moga <sergiu.moga@microchip.com>

diff --git a/arch/arm/mach-at91/armv7/Makefile b/arch/arm/mach-at91/armv7/Makefile
index f395b55c3ded13e75522bbdfd8fa3b844b0cd183..6da1cdffef6ac4befb84203b180be1e96a5961bd 100644 (file)
--- a/arch/arm/mach-at91/armv7/Makefile
+++ b/arch/arm/mach-at91/armv7/Makefile
@@ -11,9 +11,6 @@ obj-$(CONFIG_SAMA5D3) += sama5d3_devices.o clock.o
 obj-$(CONFIG_SAMA5D4)  += sama5d4_devices.o clock.o
 obj-$(CONFIG_SAMA7G5)  += sama7g5_devices.o
 obj-y += cpu.o
-ifndef CONFIG_$(SPL_TPL_)SYSRESET
-obj-y  += reset.o
-endif
 ifneq ($(CONFIG_ATMEL_TCB_TIMER),y)
 ifneq ($(CONFIG_ATMEL_PIT_TIMER),y)
 ifneq ($(CONFIG_MCHP_PIT64B_TIMER),y)

diff --git a/arch/arm/mach-at91/armv7/reset.c b/arch/arm/mach-at91/armv7/reset.c
deleted file mode 100644 (file)
index 1ea415e..0000000
--- a/arch/arm/mach-at91/armv7/reset.c
+++ /dev/null
@@ -1,31 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2007-2008
- * Stelian Pop <stelian@popies.net>
- * Lead Tech Design <www.leadtechdesign.com>
- *
- * (C) Copyright 2013
- * Bo Shen <voice.shen@atmel.com>
- */
-
-#include <common.h>
-#include <cpu_func.h>
-#include <asm/io.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/at91_rstc.h>
-
-/* Reset the cpu by telling the reset controller to do so */
-void reset_cpu(void)
-{
-       at91_rstc_t *rstc = (at91_rstc_t *)ATMEL_BASE_RSTC;
-
-       writel(AT91_RSTC_KEY
-               | AT91_RSTC_CR_PROCRST  /* Processor Reset */
-               | AT91_RSTC_CR_PERRST   /* Peripheral Reset */
-#ifdef CONFIG_AT91RESET_EXTRST
-               | AT91_RSTC_CR_EXTRST   /* External Reset (assert nRST pin) */
-#endif
-               , &rstc->cr);
-       /* never reached */
-       do { } while (1);
-}