From patchwork Thu Jul 10 07:26:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 368483 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 61E1D1400F1 for ; Thu, 10 Jul 2014 17:27:38 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751506AbaGJH1h (ORCPT ); Thu, 10 Jul 2014 03:27:37 -0400 Received: from mail-pd0-f180.google.com ([209.85.192.180]:39817 "EHLO mail-pd0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751321AbaGJH1h (ORCPT ); Thu, 10 Jul 2014 03:27:37 -0400 Received: by mail-pd0-f180.google.com with SMTP id fp1so10219654pdb.25 for ; Thu, 10 Jul 2014 00:27:36 -0700 (PDT) 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:in-reply-to :references:in-reply-to:references; bh=59MBUYo++v60sDHg2pcgEP3+J94Xa63kvG3g6D8ZcI4=; b=Pa8li2FHsB2ojnLeGtpDGXM0XMOWUTqrKHAb+OFDy75/mwOz5XVHyy6mc7Zp8da8S8 PIkig1GBX5r+1NAGgwxRQbmyjUQj9efTF1hld7P3/s3BAIwEhNLx241KGemtDcEQv1ny VK9WgxvYg8fBFcxbxXCR8uJRnK7swM9Q3F3XVmPJLdQpDI++BqEnseYXtHDeL9ann5PM VrrgVQ4tratK+0QS/1HVVqGoVLDUTv/RW9P5IrGh5UUd7CI3BhZ32DPDYark3QhvK9rB /Q2u0hUHuKYDu8jXmUvr48WpqS8cdqyu4zd/cJ4Sk+fl7VvrRcr8VZy6/pcIiY27RDXy k4wg== X-Gm-Message-State: ALoCoQnI67zAPjfSPEc8sPy5JFH+fU1sXCfpII4qvRcFCkxBwGeFiIE2mWhlXKRfVxEa0ZFm4+8k X-Received: by 10.68.253.73 with SMTP id zy9mr20338229pbc.114.1404977256881; Thu, 10 Jul 2014 00:27:36 -0700 (PDT) Received: from localhost ([122.167.123.210]) by mx.google.com with ESMTPSA id kk1sm48557023pbd.61.2014.07.10.00.27.32 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 10 Jul 2014 00:27:36 -0700 (PDT) From: Viresh Kumar To: arnd@linaro.org, olof@lixom.net Cc: linux-arm-kernel@lists.infradead.org, spear-devel@list.st.com, b.zolnierkie@samsung.com, bhelgaas@google.com, mark@nicholnet.com, linux-pci@vger.kernel.org, Pratyush Anand , Mohit Kumar , Viresh Kumar Subject: [PATCH V9 4/7] ARM: SPEAr13xx: Fix static mapping table Date: Thu, 10 Jul 2014 12:56:35 +0530 Message-Id: <5a6d915a382c34940865b9ac8835c5af78723cc4.1404976058.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.0.0.rc2 In-Reply-To: References: In-Reply-To: References: Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Pratyush Anand SPEAr13xx was using virtual address space 0xFE000000 to map physical address space 0xB3000000. But pci_remap_io uses 0xFEE00000 as virtual address and so replace 0xFE000000 with 0xF9000000. Acked-by: Viresh Kumar Acked-by: Arnd Bergmann Signed-off-by: Pratyush Anand Signed-off-by: Mohit Kumar [viresh: fixed logs/cclist] Signed-off-by: Viresh Kumar --- arch/arm/mach-spear/include/mach/spear.h | 4 ++-- arch/arm/mach-spear/spear13xx.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-spear/include/mach/spear.h b/arch/arm/mach-spear/include/mach/spear.h index 5cdc53d..f2d6a01 100644 --- a/arch/arm/mach-spear/include/mach/spear.h +++ b/arch/arm/mach-spear/include/mach/spear.h @@ -52,10 +52,10 @@ #ifdef CONFIG_ARCH_SPEAR13XX #define PERIP_GRP2_BASE UL(0xB3000000) -#define VA_PERIP_GRP2_BASE IOMEM(0xFE000000) +#define VA_PERIP_GRP2_BASE IOMEM(0xF9000000) #define MCIF_SDHCI_BASE UL(0xB3000000) #define SYSRAM0_BASE UL(0xB3800000) -#define VA_SYSRAM0_BASE IOMEM(0xFE800000) +#define VA_SYSRAM0_BASE IOMEM(0xF9800000) #define SYS_LOCATION (VA_SYSRAM0_BASE + 0x600) #define PERIP_GRP1_BASE UL(0xE0000000) diff --git a/arch/arm/mach-spear/spear13xx.c b/arch/arm/mach-spear/spear13xx.c index c9897ea..53a7614 100644 --- a/arch/arm/mach-spear/spear13xx.c +++ b/arch/arm/mach-spear/spear13xx.c @@ -52,7 +52,7 @@ void __init spear13xx_l2x0_init(void) /* * Following will create 16MB static virtual/physical mappings * PHYSICAL VIRTUAL - * 0xB3000000 0xFE000000 + * 0xB3000000 0xF9000000 * 0xE0000000 0xFD000000 * 0xEC000000 0xFC000000 * 0xED000000 0xFB000000