From patchwork Mon Jul 13 06:15:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 6774381 X-Patchwork-Delegate: horms@verge.net.au 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 468AF9F380 for ; Mon, 13 Jul 2015 06:12:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 466A0205F9 for ; Mon, 13 Jul 2015 06:12:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 411C6205F3 for ; Mon, 13 Jul 2015 06:11:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751239AbbGMGL7 (ORCPT ); Mon, 13 Jul 2015 02:11:59 -0400 Received: from mail-pd0-f170.google.com ([209.85.192.170]:34609 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751114AbbGMGL6 (ORCPT ); Mon, 13 Jul 2015 02:11:58 -0400 Received: by pdbep18 with SMTP id ep18so219561472pdb.1 for ; Sun, 12 Jul 2015 23:11:58 -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=2bcMv/ZP7C29kXh8sAFPmDAGBrKJwvQmcMaDUPfN7t8=; b=EyHSUDe1bbtEFyLY5iO9AB1jszaIwnYz0NxJlXJEaWNLR08SZBhmH2vjJ3IGR1sMp2 U32xYyrd/mxjyVUuLGi5EGCaUTQ0tzHX8S8nSPaHcRCrl7AHO4tNErtLRSU8qOyi2F/D txbwGfOnmwMMR4OIVAiXSDi5E2f6s3RAbTKFMtnZPfxiW3NY3NwZrbiD5i02LeKPx4dp o9AhAA7vLY3NM9EBh0dwnQNXEoT686G2wV7cCkyvuj6psk9y2okGzvSlCpc9w77ldd16 zkRO262G7QAymfPker3XVdxjZW+yiKIwtFqA7uuMwI6i8QIpWRVBMXWAhxHhJpp2ESP3 pCpA== X-Received: by 10.66.185.199 with SMTP id fe7mr66985097pac.48.1436767918263; Sun, 12 Jul 2015 23:11:58 -0700 (PDT) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by smtp.gmail.com with ESMTPSA id ri11sm17050637pbb.92.2015.07.12.23.11.54 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Jul 2015 23:11:56 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , horms@verge.net.au, laurent.pinchart+renesas@ideasonboard.com, geert+renesas@glider.be Date: Mon, 13 Jul 2015 15:15:12 +0900 Message-Id: <20150713061512.25534.18136.sendpatchset@little-apple> In-Reply-To: <20150713061450.25534.96315.sendpatchset@little-apple> References: <20150713061450.25534.96315.sendpatchset@little-apple> Subject: [PATCH v3 02/04] ARM: shmobile: marzen-reference: Remove C board code Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-8.2 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 The generic r8a7779 machine vector is now feature-wise equivalent to the Marzen-reference case, so simply remove the Marzen C board code to fall over on the generic r8a7779 machine vector. Signed-off-by: Magnus Damm Acked-by: Geert Uytterhoeven --- Changes since V2: - None arch/arm/mach-shmobile/Kconfig | 7 -- arch/arm/mach-shmobile/Makefile | 4 - arch/arm/mach-shmobile/board-marzen-reference.c | 56 ----------------------- 3 files changed, 1 insertion(+), 66 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 --- 0001/arch/arm/mach-shmobile/Kconfig +++ work/arch/arm/mach-shmobile/Kconfig 2015-07-13 14:28:04.082366518 +0900 @@ -96,13 +96,6 @@ config ARCH_SH73A0 select ARCH_RMOBILE select RENESAS_INTC_IRQPIN -comment "Renesas ARM SoCs Board Type" - -config MACH_MARZEN - bool "MARZEN board" - depends on ARCH_R8A7779 - select REGULATOR_FIXED_VOLTAGE if REGULATOR - comment "Renesas ARM SoCs System Configuration" endif --- 0001/arch/arm/mach-shmobile/Makefile +++ work/arch/arm/mach-shmobile/Makefile 2015-07-13 14:28:04.082366518 +0900 @@ -51,9 +51,7 @@ obj-$(CONFIG_PM_RMOBILE) += pm-rmobile.o obj-$(CONFIG_ARCH_RCAR_GEN2) += pm-rcar-gen2.o # Board objects -ifdef CONFIG_ARCH_SHMOBILE_MULTI -obj-$(CONFIG_MACH_MARZEN) += board-marzen-reference.o -else +ifndef CONFIG_ARCH_SHMOBILE_MULTI obj-$(CONFIG_MACH_BOCKW) += board-bockw.o obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o obj-$(CONFIG_MACH_MARZEN) += board-marzen.o --- 0001/arch/arm/mach-shmobile/board-marzen-reference.c +++ /dev/null 2015-01-13 15:44:39.280208949 +0900 @@ -1,56 +0,0 @@ -/* - * marzen board support - Reference DT implementation - * - * Copyright (C) 2011 Renesas Solutions Corp. - * Copyright (C) 2011 Magnus Damm - * Copyright (C) 2013 Simon Horman - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include -#include -#include - -#include -#include - -#include "common.h" -#include "irqs.h" -#include "r8a7779.h" - -static void __init marzen_init_timer(void) -{ - r8a7779_clocks_init(r8a7779_read_mode_pins()); - clocksource_of_init(); -} - -static void __init marzen_init(void) -{ - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); - r8a7779_init_irq_extpin_dt(1); /* IRQ1 as individual interrupt */ -} - -static const char *marzen_boards_compat_dt[] __initdata = { - "renesas,marzen", - "renesas,marzen-reference", - NULL, -}; - -DT_MACHINE_START(MARZEN, "marzen") - .smp = smp_ops(r8a7779_smp_ops), - .map_io = r8a7779_map_io, - .init_early = shmobile_init_delay, - .init_time = marzen_init_timer, - .init_irq = r8a7779_init_irq_dt, - .init_machine = marzen_init, - .init_late = shmobile_init_late, - .dt_compat = marzen_boards_compat_dt, -MACHINE_END