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

Commit 0fcfdbca authored by Josh Cartwright's avatar Josh Cartwright Committed by Michal Simek
Browse files

zynq: use pl310 device tree bindings 



The Zynq has a PL310 L2 cache controller.  Convert in-tree uses to using
the device tree.

Signed-off-by: default avatarJosh Cartwright <josh.cartwright@ni.com>
Cc: John Linn <john.linn@xilinx.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Tested-by: default avatarMichal Simek <michal.simek@xilinx.com>
parent f447ed2d

arch/arm/boot/dts/zynq-ep107.dts

+9 −0
Original line number Diff line number Diff line
@@ -44,6 +44,15 @@ 
			      <0xF8F00100 0x100>;

		};



		L2: cache-controller {

			compatible = "arm,pl310-cache";

			reg = <0xF8F02000 0x1000>;

			arm,data-latency = <2 3 2>;

			arm,tag-latency = <2 3 2>;

			cache-unified;

			cache-level = <2>;

		};



		uart0: uart@e0000000 {

			compatible = "xlnx,xuartps";

			reg = <0xE0000000 0x1000>;

arch/arm/mach-zynq/common.c

+1 −8
Original line number Diff line number Diff line
@@ -45,12 +45,10 @@ static struct of_device_id zynq_of_bus_ids[] __initdata = { 
 */

static void __init xilinx_init_machine(void)

{

#ifdef CONFIG_CACHE_L2X0

	/*

	 * 64KB way size, 8-way associativity, parity disabled

	 */

	l2x0_init(PL310_L2CC_BASE, 0x02060000, 0xF0F0FFFF);

#endif

	l2x0_of_init(0x02060000, 0xF0F0FFFF);



	of_platform_bus_probe(NULL, zynq_of_bus_ids, NULL);

}
@@ -83,11 +81,6 @@ static struct map_desc io_desc[] __initdata = { 
		.pfn		= __phys_to_pfn(SCU_PERIPH_PHYS),

		.length		= SZ_8K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= PL310_L2CC_VIRT,

		.pfn		= __phys_to_pfn(PL310_L2CC_PHYS),

		.length		= SZ_4K,

		.type		= MT_DEVICE,

	},



#ifdef CONFIG_DEBUG_LL

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

+0 −4
Original line number Diff line number Diff line
@@ -25,9 +25,6 @@ 
#define TTC0_PHYS			0xF8001000

#define TTC0_VIRT			TTC0_PHYS



#define PL310_L2CC_PHYS			0xF8F02000

#define PL310_L2CC_VIRT			PL310_L2CC_PHYS



#define SCU_PERIPH_PHYS			0xF8F00000

#define SCU_PERIPH_VIRT			SCU_PERIPH_PHYS
@@ -35,7 +32,6 @@ 


#define TTC0_BASE			IOMEM(TTC0_VIRT)

#define SCU_PERIPH_BASE			IOMEM(SCU_PERIPH_VIRT)

#define PL310_L2CC_BASE			IOMEM(PL310_L2CC_VIRT)



/*

 * Mandatory for CONFIG_LL_DEBUG, UART is mapped virtual = physical