aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-zynq/common.c5
-rw-r--r--arch/arm/mach-zynq/include/mach/zynq_soc.h6
-rw-r--r--arch/arm/mach-zynq/timer.c1
3 files changed, 1 insertions, 11 deletions
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 79bf5fb4dad3..2202f67c8a09 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -74,11 +74,6 @@ static void __init xilinx_irq_init(void)
74 74
75static struct map_desc io_desc[] __initdata = { 75static struct map_desc io_desc[] __initdata = {
76 { 76 {
77 .virtual = TTC0_VIRT,
78 .pfn = __phys_to_pfn(TTC0_PHYS),
79 .length = TTC0_SIZE,
80 .type = MT_DEVICE,
81 }, {
82 .virtual = SCU_PERIPH_VIRT, 77 .virtual = SCU_PERIPH_VIRT,
83 .pfn = __phys_to_pfn(SCU_PERIPH_PHYS), 78 .pfn = __phys_to_pfn(SCU_PERIPH_PHYS),
84 .length = SCU_PERIPH_SIZE, 79 .length = SCU_PERIPH_SIZE,
diff --git a/arch/arm/mach-zynq/include/mach/zynq_soc.h b/arch/arm/mach-zynq/include/mach/zynq_soc.h
index 5ebbd8e6eeee..2995044682dc 100644
--- a/arch/arm/mach-zynq/include/mach/zynq_soc.h
+++ b/arch/arm/mach-zynq/include/mach/zynq_soc.h
@@ -29,13 +29,9 @@
29#define UART_SIZE SZ_4K 29#define UART_SIZE SZ_4K
30#define UART_VIRT 0xF0001000 30#define UART_VIRT 0xF0001000
31 31
32#define TTC0_PHYS 0xF8001000
33#define TTC0_SIZE SZ_4K
34#define TTC0_VIRT (VMALLOC_END - TTC0_SIZE)
35
36#define SCU_PERIPH_PHYS 0xF8F00000 32#define SCU_PERIPH_PHYS 0xF8F00000
37#define SCU_PERIPH_SIZE SZ_8K 33#define SCU_PERIPH_SIZE SZ_8K
38#define SCU_PERIPH_VIRT (TTC0_VIRT - SCU_PERIPH_SIZE) 34#define SCU_PERIPH_VIRT (VMALLOC_END - SCU_PERIPH_SIZE)
39 35
40#if IS_ENABLED(CONFIG_DEBUG_ZYNQ_UART1) 36#if IS_ENABLED(CONFIG_DEBUG_ZYNQ_UART1)
41# define LL_UART_PADDR UART1_PHYS 37# define LL_UART_PADDR UART1_PHYS
diff --git a/arch/arm/mach-zynq/timer.c b/arch/arm/mach-zynq/timer.c
index 9662306aa12f..de3df283da74 100644
--- a/arch/arm/mach-zynq/timer.c
+++ b/arch/arm/mach-zynq/timer.c
@@ -29,7 +29,6 @@
29#include <linux/slab.h> 29#include <linux/slab.h>
30#include <linux/clk-provider.h> 30#include <linux/clk-provider.h>
31 31
32#include <mach/zynq_soc.h>
33#include "common.h" 32#include "common.h"
34 33
35/* 34/*