From: Simon Horman <horms+renesas@verge.net.au>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/4] ARM: shmobile: silk: Move SPI FLASH partitions to subnode
Date: Fri, 20 Nov 2015 19:38:55 +0000 [thread overview]
Message-ID: <1448048335-23927-5-git-send-email-horms+renesas@verge.net.au> (raw)
In-Reply-To: <1448048335-23927-1-git-send-email-horms+renesas@verge.net.au>
From: Geert Uytterhoeven <geert+renesas@glider.be>
As of commits 5cfdedb7b9a0fe38 ("mtd: ofpart: move ofpart partitions to a
dedicated dt node") and fe2585e9c29a650a ("doc: dt: mtd: support partitions
in a special 'partitions' subnode"), having partitions as direct subnodes
of an mtd device is discouraged. Hence move the SPI FLASH partitions to a
"partitions" subnode.
Based on similar work for the koelsch board by Geert Uytterhoeven.
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
* Compile tested only
---
arch/arm/boot/dts/r8a7794-silk.dts | 33 ++++++++++++++++++---------------
1 file changed, 18 insertions(+), 15 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7794-silk.dts b/arch/arm/boot/dts/r8a7794-silk.dts
index a49942b626c8..58f0ddf21c17 100644
--- a/arch/arm/boot/dts/r8a7794-silk.dts
+++ b/arch/arm/boot/dts/r8a7794-silk.dts
@@ -194,8 +194,6 @@
status = "okay";
flash@0 {
- #address-cells = <1>;
- #size-cells = <1>;
compatible = "spansion,s25fl512s", "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <30000000>;
@@ -205,19 +203,24 @@
spi-cpha;
m25p,fast-read;
- partition@0 {
- label = "loader";
- reg = <0x00000000 0x00040000>;
- read-only;
- };
- partition@40000 {
- label = "user";
- reg = <0x00040000 0x00400000>;
- read-only;
- };
- partition@440000 {
- label = "flash";
- reg = <0x00440000 0x03bc0000>;
+ partitions {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ partition@0 {
+ label = "loader";
+ reg = <0x00000000 0x00040000>;
+ read-only;
+ };
+ partition@40000 {
+ label = "user";
+ reg = <0x00040000 0x00400000>;
+ read-only;
+ };
+ partition@440000 {
+ label = "flash";
+ reg = <0x00440000 0x03bc0000>;
+ };
};
};
};
--
2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: horms+renesas@verge.net.au (Simon Horman)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/4] ARM: shmobile: silk: Move SPI FLASH partitions to subnode
Date: Fri, 20 Nov 2015 11:38:55 -0800 [thread overview]
Message-ID: <1448048335-23927-5-git-send-email-horms+renesas@verge.net.au> (raw)
In-Reply-To: <1448048335-23927-1-git-send-email-horms+renesas@verge.net.au>
From: Geert Uytterhoeven <geert+renesas@glider.be>
As of commits 5cfdedb7b9a0fe38 ("mtd: ofpart: move ofpart partitions to a
dedicated dt node") and fe2585e9c29a650a ("doc: dt: mtd: support partitions
in a special 'partitions' subnode"), having partitions as direct subnodes
of an mtd device is discouraged. Hence move the SPI FLASH partitions to a
"partitions" subnode.
Based on similar work for the koelsch board by Geert Uytterhoeven.
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
* Compile tested only
---
arch/arm/boot/dts/r8a7794-silk.dts | 33 ++++++++++++++++++---------------
1 file changed, 18 insertions(+), 15 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7794-silk.dts b/arch/arm/boot/dts/r8a7794-silk.dts
index a49942b626c8..58f0ddf21c17 100644
--- a/arch/arm/boot/dts/r8a7794-silk.dts
+++ b/arch/arm/boot/dts/r8a7794-silk.dts
@@ -194,8 +194,6 @@
status = "okay";
flash at 0 {
- #address-cells = <1>;
- #size-cells = <1>;
compatible = "spansion,s25fl512s", "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <30000000>;
@@ -205,19 +203,24 @@
spi-cpha;
m25p,fast-read;
- partition at 0 {
- label = "loader";
- reg = <0x00000000 0x00040000>;
- read-only;
- };
- partition at 40000 {
- label = "user";
- reg = <0x00040000 0x00400000>;
- read-only;
- };
- partition at 440000 {
- label = "flash";
- reg = <0x00440000 0x03bc0000>;
+ partitions {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ partition at 0 {
+ label = "loader";
+ reg = <0x00000000 0x00040000>;
+ read-only;
+ };
+ partition at 40000 {
+ label = "user";
+ reg = <0x00040000 0x00400000>;
+ read-only;
+ };
+ partition at 440000 {
+ label = "flash";
+ reg = <0x00440000 0x03bc0000>;
+ };
};
};
};
--
2.1.4
next prev parent reply other threads:[~2015-11-20 19:38 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-20 19:38 [PATCH 0/4] ARM: shmobile: Move SPI FLASH partition to subnode Simon Horman
2015-11-20 19:38 ` Simon Horman
2015-11-20 19:38 ` [PATCH 1/4] ARM: shmobile: bockw: " Simon Horman
2015-11-20 19:38 ` Simon Horman
2015-11-20 19:38 ` [PATCH 2/4] ARM: shmobile: lager: Move SPI FLASH partitions " Simon Horman
2015-11-20 19:38 ` Simon Horman
2015-11-20 19:38 ` [PATCH 3/4] ARM: shmobile: porter: " Simon Horman
2015-11-20 19:38 ` Simon Horman
2015-11-20 19:38 ` Simon Horman [this message]
2015-11-20 19:38 ` [PATCH 4/4] ARM: shmobile: silk: " Simon Horman
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=1448048335-23927-5-git-send-email-horms+renesas@verge.net.au \
--to=horms+renesas@verge.net.au \
--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.