Skip to content

Commit

Permalink
ARM: imx: Add mx53 support to common msl functions.
Browse files Browse the repository at this point in the history
Add mx53 support to cpu.c and mm.c.

Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
  • Loading branch information
Dinh Nguyen authored and Sascha Hauer committed Nov 24, 2010
1 parent c0abefd commit b66ff7a
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 2 deletions.
19 changes: 18 additions & 1 deletion arch/arm/mach-mx5/cpu.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved.
* 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
Expand Down Expand Up @@ -92,6 +92,23 @@ static int __init mx51_neon_fixup(void)
late_initcall(mx51_neon_fixup);
#endif

/*
* Returns:
* the silicon revision of the cpu
* -EINVAL - not a mx53
*/
int mx53_revision(void)
{
if (!cpu_is_mx53())
return -EINVAL;

if (cpu_silicon_rev == -1)
query_silicon_parameter();

return cpu_silicon_rev;
}
EXPORT_SYMBOL(mx53_revision);

static int __init post_cpu_init(void)
{
unsigned int reg;
Expand Down
19 changes: 18 additions & 1 deletion arch/arm/mach-mx5/mm.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved.
* 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
Expand Down Expand Up @@ -31,6 +31,15 @@ static struct map_desc mx51_io_desc[] __initdata = {
imx_map_entry(MX51, AIPS2, MT_DEVICE),
};

/*
* Define the MX53 memory map.
*/
static struct map_desc mx53_io_desc[] __initdata = {
imx_map_entry(MX53, AIPS1, MT_DEVICE),
imx_map_entry(MX53, SPBA0, MT_DEVICE),
imx_map_entry(MX53, AIPS2, MT_DEVICE),
};

/*
* This function initializes the memory map. It is called during the
* system startup to create static physical to virtual memory mappings
Expand All @@ -44,6 +53,14 @@ void __init mx51_map_io(void)
iotable_init(mx51_io_desc, ARRAY_SIZE(mx51_io_desc));
}

void __init mx53_map_io(void)
{
mxc_set_cpu_type(MXC_CPU_MX53);
mxc_iomux_v3_init(MX53_IO_ADDRESS(MX53_IOMUXC_BASE_ADDR));
mxc_arch_reset_init(MX53_IO_ADDRESS(MX53_WDOG_BASE_ADDR));
iotable_init(mx53_io_desc, ARRAY_SIZE(mx53_io_desc));
}

int imx51_register_gpios(void);

void __init mx51_init_irq(void)
Expand Down

0 comments on commit b66ff7a

Please sign in to comment.