From patchwork Mon Aug 25 03:36:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 4772401 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 10A169F2E8 for ; Mon, 25 Aug 2014 03:34:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F248F20127 for ; Mon, 25 Aug 2014 03:34:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 241E220121 for ; Mon, 25 Aug 2014 03:34:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753984AbaHYDeg (ORCPT ); Sun, 24 Aug 2014 23:34:36 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:41794 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753805AbaHYDeg (ORCPT ); Sun, 24 Aug 2014 23:34:36 -0400 Received: by mail-pa0-f52.google.com with SMTP id bj1so20002098pad.25 for ; Sun, 24 Aug 2014 20:34:36 -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=03RWybUYaQQAy+m2GsOeOI8TsRhLZC1k84mejC73ngU=; b=lUvPOm6nvuikmKShOfrVwMYzrXe/cm5URVOCHp+F/h7Ax/0gMOb2qaoueTJzNI2T6S znkrm/1FkmRiuSXYjBb3GQnBqbuVwO8kdsNJeolpKQqD/P1D+rNwcCTRNW+fvQ4zszBf 01jfkjDgcBV7saT+a9XIkaILMe8wKy/Dbi5C53lqaRZ3zf5PJr2CsRcBtk7nSLDyrVGT Vf6SVFxCH+/DIUDRUPSXME/+8rX3m0PyJBOkIhQDCJYDTB86T+UKEJaK1xktgoQGWhH4 mCn/52CEXmJCeklyqPYLOzfNIaCaSP2lqnmWWSbJzv0wWs+fSZgzaqr+3Zx80ol0k5TG +5Cw== X-Received: by 10.68.164.4 with SMTP id ym4mr24730245pbb.53.1408937675996; Sun, 24 Aug 2014 20:34:35 -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 jd5sm104464pbd.89.2014.08.24.20.34.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Aug 2014 20:34:34 -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: Mon, 25 Aug 2014 12:36:53 +0900 Message-Id: <20140825033653.9284.94459.sendpatchset@w520> In-Reply-To: <20140825033635.9284.9060.sendpatchset@w520> References: <20140825033635.9284.9060.sendpatchset@w520> Subject: [PATCH v2 02/02] 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=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, 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 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. Signed-off-by: Magnus Damm --- Built on top of renesas-devel-20140823-v3.17-rc1 and "[PATCH v2 00/05] ARM: shmobile: Kconfig and Makefile cleanups V2" arch/arm/mach-shmobile/Kconfig | 5 +++++ 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, 16 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 --- 0011/arch/arm/mach-shmobile/Kconfig +++ work/arch/arm/mach-shmobile/Kconfig 2014-08-25 12:20:19.000000000 +0900 @@ -50,6 +50,11 @@ config ARCH_R7S72100 bool "RZ/A1H (R7S72100)" select SYS_SUPPORTS_SH_MTU2 +config ARCH_R8A7740 + bool "R-Mobile A1 (R8A77400)" + select ARCH_RMOBILE + select RENESAS_INTC_IRQPIN + config ARCH_R8A7779 bool "R-Car H1 (R8A77790)" select ARCH_RCAR_GEN1 --- 0001/arch/arm/mach-shmobile/pm-r8a7740.c +++ work/arch/arm/mach-shmobile/pm-r8a7740.c 2014-08-25 12:20:19.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-25 12:20:19.000000000 +0900 @@ -53,10 +53,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-25 12:21:43.000000000 +0900 @@ -36,6 +36,7 @@ #include #include #include +#include #include "common.h" #include "dma-register.h" @@ -813,7 +814,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 of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); }