From patchwork Wed Nov 13 13:59:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3178311 Return-Path: X-Original-To: patchwork-linux-arm@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 70BC59F43F for ; Wed, 13 Nov 2013 13:59:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 235A82061E for ; Wed, 13 Nov 2013 13:59:45 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5BBB720547 for ; Wed, 13 Nov 2013 13:59:40 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vgaym-0002PT-OA; Wed, 13 Nov 2013 13:59:36 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vgayk-0000Qv-6u; Wed, 13 Nov 2013 13:59:34 +0000 Received: from perceval.ideasonboard.com ([95.142.166.194]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vgayg-0000PL-Pe for linux-arm-kernel@lists.infradead.org; Wed, 13 Nov 2013 13:59:31 +0000 Received: from avalon.ideasonboard.com (unknown [109.134.69.160]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id B4E3935A4B; Wed, 13 Nov 2013 14:58:23 +0100 (CET) From: Laurent Pinchart To: linux-sh@vger.kernel.org Subject: [PATCH] ARM: Kconfig: Mention R-Mobile and R-Car in addition to SH-Mobile Date: Wed, 13 Nov 2013 14:59:39 +0100 Message-Id: <1384351179-4593-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> X-Mailer: git-send-email 1.8.3.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131113_085931_015143_8958EAB1 X-CRM114-Status: GOOD ( 10.74 ) X-Spam-Score: -1.9 (-) Cc: phil.edworthy@renesas.com, Simon Horman , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 External engineers working on R-Car platforms sometimes can't find upstream platform support as the combination of the SH-Mobile name and using the product number proved an effective method of concealment. Make sure to mention R-Mobile and R-Car in the Kconfig comments and help texts. Reported-by: Phil Edworthy Signed-off-by: Laurent Pinchart --- arch/arm/Kconfig | 4 ++-- arch/arm/mach-shmobile/Kconfig | 21 +++++++++++---------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 1ad6fb6..970e65e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -643,7 +643,7 @@ config ARCH_MSM (clock and power control, etc). config ARCH_SHMOBILE - bool "Renesas SH-Mobile / R-Mobile" + bool "Renesas SH-/R-Mobile and R-Car" select ARM_PATCH_PHYS_VIRT select CLKDEV_LOOKUP select GENERIC_CLOCKEVENTS @@ -659,7 +659,7 @@ config ARCH_SHMOBILE select PM_GENERIC_DOMAINS if PM select SPARSE_IRQ help - Support for Renesas's SH-Mobile and R-Mobile ARM platforms. + Support for Renesas's SH-/R-Mobile and R-Car ARM platforms. config ARCH_RPC bool "RiscPC" diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 4bb548f..4cb15b4 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -1,5 +1,5 @@ config ARCH_SHMOBILE_MULTI - bool "SH-Mobile Series" if ARCH_MULTI_V7 + bool "SH-/R-Mobile and R-Car Series" if ARCH_MULTI_V7 depends on MMU select CPU_V7 select GENERIC_CLOCKEVENTS @@ -15,24 +15,24 @@ config ARCH_SHMOBILE_MULTI if ARCH_SHMOBILE_MULTI -comment "SH-Mobile System Type" +comment "SH-/R-Mobile and R-Car System Type" config ARCH_EMEV2 bool "Emma Mobile EV2" -comment "SH-Mobile Board Type" +comment "SH-/R-Mobile and R-Car Board Type" config MACH_KZM9D bool "KZM9D board" depends on ARCH_EMEV2 select REGULATOR_FIXED_VOLTAGE if REGULATOR -comment "SH-Mobile System Configuration" +comment "SH-/R-Mobile and R-Car System Configuration" endif if ARCH_SHMOBILE -comment "SH-Mobile System Type" +comment "SH-/R-Mobile and R-Car System Type" config ARCH_SH7372 bool "SH-Mobile AP4 (SH7372)" @@ -116,7 +116,7 @@ config ARCH_R7S72100 select CPU_V7 select SH_CLK_CPG -comment "SH-Mobile Board Type" +comment "SH-/R-Mobile and R-Car Board Type" config MACH_APE6EVM bool "APE6EVM board" @@ -275,7 +275,7 @@ config MACH_KZM9G_REFERENCE This is intended to aid developers -comment "SH-Mobile System Configuration" +comment "SH-/R-Mobile and R-Car System Configuration" config CPU_HAS_INTEVT bool @@ -300,9 +300,10 @@ config SHMOBILE_TIMER_HZ Allows the configuration of the timer frequency. It is customary to have the timer interrupt run at 1000 Hz or 100 Hz, but in the case of low timer frequencies other values may be more suitable. - SH-Mobile systems using a 32768 Hz RCLK for clock events may want - to select a HZ value such as 128 that can evenly divide RCLK. - A HZ value that does not divide evenly may cause timer drift. + SH-/R-Mobile and R-Car systems using a 32768 Hz RCLK for clock + events may want to select a HZ value such as 128 that can evenly + divide RCLK. A HZ value that does not divide evenly may cause timer + drift. config SH_TIMER_CMT bool "CMT timer driver"