summaryrefslogtreecommitdiff
path: root/arch/nds32
diff options
context:
space:
mode:
authorKun-Hua Huang <kunhua@andestech.com>2015-08-24 14:52:36 +0800
committerTom Rini <trini@konsulko.com>2015-08-28 11:46:35 -0400
commitb3537c08e14b9d7e3b3207de2d280dab2dc499fa (patch)
tree8a6365c85b83f9ecc66b29e09de00b8ec6cc0d46 /arch/nds32
parent2e88bb28d8061286d2f1cabcac224df15b941b82 (diff)
downloadu-boot-imx-b3537c08e14b9d7e3b3207de2d280dab2dc499fa.zip
u-boot-imx-b3537c08e14b9d7e3b3207de2d280dab2dc499fa.tar.gz
u-boot-imx-b3537c08e14b9d7e3b3207de2d280dab2dc499fa.tar.bz2
NDS32: Generic Board Support and Unsupport
Remove ag101 and ag102 support Signed-off-by: Kun-Hua Huang <kunhua@andestech.com>
Diffstat (limited to 'arch/nds32')
-rw-r--r--arch/nds32/Kconfig8
-rw-r--r--arch/nds32/cpu/n1213/ag102/Makefile21
-rw-r--r--arch/nds32/cpu/n1213/ag102/cpu.c67
-rw-r--r--arch/nds32/cpu/n1213/ag102/lowlevel_init.S307
-rw-r--r--arch/nds32/cpu/n1213/ag102/timer.c191
-rw-r--r--arch/nds32/cpu/n1213/ag102/watchdog.S33
-rw-r--r--arch/nds32/include/asm/mach-types.h28
7 files changed, 0 insertions, 655 deletions
diff --git a/arch/nds32/Kconfig b/arch/nds32/Kconfig
index 98b0282..4fcd01d 100644
--- a/arch/nds32/Kconfig
+++ b/arch/nds32/Kconfig
@@ -8,19 +8,11 @@ choice
prompt "Target select"
optional
-config TARGET_ADP_AG101
- bool "Support adp-ag101"
-
config TARGET_ADP_AG101P
bool "Support adp-ag101p"
-config TARGET_ADP_AG102
- bool "Support adp-ag102"
-
endchoice
-source "board/AndesTech/adp-ag101/Kconfig"
source "board/AndesTech/adp-ag101p/Kconfig"
-source "board/AndesTech/adp-ag102/Kconfig"
endmenu
diff --git a/arch/nds32/cpu/n1213/ag102/Makefile b/arch/nds32/cpu/n1213/ag102/Makefile
deleted file mode 100644
index c21ce02..0000000
--- a/arch/nds32/cpu/n1213/ag102/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# (C) Copyright 2009
-# Marvell Semiconductor <www.marvell.com>
-# Written-by: Prafulla Wadaskar <prafulla@marvell.com>
-#
-# Copyright (C) 2011 Andes Technology Corporation
-# Shawn Lin, Andes Technology Corporation <nobuhiro@andestech.com>
-# Macpaul Lin, Andes Technology Corporation <macpaul@andestech.com>
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
-
-obj-y := cpu.o timer.o
-
-ifndef CONFIG_SKIP_LOWLEVEL_INIT
-obj-y += lowlevel_init.o
-endif
-
-ifndef CONFIG_SKIP_TRUNOFF_WATCHDOG
-obj-y += watchdog.o
-endif
diff --git a/arch/nds32/cpu/n1213/ag102/cpu.c b/arch/nds32/cpu/n1213/ag102/cpu.c
deleted file mode 100644
index 2ee45d2..0000000
--- a/arch/nds32/cpu/n1213/ag102/cpu.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Marius Groeger <mgroeger@sysgo.de>
- *
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
- *
- * Copyright (C) 2011 Andes Technology Corporation
- * Shawn Lin, Andes Technology Corporation <nobuhiro@andestech.com>
- * Macpaul Lin, Andes Technology Corporation <macpaul@andestech.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-/* CPU specific code */
-#include <common.h>
-#include <command.h>
-#include <watchdog.h>
-#include <asm/cache.h>
-
-#include <faraday/ftwdt010_wdt.h>
-
-/*
- * cleanup_before_linux() is called just before we call linux
- * it prepares the processor for linux
- *
- * we disable interrupt and caches.
- */
-int cleanup_before_linux(void)
-{
- disable_interrupts();
-
-#ifdef CONFIG_MMU
- /* turn off I/D-cache */
- icache_disable();
- dcache_disable();
-
- /* flush I/D-cache */
- invalidate_icac();
- invalidate_dcac();
-#endif
-
- return 0;
-}
-
-int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
- disable_interrupts();
-
- /*
- * reset to the base addr of andesboot.
- * currently no ROM loader at addr 0.
- * do not use reset_cpu(0);
- */
-#ifdef CONFIG_FTWDT010_WATCHDOG
- /*
- * workaround: if we use CONFIG_HW_WATCHDOG with ftwdt010, will lead
- * automatic hardware reset when booting Linux.
- * Please do not use CONFIG_HW_WATCHDOG and WATCHDOG_RESET() here.
- */
- ftwdt010_wdt_reset();
-#endif /* CONFIG_FTWDT010_WATCHDOG */
- hang();
-
- /*NOTREACHED*/
-}
diff --git a/arch/nds32/cpu/n1213/ag102/lowlevel_init.S b/arch/nds32/cpu/n1213/ag102/lowlevel_init.S
deleted file mode 100644
index 238410d..0000000
--- a/arch/nds32/cpu/n1213/ag102/lowlevel_init.S
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
- * Copyright (C) 2011 Andes Technology Corporation
- * Macpaul Lin, Andes Technology Corporation <macpaul@andestech.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-.text
-
-#include <common.h>
-#include <config.h>
-
-#include <asm/macro.h>
-#include <generated/asm-offsets.h>
-
-/*
- * parameters for Synopsys DWC DDR2/DDR1 Memory Controller
- */
-#define DDR2C_BASE_A (CONFIG_DWCDDR21MCTL_BASE)
-#define DDR2C_CCR_A (DDR2C_BASE_A + DWCDDR21MCTL_CCR)
-#define DDR2C_DCR_A (DDR2C_BASE_A + DWCDDR21MCTL_DCR)
-#define DDR2C_IOCR_A (DDR2C_BASE_A + DWCDDR21MCTL_IOCR)
-#define DDR2C_CSR_A (DDR2C_BASE_A + DWCDDR21MCTL_CSR)
-#define DDR2C_DRR_A (DDR2C_BASE_A + DWCDDR21MCTL_DRR)
-#define DDR2C_DLLCR0_A (DDR2C_BASE_A + DWCDDR21MCTL_DLLCR0)
-#define DDR2C_DLLCR1_A (DDR2C_BASE_A + DWCDDR21MCTL_DLLCR1)
-#define DDR2C_DLLCR2_A (DDR2C_BASE_A + DWCDDR21MCTL_DLLCR2)
-#define DDR2C_DLLCR3_A (DDR2C_BASE_A + DWCDDR21MCTL_DLLCR3)
-#define DDR2C_DLLCR4_A (DDR2C_BASE_A + DWCDDR21MCTL_DLLCR4)
-#define DDR2C_DLLCR5_A (DDR2C_BASE_A + DWCDDR21MCTL_DLLCR5)
-#define DDR2C_DLLCR6_A (DDR2C_BASE_A + DWCDDR21MCTL_DLLCR6)
-#define DDR2C_DLLCR7_A (DDR2C_BASE_A + DWCDDR21MCTL_DLLCR7)
-#define DDR2C_DLLCR8_A (DDR2C_BASE_A + DWCDDR21MCTL_DLLCR8)
-#define DDR2C_DLLCR9_A (DDR2C_BASE_A + DWCDDR21MCTL_DLLCR9)
-#define DDR2C_RSLR0_A (DDR2C_BASE_A + DWCDDR21MCTL_RSLR0)
-#define DDR2C_RDGR0_A (DDR2C_BASE_A + DWCDDR21MCTL_RDGR0)
-#define DDR2C_DTAR_A (DDR2C_BASE_A + DWCDDR21MCTL_DTAR)
-#define DDR2C_MR_A (DDR2C_BASE_A + DWCDDR21MCTL_MR)
-
-#define DDR2C_CCR_D CONFIG_SYS_DWCDDR21MCTL_CCR
-#define DDR2C_CCR_D2 CONFIG_SYS_DWCDDR21MCTL_CCR2
-#define DDR2C_DCR_D CONFIG_SYS_DWCDDR21MCTL_DCR
-#define DDR2C_IOCR_D CONFIG_SYS_DWCDDR21MCTL_IOCR
-#define DDR2C_CSR_D CONFIG_SYS_DWCDDR21MCTL_CSR
-#define DDR2C_DRR_D CONFIG_SYS_DWCDDR21MCTL_DRR
-#define DDR2C_RSLR0_D CONFIG_SYS_DWCDDR21MCTL_RSLR0
-#define DDR2C_RDGR0_D CONFIG_SYS_DWCDDR21MCTL_RDGR0
-#define DDR2C_DTAR_D CONFIG_SYS_DWCDDR21MCTL_DTAR
-#define DDR2C_MR_D CONFIG_SYS_DWCDDR21MCTL_MR
-
-#define DDR2C_DLLCR0_D CONFIG_SYS_DWCDDR21MCTL_DLLCR0 /* 0-9 are same */
-
-/*
- * parameters for the ahbc controller
- */
-#define AHBC_CR_A (CONFIG_FTAHBC020S_BASE + FTAHBC020S_CR)
-#define AHBC_BSR6_A (CONFIG_FTAHBC020S_BASE + FTAHBC020S_SLAVE_BSR_6)
-
-#define AHBC_BSR6_D CONFIG_SYS_FTAHBC020S_SLAVE_BSR_6
-
-/*
- * parameters for the ANDES PCU controller
- */
-#define PCU_PCS4_A (CONFIG_ANDES_PCU_BASE + ANDES_PCU_PCS4)
-#define PCU_PCS4_D CONFIG_SYS_ANDES_CPU_PCS4
-
-/*
- * numeric 7 segment display
- */
-.macro led, num
- write32 CONFIG_DEBUG_LED, \num
-.endm
-
-/*
- * Waiting for SDRAM to set up
- */
-/*
-.macro wait_sdram
- li $r0, DDR2C_CSR_A
-1:
- lwi $r1, [$r0+FTSDMC021_CR2]
- bnez $r1, 1b
-.endm
-*/
-
-#ifndef CONFIG_SKIP_LOWLEVEL_INIT
-.globl lowlevel_init
-lowlevel_init:
- move $r10, $lp
-
- /* U200 */
-! led 0x00
-! jal scale_to_500mhz
-
- led 0x10
- jal mem_init
-
- led 0x20
- jal remap
-
-#if (defined(NDS32_EXT_FPU_DP) || defined(NDS32_EXT_FPU_SP))
- led 0x2f
- jal enable_fpu
-#endif
-
- led 0x30
- ret $r10
-
-scale_to_500mhz:
- move $r11, $lp
-
- /*
- * scale to 500Mhz
- */
- led 0x01
- write32 PCU_PCS4_A, 0x1102000f ! save data to PCS4
-
- move $lp, $r11
- ret
-
-mem_init:
- move $r11, $lp
-
- /*
- * config AHB Controller
- */
- led 0x12
- write32 AHBC_BSR6_A, AHBC_BSR6_D
-
- /*
- * config Synopsys DWC DDR2/DDR1 Memory Controller
- */
-ddr2c_init:
-set_dcr:
- led 0x14
- write32 DDR2C_DCR_A, DDR2C_DCR_D ! 0x000020d4
-
-auto_sizing:
- /*
- * ebios: $r10->$r7, $r11->$r8, $r12->$r9, $r13->$r12, $r14->$r13
- */
-set_iocr:
- led 0x19
- write32 DDR2C_IOCR_A, DDR2C_IOCR_D
-set_drr:
- led 0x16
- write32 DDR2C_DRR_A, DDR2C_DRR_D ! 0x00034812
-set_dllcr:
- led 0x18
- write32 DDR2C_DLLCR0_A, DDR2C_DLLCR0_D
- write32 DDR2C_DLLCR1_A, DDR2C_DLLCR0_D
- write32 DDR2C_DLLCR2_A, DDR2C_DLLCR0_D
- write32 DDR2C_DLLCR3_A, DDR2C_DLLCR0_D
- write32 DDR2C_DLLCR4_A, DDR2C_DLLCR0_D
- write32 DDR2C_DLLCR5_A, DDR2C_DLLCR0_D
- write32 DDR2C_DLLCR6_A, DDR2C_DLLCR0_D
- write32 DDR2C_DLLCR7_A, DDR2C_DLLCR0_D
- write32 DDR2C_DLLCR8_A, DDR2C_DLLCR0_D
- write32 DDR2C_DLLCR9_A, DDR2C_DLLCR0_D
-set_rslr0:
- write32 DDR2C_RSLR0_A, DDR2C_RSLR0_D ! 0x00000040
-set_rdgr0:
- write32 DDR2C_RDGR0_A, DDR2C_RDGR0_D ! 0x000055cf
-set_dtar:
- led 0x15
- write32 DDR2C_DTAR_A, DDR2C_DTAR_D ! 0x00100000
-set_mode:
- led 0x17
- write32 DDR2C_MR_A, DDR2C_MR_D ! 0x00000852
-set_ccr:
- write32 DDR2C_CCR_A, DDR2C_CCR_D
-
-#ifdef TRIGGER_INIT:
-trigger_init:
- write32 DDR2C_CCR_A, DDR2C_CCR_D ! 0x80020000
-
- /* Wait for ddr init state to be set */
- msync ALL
- isb
-
- /* Wait until the config initialization is finish */
-1:
- la $r4, DDR2C_CSR_A
- lwi $r5, [$r4]
- srli $r5, $r5, 23
- bnez $r5, 1b
-#endif
-
-data_training:
-! write32 DDR2C_CCR_A, DDR2C_CCR_D2 ! 0x40020004
-
- /* Wait for ddr init state to be set */
- msync ALL
- isb
-
- /* wait until the ddr data trainning is complete */
-1:
- la $r4, DDR2C_CSR_A
- lwi $r5, [$r4]
- srli $r6, $r5, 23
- bnez $r6, 1b
-
- lwi $r1, [$r4]
- srli $r6, $r5, 20
- li $r5, 0x00ffffff
- swi $r1, [$r4]
- bnez $r6, ddr2c_init
-
- led 0x1a
- move $lp, $r11
- ret
-
-remap:
- move $r11, $lp
-#ifdef __NDS32_N1213_43U1H__ /* NDS32 V0 ISA - AG101 Only */
- bal 2f
-relo_base:
- move $r0, $lp
-#else
-relo_base:
- mfusr $r0, $pc
-#endif /* __NDS32_N1213_43U1H__ */
-
- /*
- * Remapping
- */
-#ifdef CONFIG_MEM_REMAP
- /*
- * Copy ROM code to SDRAM base for memory remap layout.
- * This is not the real relocation, the real relocation is the function
- * relocate_code() is start.S which supports the systems is memory
- * remapped or not.
- */
- /*
- * Doing memory remap is essential for preparing some non-OS or RTOS
- * applications.
- *
- * This is also a must on ADP-AG101 board.
- * The reason is because the ROM/FLASH circuit on PCB board.
- * AG101-A0 board has 2 jumpers MA17 and SW5 to configure which
- * ROM/FLASH is used to boot.
- *
- * When SW5 = "0101", MA17 = LO, the ROM is connected to BANK0,
- * and the FLASH is connected to BANK1.
- * When SW5 = "1010", MA17 = HI, the ROM is disabled (still at BANK0),
- * and the FLASH is connected to BANK0.
- * It will occur problem when doing flash probing if the flash is at
- * BANK0 (0x00000000) while memory remapping was skipped.
- *
- * Other board like ADP-AG101P may not enable this since there is only
- * a FLASH connected to bank0.
- */
- led 0x21
- li $r4, PHYS_SDRAM_0_AT_INIT /* 0x10000000 */
- li $r5, 0x0
- la $r1, relo_base /* get $pc or $lp */
- sub $r2, $r0, $r1
- sethi $r6, hi20(_end)
- ori $r6, $r6, lo12(_end)
- add $r6, $r6, $r2
-1:
- lwi.p $r7, [$r5], #4
- swi.p $r7, [$r4], #4
- blt $r5, $r6, 1b
-
- /* set remap bit */
- /*
- * MEM remap bit is operational
- * - use it to map writeable memory at 0x00000000, in place of flash
- * - before remap: flash/rom 0x00000000, sdram: 0x10000000-0x4fffffff
- * - after remap: flash/rom 0x80000000, sdram: 0x00000000
- */
- led 0x2c
- setbf15 AHBC_CR_A, FTAHBC020S_CR_REMAP ! 0x1
-
-#endif /* #ifdef CONFIG_MEM_REMAP */
- move $lp, $r11
-2:
- ret
-
- /*
- * enable_fpu:
- * Some of Andes CPU version support FPU coprocessor, if so,
- * and toolchain support FPU instruction set, we should enable it.
- */
-#if (defined(NDS32_EXT_FPU_DP) || defined(NDS32_EXT_FPU_SP))
-enable_fpu:
- mfsr $r0, $CPU_VER /* enable FPU if it exists */
- srli $r0, $r0, 3
- andi $r0, $r0, 1
- beqz $r0, 1f /* skip if no COP */
- mfsr $r0, $FUCOP_EXIST
- srli $r0, $r0, 31
- beqz $r0, 1f /* skip if no FPU */
- mfsr $r0, $FUCOP_CTL
- ori $r0, $r0, 1
- mtsr $r0, $FUCOP_CTL
-1:
- ret
-#endif
-
-.globl show_led
-show_led:
- li $r8, (CONFIG_DEBUG_LED)
- swi $r7, [$r8]
- ret
-#endif /* #ifndef CONFIG_SKIP_LOWLEVEL_INIT */
diff --git a/arch/nds32/cpu/n1213/ag102/timer.c b/arch/nds32/cpu/n1213/ag102/timer.c
deleted file mode 100644
index 758b354..0000000
--- a/arch/nds32/cpu/n1213/ag102/timer.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * (C) Copyright 2009 Faraday Technology
- * Po-Yu Chuang <ratbert@faraday-tech.com>
- *
- * Copyright (C) 2011 Andes Technology Corporation
- * Shawn Lin, Andes Technology Corporation <nobuhiro@andestech.com>
- * Macpaul Lin, Andes Technology Corporation <macpaul@andestech.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#include <common.h>
-#include <asm/io.h>
-#include <faraday/fttmr010.h>
-
-static ulong timestamp;
-static ulong lastdec;
-
-int timer_init(void)
-{
- struct fttmr010 *tmr = (struct fttmr010 *)CONFIG_FTTMR010_BASE;
- unsigned int cr;
-
- debug("%s()\n", __func__);
-
- /* disable timers */
- writel(0, &tmr->cr);
-
-#ifdef CONFIG_FTTMR010_EXT_CLK
- /* use 32768Hz oscillator for RTC, WDT, TIMER */
- ftpmu010_32768osc_enable();
-#endif
-
- /* setup timer */
- writel(TIMER_LOAD_VAL, &tmr->timer3_load);
- writel(TIMER_LOAD_VAL, &tmr->timer3_counter);
- writel(0, &tmr->timer3_match1);
- writel(0, &tmr->timer3_match2);
-
- /* we don't want timer to issue interrupts */
- writel(FTTMR010_TM3_MATCH1 |
- FTTMR010_TM3_MATCH2 |
- FTTMR010_TM3_OVERFLOW,
- &tmr->interrupt_mask);
-
- cr = readl(&tmr->cr);
-#ifdef CONFIG_FTTMR010_EXT_CLK
- cr |= FTTMR010_TM3_CLOCK; /* use external clock */
-#endif
- cr |= FTTMR010_TM3_ENABLE;
- writel(cr, &tmr->cr);
-
- /* init the timestamp and lastdec value */
- reset_timer_masked();
-
- return 0;
-}
-
-/*
- * timer without interrupts
- */
-
-/*
- * reset time
- */
-void reset_timer_masked(void)
-{
- struct fttmr010 *tmr = (struct fttmr010 *)CONFIG_FTTMR010_BASE;
-
- /* capure current decrementer value time */
-#ifdef CONFIG_FTTMR010_EXT_CLK
- lastdec = readl(&tmr->timer3_counter) / (TIMER_CLOCK / CONFIG_SYS_HZ);
-#else
- lastdec = readl(&tmr->timer3_counter) /
- (CONFIG_SYS_CLK_FREQ / 2 / CONFIG_SYS_HZ);
-#endif
- timestamp = 0; /* start "advancing" time stamp from 0 */
-
- debug("%s(): lastdec = %lx\n", __func__, lastdec);
-}
-
-void reset_timer(void)
-{
- debug("%s()\n", __func__);
- reset_timer_masked();
-}
-
-/*
- * return timer ticks
- */
-ulong get_timer_masked(void)
-{
- struct fttmr010 *tmr = (struct fttmr010 *)CONFIG_FTTMR010_BASE;
-
- /* current tick value */
-#ifdef CONFIG_FTTMR010_EXT_CLK
- ulong now = readl(&tmr->timer3_counter) / (TIMER_CLOCK / CONFIG_SYS_HZ);
-#else
- ulong now = readl(&tmr->timer3_counter) /
- (CONFIG_SYS_CLK_FREQ / 2 / CONFIG_SYS_HZ);
-#endif
-
- debug("%s(): now = %lx, lastdec = %lx\n", __func__, now, lastdec);
-
- if (lastdec >= now) {
- /*
- * normal mode (non roll)
- * move stamp fordward with absoulte diff ticks
- */
- timestamp += lastdec - now;
- } else {
- /*
- * we have overflow of the count down timer
- *
- * nts = ts + ld + (TLV - now)
- * ts=old stamp, ld=time that passed before passing through -1
- * (TLV-now) amount of time after passing though -1
- * nts = new "advancing time stamp"...it could also roll and
- * cause problems.
- */
- timestamp += lastdec + TIMER_LOAD_VAL - now;
- }
-
- lastdec = now;
-
- debug("%s() returns %lx\n", __func__, timestamp);
-
- return timestamp;
-}
-
-/*
- * return difference between timer ticks and base
- */
-ulong get_timer(ulong base)
-{
- debug("%s(%lx)\n", __func__, base);
- return get_timer_masked() - base;
-}
-
-void set_timer(ulong t)
-{
- debug("%s(%lx)\n", __func__, t);
- timestamp = t;
-}
-
-/* delay x useconds AND preserve advance timestamp value */
-void __udelay(unsigned long usec)
-{
- struct fttmr010 *tmr = (struct fttmr010 *)CONFIG_FTTMR010_BASE;
-
-#ifdef CONFIG_FTTMR010_EXT_CLK
- long tmo = usec * (TIMER_CLOCK / 1000) / 1000;
-#else
- long tmo = usec * ((CONFIG_SYS_CLK_FREQ / 2) / 1000) / 1000;
-#endif
- unsigned long now, last = readl(&tmr->timer3_counter);
-
- debug("%s(%lu)\n", __func__, usec);
- while (tmo > 0) {
- now = readl(&tmr->timer3_counter);
- if (now > last) /* count down timer overflow */
- tmo -= TIMER_LOAD_VAL + last - now;
- else
- tmo -= last - now;
- last = now;
- }
-}
-
-/*
- * This function is derived from PowerPC code (read timebase as long long).
- * On ARM it just returns the timer value.
- */
-unsigned long long get_ticks(void)
-{
- debug("%s()\n", __func__);
- return get_timer(0);
-}
-
-/*
- * This function is derived from PowerPC code (timebase clock frequency).
- * On ARM it returns the number of timer ticks per second.
- */
-ulong get_tbclk(void)
-{
- debug("%s()\n", __func__);
-#ifdef CONFIG_FTTMR010_EXT_CLK
- return CONFIG_SYS_HZ;
-#else
- return CONFIG_SYS_CLK_FREQ;
-#endif
-}
diff --git a/arch/nds32/cpu/n1213/ag102/watchdog.S b/arch/nds32/cpu/n1213/ag102/watchdog.S
deleted file mode 100644
index 8f450af..0000000
--- a/arch/nds32/cpu/n1213/ag102/watchdog.S
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2011 Andes Technology Corporation
- * Macpaul Lin, Andes Technology Corporation <macpaul@andestech.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#include <asm/arch-ag102/ag102.h>
-#include <linux/linkage.h>
-
-.text
-
-#ifndef CONFIG_SKIP_TRUNOFF_WATCHDOG
-ENTRY(turnoff_watchdog)
-
-#define WD_CR 0xC
-#define WD_ENABLE 0x1
-
- ! Turn off the watchdog, according to Faraday FTWDT010 spec
- li $p0, (CONFIG_FTWDT010_BASE+WD_CR) ! Get the addr of WD CR
- lwi $p1, [$p0] ! Get the config of WD
- andi $p1, $p1, 0x1f ! Wipe out useless bits
- li $r0, ~WD_ENABLE
- and $p1, $p1, $r0 ! Set WD disable
- sw $p1, [$p0] ! Write back to WD CR
-
- ! Disable Interrupts by clear GIE in $PSW reg
- setgie.d
-
- ret
-
-ENDPROC(turnoff_watchdog)
-#endif
diff --git a/arch/nds32/include/asm/mach-types.h b/arch/nds32/include/asm/mach-types.h
index 259e4e7..1959d7e 100644
--- a/arch/nds32/include/asm/mach-types.h
+++ b/arch/nds32/include/asm/mach-types.h
@@ -12,20 +12,6 @@ extern unsigned int __machine_arch_type;
#endif
/* see arch/arm/kernel/arch.c for a description of these */
-#define MACH_TYPE_ADPAG101 0
-
-#ifdef CONFIG_ARCH_ADPAG101
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ADPAG101
-# endif
-# define machine_is_adpag101() (machine_arch_type == MACH_TYPE_ADPAG101)
-#else
-# define machine_is_adpag101() (0)
-#endif
-
#define MACH_TYPE_ADPAG101P 1
#ifdef CONFIG_ARCH_ADPAG101P
@@ -40,18 +26,4 @@ extern unsigned int __machine_arch_type;
# define machine_is_adpag101p() (1)
#endif
-#define MACH_TYPE_ADPAG102 2
-
-#ifdef CONFIG_ARCH_ADPAG102
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ADPAG102
-# endif
-# define machine_is_adpag102() (machine_arch_type == MACH_TYPE_ADPAG102)
-#else
-# define machine_is_adpag102() (2)
-#endif
-
#endif /* __ASM_NDS32_MACH_TYPE_H */