From: Stefan Agner <stefan@agner.ch>
To: Shawn Guo <shawnguo@kernel.org>
Cc: kernel@pengutronix.de, mark.rutland@arm.com,
devicetree@vger.kernel.org, pawel.moll@arm.com,
ijc+devicetree@hellion.org.uk, marcel.ziswiler@toradex.com,
linux-kernel@vger.kernel.org, robh+dt@kernel.org,
max.krummenacher@toradex.com, galak@codeaurora.org,
fabio.estevam@nxp.com, linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 1/3] ARM: dts: imx7d: create i.MX 7Solo base device tree
Date: Sat, 18 Jun 2016 21:20:05 -0700 [thread overview]
Message-ID: <9d870fb1be40772a50f08d467df048dc@agner.ch> (raw)
In-Reply-To: <20160612013526.GV20243@tiger>
On 2016-06-11 18:35, Shawn Guo wrote:
> On Tue, Jun 07, 2016 at 07:37:07PM -0700, Stefan Agner wrote:
>> The i.MX 7 series currently consists of two SoCs: i.MX 7Solo and
>> 7Dual. The i.MX 7Solo implements a subset of features available on
>> i.MX 7Dual, hence create imx7s.dtsi as the base device tree. The
>> i.MX 7Dual's additional features over i.MX 7Solo are:
>> - Second Cortex-A7 core
>> - Second Gigabit Ethernet controller
>> - EPD (Electronc Paper Display, not yet part of the device tree)
>> - PCIe (not yet part of the device tree)
>> - Additional USB2.0 OTG controller
>>
>> Signed-off-by: Stefan Agner <stefan@agner.ch>
>> ---
>> arch/arm/boot/dts/imx7d.dtsi | 923 +++----------------------------------------
>> arch/arm/boot/dts/imx7s.dtsi | 880 +++++++++++++++++++++++++++++++++++++++++
>> 2 files changed, 928 insertions(+), 875 deletions(-)
>
> We should probably have a beforehand patch to rename the file, so that
> we can avoid this dramatic diffstat.
If I delete imx7d.dtsi and add imx7s.dtsi in a single commit, and then
readd imx7d.dtsi in a second commit, it would break bisect-ability. All
existing device trees which include imx7d.dtsi would fail to build.
As soon as I keep imx7d.dtsi around, even if it only includes
imx7s.dtsi, git diff stats look dramatic with git default options.
Using -B -M makes the diff stat a bit less dramatic:
arch/arm/boot/dts/imx7d.dtsi | 1083
+++++++++++---------------------------------------------------------------------------
arch/arm/boot/dts/{imx7d.dtsi => imx7s.dtsi} | 79 +------
2 files changed, 130 insertions(+), 1032 deletions(-)
However, that is only for stats, and only when using those options...
I would rather prefer to keep it in a single commit. What do you think?
--
Stefan
next prev parent reply other threads:[~2016-06-19 4:20 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-08 2:37 [PATCH 0/3] ARM: dts: imx7d: add i.MX 7Solo and Colibri iMX7S/D dts Stefan Agner
2016-06-08 2:37 ` [PATCH 1/3] ARM: dts: imx7d: create i.MX 7Solo base device tree Stefan Agner
[not found] ` <20160608023709.32090-2-stefan-XLVq0VzYD2Y@public.gmane.org>
2016-06-12 1:35 ` Shawn Guo
2016-06-19 4:20 ` Stefan Agner [this message]
[not found] ` <9d870fb1be40772a50f08d467df048dc-XLVq0VzYD2Y@public.gmane.org>
2016-06-21 3:20 ` Shawn Guo
2016-06-08 2:37 ` [PATCH 2/3] ARM: dts: imx7d: move input header into " Stefan Agner
[not found] ` <20160608023709.32090-3-stefan-XLVq0VzYD2Y@public.gmane.org>
2016-06-08 7:29 ` Igor Grinberg
2016-06-08 2:37 ` [PATCH 3/3] ARM: dts: imx7: add Toradex Colibri iMX7S/iMX7D support Stefan Agner
2016-06-12 2:31 ` Shawn Guo
2016-06-16 5:37 ` Stefan Agner
2016-06-16 10:44 ` Marcel Ziswiler
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=9d870fb1be40772a50f08d467df048dc@agner.ch \
--to=stefan@agner.ch \
--cc=devicetree@vger.kernel.org \
--cc=fabio.estevam@nxp.com \
--cc=galak@codeaurora.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marcel.ziswiler@toradex.com \
--cc=mark.rutland@arm.com \
--cc=max.krummenacher@toradex.com \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
--cc=shawnguo@kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).