From 88196ba6bf0772ddaf99b63fbc7f491cc0d6a033 Mon Sep 17 00:00:00 2001
From: Josh Cartwright <josh.cartwright@ni.com>
Date: Mon, 19 Nov 2012 10:01:03 -0600
Subject: [PATCH] --- yaml --- r: 342407 b: refs/heads/master c:
 667f2988e2c11b25e79a46aff2f269696dbe8dc1 h: refs/heads/master i:   342405:
 9424640522b97baa2d4f54fe7b6f609c96b8f510   342403:
 8b2d92662376847212aec0f3e2e1645b33ece8be   342399:
 40c8d4b44cdbb266ec247c352730e4fedd6da6ed v: v3

---
 [refs]                                           | 2 +-
 trunk/arch/arm/mach-zynq/common.c                | 5 -----
 trunk/arch/arm/mach-zynq/include/mach/zynq_soc.h | 6 +-----
 trunk/arch/arm/mach-zynq/timer.c                 | 1 -
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 1ae058069297..9183700ba1b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84d2e38e935620004245f0e22113cf8389834635
+refs/heads/master: 667f2988e2c11b25e79a46aff2f269696dbe8dc1
diff --git a/trunk/arch/arm/mach-zynq/common.c b/trunk/arch/arm/mach-zynq/common.c
index 79bf5fb4dad3..2202f67c8a09 100644
--- a/trunk/arch/arm/mach-zynq/common.c
+++ b/trunk/arch/arm/mach-zynq/common.c
@@ -74,11 +74,6 @@ static void __init xilinx_irq_init(void)
 
 static struct map_desc io_desc[] __initdata = {
 	{
-		.virtual	= TTC0_VIRT,
-		.pfn		= __phys_to_pfn(TTC0_PHYS),
-		.length		= TTC0_SIZE,
-		.type		= MT_DEVICE,
-	}, {
 		.virtual	= SCU_PERIPH_VIRT,
 		.pfn		= __phys_to_pfn(SCU_PERIPH_PHYS),
 		.length		= SCU_PERIPH_SIZE,
diff --git a/trunk/arch/arm/mach-zynq/include/mach/zynq_soc.h b/trunk/arch/arm/mach-zynq/include/mach/zynq_soc.h
index 5ebbd8e6eeee..2995044682dc 100644
--- a/trunk/arch/arm/mach-zynq/include/mach/zynq_soc.h
+++ b/trunk/arch/arm/mach-zynq/include/mach/zynq_soc.h
@@ -29,13 +29,9 @@
 #define UART_SIZE		SZ_4K
 #define UART_VIRT		0xF0001000
 
-#define TTC0_PHYS		0xF8001000
-#define TTC0_SIZE		SZ_4K
-#define TTC0_VIRT		(VMALLOC_END - TTC0_SIZE)
-
 #define SCU_PERIPH_PHYS		0xF8F00000
 #define SCU_PERIPH_SIZE		SZ_8K
-#define SCU_PERIPH_VIRT		(TTC0_VIRT - SCU_PERIPH_SIZE)
+#define SCU_PERIPH_VIRT		(VMALLOC_END - SCU_PERIPH_SIZE)
 
 #if IS_ENABLED(CONFIG_DEBUG_ZYNQ_UART1)
 # define LL_UART_PADDR		UART1_PHYS
diff --git a/trunk/arch/arm/mach-zynq/timer.c b/trunk/arch/arm/mach-zynq/timer.c
index 9662306aa12f..de3df283da74 100644
--- a/trunk/arch/arm/mach-zynq/timer.c
+++ b/trunk/arch/arm/mach-zynq/timer.c
@@ -29,7 +29,6 @@
 #include <linux/slab.h>
 #include <linux/clk-provider.h>
 
-#include <mach/zynq_soc.h>
 #include "common.h"
 
 /*