Commit e9a259ba authored by Felipe Balbi's avatar Felipe Balbi Committed by Kevin Hilman

mtd: nand: davinci: only try to fix mux settings on dm6446

Those mux settings are only valid for dm6446, so put that
under a conditional.
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@nokia.com>
parent 9e4d3146
......@@ -50,6 +50,7 @@
#include <mach/nand.h>
#include <mach/mux.h>
#include <asm/mach-types.h>
#include <asm/mach/flash.h>
#ifdef CONFIG_NAND_FLASH_HW_ECC
......@@ -429,6 +430,14 @@ static void __init nand_davinci_flash_init(struct davinci_nand_info *info)
{
u32 regval, tmp;
/* The following mux setting are for dm6446 only,
* that's why we keep them inside the above conditional
* so we don't mess up other arch's mux settings.
*
* FIXME ideally, this should be done by board support,
* move it there at some point.
*/
if (machine_is_davinci_evm()) {
/* Check for correct pin mux, reconfigure if necessary */
tmp = davinci_readl(DAVINCI_SYSTEM_MODULE_BASE + PINMUX0);
......@@ -452,6 +461,7 @@ static void __init nand_davinci_flash_init(struct davinci_nand_info *info)
"PINMUX0 reg to 0x%08x, was 0x%08x, should be done " \
"by bootloader.\n", regval, tmp);
}
}
regval = davinci_nand_readl(info, AWCCR_OFFSET);
regval |= 0x10000000;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment