Skip to content

Commit e5a5192

Browse files
committed
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
2 parents acf6a7e + e90b833 commit e5a5192

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

arch/arm/mach-omap2/board-flash.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,6 @@ __init board_onenand_init(struct mtd_partition *onenand_parts,
9797

9898
gpmc_onenand_init(&board_onenand_data);
9999
}
100-
#else
101-
void
102-
__init board_onenand_init(struct mtd_partition *nor_parts, u8 nr_parts, u8 cs)
103-
{
104-
}
105100
#endif /* CONFIG_MTD_ONENAND_OMAP2 || CONFIG_MTD_ONENAND_OMAP2_MODULE */
106101

107102
#if defined(CONFIG_MTD_NAND_OMAP2) || \

arch/arm/mach-omap2/clock44xx_data.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3417,9 +3417,12 @@ int __init omap4xxx_clk_init(void)
34173417
if (cpu_is_omap443x()) {
34183418
cpu_mask = RATE_IN_4430;
34193419
cpu_clkflg = CK_443X;
3420-
} else if (cpu_is_omap446x()) {
3420+
} else if (cpu_is_omap446x() || cpu_is_omap447x()) {
34213421
cpu_mask = RATE_IN_4460 | RATE_IN_4430;
34223422
cpu_clkflg = CK_446X | CK_443X;
3423+
3424+
if (cpu_is_omap447x())
3425+
pr_warn("WARNING: OMAP4470 clock data incomplete!\n");
34233426
} else {
34243427
return 0;
34253428
}

0 commit comments

Comments
 (0)