From patchwork Mon May 4 15:24:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 6327621 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 1DDBCBEEE1 for ; Mon, 4 May 2015 15:24:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4D43F2010B for ; Mon, 4 May 2015 15:24:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AC60020108 for ; Mon, 4 May 2015 15:24:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751128AbbEDPYq (ORCPT ); Mon, 4 May 2015 11:24:46 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:54189 "EHLO laurent.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751834AbbEDPYm (ORCPT ); Mon, 4 May 2015 11:24:42 -0400 Received: from ayla.of.borg ([84.193.93.87]) by laurent.telenet-ops.be with bizsmtp id PrQa1q00C1t5w8s01rQasU; Mon, 04 May 2015 17:24:41 +0200 Received: from ramsan.of.borg ([192.168.97.29] helo=ramsan) by ayla.of.borg with esmtp (Exim 4.82) (envelope-from ) id 1YpIET-0002oo-TC; Mon, 04 May 2015 17:24:33 +0200 Received: from geert by ramsan with local (Exim 4.82) (envelope-from ) id 1YpIET-0004TX-UD; Mon, 04 May 2015 17:24:33 +0200 From: Geert Uytterhoeven To: Russell King - ARM Linux , Arnd Bergmann , Simon Horman , Magnus Damm , Mark Rutland , Pawel Moll Cc: Catalin Marinas , Tushar Behera , linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org, devicetree@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v3 4/6] ARM: shmobile: armadillo legacy: Migrate to generic l2c OF initialization Date: Mon, 4 May 2015 17:24:30 +0200 Message-Id: <1430753072-17145-5-git-send-email-geert+renesas@glider.be> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1430753072-17145-1-git-send-email-geert+renesas@glider.be> References: <1430753072-17145-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 --- v3: - Use 0/~0 now DT supports "arm,shared-override", v2: - Keep only {,~}L2C_AUX_CTRL_SHARED_OVERRIDE. --- arch/arm/mach-shmobile/board-armadillo800eva.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index bf37e3c532f661a6..e77fe29db4658357 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c @@ -1308,12 +1308,6 @@ static void __init eva_init(void) sdhi1 = &sdhi1_device; } - -#ifdef CONFIG_CACHE_L2X0 - /* Shared attribute override enable, 32K*8way */ - l2x0_init(IOMEM(0xf0002000), 0x00400000, 0xc20f0fff); -#endif - i2c_register_board_info(0, i2c0_devices, ARRAY_SIZE(i2c0_devices)); i2c_register_board_info(2, i2c2_devices, ARRAY_SIZE(i2c2_devices)); @@ -1354,6 +1348,8 @@ static const char *eva_boards_compat_dt[] __initdata = { }; DT_MACHINE_START(ARMADILLO800EVA_DT, "armadillo800eva") + .l2c_aux_val = 0, + .l2c_aux_mask = ~0, .map_io = r8a7740_map_io, .init_early = r8a7740_add_early_devices, .init_irq = r8a7740_init_irq_of,