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

ARM: iop32x: merge everything into mach-iop32x/ 

Various bits of iop32x are now in their traditional locations in plat-iop,
mach-iop/include/mach/ and in include/asm/mach/hardware. As nothing
outside of the iop32x mach code references these any more, this can all
be moved into one place now.

The only remaining things in the include/mach/ directory are now the
NR_IRQS definition, the entry-macros.S file and the the decompressor
uart access. After the irqchip code has been converted to SPARSE_IRQ
and GENERIC_IRQ_MULTI_HANDLER, it can be moved to ARCH_MULTIPLATFORM.

Link: https://lore.kernel.org/r/20190809163334.489360-7-arnd@arndb.de


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

arch/arm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -229,7 +229,6 @@ plat-$(CONFIG_ARCH_EXYNOS) += samsung 
plat-$(CONFIG_ARCH_OMAP)	+= omap

plat-$(CONFIG_ARCH_S3C64XX)	+= samsung

plat-$(CONFIG_ARCH_S5PV210)	+= samsung

plat-$(CONFIG_PLAT_IOP)		+= iop

plat-$(CONFIG_PLAT_ORION)	+= orion

plat-$(CONFIG_PLAT_PXA)		+= pxa

plat-$(CONFIG_PLAT_S3C24XX)	+= samsung

arch/arm/mach-iop32x/Makefile

+9 −1
Original line number Diff line number Diff line
@@ -3,7 +3,15 @@ 
# Makefile for the linux kernel.

#



obj-y			:= irq.o

obj-$(CONFIG_ARCH_IOP32X) += irq.o

obj-$(CONFIG_ARCH_IOP32X) += i2c.o

obj-$(CONFIG_ARCH_IOP32X) += pci.o

obj-$(CONFIG_ARCH_IOP32X) += setup.o

obj-$(CONFIG_ARCH_IOP32X) += time.o

obj-$(CONFIG_ARCH_IOP32X) += cp6.o

obj-$(CONFIG_ARCH_IOP32X) += adma.o

obj-$(CONFIG_ARCH_IOP32X) += pmu.o

obj-$(CONFIG_ARCH_IOP32X) += restart.o



obj-$(CONFIG_MACH_GLANTANK) += glantank.o

obj-$(CONFIG_ARCH_IQ80321) += iq80321.o

arch/arm/plat-iop/adma.c→arch/arm/mach-iop32x/adma.c

+3 −1
Original line number Diff line number Diff line
@@ -4,10 +4,12 @@ 
 * Copyright © 2006, Intel Corporation.

 */

#include <linux/platform_device.h>

#include <asm/hardware/iop3xx.h>

#include <linux/dma-mapping.h>

#include <linux/platform_data/dma-iop32x.h>



#include "iop3xx.h"

#include "irqs.h"



#define IRQ_DMA0_EOT IRQ_IOP32X_DMA0_EOT

#define IRQ_DMA0_EOC IRQ_IOP32X_DMA0_EOC

#define IRQ_DMA0_ERR IRQ_IOP32X_DMA0_ERR

arch/arm/plat-iop/cp6.c→arch/arm/mach-iop32x/cp6.c

+0 −0

File moved.

View file

arch/arm/mach-iop32x/em7210.c

+3 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/i2c.h>

#include <linux/gpio.h>

#include <linux/gpio/machine.h>

#include <mach/hardware.h>

#include <linux/io.h>

#include <linux/irq.h>

#include <asm/mach/arch.h>
@@ -29,8 +28,10 @@ 
#include <asm/mach/pci.h>

#include <asm/mach/time.h>

#include <asm/mach-types.h>

#include <mach/time.h>



#include "hardware.h"

#include "gpio-iop32x.h"

#include "irqs.h"



static void __init em7210_timer_init(void)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE