From patchwork Wed Aug 8 21:27:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10600 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 707CC23E57 for ; Wed, 8 Aug 2012 21:28:14 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id 2F7E8A1891D for ; Wed, 8 Aug 2012 21:28:14 +0000 (UTC) Received: by ggnf1 with SMTP id f1so1324072ggn.11 for ; Wed, 08 Aug 2012 14:28:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-provags-id:x-gm-message-state; bh=KVIfActIyQQZQHBDxuuZy+noDB2SaU1TOTyXcy3jx7k=; b=BekvLDsNI29oWDaw9qhK44oLz9OJb9uSEKdtMDIXWKZ0ysMfScWpgjDrWQOtmHarQo XsA4FK4imoXiN4+hE9nFDyNKa8bM8n71vIU09f/LmvEhXtdFNidSGXsCbFFYtP2KBosc lsFPS23xHWzXsoAs+6COFlPlptqun074jslYyK4EFOdkS7EDZ5siiB8x7bffIMUntOrS vSHJ1kb9/95YwcpS0dfBvoyVAJWNZZABConDhCCihymkT8gWqrYawsL195zZZ8T2nlk2 WhnJmtwLBsOJhdSulJErXFkxpk4qywq/hkJzmhLKemWDWBOOxT6lYRbxJPi5jlmRCLyF qIYA== Received: by 10.42.75.73 with SMTP id z9mr15192369icj.46.1344461293382; Wed, 08 Aug 2012 14:28:13 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.200 with SMTP id ew8csp628831igc; Wed, 8 Aug 2012 14:28:12 -0700 (PDT) Received: by 10.180.84.1 with SMTP id u1mr914319wiy.15.1344461291617; Wed, 08 Aug 2012 14:28:11 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.17.9]) by mx.google.com with ESMTP id f7si9282292wiv.40.2012.08.08.14.28.10; Wed, 08 Aug 2012 14:28:11 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.17.9 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.17.9; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.17.9 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Received: from localhost.localdomain (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0MT3nG-1T8Xhn3AUI-00SQvL; Wed, 08 Aug 2012 23:28:10 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: arm@kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Andrew Lunn , Michael Walle , Nicolas Pitre Subject: [PATCH 03/10] ARM: mv78xx0: fix win_cfg_base prototype Date: Wed, 8 Aug 2012 23:27:51 +0200 Message-Id: <1344461278-28245-4-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1344461278-28245-1-git-send-email-arnd@arndb.de> References: <1344461278-28245-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:/+eqv20jl5yUgRncULsOGbjyLhPsTRXqIDZpkcN+K9m fOnqasBsyqQPQKM5iFbGme3S0xpqEwKoiJTU0yVLzDuYgybxsN Q7a77xV+0pNSV3VbOZKoQyVcTUnuzzxfyJRXJYAw7P6rubojut VOyhlfTfMvCp/zFa7Ivgx5JRiWRgI/KZLskHjxInV/aWe0lb6e yXA9+BT0N/Xowk0rUeolJztSiPriBQyIesh/Bko8KXOsklEMKU j00Dv+d23Hqb6n0zpAYpLJk4R18rhlyz+iq+HT0p6FpDQO+QRC +S7TG5aNcCB+d7+TPi19PY4aQImkrwqxpZpWS4MpyuncrRO2Jt TfZ3M3nGK+JB7vDvtUWg7/G0iED4HrueJuGg2FG5k4sKLLbvkd v+j1yYu5fhJkQ== X-Gm-Message-State: ALoCoQloSXRwftMYoUME8tJOgcwU4lvdugabWe25lZWTh1Ju9MYZT6QgfGj8IHfLilZPCQsy0ZZO Patch b6d1c33a31 "ARM: Orion: Consolidate the address map setup" tried to merge the address map for the four orion platforms, but apparently got it wrong for mv78xx0. Admittedly I don't understand what this code actually does, but it's clear that the current version is wrong. Without this patch, building mv78xx0_defconfig results in: arch/arm/mach-mv78xx0/addr-map.c:59:2: warning: initialization from incompatible pointer type [enabled by default] arch/arm/mach-mv78xx0/addr-map.c:59:2: warning: (near initialization for 'addr_map_cfg.win_cfg_base') [enabled by default] Signed-off-by: Arnd Bergmann Cc: Andrew Lunn Cc: Michael Walle Cc: Nicolas Pitre --- arch/arm/mach-mv78xx0/addr-map.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-mv78xx0/addr-map.c b/arch/arm/mach-mv78xx0/addr-map.c index 62b53d7..a9bc841 100644 --- a/arch/arm/mach-mv78xx0/addr-map.c +++ b/arch/arm/mach-mv78xx0/addr-map.c @@ -37,7 +37,7 @@ #define WIN0_OFF(n) (BRIDGE_VIRT_BASE + 0x0000 + ((n) << 4)) #define WIN8_OFF(n) (BRIDGE_VIRT_BASE + 0x0900 + (((n) - 8) << 4)) -static void __init __iomem *win_cfg_base(int win) +static void __init __iomem *win_cfg_base(const struct orion_addr_map_cfg *cfg, int win) { /* * Find the control register base address for this window.