All of lore.kernel.org
 help / color / mirror / Atom feed
From: adam@baker-net.org.uk (Adam Baker)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 3/3] ARM: kirkwood: rename kirwood-nsa310-common to 3x0-common
Date: Tue, 08 Apr 2014 23:34:32 +0100	[thread overview]
Message-ID: <53447978.2020206@baker-net.org.uk> (raw)
In-Reply-To: <53446D6E.7070909@baker-net.org.uk>

 Rename the include file kirkwood-nsa310-common.dtsi as
 it is now also used for NSA320. There is also an NSA325
 but that appears not to be as similar so is unlikely to
 want to share an include file.

Signed-off-by: Adam Baker <linux@baker-net.org.uk>
---
I've discovered that if I don't change the git repository but pass the -M option
to git format-patch it generates a patch that describes the rename rather than
deleting and re-adding the entire file.
---
 arch/arm/boot/dts/kirkwood-nsa310.dts                                |    2 +-
 arch/arm/boot/dts/kirkwood-nsa310a.dts                               |    2 +-
 arch/arm/boot/dts/kirkwood-nsa320.dts                                |    2 +-
 .../dts/{kirkwood-nsa310-common.dtsi => kirkwood-nsa3x0-common.dtsi} |    0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename arch/arm/boot/dts/{kirkwood-nsa310-common.dtsi => kirkwood-nsa3x0-common.dtsi} (100%)

diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts
index 372f701..989846a 100644
--- a/arch/arm/boot/dts/kirkwood-nsa310.dts
+++ b/arch/arm/boot/dts/kirkwood-nsa310.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "kirkwood-nsa310-common.dtsi"
+#include "kirkwood-nsa3x0-common.dtsi"
 
 / {
 	compatible = "zyxel,nsa310", "marvell,kirkwood-88f6281", "marvell,kirkwood";
diff --git a/arch/arm/boot/dts/kirkwood-nsa310a.dts b/arch/arm/boot/dts/kirkwood-nsa310a.dts
index ead7a36..d0a6025 100644
--- a/arch/arm/boot/dts/kirkwood-nsa310a.dts
+++ b/arch/arm/boot/dts/kirkwood-nsa310a.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "kirkwood-nsa310-common.dtsi"
+#include "kirkwood-nsa3x0-common.dtsi"
 
 /*
  * There are at least two different NSA310 designs. This variant does
diff --git a/arch/arm/boot/dts/kirkwood-nsa320.dts b/arch/arm/boot/dts/kirkwood-nsa320.dts
index 6c8f692..fc20baf 100644
--- a/arch/arm/boot/dts/kirkwood-nsa320.dts
+++ b/arch/arm/boot/dts/kirkwood-nsa320.dts
@@ -11,7 +11,7 @@
 
 /dts-v1/;
 
-#include "kirkwood-nsa310-common.dtsi"
+#include "kirkwood-nsa3x0-common.dtsi"
 
 / {
 	model = "Zyxel NSA320";
diff --git a/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
similarity index 100%
rename from arch/arm/boot/dts/kirkwood-nsa310-common.dtsi
rename to arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
-- 
1.7.10.4

  reply	other threads:[~2014-04-08 22:34 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-06 21:37 [PATCH 0/3] ARM: kirkwood: Add device tree for NSA320 Adam Baker
2014-04-06 21:42 ` [PATCH 1/3] ARM: kirkwood: Move NSA310 common parts to include file Adam Baker
2014-04-06 21:42   ` [PATCH 2/3] ARM: kirkwood: Add DTS file for NSA320 Adam Baker
2014-04-06 21:42   ` [PATCH 3/3] ARM: kirkwood: rename kirwood-nsa310-common to 3x0-common Adam Baker
2014-04-08 19:26     ` Andrew Lunn
2014-04-08 21:26       ` Jason Cooper
2014-04-08 21:43       ` Adam Baker
2014-04-08 22:34         ` Adam Baker [this message]
2014-04-08 19:27 ` [PATCH 0/3] ARM: kirkwood: Add device tree for NSA320 Andrew Lunn
2014-04-24  4:44 ` Jason Cooper

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=53447978.2020206@baker-net.org.uk \
    --to=adam@baker-net.org.uk \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.