From patchwork Wed Aug 20 13:32:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 4751261 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 9C3639F344 for ; Wed, 20 Aug 2014 13:30:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7C8222014A for ; Wed, 20 Aug 2014 13:30:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3ED8A2015E for ; Wed, 20 Aug 2014 13:30:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751848AbaHTN3r (ORCPT ); Wed, 20 Aug 2014 09:29:47 -0400 Received: from mail-pd0-f179.google.com ([209.85.192.179]:40467 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751417AbaHTN3q (ORCPT ); Wed, 20 Aug 2014 09:29:46 -0400 Received: by mail-pd0-f179.google.com with SMTP id v10so11939998pde.24 for ; Wed, 20 Aug 2014 06:29:46 -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=JckYhmZF50dCeppDAuYqov//OOtmRoIGYJsKW3ugnfQ=; b=Kij7ATgvQeu5bJrFICh+lQ9qK449+YAOIcma+NZVzW5sV9BdpX0Q1CUM8Rxjs9Onnd Zx+DgayKm6IPIujLQc7CdSGZ5ZE5aEXKq824QQwoB91d3xnYlz5MVw7ap3uO3hW6DEm0 EBuukuzzbEBRhwjNYNdmIWrRA2YiFVQt7b38nZjVmTFAxvmgDC6xU9eqqmfVm14D4mbV 3S9PfXaqBADoAQASRel+IkM2gjWG4Dam3m9bqkxgnuO0epvmNdjcnJpovlIAS1MbOZHO BRGVxEJ7ZGaQXnREWukoQa2PdiFX4k5bYhursvfJjT83wfil7Wtq6eqEX9qFnP5M8Lq+ J/4g== X-Received: by 10.69.25.35 with SMTP id in3mr53198188pbd.63.1408541386283; Wed, 20 Aug 2014 06:29:46 -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 bm7sm6975178pdb.66.2014.08.20.06.29.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Aug 2014 06:29:45 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , horms@verge.net.au, geert+renesas@glider.be Date: Wed, 20 Aug 2014 22:32:03 +0900 Message-Id: <20140820133203.808.85577.sendpatchset@w520> In-Reply-To: <20140820133121.808.91022.sendpatchset@w520> References: <20140820133121.808.91022.sendpatchset@w520> Subject: [PATCH 04/06] ARM: shmobile: Introduce a Kconfig entry for R-Car Gen2 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 Add a Kconfig entry for R-Car Generation 2 SoCs that enables CMT timer and the IRQC interrupt driver. Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/Kconfig | 17 +++++++++-------- arch/arm/mach-shmobile/Makefile | 12 ++++++------ 2 files changed, 15 insertions(+), 14 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 --- 0004/arch/arm/mach-shmobile/Kconfig +++ work/arch/arm/mach-shmobile/Kconfig 2014-08-19 22:14:24.000000000 +0900 @@ -7,6 +7,11 @@ config ARCH_RCAR_GEN1 select RENESAS_INTC_IRQPIN select SYS_SUPPORTS_SH_TMU +config ARCH_RCAR_GEN2 + bool + select RENESAS_IRQC + select SYS_SUPPORTS_SH_CMT + config ARCH_RMOBILE bool select SYS_SUPPORTS_SH_CMT @@ -43,13 +48,11 @@ config ARCH_R8A7779 config ARCH_R8A7790 bool "R-Car H2 (R8A77900)" - select RENESAS_IRQC - select SYS_SUPPORTS_SH_CMT + select ARCH_RCAR_GEN2 config ARCH_R8A7791 bool "R-Car M2 (R8A77910)" - select RENESAS_IRQC - select SYS_SUPPORTS_SH_CMT + select ARCH_RCAR_GEN2 comment "Renesas ARM SoCs Board Type" @@ -123,22 +126,20 @@ config ARCH_R8A7779 config ARCH_R8A7790 bool "R-Car H2 (R8A77900)" + select ARCH_RCAR_GEN2 select ARM_GIC select CPU_V7 select MIGHT_HAVE_PCI select SH_CLK_CPG - select RENESAS_IRQC - select SYS_SUPPORTS_SH_CMT select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE config ARCH_R8A7791 bool "R-Car M2 (R8A77910)" + select ARCH_RCAR_GEN2 select ARM_GIC select CPU_V7 select MIGHT_HAVE_PCI select SH_CLK_CPG - select RENESAS_IRQC - select SYS_SUPPORTS_SH_CMT select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE comment "Renesas ARM SoCs Board Type" --- 0001/arch/arm/mach-shmobile/Makefile +++ work/arch/arm/mach-shmobile/Makefile 2014-08-19 22:21:23.000000000 +0900 @@ -13,8 +13,7 @@ obj-$(CONFIG_ARCH_R8A7740) += setup-r8a7 obj-$(CONFIG_ARCH_R8A7778) += setup-r8a7778.o obj-$(CONFIG_ARCH_R8A7779) += setup-r8a7779.o obj-$(CONFIG_ARCH_R8A7790) += setup-r8a7790.o -obj-$(CONFIG_ARCH_R8A7790) += setup-r8a7790.o setup-rcar-gen2.o -obj-$(CONFIG_ARCH_R8A7791) += setup-r8a7791.o setup-rcar-gen2.o +obj-$(CONFIG_ARCH_R8A7791) += setup-r8a7791.o obj-$(CONFIG_ARCH_EMEV2) += setup-emev2.o obj-$(CONFIG_ARCH_R7S72100) += setup-r7s72100.o @@ -33,8 +32,9 @@ endif # CPU reset vector handling objects cpu-y := platsmp.o headsmp.o -cpu-$(CONFIG_ARCH_R8A7790) += platsmp-apmu.o -cpu-$(CONFIG_ARCH_R8A7791) += platsmp-apmu.o + +# Shared SoC family objects +obj-$(CONFIG_ARCH_RCAR_GEN2) += setup-rcar-gen2.o platsmp-apmu.o $(cpu-y) # SMP objects smp-y := $(cpu-y) @@ -52,8 +52,8 @@ obj-$(CONFIG_ARCH_SH7372) += pm-sh7372.o obj-$(CONFIG_ARCH_SH73A0) += pm-sh73a0.o obj-$(CONFIG_ARCH_R8A7740) += pm-r8a7740.o pm-rmobile.o obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779.o pm-rcar.o -obj-$(CONFIG_ARCH_R8A7790) += pm-r8a7790.o pm-rcar.o $(cpu-y) -obj-$(CONFIG_ARCH_R8A7791) += pm-r8a7791.o pm-rcar.o $(cpu-y) +obj-$(CONFIG_ARCH_R8A7790) += pm-r8a7790.o pm-rcar.o +obj-$(CONFIG_ARCH_R8A7791) += pm-r8a7791.o pm-rcar.o # IRQ objects obj-$(CONFIG_ARCH_SH7372) += entry-intc.o