From patchwork Mon Jan 28 18:56:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 216315 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 B437E2C0099 for ; Tue, 29 Jan 2013 05:57:13 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752165Ab3A1S5G (ORCPT ); Mon, 28 Jan 2013 13:57:06 -0500 Received: from mail.free-electrons.com ([94.23.35.102]:58268 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751483Ab3A1S5C (ORCPT ); Mon, 28 Jan 2013 13:57:02 -0500 Received: by mail.free-electrons.com (Postfix, from userid 106) id 401C16699; Mon, 28 Jan 2013 19:57:03 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT shortcircuit=ham autolearn=disabled version=3.3.2 Received: from localhost (humanoidz.org [82.247.183.72]) by mail.free-electrons.com (Postfix) with ESMTPSA id C6ED55EEC; Mon, 28 Jan 2013 19:57:02 +0100 (CET) From: Thomas Petazzoni To: Bjorn Helgaas , linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Jason Cooper , Andrew Lunn , Gregory Clement , Arnd Bergmann , Maen Suleiman , Lior Amsalem , Thierry Reding , Eran Ben-Avi , Nadav Haklai , Shadi Ammouri , Tawfik Bayouk , Stephen Warren , Jason Gunthorpe , Russell King - ARM Linux Subject: [PATCH v2 13/27] arm: plat-orion: introduce WIN_CTRL_ENABLE in address mapping code Date: Mon, 28 Jan 2013 19:56:22 +0100 Message-Id: <1359399397-29729-14-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1359399397-29729-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1359399397-29729-1-git-send-email-thomas.petazzoni@free-electrons.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Instead of hardcoding "1" as being the bit value to enable an address decoding window, introduce and use a WIN_CTRL_ENABLE definition. Signed-off-by: Thomas Petazzoni --- arch/arm/plat-orion/addr-map.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/plat-orion/addr-map.c b/arch/arm/plat-orion/addr-map.c index febe386..4dec3db 100644 --- a/arch/arm/plat-orion/addr-map.c +++ b/arch/arm/plat-orion/addr-map.c @@ -38,6 +38,7 @@ EXPORT_SYMBOL_GPL(mv_mbus_dram_info); * CPU Address Decode Windows registers */ #define WIN_CTRL_OFF 0x0000 +#define WIN_CTRL_ENABLE BIT(0) #define WIN_BASE_OFF 0x0004 #define WIN_REMAP_LO_OFF 0x0008 #define WIN_REMAP_HI_OFF 0x000c @@ -79,7 +80,8 @@ void __init orion_setup_cpu_win(const struct orion_addr_map_cfg *cfg, } base_high = base & 0xffff0000; - ctrl = ((size - 1) & 0xffff0000) | (attr << 8) | (target << 4) | 1; + ctrl = ((size - 1) & 0xffff0000) | (attr << 8) | (target << 4) | + WIN_CTRL_ENABLE; writel(base_high, addr + WIN_BASE_OFF); writel(ctrl, addr + WIN_CTRL_OFF);