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

Commit 07e812a0 authored by Vipul Kumar Samar's avatar Vipul Kumar Samar Committed by Viresh Kumar
Browse files

ARM: SPEAr1310: Move 1310 specific misc register into machine specific files 



This patch moves some global macro definitions to the files where they are used.
Its a step towards removing spear.h completely later on.

Signed-off-by: default avatarVipul Kumar Samar <vipulkumar.samar@st.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent 8113ba91

arch/arm/mach-spear13xx/include/mach/spear.h

+0 −8
Original line number Diff line number Diff line
@@ -47,14 +47,6 @@ 
#define DMAC1_BASE				UL(0xEB000000)

#define MCIF_CF_BASE				UL(0xB2800000)



/* Devices present in SPEAr1310 */

#ifdef CONFIG_MACH_SPEAR1310

#define SPEAR1310_RAS_GRP1_BASE			UL(0xD8000000)

#define VA_SPEAR1310_RAS_GRP1_BASE		UL(0xFA000000)

#define SPEAR1310_RAS_BASE			UL(0xD8400000)

#define VA_SPEAR1310_RAS_BASE			IOMEM(UL(0xFA400000))

#endif /* CONFIG_MACH_SPEAR1310 */



/* Debug uart for linux, will be used for debug and uncompress messages */

#define SPEAR_DBG_UART_BASE			UART_BASE

#define VA_SPEAR_DBG_UART_BASE			VA_UART_BASE

arch/arm/mach-spear13xx/spear1310.c

+5 −0
Original line number Diff line number Diff line
@@ -27,6 +27,11 @@ 
#define SPEAR1310_SATA1_BASE			UL(0xB1800000)

#define SPEAR1310_SATA2_BASE			UL(0xB4000000)



#define SPEAR1310_RAS_GRP1_BASE			UL(0xD8000000)

#define VA_SPEAR1310_RAS_GRP1_BASE		UL(0xFA000000)

#define SPEAR1310_RAS_BASE			UL(0xD8400000)

#define VA_SPEAR1310_RAS_BASE			IOMEM(UL(0xFA400000))



/* ssp device registration */

static struct pl022_ssp_controller ssp1_plat_data = {

	.bus_id = 0,

drivers/clk/spear/spear1310_clock.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <mach/spear.h>

#include "clk.h"



#define VA_SPEAR1310_RAS_BASE			IOMEM(UL(0xFA400000))

/* PLL related registers and bit values */

#define SPEAR1310_PLL_CFG			(VA_MISC_BASE + 0x210)

	/* PLL_CFG bit values */