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

Commit cf82e0e4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: sirf: enable multiplatform support 



All the prerequisites are there now, so we can move sirf into multiplatform.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 275786b7

arch/arm/Kconfig

+0 −17
Original line number Original line Diff line number Diff line
@@ -49,7 +49,6 @@ config ARM 
	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_SYSCALL_TRACEPOINTS

	select HAVE_SYSCALL_TRACEPOINTS

	select HAVE_UID16

	select HAVE_UID16

	select HAVE_VIRT_TO_BUS

	select KTIME_SCALAR

	select KTIME_SCALAR

	select PERF_USE_VMALLOC

	select PERF_USE_VMALLOC

	select RTC_LIB

	select RTC_LIB
@@ -415,22 +414,6 @@ config ARCH_GEMINI 
	help

	help

	  Support for the Cortina Systems Gemini family SoCs

	  Support for the Cortina Systems Gemini family SoCs





config ARCH_SIRF

	bool "CSR SiRF"

	select ARCH_REQUIRE_GPIOLIB

	select AUTO_ZRELADDR

	select COMMON_CLK

	select GENERIC_CLOCKEVENTS

	select GENERIC_IRQ_CHIP

	select MIGHT_HAVE_CACHE_L2X0

	select NO_IOPORT

	select PINCTRL

	select PINCTRL_SIRF

	select USE_OF

	select SPARSE_IRQ

	help

	  Support for CSR SiRFprimaII/Marco/Polo platforms



config ARCH_EBSA110

config ARCH_EBSA110

	bool "EBSA-110"

	bool "EBSA-110"

	select ARCH_USES_GETTIMEOFFSET

	select ARCH_USES_GETTIMEOFFSET

arch/arm/mach-prima2/Kconfig

+12 −0
Original line number Original line Diff line number Diff line 
config ARCH_SIRF

	bool "CSR SiRF" if ARCH_MULTI_V7

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_CLOCKEVENTS

	select GENERIC_IRQ_CHIP

	select MIGHT_HAVE_CACHE_L2X0

	select NO_IOPORT

	select PINCTRL

	select PINCTRL_SIRF

	help

	  Support for CSR SiRFprimaII/Marco/Polo platforms



if ARCH_SIRF

if ARCH_SIRF





menu "CSR SiRF atlas6/primaII/Marco/Polo Specific Features"

menu "CSR SiRF atlas6/primaII/Marco/Polo Specific Features"

arch/arm/mach-prima2/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -6,3 +6,5 @@ obj-$(CONFIG_CACHE_L2X0) += l2x0.o 
obj-$(CONFIG_SUSPEND) += pm.o sleep.o

obj-$(CONFIG_SUSPEND) += pm.o sleep.o

obj-$(CONFIG_SMP) += platsmp.o headsmp.o

obj-$(CONFIG_SMP) += platsmp.o headsmp.o

obj-$(CONFIG_HOTPLUG_CPU)  += hotplug.o

obj-$(CONFIG_HOTPLUG_CPU)  += hotplug.o



CFLAGS_hotplug.o += -march=armv7-a

arch/arm/mach-prima2/common.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -13,6 +13,9 @@ 
#include <asm/mach/time.h>

#include <asm/mach/time.h>

#include <asm/exception.h>

#include <asm/exception.h>





#define SIRFSOC_VA_BASE		_AC(0xFEC00000, UL)

#define SIRFSOC_VA(x)		(SIRFSOC_VA_BASE + ((x) & 0x00FFF000))



extern struct smp_operations   sirfsoc_smp_ops;

extern struct smp_operations   sirfsoc_smp_ops;

extern void sirfsoc_secondary_startup(void);

extern void sirfsoc_secondary_startup(void);

extern void sirfsoc_cpu_die(unsigned int cpu);

extern void sirfsoc_cpu_die(unsigned int cpu);

arch/arm/mach-prima2/include/mach/clkdev.h

deleted100644 → 0
+0 −15
Original line number Original line Diff line number Diff line 
/*

 * arch/arm/mach-prima2/include/mach/clkdev.h

 *

 * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company.

 *

 * Licensed under GPLv2 or later.

 */



#ifndef __MACH_CLKDEV_H

#define __MACH_CLKDEV_H



#define __clk_get(clk) ({ 1; })

#define __clk_put(clk) do { } while (0)



#endif