From patchwork Wed Feb 4 09:02:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 436178 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6502A14012E for ; Wed, 4 Feb 2015 20:03:19 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933405AbbBDJDM (ORCPT ); Wed, 4 Feb 2015 04:03:12 -0500 Received: from mail-pa0-f51.google.com ([209.85.220.51]:33587 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932437AbbBDJDI (ORCPT ); Wed, 4 Feb 2015 04:03:08 -0500 Received: by mail-pa0-f51.google.com with SMTP id fb1so963789pad.10 for ; Wed, 04 Feb 2015 01:03:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=SLdo0/NrSn8UXrMpHPm3uyo/ZOhPP3fc/6rkAXvtqPM=; b=KRyLWGpTcnRCdNOhRDpLFGku+I0os6A1yRXihh5N8tWMA9d+yW9BENujHilMwNTPiv j4228b9jX3BkWc3hHQuB1rEh5nOg5O70EEKJ4bvugGNafaKgKvh/i7I6WkaZCR3ihNLU h+1W4G2KfFmloQ1ETSVFSljCXXWIZucOjUHlsck2GrI7cLNLyAPZcPtOCOq/K+SDXvhM 8X9jR43/WBsGd9ZYali3nq63uaMchKbLe5m3Wf+zCs3YASWyAjTZhnlV3vyz5fXb4yVW cdAr/pZU3+ze3NufAN3wkNzX478x4Y+bWbMFgj+120H6b8TkhlxmPUga2Pnpp0WC59Jk QB/w== X-Gm-Message-State: ALoCoQnZ6ILg+Vzne1jmEMW0M5rFc8MyXvsUgjHRC8rrLUCs1kUrdmto7wcMKFqUlgdO0LbiDIGe X-Received: by 10.66.66.203 with SMTP id h11mr43951752pat.131.1423040587636; Wed, 04 Feb 2015 01:03:07 -0800 (PST) Received: from xps-iwamatsu.renesas.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id mm9sm1277357pbc.76.2015.02.04.01.03.03 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Feb 2015 01:03:06 -0800 (PST) From: Nobuhiro Iwamatsu To: bhelgaas@google.com Cc: linux-pci@vger.kernel.org, phil.edworthy@renesas.com, horms+renesas@verge.net.au, Nobuhiro Iwamatsu Subject: [PATCH] PCI: rcar: Change macro name of PCIEPARL and PCIEPARH Date: Wed, 4 Feb 2015 18:02:55 +0900 Message-Id: <1423040575-28080-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> X-Mailer: git-send-email 2.1.3 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org PCIEPARL and PCIEPARH are macro that calculates address of the register. However, register name is incorrect, PCIEPALR and PCIEPAUR is correct. This change macro name to PCIEPALR and PCIEPAUR. Signed-off-by: Nobuhiro Iwamatsu Acked-by: Phil Edworthy Acked-by: Simon Horman Acked-by: Simon Horman --- drivers/pci/host/pcie-rcar.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c index eb12659..183c32d 100644 --- a/drivers/pci/host/pcie-rcar.c +++ b/drivers/pci/host/pcie-rcar.c @@ -64,8 +64,8 @@ #define LAR_ENABLE (1 << 1) /* PCIe address reg & mask */ -#define PCIEPARL(x) (0x03400 + ((x) * 0x20)) -#define PCIEPARH(x) (0x03404 + ((x) * 0x20)) +#define PCIEPALR(x) (0x03400 + ((x) * 0x20)) +#define PCIEPAUR(x) (0x03404 + ((x) * 0x20)) #define PCIEPAMR(x) (0x03408 + ((x) * 0x20)) #define PCIEPTCTLR(x) (0x0340c + ((x) * 0x20)) #define PAR_ENABLE (1 << 31) @@ -341,9 +341,9 @@ static void rcar_pcie_setup_window(int win, struct rcar_pcie *pcie) else res_start = res->start; - rcar_pci_write_reg(pcie, upper_32_bits(res_start), PCIEPARH(win)); + rcar_pci_write_reg(pcie, upper_32_bits(res_start), PCIEPAUR(win)); rcar_pci_write_reg(pcie, lower_32_bits(res_start) & ~0x7F, - PCIEPARL(win)); + PCIEPALR(win)); /* First resource is for IO */ mask = PAR_ENABLE;