From patchwork Wed Feb 4 14:15:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 5776781 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E058D9F302 for ; Wed, 4 Feb 2015 14:15:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2B72E202C8 for ; Wed, 4 Feb 2015 14:15:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EBA79202D1 for ; Wed, 4 Feb 2015 14:15:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964854AbbBDOPX (ORCPT ); Wed, 4 Feb 2015 09:15:23 -0500 Received: from baptiste.telenet-ops.be ([195.130.132.51]:44249 "EHLO baptiste.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755429AbbBDOPV (ORCPT ); Wed, 4 Feb 2015 09:15:21 -0500 Received: from ayla.of.borg ([84.193.93.87]) by baptiste.telenet-ops.be with bizsmtp id oEFK1p00F1t5w8s01EFKcG; Wed, 04 Feb 2015 15:15:19 +0100 Received: from ramsan.of.borg ([192.168.97.29] helo=ramsan) by ayla.of.borg with esmtp (Exim 4.82) (envelope-from ) id 1YJ0je-0007B3-U5; Wed, 04 Feb 2015 15:15:18 +0100 Received: from geert by ramsan with local (Exim 4.82) (envelope-from ) id 1YJ0jh-0007Qo-5C; Wed, 04 Feb 2015 15:15:21 +0100 From: Geert Uytterhoeven To: Simon Horman , Magnus Damm Cc: Arnd Bergmann , linux-sh@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 2/5] ARM: shmobile: r8a7740: Migrate to generic l2c OF initialization Date: Wed, 4 Feb 2015 15:15:12 +0100 Message-Id: <1423059315-28519-3-git-send-email-geert+renesas@glider.be> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1423059315-28519-1-git-send-email-geert+renesas@glider.be> References: <1423059315-28519-1-git-send-email-geert+renesas@glider.be> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Migrate the generic r8a7740 platform from calling l2x0_of_init() to the generic l2c OF initialization. Signed-off-by: Geert Uytterhoeven --- v2 - Keep only {,~}L2C_AUX_CTRL_SHARED_OVERRIDE --- arch/arm/mach-shmobile/setup-r8a7740.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c index d191cf4197313482..3ebd4dfc8e853a9b 100644 --- a/arch/arm/mach-shmobile/setup-r8a7740.c +++ b/arch/arm/mach-shmobile/setup-r8a7740.c @@ -835,10 +835,6 @@ static void __init r8a7740_generic_init(void) { r8a7740_meram_workaround(); -#ifdef CONFIG_CACHE_L2X0 - /* Shared attribute override enable, 32K*8way */ - l2x0_init(IOMEM(0xf0002000), 0x00400000, 0xc20f0fff); -#endif of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); } @@ -855,6 +851,8 @@ static const char *r8a7740_boards_compat_dt[] __initdata = { }; DT_MACHINE_START(R8A7740_DT, "Generic R8A7740 (Flattened Device Tree)") + .l2c_aux_val = L2C_AUX_CTRL_SHARED_OVERRIDE, + .l2c_aux_mask = ~L2C_AUX_CTRL_SHARED_OVERRIDE, .map_io = r8a7740_map_io, .init_early = shmobile_init_delay, .init_irq = r8a7740_init_irq_of,