From mboxrd@z Thu Jan 1 00:00:00 1970 From: u.kleine-koenig@pengutronix.de (Uwe =?iso-8859-1?Q?Kleine-K=F6nig?=) Date: Fri, 9 Sep 2011 10:00:24 +0200 Subject: [PATCH v3 1/4] ARM: i.MX5/mm: Consolidate arch/arm/mach-mx5/mm-*.c In-Reply-To: <1315452447-20205-2-git-send-email-jason.hui@linaro.org> References: <1315452447-20205-1-git-send-email-jason.hui@linaro.org> <1315452447-20205-2-git-send-email-jason.hui@linaro.org> Message-ID: <20110909080024.GK28816@pengutronix.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hello Jason, On Thu, Sep 08, 2011 at 11:27:24AM +0800, Jason Liu wrote: > We don't need one seperate file to deal with i.mx50 > related stuff, which is very similar with i.mx51/53. > We can put it together into one file.So, just merge > function from mm-mx50.c to mm.c and remove mm-mx50.c > > No function change by this commit. > > Signed-off-by: Jason Liu > --- > arch/arm/mach-mx5/Makefile | 1 - > arch/arm/mach-mx5/mm-mx50.c | 72 ------------------------------------------- > arch/arm/mach-mx5/mm.c | 43 +++++++++++++++++++++++++ > 3 files changed, 43 insertions(+), 73 deletions(-) > > diff --git a/arch/arm/mach-mx5/Makefile b/arch/arm/mach-mx5/Makefile > index 383e7cd..60f756d 100644 > --- a/arch/arm/mach-mx5/Makefile > +++ b/arch/arm/mach-mx5/Makefile > @@ -4,7 +4,6 @@ > > # Object file lists. > obj-y := cpu.o mm.o clock-mx51-mx53.o devices.o ehci.o system.o > -obj-$(CONFIG_SOC_IMX50) += mm-mx50.o > > obj-$(CONFIG_PM) += pm-imx5.o > obj-$(CONFIG_CPU_FREQ_IMX) += cpu_op-mx51.o > diff --git a/arch/arm/mach-mx5/mm-mx50.c b/arch/arm/mach-mx5/mm-mx50.c > deleted file mode 100644 > index 77e374c..0000000 > --- a/arch/arm/mach-mx5/mm-mx50.c > +++ /dev/null > @@ -1,72 +0,0 @@ > -/* > - * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved. > - * > - * 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. > - * > - * Create static mapping between physical to virtual memory. > - */ > - > -#include > -#include > - > -#include > - > -#include > -#include > -#include > -#include > - > -/* > - * Define the MX50 memory map. > - */ > -static struct map_desc mx50_io_desc[] __initdata = { > - imx_map_entry(MX50, TZIC, MT_DEVICE), > - imx_map_entry(MX50, SPBA0, MT_DEVICE), > - imx_map_entry(MX50, AIPS1, MT_DEVICE), > - imx_map_entry(MX50, AIPS2, 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 mx50_map_io(void) > -{ > - iotable_init(mx50_io_desc, ARRAY_SIZE(mx50_io_desc)); > -} > - > -void __init imx50_init_early(void) > -{ > - mxc_set_cpu_type(MXC_CPU_MX50); > - mxc_iomux_v3_init(MX50_IO_ADDRESS(MX50_IOMUXC_BASE_ADDR)); > - mxc_arch_reset_init(MX50_IO_ADDRESS(MX50_WDOG_BASE_ADDR)); > -} > - > -void __init mx50_init_irq(void) > -{ > - tzic_init_irq(MX50_IO_ADDRESS(MX50_TZIC_BASE_ADDR)); > -} > - > -void __init imx50_soc_init(void) > -{ > - /* i.mx50 has the i.mx31 type gpio */ > - mxc_register_gpio("imx31-gpio", 0, MX50_GPIO1_BASE_ADDR, SZ_16K, MX50_INT_GPIO1_LOW, MX50_INT_GPIO1_HIGH); > - mxc_register_gpio("imx31-gpio", 1, MX50_GPIO2_BASE_ADDR, SZ_16K, MX50_INT_GPIO2_LOW, MX50_INT_GPIO2_HIGH); > - mxc_register_gpio("imx31-gpio", 2, MX50_GPIO3_BASE_ADDR, SZ_16K, MX50_INT_GPIO3_LOW, MX50_INT_GPIO3_HIGH); > - mxc_register_gpio("imx31-gpio", 3, MX50_GPIO4_BASE_ADDR, SZ_16K, MX50_INT_GPIO4_LOW, MX50_INT_GPIO4_HIGH); > - mxc_register_gpio("imx31-gpio", 4, MX50_GPIO5_BASE_ADDR, SZ_16K, MX50_INT_GPIO5_LOW, MX50_INT_GPIO5_HIGH); > - mxc_register_gpio("imx31-gpio", 5, MX50_GPIO6_BASE_ADDR, SZ_16K, MX50_INT_GPIO6_LOW, MX50_INT_GPIO6_HIGH); > -} > diff --git a/arch/arm/mach-mx5/mm.c b/arch/arm/mach-mx5/mm.c > index baea6e5..63b0ab3 100644 > --- a/arch/arm/mach-mx5/mm.c > +++ b/arch/arm/mach-mx5/mm.c > @@ -42,6 +42,16 @@ static struct map_desc mx53_io_desc[] __initdata = { > }; > > /* > + * Define the MX50 memory map. > + */ > +static struct map_desc mx50_io_desc[] __initdata = { > + imx_map_entry(MX50, TZIC, MT_DEVICE), > + imx_map_entry(MX50, SPBA0, MT_DEVICE), > + imx_map_entry(MX50, AIPS1, MT_DEVICE), > + imx_map_entry(MX50, AIPS2, MT_DEVICE), > +}; I'd prefer to have the i.MX50 stuff above i.MX51, not below i.MX53. Applies to the other items, too. Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |