From: rnayak@ti.com (Rajendra Nayak) Date: Fri, 12 Jul 2013 13:01:48 +0530 Subject: [PATCH 1/2] Revert "ARM: OMAP2+: Fix serial init for device tree based booting" In-Reply-To: <20130712072051.GA7656@atomide.com> References: <1373539986-27272-1-git-send-email-rnayak@ti.com> <1373539986-27272-2-git-send-email-rnayak@ti.com> <20130712072051.GA7656@atomide.com> Message-ID: <51DFB0E4.6040007@ti.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Friday 12 July 2013 12:50 PM, Tony Lindgren wrote: > * Rajendra Nayak [130711 03:59]: >> This reverts commit 82702ea11ddfe0e43382e1fa5b66d807d8114916. >> >> The above commit stubbed out omap_serial_early_init() in case of >> DT build thinking it was doing the serial port initializations. > > Well not really. It was done to cut dependency between device > tree initialized drivers and pdata initialized drivers. > >> omap_serial_early_init() however does not do the serial port >> inits (its instead done by omap_serial_init_port()) instead >> it sets the HWMOD_INIT_NO_IDLE and HWMOD_INIT_NO_RESET flags >> for the console uart which causes hwmod to avoid doing a reset >> followed by the idling of the console uart. >> >> This is still needed even in the DT case. > > This fix is going the wrong way. > > The console is working fine with DT based booting for me, > except for the earlyprintk fix needed. It works on omap4 and omap5. It won't work on any am33xx devices. > > And there should not be any need to parse cmdline for console > as omap-serial.c sets it up and already knows about it. > > Care to state what exactly this attempts to fix and for which > omaps? If this is only needed for am33xx, then why? Yes, this is needed only for am33xx because am33xx hwmod rightly had the hwmod flags for NO_IDLE and NO_RESET removed and omap4 and omap5 wrongly still carry them around. Just try applying PATCH 2/2 of this series and it won't work on the omap4 sdp anymore. regards, Rajendra > > Regards, > > Tony > >> Signed-off-by: Rajendra Nayak >> Reported-by: Mark Jackson >> Reported-by: Vaibhav Bedia >> --- >> arch/arm/mach-omap2/serial.c | 3 --- >> 1 file changed, 3 deletions(-) >> >> diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c >> index 3a674de..58d5b56 100644 >> --- a/arch/arm/mach-omap2/serial.c >> +++ b/arch/arm/mach-omap2/serial.c >> @@ -175,9 +175,6 @@ static char *cmdline_find_option(char *str) >> >> static int __init omap_serial_early_init(void) >> { >> - if (of_have_populated_dt()) >> - return -ENODEV; >> - >> do { >> char oh_name[MAX_UART_HWMOD_NAME_LEN]; >> struct omap_hwmod *oh; >> -- >> 1.7.9.5 >>