From patchwork Sat Aug 4 23:11:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugeniu Rosca X-Patchwork-Id: 10555955 X-Patchwork-Delegate: horms@verge.net.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B68DB13BB for ; Sat, 4 Aug 2018 23:13:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A8B3A29AC0 for ; Sat, 4 Aug 2018 23:13:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9AFEC29AC4; Sat, 4 Aug 2018 23:13:00 +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=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_WEB autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 09DF429AC0 for ; Sat, 4 Aug 2018 23:12:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729727AbeHEBPQ (ORCPT ); Sat, 4 Aug 2018 21:15:16 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:51562 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729669AbeHEBPP (ORCPT ); Sat, 4 Aug 2018 21:15:15 -0400 Received: by mail-wm0-f67.google.com with SMTP id y2-v6so10005351wma.1 for ; Sat, 04 Aug 2018 16:12:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vPrMQFUlZ/65PWidBIflbA1S9XuF8eu2ETurWTnWFaM=; b=Y51LqajHYWws21ngQLtc5trJ6IdNDBd0pFk/yNp+FntzagmekCTTh2QBlm5KDzL2Y4 Ae5lreTqAIUj/yWs2YaftJgixneRDZqoGKiUORyqoNJhvKTJU9oO7wKUlqPFmi/s4JG2 vRTThWUI5XyeEbu06UU1qQdo+28y2Bg7E3AtR8KdlEBCu6nlwRFze6iblxLMi9iPcHGR WmeFZBbIGPFWmYfPjCb22faPL6VgvNfx7h3QWeR5bhrzimdMpxJ2LJvLe6rFSCZCRIZb 2AsYg7keKYlf8u7SyVxJ5cjfO3buL2ejsQY26hDS7fu/YjcSn56OnKzAw3Y+ZpV5ueii Saqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vPrMQFUlZ/65PWidBIflbA1S9XuF8eu2ETurWTnWFaM=; b=eWGmfByFmz+IQCUJANX8B+uHcuFGGlWuQSrDpZQWq5ZWGwSRSA/K77Mv8PzRgOZjFG /seY4n5CZmj1QHlOfp00KP2UzO2zh+ZcbDVJ/+9mq0R2JfHoUqMumqmpwxb/EO3r5Fb0 SG2VZvoLdfX063M/DcHf/8F3dsNeMSCZxhxl8D9e+DauhlfD1tn3bXVwntL13FV6yTem BgxZXr4Pw+UD4RZ3kiReo/zHd30qkiqX19qtx8y4RiGWAFz7usd2G+0+tO58rUHaL6l6 NEwW+XZ2XAiTDfI02vTCadF2geWTCVTpSpUByzvM0eluPghEmwo2Zlv3Sh5awPOWLS58 6cqg== X-Gm-Message-State: AOUpUlF5krMHaRnPIEUNsPforlGZW2Q95qZWybv2fK+MSZ0u5UP4STVe zipqKGubrblA/dB6RIoQjWo= X-Google-Smtp-Source: AAOMgpeyil5MbWedSN6yXldRMfdtL0tr4iAB2rQ4GwDjBXkWVXxJxNE+/VWdCeeblSHhT1aPO0H8wQ== X-Received: by 2002:a1c:7313:: with SMTP id d19-v6mr8495202wmb.54.1533424376721; Sat, 04 Aug 2018 16:12:56 -0700 (PDT) Received: from localhost.localdomain (ipb218f456.dynamic.kabel-deutschland.de. [178.24.244.86]) by smtp.gmail.com with ESMTPSA id f17-v6sm5645627wrs.1.2018.08.04.16.12.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 04 Aug 2018 16:12:55 -0700 (PDT) From: Eugeniu Rosca X-Google-Original-From: Eugeniu Rosca To: Simon Horman , Geert Uytterhoeven , Yoshihiro Shimoda , Sergei Shtylyov , Vladimir Barinov , Niklas Soderlund , Laurent Pinchart , Jacopo Mondi , Magnus Damm , Kieran Bingham , Takeshi Kihara , Ulrich Hecht , Kuninori Morimoto , linux-renesas-soc@vger.kernel.org Cc: Eugeniu Rosca , Eugeniu Rosca Subject: [PATCH 01/14] arm64: dts: renesas: Cut redundant in *-ulcb*.dts Date: Sun, 5 Aug 2018 01:11:01 +0200 Message-Id: <20180804231114.21420-2-erosca@de.adit-jv.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180804231114.21420-1-erosca@de.adit-jv.com> References: <20180804231114.21420-1-erosca@de.adit-jv.com> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Perform a 's/(h|m)3ulcb/ulcb/' substitution in below DTS filenames: - r8a7795-es1-h3ulcb.dts => r8a7795-es1-ulcb.dts - r8a7795-es1-h3ulcb-kf.dts => r8a7795-es1-ulcb-kf.dts - r8a7795-h3ulcb.dts => r8a7795-ulcb.dts - r8a7795-h3ulcb-kf.dts => r8a7795-ulcb-kf.dts - r8a7796-m3ulcb.dts => r8a7796-ulcb.dts - r8a7796-m3ulcb-kf.dts => r8a7796-ulcb-kf.dts The background of this commit is M3-N ULCB (RTP0RC77965SKBX010SA00) bring-up, which (assuming no change in existing DTS name patterns) requires two new DTS files: - r8a77965-m3nulcb.dts - r8a77965-m3nulcb-kf.dts In all above examples: - "m3n" prefix is redundant, since r8a77965 denotes the M3-N SoC - "m3" prefix is redundant, since r8a7796 denotes the M3/M3-W SoC - "h3" prefix is redundant, since r8a7795 denotes the H3 SoC To make the DTS naming conventions consistent, drop the unneeded prefixes. Similar reasoning was applied by Marek in U-Boot v2017.09 commit bd39050cb2a0 ("ARM: rmobile: ulcb: Add ULCB board support"): $ git log -1 --format= --name-only bd39050cb2a -- "*defconfig" configs/r8a7795_ulcb_defconfig configs/r8a7796_ulcb_defconfig DTB md5 sums match with and w/o the patch (hence no functional change). Signed-off-by: Eugeniu Rosca --- arch/arm64/boot/dts/renesas/Makefile | 12 ++++++------ arch/arm64/boot/dts/renesas/{r8a7795-es1-h3ulcb-kf.dts => r8a7795-es1-ulcb-kf.dts} | 2 +- arch/arm64/boot/dts/renesas/{r8a7795-es1-h3ulcb.dts => r8a7795-es1-ulcb.dts} | 0 arch/arm64/boot/dts/renesas/{r8a7795-h3ulcb-kf.dts => r8a7795-ulcb-kf.dts} | 2 +- arch/arm64/boot/dts/renesas/{r8a7795-h3ulcb.dts => r8a7795-ulcb.dts} | 0 arch/arm64/boot/dts/renesas/{r8a7796-m3ulcb-kf.dts => r8a7796-ulcb-kf.dts} | 2 +- arch/arm64/boot/dts/renesas/{r8a7796-m3ulcb.dts => r8a7796-ulcb.dts} | 0 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile index 9e2394bc3c62..5debb02fad2c 100644 --- a/arch/arm64/boot/dts/renesas/Makefile +++ b/arch/arm64/boot/dts/renesas/Makefile @@ -1,11 +1,11 @@ # SPDX-License-Identifier: GPL-2.0 -dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-x.dtb r8a7795-h3ulcb.dtb -dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-h3ulcb-kf.dtb +dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-x.dtb r8a7795-ulcb.dtb +dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-ulcb-kf.dtb dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-xs.dtb -dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-salvator-x.dtb r8a7795-es1-h3ulcb.dtb -dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-h3ulcb-kf.dtb -dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-x.dtb r8a7796-m3ulcb.dtb -dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-m3ulcb-kf.dtb +dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-salvator-x.dtb r8a7795-es1-ulcb.dtb +dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-ulcb-kf.dtb +dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-x.dtb r8a7796-ulcb.dtb +dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-ulcb-kf.dtb dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-xs.dtb dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-salvator-x.dtb r8a77965-salvator-xs.dtb dtb-$(CONFIG_ARCH_R8A77970) += r8a77970-eagle.dtb r8a77970-v3msk.dtb diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts b/arch/arm64/boot/dts/renesas/r8a7795-es1-ulcb-kf.dts similarity index 93% rename from arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts rename to arch/arm64/boot/dts/renesas/r8a7795-es1-ulcb-kf.dts index 009cb1cb0dde..06deb67c36c8 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts +++ b/arch/arm64/boot/dts/renesas/r8a7795-es1-ulcb-kf.dts @@ -9,7 +9,7 @@ * kind, whether express or implied. */ -#include "r8a7795-es1-h3ulcb.dts" +#include "r8a7795-es1-ulcb.dts" #include "ulcb-kf.dtsi" / { diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a7795-es1-ulcb.dts similarity index 100% rename from arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts rename to arch/arm64/boot/dts/renesas/r8a7795-es1-ulcb.dts diff --git a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts b/arch/arm64/boot/dts/renesas/r8a7795-ulcb-kf.dts similarity index 94% rename from arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts rename to arch/arm64/boot/dts/renesas/r8a7795-ulcb-kf.dts index 4403227c0f97..70a0c5332d54 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts +++ b/arch/arm64/boot/dts/renesas/r8a7795-ulcb-kf.dts @@ -9,7 +9,7 @@ * kind, whether express or implied. */ -#include "r8a7795-h3ulcb.dts" +#include "r8a7795-ulcb.dts" #include "ulcb-kf.dtsi" / { diff --git a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a7795-ulcb.dts similarity index 100% rename from arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts rename to arch/arm64/boot/dts/renesas/r8a7795-ulcb.dts diff --git a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts b/arch/arm64/boot/dts/renesas/r8a7796-ulcb-kf.dts similarity index 94% rename from arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts rename to arch/arm64/boot/dts/renesas/r8a7796-ulcb-kf.dts index de2390f009e7..faa32c28eef7 100644 --- a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts +++ b/arch/arm64/boot/dts/renesas/r8a7796-ulcb-kf.dts @@ -9,7 +9,7 @@ * kind, whether express or implied. */ -#include "r8a7796-m3ulcb.dts" +#include "r8a7796-ulcb.dts" #include "ulcb-kf.dtsi" / { diff --git a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a7796-ulcb.dts similarity index 100% rename from arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts rename to arch/arm64/boot/dts/renesas/r8a7796-ulcb.dts