Commit 64dbc4dd authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: pxa: move plat-pxa to drivers/soc/ 



There are two drivers in arch/arm/plat-pxa: mfp and ssp. Both
of them should ideally not be needed at all, as there are
proper subsystems to replace them.

OTOH, they are self-contained and can simply be normal
SoC drivers, so move them over there to eliminate one more
of the plat-* directories.

Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> (mach-pxa)
Acked-by: Lubomir Rintel <lkundrak@v3.sk> (mach-mmp)
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 6922a3d1

arch/arm/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -667,7 +667,6 @@ source "arch/arm/mach-orion5x/Kconfig" 
source "arch/arm/mach-oxnas/Kconfig"



source "arch/arm/mach-pxa/Kconfig"

source "arch/arm/plat-pxa/Kconfig"



source "arch/arm/mach-qcom/Kconfig"
@@ -753,9 +752,6 @@ config PLAT_ORION_LEGACY 
	bool

	select PLAT_ORION



config PLAT_PXA

	bool



config PLAT_VERSATILE

	bool

arch/arm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -230,7 +230,6 @@ machine-$(CONFIG_PLAT_SPEAR) += spear 
# by CONFIG_* macro name.

plat-$(CONFIG_ARCH_OMAP)	+= omap

plat-$(CONFIG_PLAT_ORION)	+= orion

plat-$(CONFIG_PLAT_PXA)		+= pxa

plat-$(CONFIG_PLAT_VERSATILE)	+= versatile



# The byte offset of the kernel image in RAM from the start of RAM.

arch/arm/mach-mmp/mfp.h

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#ifndef __ASM_MACH_MFP_H

#define __ASM_MACH_MFP_H



#include <plat/mfp.h>

#include <linux/soc/pxa/mfp.h>



/*

 * NOTE: the MFPR register bit definitions on PXA168 processor lines are a

arch/arm/mach-pxa/include/mach/mfp.h

+1 −1
Original line number Diff line number Diff line
@@ -13,6 +13,6 @@ 
#ifndef __ASM_ARCH_MFP_H

#define __ASM_ARCH_MFP_H



#include <plat/mfp.h>

#include <linux/soc/pxa/mfp.h>



#endif /* __ASM_ARCH_MFP_H */

arch/arm/mach-pxa/mfp-pxa2xx.h

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#ifndef __ASM_ARCH_MFP_PXA2XX_H

#define __ASM_ARCH_MFP_PXA2XX_H



#include <plat/mfp.h>

#include <linux/soc/pxa/mfp.h>



/*

 * the following MFP_xxx bit definitions in mfp.h are re-used for pxa2xx: