diff options
| author | Olof Johansson <olof@lixom.net> | 2012-06-30 15:21:00 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-06-30 15:21:00 -0700 |
| commit | e5a5192a5e42edca10c9d5e391e6f9fdd11f28ea (patch) | |
| tree | c8460317d779232a169546d2b8278b89e406fc29 /arch | |
| parent | acf6a7ecbddfc84c66408ac549509d97c2ab4f8a (diff) | |
| parent | e90b833ee1aae64b6fca2455001323ffe29e1698 (diff) | |
| download | linux-3.10-e5a5192a5e42edca10c9d5e391e6f9fdd11f28ea.tar.gz linux-3.10-e5a5192a5e42edca10c9d5e391e6f9fdd11f28ea.tar.bz2 linux-3.10-e5a5192a5e42edca10c9d5e391e6f9fdd11f28ea.zip | |
Merge tag 'omap-fixes-for-v3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
From Tony Lindgren:
"Here's one more regression fix that I missed earlier, and a
trivial fix to get omap4470 booting."
* tag 'omap-fixes-for-v3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP4470: Fix OMAP4470 boot failure
ARM: OMAP2+: nand: fix build error when CONFIG_MTD_ONENAND_OMAP2=n
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/board-flash.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/clock44xx_data.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/board-flash.c b/arch/arm/mach-omap2/board-flash.c index 70a81f900bb..53c39d239d6 100644 --- a/arch/arm/mach-omap2/board-flash.c +++ b/arch/arm/mach-omap2/board-flash.c @@ -97,11 +97,6 @@ __init board_onenand_init(struct mtd_partition *onenand_parts, gpmc_onenand_init(&board_onenand_data); } -#else -void -__init board_onenand_init(struct mtd_partition *nor_parts, u8 nr_parts, u8 cs) -{ -} #endif /* CONFIG_MTD_ONENAND_OMAP2 || CONFIG_MTD_ONENAND_OMAP2_MODULE */ #if defined(CONFIG_MTD_NAND_OMAP2) || \ diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c index e2b701e164f..ba6f9a0a43e 100644 --- a/arch/arm/mach-omap2/clock44xx_data.c +++ b/arch/arm/mach-omap2/clock44xx_data.c @@ -3417,9 +3417,12 @@ int __init omap4xxx_clk_init(void) if (cpu_is_omap443x()) { cpu_mask = RATE_IN_4430; cpu_clkflg = CK_443X; - } else if (cpu_is_omap446x()) { + } else if (cpu_is_omap446x() || cpu_is_omap447x()) { cpu_mask = RATE_IN_4460 | RATE_IN_4430; cpu_clkflg = CK_446X | CK_443X; + + if (cpu_is_omap447x()) + pr_warn("WARNING: OMAP4470 clock data incomplete!\n"); } else { return 0; } |