From patchwork Mon Nov 23 13:56:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 7682241 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 777EABF90C for ; Mon, 23 Nov 2015 13:56:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 90B4E206B6 for ; Mon, 23 Nov 2015 13:56:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B82C1206FA for ; Mon, 23 Nov 2015 13:56:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752928AbbKWN4H (ORCPT ); Mon, 23 Nov 2015 08:56:07 -0500 Received: from michel.telenet-ops.be ([195.130.137.88]:55141 "EHLO michel.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753024AbbKWN4F (ORCPT ); Mon, 23 Nov 2015 08:56:05 -0500 Received: from ayla.of.borg ([84.195.106.123]) by michel.telenet-ops.be with bizsmtp id l1w41r0072fm56U061w4vv; Mon, 23 Nov 2015 14:56:04 +0100 Received: from ramsan.of.borg ([192.168.97.29] helo=ramsan) by ayla.of.borg with esmtp (Exim 4.82) (envelope-from ) id 1a0rb9-0000r9-R1; Mon, 23 Nov 2015 14:56:03 +0100 Received: from geert by ramsan with local (Exim 4.82) (envelope-from ) id 1a0rbL-0004Pc-Je; Mon, 23 Nov 2015 14:56:15 +0100 From: Geert Uytterhoeven To: Simon Horman , Magnus Damm Cc: Sudeep Holla , linux-sh@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v5 3/4] ARM: shmobile: r8a7740: Migrate to generic l2c OF initialization Date: Mon, 23 Nov 2015 14:56:01 +0100 Message-Id: <1448286962-16897-4-git-send-email-geert+renesas@glider.be> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1448286962-16897-1-git-send-email-geert+renesas@glider.be> References: <1448286962-16897-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=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 --- v5: - No changes, v4: - This depends on commit eeedcea69e927857 ("ARM: 8395/1: l2c: Add support for the "arm,shared-override" property"), which is queued for 4.3 in arm/for-next, v3: - Use 0/~0 now DT supports "arm,shared-override", 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 0c8f80c5b04df34d..7b16c12e3f816f7f 100644 --- a/arch/arm/mach-shmobile/setup-r8a7740.c +++ b/arch/arm/mach-shmobile/setup-r8a7740.c @@ -110,10 +110,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); } @@ -123,6 +119,8 @@ static const char *const r8a7740_boards_compat_dt[] __initconst = { }; DT_MACHINE_START(R8A7740_DT, "Generic R8A7740 (Flattened Device Tree)") + .l2c_aux_val = 0, + .l2c_aux_mask = ~0, .map_io = r8a7740_map_io, .init_early = shmobile_init_delay, .init_irq = r8a7740_init_irq_of,