From patchwork Fri Aug 8 11:04:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 4695431 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EF0BAC0338 for ; Fri, 8 Aug 2014 11:02:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1445A2010C for ; Fri, 8 Aug 2014 11:02:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 22725200D0 for ; Fri, 8 Aug 2014 11:02:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756005AbaHHLCX (ORCPT ); Fri, 8 Aug 2014 07:02:23 -0400 Received: from mail-pd0-f181.google.com ([209.85.192.181]:64061 "EHLO mail-pd0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755969AbaHHLCX (ORCPT ); Fri, 8 Aug 2014 07:02:23 -0400 Received: by mail-pd0-f181.google.com with SMTP id g10so6783145pdj.26 for ; Fri, 08 Aug 2014 04:02:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:subject; bh=dICouC3x9Ff4ydtnLdRG8xdoJf2xzpFfbD/bKWF+Heg=; b=pBCDzD3cf/2XLC5Ss+RKRavzE2O0REDJ7iCtG93MaDCAGvszK51RadSw+wVYhMby6n 27lrhsV4ysW+YHlNFXcos5o8+j8pJ+Rv259kVUl8BeN5eJSuSrMVzkTcDfIF9wC77ik0 1BFv/JVZFxDAvfrhajWIrbwPujjmrFFyAxVkuBw7qxZMRsh+0XiyRCWsJZF1Toxx5UBl afkkoWSA5erzJgXQrSaF+9tTP8WpzuWbfg3ANhRFZ0FUx4ErBtD3ojJlzMwXYk3B8Zrt PD5M5mw3w4jD8VnA1BVYuBDsboM3joPKvXk4eqkhverfTO0p8qawSEeX9HbUNt61yliX QSKA== X-Received: by 10.70.103.175 with SMTP id fx15mr23854761pdb.94.1407495742669; Fri, 08 Aug 2014 04:02:22 -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 ov4sm2611979pbc.86.2014.08.08.04.02.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Aug 2014 04:02:21 -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: Fri, 08 Aug 2014 20:04:37 +0900 Message-Id: <20140808110437.2822.33109.sendpatchset@w520> Subject: [PATCH] ARM: shmobile: r8a7740: Multiplatform support 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, 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 Enable r8a7740 Multiplatform support for the generic r8a7740 machine vector. No board support is enabled, and the board code for Armadillo 800 EVA DT Reference is left by itself. Once the r8a7740 CCF DTS bits are merged together with SCIF and CMT clock changes and a CMT DT update it will be possible to boot an Armadillo 800 EVA board using the generic r8a7740 machine vector. Signed-off-by: Magnus Damm --- Built on top of renesas-devel-v3.16-20140808 and "[PATCH] ARM: shmobile: Partial build of pm-rmobile.c for multiplatform" arch/arm/mach-shmobile/Kconfig | 6 ++++++ arch/arm/mach-shmobile/pm-r8a7740.c | 5 ++--- arch/arm/mach-shmobile/r8a7740.h | 4 ++-- arch/arm/mach-shmobile/setup-r8a7740.c | 8 +++++++- 4 files changed, 17 insertions(+), 6 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/Kconfig +++ work/arch/arm/mach-shmobile/Kconfig 2014-08-08 17:58:04.000000000 +0900 @@ -26,6 +26,12 @@ config ARCH_R7S72100 bool "RZ/A1H (R7S72100)" select SYS_SUPPORTS_SH_MTU2 +config ARCH_R8A7740 + bool "R-Mobile A1 (R8A77400)" + select RENESAS_INTC_IRQPIN + select SYS_SUPPORTS_SH_CMT + select SYS_SUPPORTS_SH_TMU + config ARCH_R8A7779 bool "R-Car H1 (R8A77790)" select RENESAS_INTC_IRQPIN --- 0001/arch/arm/mach-shmobile/pm-r8a7740.c +++ work/arch/arm/mach-shmobile/pm-r8a7740.c 2014-08-08 17:58:04.000000000 +0900 @@ -13,7 +13,7 @@ #include "common.h" #include "pm-rmobile.h" -#ifdef CONFIG_PM +#if defined(CONFIG_PM) && !defined(CONFIG_ARCH_MULTIPLATFORM) static int r8a7740_pd_a4s_suspend(void) { /* @@ -58,8 +58,7 @@ void __init r8a7740_init_pm_domains(void rmobile_init_domains(r8a7740_pm_domains, ARRAY_SIZE(r8a7740_pm_domains)); pm_genpd_add_subdomain_names("A4S", "A3SP"); } - -#endif /* CONFIG_PM */ +#endif /* CONFIG_PM && !CONFIG_ARCH_MULTIPLATFORM */ #ifdef CONFIG_SUSPEND static int r8a7740_enter_suspend(suspend_state_t suspend_state) --- 0001/arch/arm/mach-shmobile/r8a7740.h +++ work/arch/arm/mach-shmobile/r8a7740.h 2014-08-08 17:58:04.000000000 +0900 @@ -54,10 +54,10 @@ extern void r8a7740_clock_init(u8 md_ck) extern void r8a7740_pinmux_init(void); extern void r8a7740_pm_init(void); -#ifdef CONFIG_PM +#if defined(CONFIG_PM) && !defined(CONFIG_ARCH_MULTIPLATFORM) extern void __init r8a7740_init_pm_domains(void); #else static inline void r8a7740_init_pm_domains(void) {} -#endif /* CONFIG_PM */ +#endif /* CONFIG_PM && !CONFIG_ARCH_MULTIPLATFORM */ #endif /* __ASM_R8A7740_H__ */ --- 0001/arch/arm/mach-shmobile/setup-r8a7740.c +++ work/arch/arm/mach-shmobile/setup-r8a7740.c 2014-08-08 19:45:44.000000000 +0900 @@ -36,6 +36,7 @@ #include #include #include +#include #include "common.h" #include "dma-register.h" @@ -827,7 +828,12 @@ void __init r8a7740_init_irq_of(void) static void __init r8a7740_generic_init(void) { - r8a7740_clock_init(0); + r8a7740_meram_workaround(); + +#ifdef CONFIG_CACHE_L2X0 + /* Shared attribute override enable, 32K*8way */ + l2x0_init(IOMEM(0xf0002000), 0x00400000, 0xc20f0fff); +#endif r8a7740_add_standard_devices_dt(); }