From patchwork Sat Aug 22 14:46:22 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 43308 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n7MEkWpa015363 for ; Sat, 22 Aug 2009 14:46:32 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755252AbZHVOqZ (ORCPT ); Sat, 22 Aug 2009 10:46:25 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755303AbZHVOqZ (ORCPT ); Sat, 22 Aug 2009 10:46:25 -0400 Received: from ey-out-2122.google.com ([74.125.78.24]:12327 "EHLO ey-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755252AbZHVOqY (ORCPT ); Sat, 22 Aug 2009 10:46:24 -0400 Received: by ey-out-2122.google.com with SMTP id 22so352206eye.37 for ; Sat, 22 Aug 2009 07:46:25 -0700 (PDT) Received: by 10.210.142.6 with SMTP id p6mr2507567ebd.85.1250952385235; Sat, 22 Aug 2009 07:46:25 -0700 (PDT) Received: from localhost (cs181240116.pp.htv.fi [82.181.240.116]) by mx.google.com with ESMTPS id 10sm2602157eyz.51.2009.08.22.07.46.23 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 22 Aug 2009 07:46:24 -0700 (PDT) To: Vikram Pandita Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.arm.linux.org.uk Subject: Re: [PATCH 4/5] OMAP: Zoom2: Fix serial break References: <1250878266-10632-1-git-send-email-vikram.pandita@ti.com> From: Kevin Hilman Organization: Deep Root Systems, LLC Date: Sat, 22 Aug 2009 16:46:22 +0200 In-Reply-To: <1250878266-10632-1-git-send-email-vikram.pandita@ti.com> (Vikram Pandita's message of "Fri\, 21 Aug 2009 13\:11\:06 -0500") Message-ID: <87ocq7vrcx.fsf@deeprootsystems.com> User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.2 (gnu/linux) MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Vikram Pandita writes: > Fix the break in Zoom2 Quad uart debug port support. > > Patch by Kevin Hilman fd455ea899b5a14 caused a break as it introuduced > per port PLATFORM id and Zoom2 was not tested with this change. ...because working zoom2 UART support was not yet upstream. > For Zoom2 serial port, add platform id as 4 > > Signed-off-by: Vikram Pandita > cc: Kevin Hilman > --- > arch/arm/mach-omap2/board-zoom-debugboard.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c b/arch/arm/mach-omap2/board-zoom-debugboard.c > index f8b0726..4dd714d 100644 > --- a/arch/arm/mach-omap2/board-zoom-debugboard.c > +++ b/arch/arm/mach-omap2/board-zoom-debugboard.c > @@ -97,7 +97,7 @@ static struct plat_serial8250_port serial_platform_data[] = { > > static struct platform_device zoom2_debugboard_serial_device = { > .name = "serial8250", > - .id = PLAT8250_DEV_PLATFORM1, > + .id = PLAT8250_DEV_FOURPORT, Using FOURPORT isn't right either. Just use a number. If you're OK with the version below, I'll pull it into my fixes queue. I've also updated the changelog to explain the problem instead of just "fix the break..." This fix messages are not useful when looking back through the changelog history. I don't currently have access to a Zoom2, so this has not been tested. Kevin commit c52bc1989540d1305aa5372a73bc6096636c8432 Author: Vikram Pandita Date: Fri Aug 21 13:11:06 2009 -0500 OMAP: Zoom2: update serial platform_data id for external UART Now that on-chip UARTs each have separate platform_data, the external UART needs an non-conflicting ID. Since there are 3 on-chip UARTs, the Zoom2 external UART will be registered after as the fourth. Signed-off-by: Vikram Pandita Signed-off-by: Kevin Hilman --- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c b/arch/arm/mach-omap2/board-zoom-debugboard.c index bac5c43..66fe940 100644 --- a/arch/arm/mach-omap2/board-zoom-debugboard.c +++ b/arch/arm/mach-omap2/board-zoom-debugboard.c @@ -94,7 +94,7 @@ static struct plat_serial8250_port serial_platform_data[] = { static struct platform_device zoom2_debugboard_serial_device = { .name = "serial8250", - .id = PLAT8250_DEV_PLATFORM1, + .id = 3, .dev = { .platform_data = serial_platform_data, },