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

Commit 8864eaca authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'mmp/multiplatform' into next/multiplatform 

* mmp/multiplatform:
  ARM: mmp: avoid unused functions
  ARM: mmp: move into ARCH_MULTIPLATFORM
  ARM: mmp: make all header files local
  ARM: mmp: make plat-pxa build standalone
  ARM: mmp: remove remaining legacy pxa-dma support
  ARM: mohawk: allow building with MMU disabled
  ARM: make xscale iwmmxt code multiplatform aware
  clk: mmp: stop using platform headers
parents fb4f0424 84f45ee9

arch/arm/Kconfig

+0 −16
Original line number Diff line number Diff line
@@ -546,22 +546,6 @@ config ARCH_ORION5X 
	  Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182),

	  Orion-2 (5281), Orion-1-90 (6183).



config ARCH_MMP

	bool "Marvell PXA168/910/MMP2"

	depends on MMU

	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select GENERIC_ALLOCATOR

	select GENERIC_CLOCKEVENTS

	select GPIO_PXA

	select IRQ_DOMAIN

	select MULTI_IRQ_HANDLER

	select PINCTRL

	select PLAT_PXA

	select SPARSE_IRQ

	help

	  Support for Marvell's PXA168/PXA910(MMP) and MMP2 processor line.



config ARCH_KS8695

	bool "Micrel/Kendin KS8695"

	select ARCH_REQUIRE_GPIOLIB

arch/arm/include/asm/cputype.h

+19 −3
Original line number Diff line number Diff line
@@ -228,10 +228,26 @@ static inline int cpu_is_xsc3(void) 
}

#endif



#if !defined(CONFIG_CPU_XSCALE) && !defined(CONFIG_CPU_XSC3)

#define	cpu_is_xscale()	0

#if !defined(CONFIG_CPU_XSCALE) && !defined(CONFIG_CPU_XSC3) && \

    !defined(CONFIG_CPU_MOHAWK)

#define	cpu_is_xscale_family() 0

#else

#define	cpu_is_xscale()	1

static inline int cpu_is_xscale_family(void)

{

	unsigned int id;

	id = read_cpuid_id() & 0xffffe000;



	switch (id) {

	case 0x69052000: /* Intel XScale 1 */

	case 0x69054000: /* Intel XScale 2 */

	case 0x69056000: /* Intel XScale 3 */

	case 0x56056000: /* Marvell XScale 3 */

	case 0x56158000: /* Marvell Mohawk */

		return 1;

	}



	return 0;

}

#endif



/*

arch/arm/kernel/xscale-cp0.c

+7 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ 
#include <linux/init.h>

#include <linux/io.h>

#include <asm/thread_notify.h>

#include <asm/cputype.h>



asm("	.arch armv5te\n");



static inline void dsp_save_state(u32 *state)

{
@@ -152,6 +155,10 @@ static int __init xscale_cp0_init(void) 
{

	u32 cp_access;



	/* do not attempt to probe iwmmxt on non-xscale family CPUs */

	if (!cpu_is_xscale_family())

		return 0;



	cp_access = xscale_cp_access_read() & ~3;

	xscale_cp_access_write(cp_access | 1);

arch/arm/mach-mmp/Kconfig

+26 −8
Original line number Diff line number Diff line 
menuconfig ARCH_MMP

	bool "Marvell PXA168/910/MMP2"

	depends on ARCH_MULTI_V5 || ARCH_MULTI_V7

	select ARCH_REQUIRE_GPIOLIB

	select GPIO_PXA

	select PINCTRL

	select PLAT_PXA

	help

	  Support for Marvell's PXA168/PXA910(MMP) and MMP2 processor line.



if ARCH_MMP



menu "Marvell PXA168/910/MMP2 Implmentations"

menu "Marvell PXA168/910/MMP2 Implementations"



if ATAGS



config MACH_ASPENITE

	bool "Marvell's PXA168 Aspenite Development Board"

	depends on ARCH_MULTI_V5

	select CPU_PXA168

	help

	  Say 'Y' here if you want to support the Marvell PXA168-based
