From patchwork Fri Aug 14 13:51:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 7015131 X-Patchwork-Delegate: horms@verge.net.au 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EAD07C05AC for ; Fri, 14 Aug 2015 13:51:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0D355207E9 for ; Fri, 14 Aug 2015 13:51:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1D2E6207E6 for ; Fri, 14 Aug 2015 13:51:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755328AbbHNNv3 (ORCPT ); Fri, 14 Aug 2015 09:51:29 -0400 Received: from mail-wi0-f173.google.com ([209.85.212.173]:34876 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755377AbbHNNv3 (ORCPT ); Fri, 14 Aug 2015 09:51:29 -0400 Received: by wicne3 with SMTP id ne3so18944911wic.0 for ; Fri, 14 Aug 2015 06:51:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=zAfk/2M1C37EeAXXTyUT9/qi28zhkXQC5o1zSvJQWfg=; b=SmALgVuMvZUovCBzC/IY729Vic4yTk+Fscx3iA4rKc6d78Je7vgTOjf32moC2H/ftk lLRwr7T0TMDc3QcSapPq0/+F/jwY3gyUVFgX3C9gUVXp+hs/lXqRW6BVZEijc06hTxLO utsmpg9dUAlgiaeMTwDcgTWqHJLuLBboSUM6ALpkDp2G4t4AeSUmBr0zDDjxbhkotbOI qb22dkHuzp9cxl3X4Rdwln3DUfdCavCK/SG9SM8C7K4sYT+5rQSv46IXWSeFELHES3WV Hx9zMTIGoFS1GO/yxUumcdxInoKhCf3tUmsBZWTSIvi8a7Qix4FNDnxjserUDE+h3Srj k9Yw== X-Received: by 10.194.20.161 with SMTP id o1mr75511wje.32.1439560288101; Fri, 14 Aug 2015 06:51:28 -0700 (PDT) Received: from groucho.site (tsn109-201-154-192.dyn.nltelcom.net. [109.201.154.192]) by smtp.gmail.com with ESMTPSA id jr5sm8352012wjc.14.2015.08.14.06.51.26 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Aug 2015 06:51:27 -0700 (PDT) From: Ulrich Hecht To: horms@verge.net.au, linux-sh@vger.kernel.org Cc: magnus.damm@gmail.com, geert+renesas@glider.be, Ulrich Hecht Subject: [PATCH 5/7] ARM: shmobile: remove ARCH_SHMOBILE_LEGACY option Date: Fri, 14 Aug 2015 15:51:06 +0200 Message-Id: <1439560268-4935-6-git-send-email-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1439560268-4935-1-git-send-email-ulrich.hecht+renesas@gmail.com> References: <1439560268-4935-1-git-send-email-ulrich.hecht+renesas@gmail.com> 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.8 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 With Bock-W, the last legacy platform has been removed. Signed-off-by: Ulrich Hecht --- arch/arm/Kconfig | 26 +------------------------- arch/arm/Kconfig.debug | 3 +-- arch/arm/mach-shmobile/Kconfig | 23 ----------------------- 3 files changed, 2 insertions(+), 50 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 1c50210..a5ddf37 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -618,28 +618,6 @@ config ARCH_PXA help Support for Intel/Marvell's PXA2xx/PXA3xx processor line. -config ARCH_SHMOBILE_LEGACY - bool "Renesas ARM SoCs (non-multiplatform)" - select ARCH_SHMOBILE - select ARM_PATCH_PHYS_VIRT if MMU - select CLKDEV_LOOKUP - select CPU_V7 - select GENERIC_CLOCKEVENTS - select HAVE_ARM_SCU if SMP - select HAVE_ARM_TWD if SMP - select HAVE_SMP - select MIGHT_HAVE_CACHE_L2X0 - select MULTI_IRQ_HANDLER - select NO_IOPORT_MAP - select PINCTRL - select PM_GENERIC_DOMAINS if PM - select SH_CLK_CPG - select SPARSE_IRQ - help - Support for Renesas ARM SoC platforms using a non-multiplatform - kernel. This includes the SH-Mobile, R-Mobile, EMMA-Mobile, R-Car - and RZ families. - config ARCH_RPC bool "RiscPC" select ARCH_ACORN @@ -1530,7 +1508,6 @@ config HZ_FIXED default 200 if ARCH_EBSA110 || ARCH_S3C24XX || \ ARCH_S5PV210 || ARCH_EXYNOS4 default 128 if SOC_AT91RM9200 - default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE_LEGACY default 0 choice @@ -1737,8 +1714,7 @@ config ARM_MODULE_PLTS source "mm/Kconfig" config FORCE_MAX_ZONEORDER - int "Maximum zone order" if ARCH_SHMOBILE_LEGACY - range 11 64 if ARCH_SHMOBILE_LEGACY + int "Maximum zone order" default "12" if SOC_AM33XX default "9" if SA1111 || ARCH_EFM32 default "11" diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index a2e16f9..38ad594 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -1606,8 +1606,7 @@ config DEBUG_UNCOMPRESS config UNCOMPRESS_INCLUDE string default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \ - PLAT_SAMSUNG || ARM_SINGLE_ARMV7M || \ - ARCH_SHMOBILE_LEGACY + PLAT_SAMSUNG || ARM_SINGLE_ARMV7M default "mach/uncompress.h" config EARLY_PRINTK diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 61a59b1..7f2e053 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -99,29 +99,6 @@ config ARCH_SH73A0 comment "Renesas ARM SoCs System Configuration" endif -if ARCH_SHMOBILE_LEGACY - -comment "Renesas ARM SoCs System Type" - -config ARCH_R8A7779 - bool "R-Car H1 (R8A77790)" - select ARCH_RCAR_GEN1 - select ARCH_WANT_OPTIONAL_GPIOLIB - select ARM_GIC - -comment "Renesas ARM SoCs System Configuration" - -config CPU_HAS_INTEVT - bool - default y - -config SH_CLK_CPG - bool - -source "drivers/sh/Kconfig" - -endif - if ARCH_SHMOBILE menu "Timer and clock configuration"