Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2024-12-29 17:23:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2019-09-20 13:33:40 +02:00
parent 6922a3d14e
commit 64dbc4dd7a
13 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/Kconfig
View File

@ -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

1
arch/arm/Makefile
View File

@ -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.

2
arch/arm/mach-mmp/mfp.h
View File

@ -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

2
arch/arm/mach-pxa/include/mach/mfp.h
View File

@ -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 */

2
arch/arm/mach-pxa/mfp-pxa2xx.h
View File

@ -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:

2
arch/arm/mach-pxa/mfp-pxa3xx.h
View File

@ -2,7 +2,7 @@
#ifndef __ASM_ARCH_MFP_PXA3XX_H
#define __ASM_ARCH_MFP_PXA3XX_H
#include <plat/mfp.h>
#include <linux/soc/pxa/mfp.h>
#define MFPR_BASE (0x40e10000)

1
drivers/soc/Kconfig
View File

@ -14,6 +14,7 @@ source "drivers/soc/ixp4xx/Kconfig"
source "drivers/soc/litex/Kconfig"
source "drivers/soc/mediatek/Kconfig"
source "drivers/soc/microchip/Kconfig"
source "drivers/soc/pxa/Kconfig"
source "drivers/soc/qcom/Kconfig"
source "drivers/soc/renesas/Kconfig"
source "drivers/soc/rockchip/Kconfig"

1
drivers/soc/Makefile
View File

@ -19,6 +19,7 @@ obj-$(CONFIG_SOC_XWAY) += lantiq/
obj-$(CONFIG_LITEX_SOC_CONTROLLER) += litex/
obj-y += mediatek/
obj-y += microchip/
obj-y += pxa/
obj-y += amlogic/
obj-y += qcom/
obj-y += renesas/

5
arch/arm/plat-pxa/Kconfig → drivers/soc/pxa/Kconfig
View File

@ -1,9 +1,8 @@
# SPDX-License-Identifier: GPL-2.0-only
if PLAT_PXA
config PLAT_PXA
bool
config PXA_SSP
tristate
help
Enable support for PXA2xx SSP ports
endif

4
arch/arm/plat-pxa/Makefile → drivers/soc/pxa/Makefile
View File

@ -1,8 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
#
# Makefile for code common across different PXA processor families
#
ccflags-$(CONFIG_ARCH_MMP) := -I$(srctree)/$(src)/include
obj-$(CONFIG_PXA3xx) += mfp.o
obj-$(CONFIG_ARCH_MMP) += mfp.o

2
arch/arm/plat-pxa/mfp.c → drivers/soc/pxa/mfp.c
View File

@ -15,7 +15,7 @@
#include <linux/init.h>
#include <linux/io.h>
#include <plat/mfp.h>
#include <linux/soc/pxa/mfp.h>
#define MFPR_SIZE (PAGE_SIZE)

0
arch/arm/plat-pxa/ssp.c → drivers/soc/pxa/ssp.c
View File

6
arch/arm/plat-pxa/include/plat/mfp.h → include/linux/soc/pxa/mfp.h
View File

@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* arch/arm/plat-pxa/include/plat/mfp.h
*
* Common Multi-Function Pin Definitions
*
* Copyright (C) 2007 Marvell International Ltd.
@ -453,8 +451,8 @@ struct mfp_addr_map {
#define MFP_ADDR_END { MFP_PIN_INVALID, 0 }
void __init mfp_init_base(void __iomem *mfpr_base);
void __init mfp_init_addr(struct mfp_addr_map *map);
void mfp_init_base(void __iomem *mfpr_base);
void mfp_init_addr(struct mfp_addr_map *map);
/*
* mfp_{read, write}() - for direct read/write access to the MFPR register