From patchwork Wed May 31 07:59:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 9756133 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DB99F602BF for ; Wed, 31 May 2017 08:01:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE6FB284B1 for ; Wed, 31 May 2017 08:01:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C34A9284AA; Wed, 31 May 2017 08:01:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 560BB284AF for ; Wed, 31 May 2017 08:01:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=UmWNpxkJ6djnKIkQ2kqMkamJ4mM343WKNj4meoFMgpw=; b=Xq+ XFd6IMSX7ykxL4pbEIeAYSzVdVPruSlel+yKoYa4qXcj8vj2jWk8lh0Rrv4ZNuB83oLDf4KFuk5Dn cKBmRjOioHfbUN40GO4s5QSDBMtMBPpngo+0sMTcacvftM8bNS5YaJFHPbAUhvMvLk9B+C9m0mJaq eYvoPG/heCtXc7MztXGQVMXkwKeVkIwviKKPDz4/TDyf39lto6uFsUbHshczAakBK/1f3c1n9kBn7 Gx8ZwQF4LTGDiLDL1keml8eM71ADuu95Z0xhqu1QZIeyB1nIzA2B0HoHs1wVtEzjfj4+he2lafTR9 pyyBwiEbaUhcDDRZZnBo8uVHAht52LA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dFyZV-0007JH-8k; Wed, 31 May 2017 08:01:37 +0000 Received: from newton.telenet-ops.be ([2a02:1800:120:4::f00:d]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dFyYD-0004gi-MF for linux-arm-kernel@lists.infradead.org; Wed, 31 May 2017 08:00:42 +0000 Received: from laurent.telenet-ops.be (laurent.telenet-ops.be [IPv6:2a02:1800:110:4::f00:19]) by newton.telenet-ops.be (Postfix) with ESMTPS id 3wd2v7096GzMr7Ty for ; Wed, 31 May 2017 09:59:47 +0200 (CEST) Received: from ayla.of.borg ([84.193.137.253]) by laurent.telenet-ops.be with bizsmtp id Svzi1v00H5UCtCs01vzioq; Wed, 31 May 2017 09:59:46 +0200 Received: from ramsan.of.borg ([192.168.97.29] helo=ramsan) by ayla.of.borg with esmtp (Exim 4.86_2) (envelope-from ) id 1dFyXe-00016b-C5; Wed, 31 May 2017 09:59:42 +0200 Received: from geert by ramsan with local (Exim 4.86_2) (envelope-from ) id 1dFyXe-0001TU-99; Wed, 31 May 2017 09:59:42 +0200 From: Geert Uytterhoeven To: Simon Horman , Magnus Damm Subject: [PATCH v5] arm64: dts: r8a7795: h3ulcb: Add support for R-Car H3 ES2.0 Date: Wed, 31 May 2017 09:59:40 +0200 Message-Id: <1496217580-5628-1-git-send-email-geert+renesas@glider.be> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170531_010018_237196_A8E35E21 X-CRM114-Status: UNSURE ( 9.20 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-renesas-soc@vger.kernel.org, Geert Uytterhoeven , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Split off support for H3ULCB boards with the ES1.x revision of the R-Car H3 SoC into a separate file. The main r8a7795-h3ulcb.dts file now corresponds to H3ULCB with R-Car H3 ES2.0 or later. Signed-off-by: Geert Uytterhoeven --- v5: - Now also tested on H3ULCB with H3 ES2.0, so please apply. Thanks! v4: - No changes, v3: - New. --- arch/arm64/boot/dts/renesas/Makefile | 2 +- .../boot/dts/renesas/{r8a7795-h3ulcb.dts => r8a7795-es1-h3ulcb.dts} | 0 arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) copy arch/arm64/boot/dts/renesas/{r8a7795-h3ulcb.dts => r8a7795-es1-h3ulcb.dts} (100%) diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile index b6c723d8f6875f2d..d5451015950e3dfc 100644 --- a/arch/arm64/boot/dts/renesas/Makefile +++ b/arch/arm64/boot/dts/renesas/Makefile @@ -1,5 +1,5 @@ dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-x.dtb r8a7795-h3ulcb.dtb -dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-salvator-x.dtb +dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-salvator-x.dtb r8a7795-es1-h3ulcb.dtb dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-x.dtb r8a7796-m3ulcb.dtb always := $(dtb-y) diff --git a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts similarity index 100% copy from arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts copy to arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts diff --git a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts index 95fe207cb6a3fd2f..0426f41765f0bc68 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts +++ b/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts @@ -12,11 +12,11 @@ #define CPG_AUDIO_CLK_I R8A7795_CLK_S0D4 /dts-v1/; -#include "r8a7795-es1.dtsi" +#include "r8a7795.dtsi" #include "ulcb.dtsi" / { - model = "Renesas H3ULCB board based on r8a7795 ES1.x"; + model = "Renesas H3ULCB board based on r8a7795 ES2.0+"; compatible = "renesas,h3ulcb", "renesas,r8a7795"; memory@48000000 {