From patchwork Tue Aug 2 15:48:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 3220 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 863B023F46 for ; Tue, 2 Aug 2011 15:48:46 +0000 (UTC) Received: from mail-qw0-f52.google.com (mail-qw0-f52.google.com [209.85.216.52]) by fiordland.canonical.com (Postfix) with ESMTP id 4CC63A18519 for ; Tue, 2 Aug 2011 15:48:46 +0000 (UTC) Received: by qwb8 with SMTP id 8so4973086qwb.11 for ; Tue, 02 Aug 2011 08:48:45 -0700 (PDT) Received: by 10.229.183.84 with SMTP id cf20mr1820044qcb.121.1312300125721; Tue, 02 Aug 2011 08:48:45 -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.229.6.73 with SMTP id 9cs127877qcy; Tue, 2 Aug 2011 08:48:45 -0700 (PDT) Received: by 10.204.151.216 with SMTP id d24mr1841313bkw.304.1312300124327; Tue, 02 Aug 2011 08:48:44 -0700 (PDT) Received: from mail.df.lth.se (mail.df.lth.se [194.47.250.12]) by mx.google.com with ESMTPS id b15si4041369bka.99.2011.08.02.08.48.43 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 02 Aug 2011 08:48:44 -0700 (PDT) Received-SPF: neutral (google.com: 194.47.250.12 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=194.47.250.12; Authentication-Results: mx.google.com; spf=neutral (google.com: 194.47.250.12 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) smtp.mail=linus.walleij@stericsson.com Received: from localhost.localdomain (unknown [109.234.204.184]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.df.lth.se (Postfix) with ESMTPSA id 4BC8B65D65; Tue, 2 Aug 2011 17:48:42 +0200 (CEST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Cc: Lee Jones , Linus Walleij , Dave Martin , Arnd Bergmann Subject: [PATCH] mach-davinci: fix cache flush build error Date: Tue, 2 Aug 2011 17:48:38 +0200 Message-Id: <1312300118-9088-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.6 From: Linus Walleij The TNET variant of DaVinci compiles some code that it shares with other DaVinci variants, however it has a V6 CPU rather than an ARM926T, thus the hardcoded call to arm926_flush_kern_cache_all() in sleep.S will obviously fail, and we need to build with the v6_flush_kern_cache_all() call instead. This was triggered by manually altering the DaVinci config to build the TNET version. Cc: Dave Martin Cc: Arnd Bergmann Signed-off-by: Linus Walleij --- This is just an ifdef to get the DaVinci TNET variant to compile, if there is a way to call out to some abstract flush function in a MULTI CPU/cache configuration from _assembler_ code, please tell me, I'm not all that happy about this since it blocks proper multiboard support for DaVinci, would be nice to find a better solution. --- arch/arm/mach-davinci/sleep.S | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-davinci/sleep.S b/arch/arm/mach-davinci/sleep.S index fb5e72b..5f1e045 100644 --- a/arch/arm/mach-davinci/sleep.S +++ b/arch/arm/mach-davinci/sleep.S @@ -217,7 +217,11 @@ ddr2clk_stop_done: ENDPROC(davinci_ddr_psc_config) CACHE_FLUSH: - .word arm926_flush_kern_cache_all +#ifdef CONFIG_CPU_V6 + .word v6_flush_kern_cache_all +#else + .word arm926_flush_kern_cache_all +#endif ENTRY(davinci_cpu_suspend_sz) .word . - davinci_cpu_suspend