Commit 86fa0707 authored by Fabio Estevam's avatar Fabio Estevam Committed by Shawn Guo
Browse files

ARM: imx27: Get rid of mm-imx27.c 



Get rid of mm-imx27.c and move its code to the mach-imx27.c file.

This aligns with other i.MX SoC code.

Signed-off-by: default avatarFabio Estevam <festevam@gmail.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent eeae5688

arch/arm/mach-imx/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ obj-y := cpu.o system.o irq-common.o 


obj-$(CONFIG_SOC_IMX25) += cpu-imx25.o mach-imx25.o pm-imx25.o



obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o mach-imx27.o mm-imx27.o

obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o mach-imx27.o



obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o iomux-imx31.o mach-imx31.o

obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o mach-imx35.o

arch/arm/mach-imx/common.h

+0 −3
Original line number Diff line number Diff line
@@ -18,16 +18,13 @@ enum mxc_cpu_pwr_mode; 
struct of_device_id;



void mx21_map_io(void);

void mx27_map_io(void);

void mx31_map_io(void);

void mx35_map_io(void);

void imx21_init_early(void);

void imx27_init_early(void);

void imx31_init_early(void);

void imx35_init_early(void);

void mxc_init_irq(void __iomem *);

void mx21_init_irq(void);

void mx27_init_irq(void);

void mx31_init_irq(void);

void mx35_init_irq(void);

void imx21_soc_init(void);

arch/arm/mach-imx/mach-imx27.c

+49 −0
Original line number Diff line number Diff line
@@ -3,15 +3,64 @@ 
 * Copyright 2012 Sascha Hauer, Pengutronix

 */



#include <linux/init.h>

#include <linux/irq.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <linux/mm.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/mach/time.h>



#include "common.h"

#include "devices/devices-common.h"

#include "hardware.h"

#include "mx27.h"



/* MX27 memory map definition */

static struct map_desc imx27_io_desc[] __initdata = {

	/*

	 * this fixed mapping covers:

	 * - AIPI1

	 * - AIPI2

	 * - AITC

	 * - ROM Patch

	 * - and some reserved space

	 */

	imx_map_entry(MX27, AIPI, MT_DEVICE),

	/*

	 * this fixed mapping covers:

	 * - CSI

	 * - ATA

	 */

	imx_map_entry(MX27, SAHB1, MT_DEVICE),

	/*

	 * this fixed mapping covers:

	 * - EMI

	 */

	imx_map_entry(MX27, X_MEMC, MT_DEVICE),

};



/*

 * Initialize the memory map. It is called during the

 * system startup to create static physical to virtual

 * memory map for the IO modules.

 */

static void __init mx27_map_io(void)

{

	iotable_init(imx27_io_desc, ARRAY_SIZE(imx27_io_desc));

}



static void __init imx27_init_early(void)

{

	mxc_set_cpu_type(MXC_CPU_MX27);

}



static void __init mx27_init_irq(void)

{

	mxc_init_irq(MX27_IO_ADDRESS(MX27_AVIC_BASE_ADDR));

}



static const char * const imx27_dt_board_compat[] __initconst = {

	"fsl,imx27",

	NULL

arch/arm/mach-imx/mm-imx27.c

deleted100644 → 0
+0 −58
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * arch/arm/mach-imx/mm-imx27.c

 *

 * Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de)

 */



#include <linux/mm.h>

#include <linux/init.h>

#include <asm/mach/map.h>



#include "common.h"

#include "devices/devices-common.h"

#include "hardware.h"



/* MX27 memory map definition */

static struct map_desc imx27_io_desc[] __initdata = {

	/*

	 * this fixed mapping covers:

	 * - AIPI1

	 * - AIPI2

	 * - AITC

	 * - ROM Patch

	 * - and some reserved space

	 */

	imx_map_entry(MX27, AIPI, MT_DEVICE),

	/*

	 * this fixed mapping covers:

	 * - CSI

	 * - ATA

	 */

	imx_map_entry(MX27, SAHB1, MT_DEVICE),

	/*

	 * this fixed mapping covers:

	 * - EMI

	 */

	imx_map_entry(MX27, X_MEMC, MT_DEVICE),

};



/*

 * Initialize the memory map. It is called during the

 * system startup to create static physical to virtual

 * memory map for the IO modules.

 */

void __init mx27_map_io(void)

{

	iotable_init(imx27_io_desc, ARRAY_SIZE(imx27_io_desc));

}



void __init imx27_init_early(void)

{

	mxc_set_cpu_type(MXC_CPU_MX27);

}



void __init mx27_init_irq(void)

{

	mxc_init_irq(MX27_IO_ADDRESS(MX27_AVIC_BASE_ADDR));

}