From patchwork Mon Feb 29 11:53:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 589856 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id CC53214031B for ; Mon, 29 Feb 2016 22:53:44 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=nbQmIc4t; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 46B84A75CB; Mon, 29 Feb 2016 12:53:42 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FkEwkUv36f8C; Mon, 29 Feb 2016 12:53:41 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id ADB75A75C3; Mon, 29 Feb 2016 12:53:41 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8E4E6A75C3 for ; Mon, 29 Feb 2016 12:53:39 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qJeThPT6MwK2 for ; Mon, 29 Feb 2016 12:53:39 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-ig0-f171.google.com (mail-ig0-f171.google.com [209.85.213.171]) by theia.denx.de (Postfix) with ESMTPS id 1E172A74C3 for ; Mon, 29 Feb 2016 12:53:36 +0100 (CET) Received: by mail-ig0-f171.google.com with SMTP id hb3so72766689igb.0 for ; Mon, 29 Feb 2016 03:53:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=HL/UKuVWpkXyGDpjFvW1lFJb1DYPvA6GkN/H948cqT0=; b=nbQmIc4t8mukzBNqim77zxO+H5pF/4dq+1Azu2aYI3eZGlcNNGup+Kbo+euZqNMG7X 5YOtjnuVd6z7xJUB4fS9orTpEDnfQDprqSGLttoRLzvbbyOkav12F1699jvYhpcqMZT7 lXVWoMbIDiyHaxEKLnst3Mq+WVuGwkoMHKTtZBIkCbYkL22D8MuXaKvN4lK0PBa6ZCqu L0WufHkvwcW+Xkq6GQBeFiwnJ2Z0jKVXXr9UvWGFty+ecdp4L9YSWf1i3yvZME8GMmms JFsFmlQC0khbOF4xOyd67uwFYEa/40XxL0kkoZjNRGECOd5+CDjhL55iRfym7GKsjCRA BQXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=HL/UKuVWpkXyGDpjFvW1lFJb1DYPvA6GkN/H948cqT0=; b=h6EvBLhrKrCxTZ8ah4dR/1JT/KPdxhuzavlaB7fA2D43fFEJSWNZpAoebHwboglowx fr2W5e7dM1/5y0XMc94KeLYzkX7QYDLs8jg2oSe3eep6ptbj/DEl++ZZD6iSIaYJ0pLV pDeyphCT6JYk0RB3xu5wSiLTyPMy5nPIa9UydenrcSayH/RvKvmtP4qFD9QTTI/CZYQE 5yXQNkNIyIfvff8X6FEapBoVphdbe52s6xFhntRJ5tl9JHRy5GkGZB+dpKTHHpkMZ2fh pW0Ys9LNKN+NvnfuFUnreaP8DoIQP1CG+8aSDklzTPpLEVLUkN9Zz0z5DeIXPxMLgdsS 1nzQ== X-Gm-Message-State: AD7BkJJ6K9v5vIzLHASdQO3VLjnU34E2GCXYKxXEwWjWkxFPHa9Mt8Rt3yskNxaggxdJCg== X-Received: by 10.50.137.35 with SMTP id qf3mr9500028igb.92.1456746815326; Mon, 29 Feb 2016 03:53:35 -0800 (PST) Received: from localhost.localdomain (c-76-113-128-183.hsd1.mn.comcast.net. [76.113.128.183]) by smtp.gmail.com with ESMTPSA id ea8sm6206340igc.0.2016.02.29.03.53.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 29 Feb 2016 03:53:34 -0800 (PST) From: Adam Ford To: u-boot@lists.denx.de Date: Mon, 29 Feb 2016 05:53:28 -0600 Message-Id: <1456746808-5177-1-git-send-email-aford173@gmail.com> X-Mailer: git-send-email 1.9.1 Cc: trini@konsulko.com, adam.ford@logicpd.com Subject: [U-Boot] [PATCH V2] OMAP3: Various: Update serial platdata to update reg_offset to 0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" V2: I hastily copy-pasted the boards without looking at the UART number. This addresses 3 boards that use UART3 and not UART1. With commit: d9a3bec682f9 "dm: ns16550: Add support for reg-offset property" reg_offset is added to the struct ns16550_platdata to be dt compatible with Linux kernel driver. A variety of OMAP3 boards are broken as the serial platdata is missing offsets. By explicitly naming the entry, this should also help 'future-proof' if more entries get added but are not needed for OMAP3. Tested on the Logic PD Torpedo + Wireless. I only changed a handful of devices that used the same syntax as the Logic board. Appologies if I missed one or stepped on toes. Thanks to Derald Woods and Alexander Graf. Signed-off-by: Adam Ford Reviewed-by: Heiko Schocher --- board/isee/igep00x0/igep00x0.c | 7 ++++--- board/logicpd/omap3som/omap3logic.c | 7 ++++--- board/logicpd/zoom1/zoom1.c | 7 ++++--- board/overo/overo.c | 7 ++++--- board/quipos/cairo/cairo.c | 7 ++++--- board/ti/beagle/beagle.c | 7 ++++--- board/timll/devkit8000/devkit8000.c | 7 ++++--- 7 files changed, 28 insertions(+), 21 deletions(-) diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c index e2fce50..63489e5 100644 --- a/board/isee/igep00x0/igep00x0.c +++ b/board/isee/igep00x0/igep00x0.c @@ -34,9 +34,10 @@ static const u32 gpmc_lan_config[] = { #endif static const struct ns16550_platdata igep_serial = { - OMAP34XX_UART3, - 2, - V_NS16550_CLK + .base = OMAP34XX_UART1, + .reg_offset = 0, + .reg_shift = 2, + .clock = V_NS16550_CLK }; U_BOOT_DEVICE(igep_uart) = { diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c index 668f684..0e72a5a 100644 --- a/board/logicpd/omap3som/omap3logic.c +++ b/board/logicpd/omap3som/omap3logic.c @@ -47,9 +47,10 @@ DECLARE_GLOBAL_DATA_PTR; */ static const struct ns16550_platdata omap3logic_serial = { - OMAP34XX_UART1, - 2, - V_NS16550_CLK + .base = OMAP34XX_UART1, + .reg_offset = 0, + .reg_shift = 2, + .clock = V_NS16550_CLK }; U_BOOT_DEVICE(omap3logic_uart) = { diff --git a/board/logicpd/zoom1/zoom1.c b/board/logicpd/zoom1/zoom1.c index 4040114..3d34919 100644 --- a/board/logicpd/zoom1/zoom1.c +++ b/board/logicpd/zoom1/zoom1.c @@ -44,9 +44,10 @@ static const u32 gpmc_lab_enet[] = { }; static const struct ns16550_platdata zoom1_serial = { - OMAP34XX_UART3, - 2, - V_NS16550_CLK + .base = OMAP34XX_UART1, + .reg_offset = 0, + .reg_shift = 2, + .clock = V_NS16550_CLK }; U_BOOT_DEVICE(zoom1_uart) = { diff --git a/board/overo/overo.c b/board/overo/overo.c index a38b959..3da80e9 100644 --- a/board/overo/overo.c +++ b/board/overo/overo.c @@ -68,9 +68,10 @@ static struct { } expansion_config = {0x0}; static const struct ns16550_platdata overo_serial = { - OMAP34XX_UART3, - 2, - V_NS16550_CLK + .base = OMAP34XX_UART3, + .reg_offset = 0, + .reg_shift = 2, + .clock = V_NS16550_CLK }; U_BOOT_DEVICE(overo_uart) = { diff --git a/board/quipos/cairo/cairo.c b/board/quipos/cairo/cairo.c index 21793e8..15d68c1 100644 --- a/board/quipos/cairo/cairo.c +++ b/board/quipos/cairo/cairo.c @@ -91,9 +91,10 @@ void get_board_mem_timings(struct board_sdrc_timings *timings) #endif static const struct ns16550_platdata cairo_serial = { - OMAP34XX_UART2, - 2, - V_NS16550_CLK + .base = OMAP34XX_UART1, + .reg_offset = 0, + .reg_shift = 2, + .clock = V_NS16550_CLK }; U_BOOT_DEVICE(cairo_uart) = { diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index ff317ef..a5f2af7 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -73,9 +73,10 @@ static struct { } expansion_config; static const struct ns16550_platdata beagle_serial = { - OMAP34XX_UART3, - 2, - V_NS16550_CLK + .base = OMAP34XX_UART3, + .reg_offset = 0, + .reg_shift = 2, + .clock = V_NS16550_CLK }; U_BOOT_DEVICE(beagle_uart) = { diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c index 1a447c7..fb8e357 100644 --- a/board/timll/devkit8000/devkit8000.c +++ b/board/timll/devkit8000/devkit8000.c @@ -46,9 +46,10 @@ static u32 gpmc_net_config[GPMC_MAX_REG] = { }; static const struct ns16550_platdata devkit8000_serial = { - OMAP34XX_UART3, - 2, - V_NS16550_CLK + .base = OMAP34XX_UART3, + .reg_offset = 0, + .reg_shift = 2, + .clock = V_NS16550_CLK }; U_BOOT_DEVICE(devkit8000_uart) = {