ARM: mxs: Consolidate mm-mx23.c and mm-mx28.c into a single file (a6d34048) · Commits · e / devices / android_kernel_teracube_2e

arch/arm/mach-mxs/Makefile

+3 −3

Original line number	Original line	Diff line number	Diff line
	# Common support		# Common support
	obj-y := clock.o devices.o icoll.o iomux.o system.o timer.o		obj-y := clock.o devices.o icoll.o iomux.o system.o timer.o mm.o

	obj-$(CONFIG_MXS_OCOTP) += ocotp.o		obj-$(CONFIG_MXS_OCOTP) += ocotp.o
	obj-$(CONFIG_PM) += pm.o		obj-$(CONFIG_PM) += pm.o

	obj-$(CONFIG_SOC_IMX23) += clock-mx23.o mm-mx23.o		obj-$(CONFIG_SOC_IMX23) += clock-mx23.o
	obj-$(CONFIG_SOC_IMX28) += clock-mx28.o mm-mx28.o		obj-$(CONFIG_SOC_IMX28) += clock-mx28.o

	obj-$(CONFIG_MACH_STMP378X_DEVB) += mach-stmp378x_devb.o		obj-$(CONFIG_MACH_STMP378X_DEVB) += mach-stmp378x_devb.o
	obj-$(CONFIG_MACH_MX23EVK) += mach-mx23evk.o		obj-$(CONFIG_MACH_MX23EVK) += mach-mx23evk.o

deleted100644 → 0

+0 −44

Original line number	Original line	Diff line number	Diff line
	/*
	* Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
	*
	* The code contained herein is licensed under the GNU General Public
	* License. You may obtain a copy of the GNU General Public License
	* Version 2 or later at the following locations:
	*
	* http://www.opensource.org/licenses/gpl-license.html
	* http://www.gnu.org/copyleft/gpl.html
	*
	* Create static mapping between physical to virtual memory.
	*/

	#include <linux/mm.h>
	#include <linux/init.h>

	#include <asm/mach/map.h>

	#include <mach/mx28.h>
	#include <mach/common.h>
	#include <mach/iomux.h>

	/*
	* Define the MX28 memory map.
	*/
	static struct map_desc mx28_io_desc[] __initdata = {
	mxs_map_entry(MX28, OCRAM, MT_DEVICE),
	mxs_map_entry(MX28, IO, MT_DEVICE),
	};

	/*
	* This function initializes the memory map. It is called during the
	* system startup to create static physical to virtual memory mappings
	* for the IO modules.
	*/
	void __init mx28_map_io(void)
	{
	iotable_init(mx28_io_desc, ARRAY_SIZE(mx28_io_desc));
	}

	void __init mx28_init_irq(void)
	{
	icoll_init_irq();
	}

+19 −0

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@
	#include <asm/mach/map.h>		#include <asm/mach/map.h>

	#include <mach/mx23.h>		#include <mach/mx23.h>
			#include <mach/mx28.h>
	#include <mach/common.h>		#include <mach/common.h>
	#include <mach/iomux.h>		#include <mach/iomux.h>

	@@ -28,6 +29,14 @@ static struct map_desc mx23_io_desc[] __initdata = {
	mxs_map_entry(MX23, IO, MT_DEVICE),		mxs_map_entry(MX23, IO, MT_DEVICE),
	};		};

			/*
			* Define the MX28 memory map.
			*/
			static struct map_desc mx28_io_desc[] __initdata = {
			mxs_map_entry(MX28, OCRAM, MT_DEVICE),
			mxs_map_entry(MX28, IO, MT_DEVICE),
			};

	/*		/*
	* This function initializes the memory map. It is called during the		* This function initializes the memory map. It is called during the
	* system startup to create static physical to virtual memory mappings		* system startup to create static physical to virtual memory mappings
	@@ -42,3 +51,13 @@ void __init mx23_init_irq(void)
	{		{
	icoll_init_irq();		icoll_init_irq();
	}		}

			void __init mx28_map_io(void)
			{
			iotable_init(mx28_io_desc, ARRAY_SIZE(mx28_io_desc));
			}

			void __init mx28_init_irq(void)
			{
			icoll_init_irq();
			}