From patchwork Thu Jun 25 08:58:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 6672701 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 6D614C05AC for ; Thu, 25 Jun 2015 08:55:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7555220528 for ; Thu, 25 Jun 2015 08:55:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 72EF520520 for ; Thu, 25 Jun 2015 08:55:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751922AbbFYIzL (ORCPT ); Thu, 25 Jun 2015 04:55:11 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:34010 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751617AbbFYIzJ (ORCPT ); Thu, 25 Jun 2015 04:55:09 -0400 Received: by pabvl15 with SMTP id vl15so46197629pab.1 for ; Thu, 25 Jun 2015 01:55:09 -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=nnUUewZ/RAO4WQx7wkI3Wrz6Uq3ilvWi2vss6QWiabQ=; b=n/NuybWS1xh5kIU+6iNSE+Gnsk2r8iR9gYtC9KzABhMpsajsBbsjQ3zEqQvIKE7a0H 7P5EHxT3N9OReFELIrE5l7DMR4oPXyUyGCkRcFa0PeBJgffF6w5twkuiqc3T7LP1LiqN va0xXrNS2mlUjeY7YB6PS8tgd3TY05fRnQvfA6656EWZxfgjtOOg4sA9DhElNQvvcuXN u9xylAK9vjPREZT+UM58I1kRWcPtMNKfdBGrwDgJEYPZ17F6ZvoNWgws6M3+KYXUfu9i 6w1qnbRGAWnK8lx1xqmu2stcXXJk/vyXbcTxo/2hbD7HJfj2uaQAC54HZRq4OyAOQK7G U41A== X-Received: by 10.70.37.69 with SMTP id w5mr88280508pdj.123.1435222509327; Thu, 25 Jun 2015 01:55:09 -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 j9sm26973581pdl.65.2015.06.25.01.55.05 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Jun 2015 01:55:07 -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: Thu, 25 Jun 2015 17:58:02 +0900 Message-Id: <20150625085802.24543.27224.sendpatchset@little-apple> In-Reply-To: <20150625085716.24543.84444.sendpatchset@little-apple> References: <20150625085716.24543.84444.sendpatchset@little-apple> Subject: [PATCH v2 04/06] 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 --- Changes since V1: - 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-06-25 17:31:39.152366518 +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-06-25 17:31:39.152366518 +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