arm/mx2: split generic.c into mm-imx2[17].c (4a50d00c) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm/mach-mx2/Makefile

+3 −4

Original line number	Original line	Diff line number	Diff line
	@@ -4,13 +4,12 @@

	# Object file lists.		# Object file lists.

	obj-y := generic.o devices.o serial.o		obj-y := devices.o serial.o
	CFLAGS_generic.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS

	obj-$(CONFIG_MACH_MX21) += clock_imx21.o		obj-$(CONFIG_MACH_MX21) += clock_imx21.o mm-imx21.o

	obj-$(CONFIG_MACH_MX27) += cpu_imx27.o		obj-$(CONFIG_MACH_MX27) += cpu_imx27.o
	obj-$(CONFIG_MACH_MX27) += clock_imx27.o		obj-$(CONFIG_MACH_MX27) += clock_imx27.o mm-imx27.o

	obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o		obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o
	obj-$(CONFIG_MACH_MX27ADS) += mach-mx27ads.o		obj-$(CONFIG_MACH_MX27ADS) += mach-mx27ads.o

arch/arm/mach-mx2/mm-imx21.c

0 → 100644

+83 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* arch/arm/mach-mx2/mm-imx21.c
			*
			* Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de)
			*
			* This program is free software; you can redistribute it and/or
			* modify it under the terms of the GNU General Public License
			* as published by the Free Software Foundation; either version 2
			* of the License, or (at your option) any later version.
			* This program is distributed in the hope that it will be useful,
			* but WITHOUT ANY WARRANTY; without even the implied warranty of
			* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
			* GNU General Public License for more details.
			*
			* You should have received a copy of the GNU General Public License
			* along with this program; if not, write to the Free Software
			* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
			* MA 02110-1301, USA.
			*/

			#include <linux/mm.h>
			#include <linux/init.h>
			#include <mach/hardware.h>
			#include <mach/common.h>
			#include <asm/pgtable.h>
			#include <asm/mach/map.h>

			/* MX21 memory map definition */
			static struct map_desc imx21_io_desc[] __initdata = {
			/*
			* this fixed mapping covers:
			* - AIPI1
			* - AIPI2
			* - AITC
			* - ROM Patch
			* - and some reserved space
			*/
			{
			.virtual = MX21_AIPI_BASE_ADDR_VIRT,
			.pfn = __phys_to_pfn(MX21_AIPI_BASE_ADDR),
			.length = MX21_AIPI_SIZE,
			.type = MT_DEVICE
			},
			/*
			* this fixed mapping covers:
			* - CSI
			* - ATA
			*/
			{
			.virtual = MX21_SAHB1_BASE_ADDR_VIRT,
			.pfn = __phys_to_pfn(MX21_SAHB1_BASE_ADDR),
			.length = MX21_SAHB1_SIZE,
			.type = MT_DEVICE
			},
			/*
			* this fixed mapping covers:
			* - EMI
			*/
			{
			.virtual = MX21_X_MEMC_BASE_ADDR_VIRT,
			.pfn = __phys_to_pfn(MX21_X_MEMC_BASE_ADDR),
			.length = MX21_X_MEMC_SIZE,
			.type = 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 mx21_map_io(void)
			{
			mxc_set_cpu_type(MXC_CPU_MX21);
			mxc_arch_reset_init(MX21_IO_ADDRESS(MX21_WDOG_BASE_ADDR));

			iotable_init(imx21_io_desc, ARRAY_SIZE(imx21_io_desc));
			}

			void __init mx21_init_irq(void)
			{
			mxc_init_irq(MX21_IO_ADDRESS(MX21_AVIC_BASE_ADDR));
			}

arch/arm/mach-mx2/generic.c→arch/arm/mach-mx2/mm-imx27.c

+15 −29

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* generic.c		* arch/arm/mach-mx2/mm-imx27.c
	*		*
	* Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de)		* Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de)
	*		*
	@@ -26,7 +26,7 @@
	#include <asm/mach/map.h>		#include <asm/mach/map.h>

	/* MX27 memory map definition */		/* MX27 memory map definition */
	static struct map_desc mxc_io_desc[] __initdata = {		static struct map_desc imx27_io_desc[] __initdata = {
	/*		/*
	* this fixed mapping covers:		* this fixed mapping covers:
	* - AIPI1		* - AIPI1
	@@ -36,9 +36,9 @@ static struct map_desc mxc_io_desc[] __initdata = {
	* - and some reserved space		* - and some reserved space
	*/		*/
	{		{
	.virtual = AIPI_BASE_ADDR_VIRT,		.virtual = MX27_AIPI_BASE_ADDR_VIRT,
	.pfn = __phys_to_pfn(AIPI_BASE_ADDR),		.pfn = __phys_to_pfn(MX27_AIPI_BASE_ADDR),
	.length = AIPI_SIZE,		.length = MX27_AIPI_SIZE,
	.type = MT_DEVICE		.type = MT_DEVICE
	},		},
	/*		/*
	@@ -47,9 +47,9 @@ static struct map_desc mxc_io_desc[] __initdata = {
	* - ATA		* - ATA
	*/		*/
	{		{
	.virtual = SAHB1_BASE_ADDR_VIRT,		.virtual = MX27_SAHB1_BASE_ADDR_VIRT,
	.pfn = __phys_to_pfn(SAHB1_BASE_ADDR),		.pfn = __phys_to_pfn(MX27_SAHB1_BASE_ADDR),
	.length = SAHB1_SIZE,		.length = MX27_SAHB1_SIZE,
	.type = MT_DEVICE		.type = MT_DEVICE
	},		},
	/*		/*
	@@ -57,11 +57,11 @@ static struct map_desc mxc_io_desc[] __initdata = {
	* - EMI		* - EMI
	*/		*/
	{		{
	.virtual = X_MEMC_BASE_ADDR_VIRT,		.virtual = MX27_X_MEMC_BASE_ADDR_VIRT,
	.pfn = __phys_to_pfn(X_MEMC_BASE_ADDR),		.pfn = __phys_to_pfn(MX27_X_MEMC_BASE_ADDR),
	.length = X_MEMC_SIZE,		.length = MX27_X_MEMC_SIZE,
	.type = MT_DEVICE		.type = MT_DEVICE
	}		},
	};		};

	/*		/*
	@@ -69,29 +69,15 @@ static struct map_desc mxc_io_desc[] __initdata = {
	* system startup to create static physical to virtual		* system startup to create static physical to virtual
	* memory map for the IO modules.		* memory map for the IO modules.
	*/		*/
	void __init mx21_map_io(void)
	{
	mxc_set_cpu_type(MXC_CPU_MX21);
	mxc_arch_reset_init(IO_ADDRESS(WDOG_BASE_ADDR));

	iotable_init(mxc_io_desc, ARRAY_SIZE(mxc_io_desc));
	}

	void __init mx27_map_io(void)		void __init mx27_map_io(void)
	{		{
	mxc_set_cpu_type(MXC_CPU_MX27);		mxc_set_cpu_type(MXC_CPU_MX27);
	mxc_arch_reset_init(IO_ADDRESS(WDOG_BASE_ADDR));		mxc_arch_reset_init(MX27_IO_ADDRESS(MX27_WDOG_BASE_ADDR));

	iotable_init(mxc_io_desc, ARRAY_SIZE(mxc_io_desc));		iotable_init(imx27_io_desc, ARRAY_SIZE(imx27_io_desc));
	}		}

	void __init mx27_init_irq(void)		void __init mx27_init_irq(void)
	{		{
	mxc_init_irq(IO_ADDRESS(AVIC_BASE_ADDR));		mxc_init_irq(MX27_IO_ADDRESS(MX27_AVIC_BASE_ADDR));
	}		}

	void __init mx21_init_irq(void)
	{
	mx27_init_irq();
	}