Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04a92358 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Tony Lindgren
Browse files

ARM: OMAP1/2: fix SoC name printing 



Currently we get extra newlines on OMAP1/2 when the SoC name is printed:

[    0.000000] OMAP1510
[    0.000000]  revision 2 handled as 15xx id: bc058c9b93111a16

[    0.000000] OMAP2420
[    0.000000]

Fix by using pr_cont.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 3af89f2d

arch/arm/mach-omap1/id.c

+3 −3
Original line number Diff line number Diff line
@@ -200,10 +200,10 @@ void __init omap_check_revision(void) 
		printk(KERN_INFO "Unknown OMAP cpu type: 0x%02x\n", cpu_type);

	}



	printk(KERN_INFO "OMAP%04x", omap_revision >> 16);

	pr_info("OMAP%04x", omap_revision >> 16);

	if ((omap_revision >> 8) & 0xff)

		printk(KERN_INFO "%x", (omap_revision >> 8) & 0xff);

	printk(KERN_INFO " revision %i handled as %02xxx id: %08x%08x\n",

		pr_cont("%x", (omap_revision >> 8) & 0xff);

	pr_cont(" revision %i handled as %02xxx id: %08x%08x\n",

	       die_rev, omap_revision & 0xff, system_serial_low,

	       system_serial_high);

}

arch/arm/mach-omap2/id.c

+2 −2
Original line number Diff line number Diff line
@@ -199,8 +199,8 @@ void __init omap2xxx_check_revision(void) 


	pr_info("%s", soc_name);

	if ((omap_rev() >> 8) & 0x0f)

		pr_info("%s", soc_rev);

	pr_info("\n");

		pr_cont("%s", soc_rev);

	pr_cont("\n");

}



#define OMAP3_SHOW_FEATURE(feat)		\