From patchwork Mon Jun 1 02:51:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 49278 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 66D35218FC for ; Mon, 1 Jun 2015 02:52:35 +0000 (UTC) Received: by wifx6 with SMTP id x6sf19058858wif.1 for ; Sun, 31 May 2015 19:52:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=mbxDVjgPvOA644g7/9oliBwsNIvHr6CRwlS6YOuuMLA=; b=O4q/I7WQwrJ4nqnMjkGq4W+tm/Lq5pgeqBntZWtvZ2zL5P6trp0cW9WnEMpM4ldwOd XtfLZXNcZ1tJZ5AOh7FEq9cktM+bt6AEAyIHPavoR9Vz6kzZ8+XnjQZZJlUDiKcqGq+J j9NHERGPNugyYxjfMPVCW98quYqimQkhjQ8zfdIe+l8wKbakQXFe//4Ll3YifRiSTikJ uLF5HOUYokzVSXGVmie+E8srijSsLQjO9yHTduhXtCfm3Q3VDSDyVpYU6XWk9cQDSRdK tulQbIObRFpqLpctOX53y4K+Bd45UfPVL69aZ8eIu5k9cxNd1LNOV2G4MHoIy79ZyYjt Xwmw== X-Gm-Message-State: ALoCoQmeM550I36Mw627b8grAWfv6IzG4OrQUjqvl4gGdX2JHYu7C85CzjGHydpQp5UHwdUgTSmF X-Received: by 10.112.219.200 with SMTP id pq8mr18812536lbc.7.1433127154704; Sun, 31 May 2015 19:52:34 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.207.35 with SMTP id lt3ls541094lac.38.gmail; Sun, 31 May 2015 19:52:34 -0700 (PDT) X-Received: by 10.152.170.165 with SMTP id an5mr19073964lac.100.1433127154451; Sun, 31 May 2015 19:52:34 -0700 (PDT) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id mr8si11127331lbb.104.2015.05.31.19.52.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 31 May 2015 19:52:34 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by labko7 with SMTP id ko7so87757323lab.2 for ; Sun, 31 May 2015 19:52:34 -0700 (PDT) X-Received: by 10.152.87.204 with SMTP id ba12mr19233200lab.35.1433127154351; Sun, 31 May 2015 19:52:34 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1994566lbb; Sun, 31 May 2015 19:52:33 -0700 (PDT) X-Received: by 10.68.245.67 with SMTP id xm3mr36049984pbc.45.1433127152221; Sun, 31 May 2015 19:52:32 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ms7si19273822pbb.130.2015.05.31.19.52.31 for ; Sun, 31 May 2015 19:52:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754718AbbFACwa (ORCPT ); Sun, 31 May 2015 22:52:30 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:36063 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754529AbbFACwa (ORCPT ); Sun, 31 May 2015 22:52:30 -0400 Received: by pacux9 with SMTP id ux9so58751897pac.3 for ; Sun, 31 May 2015 19:52:29 -0700 (PDT) X-Received: by 10.68.209.227 with SMTP id mp3mr36167738pbc.100.1433127149746; Sun, 31 May 2015 19:52:29 -0700 (PDT) Received: from localhost.localdomain ([107.6.117.179]) by mx.google.com with ESMTPSA id da3sm12552968pdb.8.2015.05.31.19.52.24 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 31 May 2015 19:52:28 -0700 (PDT) From: Jun Nie To: peter@hurleysoftware.com, linux@arm.linux.org.uk, Andrew.Jackson@arm.com, gregkh@linuxfoundation.org, linux-serial@vger.kernel.org, shawn.guo@linaro.org Cc: Jun Nie Subject: [PATCH v10 3/3] uart: pl011: polish registers offset handling Date: Mon, 1 Jun 2015 10:51:34 +0800 Message-Id: <1433127094-29586-4-git-send-email-jun.nie@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1433127094-29586-1-git-send-email-jun.nie@linaro.org> References: <1433127094-29586-1-git-send-email-jun.nie@linaro.org> Sender: linux-serial-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-serial@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: jun.nie@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Use enum definition for register offset look up table entry. Signed-off-by: Jun Nie Reviewed-by: Peter Hurley --- drivers/tty/serial/amba-pl011.c | 124 ++++++++++++++++++++++------------------ 1 file changed, 67 insertions(+), 57 deletions(-) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 75eed09..8feb9b2 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -87,6 +87,27 @@ struct vendor_data { unsigned int (*get_fifosize)(struct amba_device *dev); }; +enum reg_idx { + REG_DR = 0, + REG_RSR, + REG_ST_DMAWM, + REG_LCRM, + REG_LCRL, + REG_FR = 6, + REG_LCRH_RX, + REG_ILPR, + REG_IBRD, + REG_FBRD, + REG_LCRH_TX, + REG_CR, + REG_IFLS, + REG_IMSC, + REG_RIS, + REG_MIS, + REG_ICR, + REG_DMACR, +}; + #ifdef CONFIG_ARM_AMBA static unsigned int get_fifosize_arm(struct amba_device *dev) { @@ -95,25 +116,21 @@ static unsigned int get_fifosize_arm(struct amba_device *dev) static u8 arm_reg[REG_NR] = { /* All registers offset are in order except LCRH as comment */ - [IDX(UART01x_DR)] = UART01x_DR, - [IDX(UART01x_RSR)] = UART01x_RSR, - [IDX(ST_UART011_DMAWM)] = ST_UART011_DMAWM, - [IDX(UART010_LCRM)] = UART010_LCRM, - [IDX(UART010_LCRL)] = UART010_LCRL, - [IDX(UART010_CR)] = UART010_CR, - [IDX(UART01x_FR)] = UART01x_FR, - [IDX(UART011_LCRH_RX)] = UART011_LCRH, /* remapped */ - [IDX(UART01x_ILPR)] = UART01x_ILPR, - [IDX(UART011_IBRD)] = UART011_IBRD, - [IDX(UART011_FBRD)] = UART011_FBRD, - [IDX(UART011_LCRH)] = UART011_LCRH, - [IDX(UART011_CR)] = UART011_CR, - [IDX(UART011_IFLS)] = UART011_IFLS, - [IDX(UART011_IMSC)] = UART011_IMSC, - [IDX(UART011_RIS)] = UART011_RIS, - [IDX(UART011_MIS)] = UART011_MIS, - [IDX(UART011_ICR)] = UART011_ICR, - [IDX(UART011_DMACR)] = UART011_DMACR, + [REG_DR] = UART01x_DR, + [REG_RSR] = UART01x_RSR, + [REG_FR] = UART01x_FR, + [REG_LCRH_RX] = UART011_LCRH, /* remapped */ + [REG_ILPR] = UART01x_ILPR, + [REG_IBRD] = UART011_IBRD, + [REG_FBRD] = UART011_FBRD, + [REG_LCRH_TX] = UART011_LCRH_TX, + [REG_CR] = UART011_CR, + [REG_IFLS] = UART011_IFLS, + [REG_IMSC] = UART011_IMSC, + [REG_RIS] = UART011_RIS, + [REG_MIS] = UART011_MIS, + [REG_ICR] = UART011_ICR, + [REG_DMACR] = UART011_DMACR, }; static struct vendor_data vendor_arm = { @@ -136,25 +153,22 @@ static unsigned int get_fifosize_st(struct amba_device *dev) static u8 st_reg[REG_NR] = { /* All registers offset are in order */ - [IDX(UART01x_DR)] = UART01x_DR, - [IDX(UART01x_RSR)] = UART01x_RSR, - [IDX(ST_UART011_DMAWM)] = ST_UART011_DMAWM, - [IDX(UART010_LCRM)] = UART010_LCRM, - [IDX(UART010_LCRL)] = UART010_LCRL, - [IDX(UART010_CR)] = UART010_CR, - [IDX(UART01x_FR)] = UART01x_FR, - [IDX(UART011_LCRH_RX)] = ST_UART011_LCRH_RX, - [IDX(UART01x_ILPR)] = UART01x_ILPR, - [IDX(UART011_IBRD)] = UART011_IBRD, - [IDX(UART011_FBRD)] = UART011_FBRD, - [IDX(ST_UART011_LCRH_TX)] = ST_UART011_LCRH_TX, - [IDX(UART011_CR)] = UART011_CR, - [IDX(UART011_IFLS)] = UART011_IFLS, - [IDX(UART011_IMSC)] = UART011_IMSC, - [IDX(UART011_RIS)] = UART011_RIS, - [IDX(UART011_MIS)] = UART011_MIS, - [IDX(UART011_ICR)] = UART011_ICR, - [IDX(UART011_DMACR)] = UART011_DMACR, + [REG_DR] = UART01x_DR, + [REG_RSR] = UART01x_RSR, + [REG_ST_DMAWM] = ST_UART011_DMAWM, + [REG_FR] = UART01x_FR, + [REG_LCRH_RX] = ST_UART011_LCRH_RX, + [REG_ILPR] = UART01x_ILPR, + [REG_IBRD] = UART011_IBRD, + [REG_FBRD] = UART011_FBRD, + [REG_LCRH_TX] = ST_UART011_LCRH_TX, + [REG_CR] = UART011_CR, + [REG_IFLS] = UART011_IFLS, + [REG_IMSC] = UART011_IMSC, + [REG_RIS] = UART011_RIS, + [REG_MIS] = UART011_MIS, + [REG_ICR] = UART011_ICR, + [REG_DMACR] = UART011_DMACR, }; static struct vendor_data vendor_st = { @@ -179,25 +193,21 @@ static unsigned int get_fifosize_zx(struct amba_device *dev) static u8 zx_reg[REG_NR] = { /* Registers offset are remapped from origin offset as in comment */ - [IDX(UART01x_DR)] = ZX_UART01x_DR, /* remapped */ - [IDX(UART01x_RSR)] = UART01x_RSR, - [IDX(ST_UART011_DMAWM)] = ST_UART011_DMAWM, - [IDX(UART010_LCRM)] = UART010_LCRM, - [IDX(UART010_LCRL)] = UART010_LCRL, - [IDX(UART010_CR)] = UART010_CR, - [IDX(UART01x_FR)] = ZX_UART01x_FR, /* remapped */ - [IDX(UART011_LCRH_RX)] = UART011_LCRH_RX, - [IDX(UART01x_ILPR)] = UART01x_ILPR, - [IDX(UART011_IBRD)] = UART011_IBRD, - [IDX(UART011_FBRD)] = UART011_FBRD, - [IDX(UART011_LCRH_TX)] = ZX_UART011_LCRH_TX, /* remapped */ - [IDX(UART011_CR)] = ZX_UART011_CR, /* remapped */ - [IDX(UART011_IFLS)] = ZX_UART011_IFLS, /* remapped */ - [IDX(UART011_IMSC)] = ZX_UART011_IMSC, /* remapped */ - [IDX(UART011_RIS)] = UART011_RIS, - [IDX(UART011_MIS)] = ZX_UART011_MIS, /* remapped */ - [IDX(UART011_ICR)] = ZX_UART011_ICR, /* remapped */ - [IDX(UART011_DMACR)] = ZX_UART011_DMACR, /* remapped */ + [REG_DR] = ZX_UART01x_DR, /* remapped */ + [REG_RSR] = UART01x_RSR, + [REG_FR] = ZX_UART01x_FR, /* remapped */ + [REG_LCRH_RX] = UART011_LCRH_RX, + [REG_ILPR] = UART01x_ILPR, + [REG_IBRD] = UART011_IBRD, + [REG_FBRD] = UART011_FBRD, + [REG_LCRH_TX] = ZX_UART011_LCRH_TX, /* remapped */ + [REG_CR] = ZX_UART011_CR, /* remapped */ + [REG_IFLS] = ZX_UART011_IFLS, /* remapped */ + [REG_IMSC] = ZX_UART011_IMSC, /* remapped */ + [REG_RIS] = UART011_RIS, + [REG_MIS] = ZX_UART011_MIS, /* remapped */ + [REG_ICR] = ZX_UART011_ICR, /* remapped */ + [REG_DMACR] = ZX_UART011_DMACR, /* remapped */ }; static struct vendor_data vendor_zx = {