Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 667f2988 authored by Josh Cartwright's avatar Josh Cartwright Committed by Michal Simek
Browse files

ARM: zynq: remove TTC early mapping 



Now that the TTC driver has proper support for DT bindings, it is not
necessary for the registers to be mapped early.  They will be mapped
during clock initialization using of_iomap().  Remove the early mapping.

In addition, remove the extraneous zynq_soc.h include from the timer
driver.

Signed-off-by: default avatarJosh Cartwright <josh.cartwright@ni.com>
Tested-by: default avatarMichal Simek <michal.simek@xilinx.com>
parent 84d2e38e

arch/arm/mach-zynq/common.c

+0 −5
Original line number Diff line number Diff line
@@ -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,

arch/arm/mach-zynq/include/mach/zynq_soc.h

+1 −5
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-zynq/timer.c

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <linux/slab.h>

#include <linux/clk-provider.h>



#include <mach/zynq_soc.h>

#include "common.h"



/*