From patchwork Mon Aug 25 03:03:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 4772261 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 EB66BC0338 for ; Mon, 25 Aug 2014 03:01:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 090512012B for ; Mon, 25 Aug 2014 03:01:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F16CC20114 for ; Mon, 25 Aug 2014 03:01:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753889AbaHYDBZ (ORCPT ); Sun, 24 Aug 2014 23:01:25 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:39754 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753826AbaHYDBZ (ORCPT ); Sun, 24 Aug 2014 23:01:25 -0400 Received: by mail-pa0-f50.google.com with SMTP id et14so20285412pad.9 for ; Sun, 24 Aug 2014 20:01:25 -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=G7D+ZUFamRDjFlfQljhIxlpLOgn3/waxptquyRUTrks=; b=CG7Jg0h6pad2Lca9v2g4uu6KouYg4Cl0SNHzcfkKQ1nm4eScHvdjbEulhNcSS7Ic2u wsGm9oEKvODW9W2iZs77axP/xLf9Vhrt6839sr/zhLJFmjZn0gLnMtNinDLA4FdQZ0VJ 4HQSijfObY14GRhE5JOz7bZXyl3b/6kC02hE2RqFCtKldOe/Wq0ZoCbjy6qLnqGeq4kY BWnMKLS1osIQg32NtIizibz6csnvT2eytUoD25LPuxcqiOs6C6FjkM826oNu8x9gPi5L 3UymarmIWLBlbYP1Iqovz/KsqP+myjQhP1jolfvtqNyZREPfXseNrKWM4yctMRhtjxN3 +HVw== X-Received: by 10.69.31.234 with SMTP id kp10mr7300749pbd.138.1408935684973; Sun, 24 Aug 2014 20:01:24 -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 xk1sm130613841pac.21.2014.08.24.20.01.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Aug 2014 20:01:23 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , horms@verge.net.au, geert+renesas@glider.be Date: Mon, 25 Aug 2014 12:03:43 +0900 Message-Id: <20140825030343.1936.61634.sendpatchset@w520> In-Reply-To: <20140825030316.1936.88249.sendpatchset@w520> References: <20140825030316.1936.88249.sendpatchset@w520> Subject: [PATCH v2 03/05] 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=-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 Add a Kconfig entry for R-Car Generation 2 SoCs that enables CMT timer and the IRQC interrupt driver. Signed-off-by: Magnus Damm Acked-by: Geert Uytterhoeven --- Changes since V1: - Removed dependency of "ARM: shmobile: Consolidate GPIOLIB Kconfig bits" 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 --- 0003/arch/arm/mach-shmobile/Kconfig +++ work/arch/arm/mach-shmobile/Kconfig 2014-08-25 11:32:29.000000000 +0900 @@ -6,6 +6,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 @@ -42,13 +47,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" @@ -130,24 +133,22 @@ config ARCH_R8A7779 config ARCH_R8A7790 bool "R-Car H2 (R8A77900)" + select ARCH_RCAR_GEN2 select ARCH_WANT_OPTIONAL_GPIOLIB 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 ARCH_WANT_OPTIONAL_GPIOLIB 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-25 11:31:37.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