@@ -11,6 +24,7 @@ config MACH_ASPENITE 


config MACH_ZYLONITE2

	bool "Marvell's PXA168 Zylonite2 Development Board"

	depends on ARCH_MULTI_V5

	select CPU_PXA168

	help

	  Say 'Y' here if you want to support the Marvell PXA168-based
@@ -18,6 +32,7 @@ config MACH_ZYLONITE2 


config MACH_AVENGERS_LITE

	bool "Marvell's PXA168 Avengers Lite Development Board"

	depends on ARCH_MULTI_V5

	select CPU_PXA168

	help

	  Say 'Y' here if you want to support the Marvell PXA168-based
@@ -25,6 +40,7 @@ config MACH_AVENGERS_LITE 


config MACH_TAVOREVB

	bool "Marvell's PXA910 TavorEVB Development Board"

	depends on ARCH_MULTI_V5

	select CPU_PXA910

	help

	  Say 'Y' here if you want to support the Marvell PXA910-based
@@ -32,6 +48,7 @@ config MACH_TAVOREVB 


config MACH_TTC_DKB

	bool "Marvell's PXA910 TavorEVB Development Board"

	depends on ARCH_MULTI_V5

	select CPU_PXA910

	help

	  Say 'Y' here if you want to support the Marvell PXA910-based
@@ -39,7 +56,7 @@ config MACH_TTC_DKB 


config MACH_BROWNSTONE

	bool "Marvell's Brownstone Development Platform"

	depends on !CPU_MOHAWK

	depends on ARCH_MULTI_V7

	select CPU_MMP2

	help

	  Say 'Y' here if you want to support the Marvell MMP2-based
@@ -50,7 +67,7 @@ config MACH_BROWNSTONE 


config MACH_FLINT

	bool "Marvell's Flint Development Platform"

	depends on !CPU_MOHAWK

	depends on ARCH_MULTI_V7

	select CPU_MMP2

	help

	  Say 'Y' here if you want to support the Marvell MMP2-based
@@ -61,7 +78,7 @@ config MACH_FLINT 


config MACH_MARVELL_JASPER

	bool "Marvell's Jasper Development Platform"

	depends on !CPU_MOHAWK

	depends on ARCH_MULTI_V7

	select CPU_MMP2

	help

	  Say 'Y' here if you want to support the Marvell MMP2-base
@@ -72,6 +89,7 @@ config MACH_MARVELL_JASPER 


config MACH_TETON_BGA

	bool "Marvell's PXA168 Teton BGA Development Board"

	depends on ARCH_MULTI_V5

	select CPU_PXA168

	help

	  Say 'Y' here if you want to support the Marvell PXA168-based
@@ -79,14 +97,16 @@ config MACH_TETON_BGA 


config MACH_GPLUGD

	bool "Marvell's PXA168 GuruPlug Display (gplugD) Board"

	depends on ARCH_MULTI_V5

	select CPU_PXA168

	help

	  Say 'Y' here if you want to support the Marvell PXA168-based

	  GuruPlug Display (gplugD) Board

endif



config MACH_MMP_DT

	bool "Support MMP (ARMv5) platforms from device tree"

	select USE_OF

	depends on ARCH_MULTI_V5

	select PINCTRL

	select PINCTRL_SINGLE

	select COMMON_CLK
@@ -99,11 +119,9 @@ config MACH_MMP_DT 


config MACH_MMP2_DT

	bool "Support MMP2 (ARMv7) platforms from device tree"

	depends on !CPU_MOHAWK

	select USE_OF

	depends on ARCH_MULTI_V7

	select PINCTRL

	select PINCTRL_SINGLE

	select COMMON_CLK

	select ARCH_HAS_RESET_CONTROLLER

	select CPU_PJ4

	help

arch/arm/mach-mmp/Makefile

+1 −0
Original line number Diff line number Diff line 
#

# Makefile for Marvell's PXA168 processors line

#

ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-pxa/include



obj-y				+= common.o devices.o time.o