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

Commit 1ffedce7 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] Fix Realview machine for patch 3016/1 



3016/1 changed the map_desc structure to take a PFN instead of a
physical address.  Fixup Realview machine support for this change.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 6bf7bd69

arch/arm/mach-realview/realview_eb.c

+37 −7
Original line number Original line Diff line number Diff line
@@ -43,14 +43,44 @@ 
#include "clock.h"

#include "clock.h"





static struct map_desc realview_eb_io_desc[] __initdata = {

static struct map_desc realview_eb_io_desc[] __initdata = {

 { IO_ADDRESS(REALVIEW_SYS_BASE),	REALVIEW_SYS_BASE,	SZ_4K,	MT_DEVICE },

	{

 { IO_ADDRESS(REALVIEW_GIC_CPU_BASE),	REALVIEW_GIC_CPU_BASE,	SZ_4K,	MT_DEVICE },

		.virtual	= IO_ADDRESS(REALVIEW_SYS_BASE),

 { IO_ADDRESS(REALVIEW_GIC_DIST_BASE),	REALVIEW_GIC_DIST_BASE,	SZ_4K,	MT_DEVICE },

		.pfn		= __phys_to_pfn(REALVIEW_SYS_BASE),

 { IO_ADDRESS(REALVIEW_SCTL_BASE),	REALVIEW_SCTL_BASE,	SZ_4K,	MT_DEVICE },

		.length		= SZ_4K,

 { IO_ADDRESS(REALVIEW_TIMER0_1_BASE),	REALVIEW_TIMER0_1_BASE,	SZ_4K,	MT_DEVICE },

		.type		= MT_DEVICE,

 { IO_ADDRESS(REALVIEW_TIMER2_3_BASE),	REALVIEW_TIMER2_3_BASE,	SZ_4K,	MT_DEVICE },

	}, {

		.virtual	= IO_ADDRESS(REALVIEW_GIC_CPU_BASE),

		.pfn		= __phys_to_pfn(REALVIEW_GIC_CPU_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= IO_ADDRESS(REALVIEW_GIC_DIST_BASE),

		.pfn		= __phys_to_pfn(REALVIEW_GIC_DIST_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= IO_ADDRESS(REALVIEW_SCTL_BASE),

		.pfn		= __phys_to_pfn(REALVIEW_SCTL_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= IO_ADDRESS(REALVIEW_TIMER0_1_BASE),

		.pfn		= __phys_to_pfn(REALVIEW_TIMER0_1_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= IO_ADDRESS(REALVIEW_TIMER2_3_BASE),

		.pfn		= __phys_to_pfn(REALVIEW_TIMER2_3_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE,

	},

#ifdef CONFIG_DEBUG_LL

#ifdef CONFIG_DEBUG_LL

 { IO_ADDRESS(REALVIEW_UART0_BASE),	REALVIEW_UART0_BASE,	SZ_4K,	MT_DEVICE },

	{

		.virtual	= IO_ADDRESS(REALVIEW_UART0_BASE),

		.pfn		= __phys_to_pfn(REALVIEW_UART0_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE,

	}

#endif

#endif

};

};