From patchwork Thu Sep 4 02:28:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 4842171 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9A6B79F314 for ; Thu, 4 Sep 2014 02:26:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C01D22020F for ; Thu, 4 Sep 2014 02:26:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E1C23201EF for ; Thu, 4 Sep 2014 02:26:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756912AbaIDC0c (ORCPT ); Wed, 3 Sep 2014 22:26:32 -0400 Received: from mail-pd0-f175.google.com ([209.85.192.175]:41929 "EHLO mail-pd0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756693AbaIDC0c (ORCPT ); Wed, 3 Sep 2014 22:26:32 -0400 Received: by mail-pd0-f175.google.com with SMTP id ft15so12440884pdb.6 for ; Wed, 03 Sep 2014 19:26:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=n+my+MFmll5/uKLVwNrLVd0lxd3TlF1EoYOFczNwE1s=; b=Et1s/6/Y3N5vpwmVwBJw7iD/fV5G0Z2z6dzrBHm6UQHuHh8/Z+ucEbAovqbOwmi6bh Xv8GSybVwnVDIewucMpowdC7LgnSQ7G9cV/S31MZKJhtZv6ICnJ9rn8U45DndmrwFTyw +h25qVuWeuzAKBGWO1KEYCvhljckQGjxXeyJLulk0Js3TsfBDa4oqVAseHMOIL0abK9g nGBKl2uYtR+Y4FQt7xVFDXFqNv7pN4/xh0LfeiG6K2VdlmRxEaXeHI4FGeLoGVXfupLL vPQlqlVeCI7aZ8FZWNz5Nt50dcUbMu1+GhWwCCbgxKD52tLHMx6llAx7luXw+O3y2Txn X/mA== X-Received: by 10.66.169.42 with SMTP id ab10mr2839952pac.138.1409797587691; Wed, 03 Sep 2014 19:26:27 -0700 (PDT) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by mx.google.com with ESMTPSA id k1sm226777pdj.8.2014.09.03.19.26.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Sep 2014 19:26:26 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: ulrich.hecht+renesas@gmail.com, Magnus Damm , horms@verge.net.au, geert+renesas@glider.be Date: Thu, 04 Sep 2014 11:28:45 +0900 Message-Id: <20140904022845.26216.45573.sendpatchset@w520> In-Reply-To: <20140904022835.26216.90336.sendpatchset@w520> References: <20140904022835.26216.90336.sendpatchset@w520> Subject: [PATCH 01/03] ARM: shmobile: sh73a0: Introduce generic setup callback Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-8.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 From: Magnus Damm Add a generic sh73a0 machine setup callback for the upcoming sh73a0 multiplatform case. Cache needs to be configured, and legacy clocks must be omitted. Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/setup-sh73a0.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 0001/arch/arm/mach-shmobile/setup-sh73a0.c +++ work/arch/arm/mach-shmobile/setup-sh73a0.c 2014-09-04 10:46:41.000000000 +0900 @@ -33,6 +33,7 @@ #include #include +#include #include #include #include @@ -772,8 +773,6 @@ void __init sh73a0_add_early_devices(voi shmobile_setup_console(); } -#ifdef CONFIG_USE_OF - void __init sh73a0_add_standard_devices_dt(void) { /* clocks are setup late during boot in the case of DT */ @@ -784,6 +783,17 @@ void __init sh73a0_add_standard_devices_ of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); } +#ifdef CONFIG_USE_OF + +static void __init sh73a0_generic_init(void) +{ +#ifdef CONFIG_CACHE_L2X0 + /* Shared attribute override enable, 64K*8way */ + l2x0_init(IOMEM(0xf0100000), 0x00400000, 0xc20f0fff); +#endif + of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); +} + static const char *sh73a0_boards_compat_dt[] __initdata = { "renesas,sh73a0", NULL, @@ -793,7 +803,7 @@ DT_MACHINE_START(SH73A0_DT, "Generic SH7 .smp = smp_ops(sh73a0_smp_ops), .map_io = sh73a0_map_io, .init_early = sh73a0_init_delay, - .init_machine = sh73a0_add_standard_devices_dt, + .init_machine = sh73a0_generic_init, .init_late = shmobile_init_late, .dt_compat = sh73a0_boards_compat_dt, MACHINE_END