From patchwork Sat May 31 17:22:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 4276321 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 61AC99F326 for ; Sat, 31 May 2014 17:24:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8CD142024D for ; Sat, 31 May 2014 17:24:41 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BD92D2022A for ; Sat, 31 May 2014 17:24:40 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wqmxc-000607-Av; Sat, 31 May 2014 17:20:48 +0000 Received: from mail-pd0-f182.google.com ([209.85.192.182]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WqmxZ-0005zR-Cq for linux-arm-kernel@lists.infradead.org; Sat, 31 May 2014 17:20:45 +0000 Received: by mail-pd0-f182.google.com with SMTP id r10so2026139pdi.27 for ; Sat, 31 May 2014 10:20:23 -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; bh=zQ/8zua3xMhicA+5Rbj12ABAYNy2N7GH8F5yYqCEfSY=; b=BqYVRbDVa4WyLaUZDI26TXLhQtp+fNMv3clvdcC5HlDB4xJzlEs7SM8Q/PGv0Uxwbt 8y9tLmsIqgsCqPDmqsgBQUT+EiHEz8aYzqsrxm3O52IKHzjvFLzzJXOER3ZSG+3qftb7 uU4uYsVfNLtyh2/9xuEy6OkH71I2Rh2tl+lIdTo9wX/QpyTBMYNd7E2JiR/6eQI11yLr ClnJZvM5N7fe5AP9RVxGROPJYmqfscmGTmIX6ofdl6dSFZtSxiG4uEUF8Oq5FERRzmGe n5o1DQ25Urded3OGvpGVu/keouqkL3SLZjQw0NHCPIT6ywpE9gDfIn+CSu3i/VcRdY4O zqXA== X-Gm-Message-State: ALoCoQk4Xr2ksrNnBSLgV4n+K+0CGT4W5ZurJZR9vqhBcu4pGDyp9YNFYQbl7fKvI5uB1eQpQFvw X-Received: by 10.68.132.9 with SMTP id oq9mr27513188pbb.103.1401556823429; Sat, 31 May 2014 10:20:23 -0700 (PDT) Received: from brutus.lixom.net (173-13-129-225-sfba.hfc.comcastbusiness.net. [173.13.129.225]) by mx.google.com with ESMTPSA id nf5sm12161042pbc.77.2014.05.31.10.20.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 31 May 2014 10:20:22 -0700 (PDT) From: Olof Johansson To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: exynos: don't run exynos4 l2x0 setup on other platforms Date: Sat, 31 May 2014 10:22:04 -0700 Message-Id: <1401556924-18006-1-git-send-email-olof@lixom.net> X-Mailer: git-send-email 1.7.10.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140531_102045_448318_6E5BF366 X-CRM114-Status: GOOD ( 11.28 ) X-Spam-Score: 0.0 (/) Cc: Olof Johansson , t.figa@samsung.com, kgene.kim@samsung.com, linux@arm.linux.org.uk X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This was caught by a panic on Broadcom mobile platforms. Note that this code is all going away with the pending l2x0 cleanup series from Russell, but we need this here until that's landed so we can enable exynos multiplatform. Signed-off-by: Olof Johansson --- arch/arm/mach-exynos/exynos.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c index d51d5af7e7df..4800b1ce3d71 100644 --- a/arch/arm/mach-exynos/exynos.c +++ b/arch/arm/mach-exynos/exynos.c @@ -246,6 +246,9 @@ static int __init exynos4_l2x0_cache_init(void) { int ret; + if (!soc_is_exynos4()) + return 0; + ret = l2x0_of_init(L2_AUX_VAL, L2_AUX_MASK); if (ret) return ret;