From patchwork Thu May 21 10:50:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 6454001 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 91704C0432 for ; Thu, 21 May 2015 10:50:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AD9FF20435 for ; Thu, 21 May 2015 10:50:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BFD0820382 for ; Thu, 21 May 2015 10:50:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753001AbbEUKuZ (ORCPT ); Thu, 21 May 2015 06:50:25 -0400 Received: from mail-wg0-f42.google.com ([74.125.82.42]:33244 "EHLO mail-wg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752515AbbEUKuZ (ORCPT ); Thu, 21 May 2015 06:50:25 -0400 Received: by wgjc11 with SMTP id c11so81434137wgj.0 for ; Thu, 21 May 2015 03:50:23 -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=SVmNt71ydof0y3gDQ/M/7MppsHnhwIPoT8PNB6FcM6U=; b=iCI9twVyMmMxP0IhD15MNt0bzL8cggqRIVwSlDcJH7AQ8pe3QHx5L9B73hzPE2bkTC 9kbhJ9K9WIe2UBBjgGxRI7xZFNC1xdfVpftnaW80nzWvEiI83L9zQgWTjzZqu8d3FHUA eY9kV6KHE6Dim8lKnNXD8lNel+fu60EhvkYS+BXtDKWCn6prFbsRyvQkRiGEv6aAFCzh 7O+YrWym9SkFYozprWSZMOYkOD+9T+sjoC7h/DEHBrJE7xjThtGFxlWFMMnXXepzrzru gHxBsYnNett+ncfR4rbUxt0tOxMtsIEnQ3B9WP7j1/4CNSJBX/xtMM2+r/wWSdQiomZR DEUQ== X-Received: by 10.194.22.170 with SMTP id e10mr4307034wjf.38.1432205423839; Thu, 21 May 2015 03:50:23 -0700 (PDT) Received: from groucho.site (ipbcc02225.dynamic.kabel-deutschland.de. [188.192.34.37]) by mx.google.com with ESMTPSA id it5sm2255631wid.3.2015.05.21.03.50.22 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 May 2015 03:50:23 -0700 (PDT) From: Ulrich Hecht To: linux-sh@vger.kernel.org, laurent.pinchart+renesas@ideasonboard.com Cc: horms@verge.net.au, magnus.damm@gmail.com, Ulrich Hecht Subject: [RFC 3/3] ARM: shmobile: r8a7794: use generic "renesas, rcar-gen2" machine Date: Thu, 21 May 2015 12:50:13 +0200 Message-Id: <1432205413-9584-4-git-send-email-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 2.3.5 In-Reply-To: <1432205413-9584-1-git-send-email-ulrich.hecht+renesas@gmail.com> References: <1432205413-9584-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=-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 Removes the unnecessary SoC-specific setup code and uses the generic R-Car Gen2 machine. Signed-off-by: Ulrich Hecht Acked-by: Laurent Pinchart Acked-by: Geert Uytterhoeven --- arch/arm/boot/dts/r8a7794-alt.dts | 2 +- arch/arm/boot/dts/r8a7794.dtsi | 2 +- arch/arm/mach-shmobile/Makefile | 1 - arch/arm/mach-shmobile/setup-r8a7794.c | 33 --------------------------------- 4 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 arch/arm/mach-shmobile/setup-r8a7794.c diff --git a/arch/arm/boot/dts/r8a7794-alt.dts b/arch/arm/boot/dts/r8a7794-alt.dts index c3b90f9..686179a 100644 --- a/arch/arm/boot/dts/r8a7794-alt.dts +++ b/arch/arm/boot/dts/r8a7794-alt.dts @@ -13,7 +13,7 @@ / { model = "Alt"; - compatible = "renesas,alt", "renesas,r8a7794"; + compatible = "renesas,alt", "renesas,r8a7794", "renesas,rcar-gen2"; aliases { serial0 = &scif2; diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi index 01cf54f..5189356 100644 --- a/arch/arm/boot/dts/r8a7794.dtsi +++ b/arch/arm/boot/dts/r8a7794.dtsi @@ -14,7 +14,7 @@ #include / { - compatible = "renesas,r8a7794"; + compatible = "renesas,r8a7794", "renesas,rcar-gen2"; interrupt-parent = <&gic>; #address-cells = <2>; #size-cells = <2>; diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index 81431c9..70f3700 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile @@ -13,7 +13,6 @@ obj-$(CONFIG_ARCH_R8A7778) += setup-r8a7778.o obj-$(CONFIG_ARCH_R8A7779) += setup-r8a7779.o pm-r8a7779.o obj-$(CONFIG_ARCH_R8A7790) += setup-r8a7790.o obj-$(CONFIG_ARCH_R8A7791) += setup-r8a7791.o -obj-$(CONFIG_ARCH_R8A7794) += setup-r8a7794.o obj-$(CONFIG_ARCH_EMEV2) += setup-emev2.o obj-$(CONFIG_ARCH_R7S72100) += setup-r7s72100.o diff --git a/arch/arm/mach-shmobile/setup-r8a7794.c b/arch/arm/mach-shmobile/setup-r8a7794.c deleted file mode 100644 index d2b0930..0000000 --- a/arch/arm/mach-shmobile/setup-r8a7794.c +++ /dev/null @@ -1,33 +0,0 @@ -/* - * r8a7794 processor support - * - * Copyright (C) 2014 Renesas Electronics Corporation - * Copyright (C) 2014 Ulrich Hecht - * - * 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 "common.h" -#include "rcar-gen2.h" -#include - -static const char * const r8a7794_boards_compat_dt[] __initconst = { - "renesas,r8a7794", - NULL, -}; - -DT_MACHINE_START(R8A7794_DT, "Generic R8A7794 (Flattened Device Tree)") - .init_early = shmobile_init_delay, - .init_late = shmobile_init_late, - .init_time = rcar_gen2_timer_init, - .reserve = rcar_gen2_reserve, - .dt_compat = r8a7794_boards_compat_dt, -MACHINE_END