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

Commit 732078c3 authored by Michal Simek's avatar Michal Simek
Browse files

arm: zynq: Load scu baseaddress at run time 



Use Cortex a9 cp15 to read scu baseaddress.

Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
parent 4f0f234f

arch/arm/mach-zynq/common.c

+22 −12
Original line number Diff line number Diff line
@@ -33,10 +33,13 @@ 
#include <asm/mach-types.h>

#include <asm/page.h>

#include <asm/pgtable.h>

#include <asm/smp_scu.h>

#include <asm/hardware/cache-l2x0.h>



#include "common.h"



void __iomem *zynq_scu_base;



static struct of_device_id zynq_of_bus_ids[] __initdata = {

	{ .compatible = "simple-bus", },

	{}
@@ -56,17 +59,6 @@ static void __init xilinx_init_machine(void) 
	of_platform_bus_probe(NULL, zynq_of_bus_ids, NULL);

}



#define SCU_PERIPH_PHYS		0xF8F00000

#define SCU_PERIPH_SIZE		SZ_8K

#define SCU_PERIPH_VIRT		(VMALLOC_END - SCU_PERIPH_SIZE)



static struct map_desc scu_desc __initdata = {

	.virtual	= SCU_PERIPH_VIRT,

	.pfn		= __phys_to_pfn(SCU_PERIPH_PHYS),

	.length		= SCU_PERIPH_SIZE,

	.type		= MT_DEVICE,

};



static void __init xilinx_zynq_timer_init(void)

{

	struct device_node *np;
@@ -81,13 +73,31 @@ static void __init xilinx_zynq_timer_init(void) 
	clocksource_of_init();

}



static struct map_desc zynq_cortex_a9_scu_map __initdata = {

	.length	= SZ_256,

	.type	= MT_DEVICE,

};



static void __init zynq_scu_map_io(void)

{

	unsigned long base;



	base = scu_a9_get_base();

	zynq_cortex_a9_scu_map.pfn = __phys_to_pfn(base);

	/* Expected address is in vmalloc area that's why simple assign here */

	zynq_cortex_a9_scu_map.virtual = base;

	iotable_init(&zynq_cortex_a9_scu_map, 1);

	zynq_scu_base = (void __iomem *)base;

	BUG_ON(!zynq_scu_base);

}



/**

 * xilinx_map_io() - Create memory mappings needed for early I/O.

 */

static void __init xilinx_map_io(void)

{

	debug_ll_io_init();

	iotable_init(&scu_desc, 1);

	zynq_scu_map_io();

}



static const char *xilinx_dt_match[] = {

arch/arm/mach-zynq/common.h

+2 −0
Original line number Diff line number Diff line
@@ -17,4 +17,6 @@ 
#ifndef __MACH_ZYNQ_COMMON_H__

#define __MACH_ZYNQ_COMMON_H__



extern void __iomem *zynq_scu_base;



#endif