diff mbox

ARM: dts: rmobile: Drop MTD partitioning from DT

Message ID 20180530101130.3566-1-marek.vasut+renesas@gmail.com (mailing list archive)
State Superseded
Headers show

Commit Message

Marek Vasut May 30, 2018, 10:11 a.m. UTC
Drop the MTD partitioning from DT, since it does not describe HW
and to give way to a more flexible kernel command line partition
passing.

To retain the original partitioning, assure you have enabled
CONFIG_MTD_CMDLINE_PARTS in your kernel config and add the
following to your kernel command line:

lager:   mtdparts=spi0.0:256k(loader),4m(user),-(flash)
stout:   mtdparts=spi0.0:512k(loader),256k(uboot),256k(uboot-env),-(flash)
koelsch: mtdparts=spi0.0:512k(loader),5632k(user),-(flash)
porter:  mtdparts=spi0.0:256k(loader_prg),4m(user_prg),-(flash_fs)
wheat:   mtdparts=spi0.0:256k(loader),4m(user),-(flash)
gose:    mtdparts=spi0.0:256k(loader),4m(user),-(flash)
alt:     mtdparts=spi0.0:256k(loader),256k(system),-(user)
silk:    mtdparts=spi0.0:256k(loader),4m(user),-(flash)

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be> on Koelsch
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Simon Horman <horms+renesas@verge.net.au>
Cc: Wolfram Sang <wsa@the-dreams.de>
Cc: linux-renesas-soc@vger.kernel.org
---
V2: Drop the @0 anchor from the commit message, use 4m
V3: Squash the patches into one as requested by the higher ups
---
 arch/arm/boot/dts/r8a7790-lager.dts   | 21 ---------------------
 arch/arm/boot/dts/r8a7790-stout.dts   | 26 --------------------------
 arch/arm/boot/dts/r8a7791-koelsch.dts | 21 ---------------------
 arch/arm/boot/dts/r8a7791-porter.dts  | 21 ---------------------
 arch/arm/boot/dts/r8a7792-wheat.dts   | 21 ---------------------
 arch/arm/boot/dts/r8a7793-gose.dts    | 21 ---------------------
 arch/arm/boot/dts/r8a7794-alt.dts     | 21 ---------------------
 arch/arm/boot/dts/r8a7794-silk.dts    | 21 ---------------------
 8 files changed, 173 deletions(-)

Comments

Simon Horman May 31, 2018, 11:39 a.m. UTC | #1
On Wed, May 30, 2018 at 12:11:30PM +0200, Marek Vasut wrote:
> Drop the MTD partitioning from DT, since it does not describe HW
> and to give way to a more flexible kernel command line partition
> passing.
> 
> To retain the original partitioning, assure you have enabled
> CONFIG_MTD_CMDLINE_PARTS in your kernel config and add the
> following to your kernel command line:
> 
> lager:   mtdparts=spi0.0:256k(loader),4m(user),-(flash)
> stout:   mtdparts=spi0.0:512k(loader),256k(uboot),256k(uboot-env),-(flash)
> koelsch: mtdparts=spi0.0:512k(loader),5632k(user),-(flash)
> porter:  mtdparts=spi0.0:256k(loader_prg),4m(user_prg),-(flash_fs)
> wheat:   mtdparts=spi0.0:256k(loader),4m(user),-(flash)
> gose:    mtdparts=spi0.0:256k(loader),4m(user),-(flash)
> alt:     mtdparts=spi0.0:256k(loader),256k(system),-(user)
> silk:    mtdparts=spi0.0:256k(loader),4m(user),-(flash)
> 
> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
> Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Tested-by: Geert Uytterhoeven <geert+renesas@glider.be> on Koelsch
> Cc: Geert Uytterhoeven <geert+renesas@glider.be>
> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Cc: Simon Horman <horms+renesas@verge.net.au>
> Cc: Wolfram Sang <wsa@the-dreams.de>
> Cc: linux-renesas-soc@vger.kernel.org
> ---
> V2: Drop the @0 anchor from the commit message, use 4m
> V3: Squash the patches into one as requested by the higher ups

Thanks, applied.
Olof Johansson July 21, 2018, 9:47 p.m. UTC | #2
Hi,

On Wed, May 30, 2018 at 3:11 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
> Drop the MTD partitioning from DT, since it does not describe HW
> and to give way to a more flexible kernel command line partition
> passing.
>
> To retain the original partitioning, assure you have enabled
> CONFIG_MTD_CMDLINE_PARTS in your kernel config and add the
> following to your kernel command line:
>
> lager:   mtdparts=spi0.0:256k(loader),4m(user),-(flash)
> stout:   mtdparts=spi0.0:512k(loader),256k(uboot),256k(uboot-env),-(flash)
> koelsch: mtdparts=spi0.0:512k(loader),5632k(user),-(flash)
> porter:  mtdparts=spi0.0:256k(loader_prg),4m(user_prg),-(flash_fs)
> wheat:   mtdparts=spi0.0:256k(loader),4m(user),-(flash)
> gose:    mtdparts=spi0.0:256k(loader),4m(user),-(flash)
> alt:     mtdparts=spi0.0:256k(loader),256k(system),-(user)
> silk:    mtdparts=spi0.0:256k(loader),4m(user),-(flash)

Having to specify on command line is such a nasty hack. I wish we
could remove that, and at the very least not add it for anything new.

You end up with user space tools trying to parse the kernel command
line to figure out what's on the flash, and other really bad habits.
:(

I'd strongly advice you to keep this in the board files, unless you
have an actual real motivation for changing it. This patch does not
provide one.


-Olof
Marek Vasut July 21, 2018, 9:54 p.m. UTC | #3
On 07/21/2018 11:47 PM, Olof Johansson wrote:
> Hi,

Hi,

> On Wed, May 30, 2018 at 3:11 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
>> Drop the MTD partitioning from DT, since it does not describe HW
>> and to give way to a more flexible kernel command line partition
>> passing.
>>
>> To retain the original partitioning, assure you have enabled
>> CONFIG_MTD_CMDLINE_PARTS in your kernel config and add the
>> following to your kernel command line:
>>
>> lager:   mtdparts=spi0.0:256k(loader),4m(user),-(flash)
>> stout:   mtdparts=spi0.0:512k(loader),256k(uboot),256k(uboot-env),-(flash)
>> koelsch: mtdparts=spi0.0:512k(loader),5632k(user),-(flash)
>> porter:  mtdparts=spi0.0:256k(loader_prg),4m(user_prg),-(flash_fs)
>> wheat:   mtdparts=spi0.0:256k(loader),4m(user),-(flash)
>> gose:    mtdparts=spi0.0:256k(loader),4m(user),-(flash)
>> alt:     mtdparts=spi0.0:256k(loader),256k(system),-(user)
>> silk:    mtdparts=spi0.0:256k(loader),4m(user),-(flash)
> 
> Having to specify on command line is such a nasty hack. I wish we
> could remove that, and at the very least not add it for anything new.

Do you have a better suggestion ?

> You end up with user space tools trying to parse the kernel command
> line to figure out what's on the flash, and other really bad habits.
> :(

You should just read /proc/mtd , see
http://www.linux-mtd.infradead.org/doc/general.html

> I'd strongly advice you to keep this in the board files, unless you
> have an actual real motivation for changing it. This patch does not
> provide one.

Partitioning is not hardware description, it should not be in DT.
Olof Johansson July 21, 2018, 10:01 p.m. UTC | #4
On Sat, Jul 21, 2018 at 2:54 PM, Marek Vasut <marek.vasut@gmail.com> wrote:
> On 07/21/2018 11:47 PM, Olof Johansson wrote:
>> Hi,
>
> Hi,
>
>> On Wed, May 30, 2018 at 3:11 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
>>> Drop the MTD partitioning from DT, since it does not describe HW
>>> and to give way to a more flexible kernel command line partition
>>> passing.
>>>
>>> To retain the original partitioning, assure you have enabled
>>> CONFIG_MTD_CMDLINE_PARTS in your kernel config and add the
>>> following to your kernel command line:
>>>
>>> lager:   mtdparts=spi0.0:256k(loader),4m(user),-(flash)
>>> stout:   mtdparts=spi0.0:512k(loader),256k(uboot),256k(uboot-env),-(flash)
>>> koelsch: mtdparts=spi0.0:512k(loader),5632k(user),-(flash)
>>> porter:  mtdparts=spi0.0:256k(loader_prg),4m(user_prg),-(flash_fs)
>>> wheat:   mtdparts=spi0.0:256k(loader),4m(user),-(flash)
>>> gose:    mtdparts=spi0.0:256k(loader),4m(user),-(flash)
>>> alt:     mtdparts=spi0.0:256k(loader),256k(system),-(user)
>>> silk:    mtdparts=spi0.0:256k(loader),4m(user),-(flash)
>>
>> Having to specify on command line is such a nasty hack. I wish we
>> could remove that, and at the very least not add it for anything new.
>
> Do you have a better suggestion ?

Yes, keep it in DT.

>> You end up with user space tools trying to parse the kernel command
>> line to figure out what's on the flash, and other really bad habits.
>> :(
>
> You should just read /proc/mtd , see
> http://www.linux-mtd.infradead.org/doc/general.html

Sure, I know that but not everybody does, and they do it in bad ways
if given the opportunity.


>> I'd strongly advice you to keep this in the board files, unless you
>> have an actual real motivation for changing it. This patch does not
>> provide one.
>
> Partitioning is not hardware description, it should not be in DT.

Read my reply again. It's part of _platform_ description, and belongs in DT.


-Olof
Marek Vasut July 21, 2018, 10:11 p.m. UTC | #5
On 07/22/2018 12:01 AM, Olof Johansson wrote:
> On Sat, Jul 21, 2018 at 2:54 PM, Marek Vasut <marek.vasut@gmail.com> wrote:
>> On 07/21/2018 11:47 PM, Olof Johansson wrote:
>>> Hi,
>>
>> Hi,
>>
>>> On Wed, May 30, 2018 at 3:11 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
>>>> Drop the MTD partitioning from DT, since it does not describe HW
>>>> and to give way to a more flexible kernel command line partition
>>>> passing.
>>>>
>>>> To retain the original partitioning, assure you have enabled
>>>> CONFIG_MTD_CMDLINE_PARTS in your kernel config and add the
>>>> following to your kernel command line:
>>>>
>>>> lager:   mtdparts=spi0.0:256k(loader),4m(user),-(flash)
>>>> stout:   mtdparts=spi0.0:512k(loader),256k(uboot),256k(uboot-env),-(flash)
>>>> koelsch: mtdparts=spi0.0:512k(loader),5632k(user),-(flash)
>>>> porter:  mtdparts=spi0.0:256k(loader_prg),4m(user_prg),-(flash_fs)
>>>> wheat:   mtdparts=spi0.0:256k(loader),4m(user),-(flash)
>>>> gose:    mtdparts=spi0.0:256k(loader),4m(user),-(flash)
>>>> alt:     mtdparts=spi0.0:256k(loader),256k(system),-(user)
>>>> silk:    mtdparts=spi0.0:256k(loader),4m(user),-(flash)
>>>
>>> Having to specify on command line is such a nasty hack. I wish we
>>> could remove that, and at the very least not add it for anything new.
>>
>> Do you have a better suggestion ?
> 
> Yes, keep it in DT.

See below

>>> You end up with user space tools trying to parse the kernel command
>>> line to figure out what's on the flash, and other really bad habits.
>>> :(
>>
>> You should just read /proc/mtd , see
>> http://www.linux-mtd.infradead.org/doc/general.html
> 
> Sure, I know that but not everybody does, and they do it in bad ways
> if given the opportunity.

That's what the documentation is for. I assume whoever is using MTD is
also capable of reading the documentation and thus avoiding such basic
mistakes.

>>> I'd strongly advice you to keep this in the board files, unless you
>>> have an actual real motivation for changing it. This patch does not
>>> provide one.
>>
>> Partitioning is not hardware description, it should not be in DT.
> 
> Read my reply again. It's part of _platform_ description, and belongs in DT.

I can repartition the flash whichever way I want for my purposes, just
like I can repartition a harddrive. We don't have harddrive partitioning
in the DT, why should we have flash partitioning there ? How do those
differ ?
Olof Johansson July 21, 2018, 10:23 p.m. UTC | #6
On Sat, Jul 21, 2018 at 3:11 PM, Marek Vasut <marek.vasut@gmail.com> wrote:
> On 07/22/2018 12:01 AM, Olof Johansson wrote:
>> On Sat, Jul 21, 2018 at 2:54 PM, Marek Vasut <marek.vasut@gmail.com> wrote:
>>> On 07/21/2018 11:47 PM, Olof Johansson wrote:
>>>> Hi,
>>>
>>> Hi,
>>>
>>>> On Wed, May 30, 2018 at 3:11 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
>>>>> Drop the MTD partitioning from DT, since it does not describe HW
>>>>> and to give way to a more flexible kernel command line partition
>>>>> passing.
>>>>>
>>>>> To retain the original partitioning, assure you have enabled
>>>>> CONFIG_MTD_CMDLINE_PARTS in your kernel config and add the
>>>>> following to your kernel command line:
>>>>>
>>>>> lager:   mtdparts=spi0.0:256k(loader),4m(user),-(flash)
>>>>> stout:   mtdparts=spi0.0:512k(loader),256k(uboot),256k(uboot-env),-(flash)
>>>>> koelsch: mtdparts=spi0.0:512k(loader),5632k(user),-(flash)
>>>>> porter:  mtdparts=spi0.0:256k(loader_prg),4m(user_prg),-(flash_fs)
>>>>> wheat:   mtdparts=spi0.0:256k(loader),4m(user),-(flash)
>>>>> gose:    mtdparts=spi0.0:256k(loader),4m(user),-(flash)
>>>>> alt:     mtdparts=spi0.0:256k(loader),256k(system),-(user)
>>>>> silk:    mtdparts=spi0.0:256k(loader),4m(user),-(flash)
>>>>
>>>> Having to specify on command line is such a nasty hack. I wish we
>>>> could remove that, and at the very least not add it for anything new.
>>>
>>> Do you have a better suggestion ?
>>
>> Yes, keep it in DT.
>
> See below
>
>>>> You end up with user space tools trying to parse the kernel command
>>>> line to figure out what's on the flash, and other really bad habits.
>>>> :(
>>>
>>> You should just read /proc/mtd , see
>>> http://www.linux-mtd.infradead.org/doc/general.html
>>
>> Sure, I know that but not everybody does, and they do it in bad ways
>> if given the opportunity.
>
> That's what the documentation is for. I assume whoever is using MTD is
> also capable of reading the documentation and thus avoiding such basic
> mistakes.

Why read the docs when the information obviously is there when you grep it?

I'm agreeing with you -- I've just seen it done wrong so many times.
Making it harder to make mistakes is always a good thing.

>>>> I'd strongly advice you to keep this in the board files, unless you
>>>> have an actual real motivation for changing it. This patch does not
>>>> provide one.
>>>
>>> Partitioning is not hardware description, it should not be in DT.
>>
>> Read my reply again. It's part of _platform_ description, and belongs in DT.
>
> I can repartition the flash whichever way I want for my purposes, just
> like I can repartition a harddrive. We don't have harddrive partitioning
> in the DT, why should we have flash partitioning there ? How do those
> differ ?

A drive can be auto-probed. We have partition tables on the disk that
self-describes the contents.

That doesn't exist on flashes, at least not usually. This is really
unfortunate, I wish we could change _that_ instead of argue here.

If you repartition your disk, you need to change the command line
arguments to the kernel too. It's definitely not an argument to
keeping it on the command line instead.

Also, you now have a dependencies between hardware description, probe
order and stable naming in the kernel, and the command line. With DT,
you have it all in one place, right next to the flash part. It doesn't
matter what name it gets probed at, and nobody needs to know the
mapping to get it right.




-Olof
Marek Vasut July 22, 2018, 10:10 a.m. UTC | #7
On 07/22/2018 12:23 AM, Olof Johansson wrote:
[...]
>>>>> You end up with user space tools trying to parse the kernel command
>>>>> line to figure out what's on the flash, and other really bad habits.
>>>>> :(
>>>>
>>>> You should just read /proc/mtd , see
>>>> http://www.linux-mtd.infradead.org/doc/general.html
>>>
>>> Sure, I know that but not everybody does, and they do it in bad ways
>>> if given the opportunity.
>>
>> That's what the documentation is for. I assume whoever is using MTD is
>> also capable of reading the documentation and thus avoiding such basic
>> mistakes.
> 
> Why read the docs when the information obviously is there when you grep it?

To do things correctly of course.

> I'm agreeing with you -- I've just seen it done wrong so many times.
> Making it harder to make mistakes is always a good thing.

If you follow this argument through, you could say we should start
plucking out random files from /proc because someone might cluelessly
misuse them. This might lead to a system that's hard to misuse indeed,
but likely also quite useless.

>>>>> I'd strongly advice you to keep this in the board files, unless you
>>>>> have an actual real motivation for changing it. This patch does not
>>>>> provide one.
>>>>
>>>> Partitioning is not hardware description, it should not be in DT.
>>>
>>> Read my reply again. It's part of _platform_ description, and belongs in DT.
>>
>> I can repartition the flash whichever way I want for my purposes, just
>> like I can repartition a harddrive. We don't have harddrive partitioning
>> in the DT, why should we have flash partitioning there ? How do those
>> differ ?
> 
> A drive can be auto-probed. We have partition tables on the disk that
> self-describes the contents.
> 
> That doesn't exist on flashes, at least not usually. This is really
> unfortunate, I wish we could change _that_ instead of argue here.

Technically it does. Consider the fact that those flashes have between
4-64 MiB in size and sector size of 256 kiB . If you waste one sector on
the 4 MiB flash for some sort of partition table, you waste 1/16th of
the flash, which is a lot.

The bootloader needs to know the flash layout and it must be in sync
with the kernel, so there has to be some sort of communication channel
between those two. I don't want to add handler for every possible
bootloader that can be used on those platforms into the kernel though.

> If you repartition your disk, you need to change the command line
> arguments to the kernel too. It's definitely not an argument to
> keeping it on the command line instead.

How so ? /dev/sdxy remains /dev/sdxy . Sure, you can use UUID and change
it, but that's a specific case.

> Also, you now have a dependencies between hardware description, probe
> order and stable naming in the kernel, and the command line. With DT,
> you have it all in one place, right next to the flash part. It doesn't
> matter what name it gets probed at, and nobody needs to know the
> mapping to get it right.

In this case it doesn't matter either, since you have only one flash device.
Olof Johansson July 22, 2018, 4:17 p.m. UTC | #8
On Sun, Jul 22, 2018 at 3:10 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
> On 07/22/2018 12:23 AM, Olof Johansson wrote:
> [...]
>>>>>> You end up with user space tools trying to parse the kernel command
>>>>>> line to figure out what's on the flash, and other really bad habits.
>>>>>> :(
>>>>>
>>>>> You should just read /proc/mtd , see
>>>>> http://www.linux-mtd.infradead.org/doc/general.html
>>>>
>>>> Sure, I know that but not everybody does, and they do it in bad ways
>>>> if given the opportunity.
>>>
>>> That's what the documentation is for. I assume whoever is using MTD is
>>> also capable of reading the documentation and thus avoiding such basic
>>> mistakes.
>>
>> Why read the docs when the information obviously is there when you grep it?
>
> To do things correctly of course.
>
>> I'm agreeing with you -- I've just seen it done wrong so many times.
>> Making it harder to make mistakes is always a good thing.
>
> If you follow this argument through, you could say we should start
> plucking out random files from /proc because someone might cluelessly
> misuse them. This might lead to a system that's hard to misuse indeed,
> but likely also quite useless.
>
>>>>>> I'd strongly advice you to keep this in the board files, unless you
>>>>>> have an actual real motivation for changing it. This patch does not
>>>>>> provide one.
>>>>>
>>>>> Partitioning is not hardware description, it should not be in DT.
>>>>
>>>> Read my reply again. It's part of _platform_ description, and belongs in DT.
>>>
>>> I can repartition the flash whichever way I want for my purposes, just
>>> like I can repartition a harddrive. We don't have harddrive partitioning
>>> in the DT, why should we have flash partitioning there ? How do those
>>> differ ?
>>
>> A drive can be auto-probed. We have partition tables on the disk that
>> self-describes the contents.
>>
>> That doesn't exist on flashes, at least not usually. This is really
>> unfortunate, I wish we could change _that_ instead of argue here.
>
> Technically it does. Consider the fact that those flashes have between
> 4-64 MiB in size and sector size of 256 kiB . If you waste one sector on
> the 4 MiB flash for some sort of partition table, you waste 1/16th of
> the flash, which is a lot.
>
> The bootloader needs to know the flash layout and it must be in sync
> with the kernel, so there has to be some sort of communication channel
> between those two. I don't want to add handler for every possible
> bootloader that can be used on those platforms into the kernel though.

The standard argument here, is always to have the bootloader patch up
the device tree to make it represent the actual device. We do this all
the time for things such as command line, memory sizes, ethernet
addresses, etc. This is no different.

>> If you repartition your disk, you need to change the command line
>> arguments to the kernel too. It's definitely not an argument to
>> keeping it on the command line instead.
>
> How so ? /dev/sdxy remains /dev/sdxy . Sure, you can use UUID and change
> it, but that's a specific case.
>
>> Also, you now have a dependencies between hardware description, probe
>> order and stable naming in the kernel, and the command line. With DT,
>> you have it all in one place, right next to the flash part. It doesn't
>> matter what name it gets probed at, and nobody needs to know the
>> mapping to get it right.
>
> In this case it doesn't matter either, since you have only one flash device.

In this very narrow case maybe, but in general it's a horrible idea to
encourage people to use the command line instead of device tree for
this.

I'm still waiting on a compelling argument to motivate why this patch
should be applied. I don't think there is one, so let's not apply it.


-Olof
diff mbox

Patch

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 092610e3f953..7c95e62efd46 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -710,27 +710,6 @@ 
 		spi-cpha;
 		spi-cpol;
 		m25p,fast-read;
-
-		partitions {
-			compatible = "fixed-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>;
-			};
-		};
 	};
 };
 
diff --git a/arch/arm/boot/dts/r8a7790-stout.dts b/arch/arm/boot/dts/r8a7790-stout.dts
index a13a92c26645..dc65519d53ab 100644
--- a/arch/arm/boot/dts/r8a7790-stout.dts
+++ b/arch/arm/boot/dts/r8a7790-stout.dts
@@ -211,32 +211,6 @@ 
 		spi-cpha;
 		spi-cpol;
 		m25p,fast-read;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition@0 {
-				label = "loader";
-				reg = <0x00000000 0x00080000>;
-				read-only;
-			};
-			partition@80000 {
-				label = "uboot";
-				reg = <0x00080000 0x00040000>;
-				read-only;
-			};
-			partition@c0000 {
-				label = "uboot-env";
-				reg = <0x000c0000 0x00040000>;
-				read-only;
-			};
-			partition@100000 {
-				label = "flash";
-				reg = <0x00100000 0x03f00000>;
-			};
-		};
 	};
 };
 
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index 8ab793d8b2fd..406d5d29e29c 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -724,27 +724,6 @@ 
 		spi-cpha;
 		spi-cpol;
 		m25p,fast-read;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition@0 {
-				label = "loader";
-				reg = <0x00000000 0x00080000>;
-				read-only;
-			};
-			partition@80000 {
-				label = "user";
-				reg = <0x00080000 0x00580000>;
-				read-only;
-			};
-			partition@600000 {
-				label = "flash";
-				reg = <0x00600000 0x03a00000>;
-			};
-		};
 	};
 };
 
diff --git a/arch/arm/boot/dts/r8a7791-porter.dts b/arch/arm/boot/dts/r8a7791-porter.dts
index a01101b49d99..45d89e064407 100644
--- a/arch/arm/boot/dts/r8a7791-porter.dts
+++ b/arch/arm/boot/dts/r8a7791-porter.dts
@@ -344,27 +344,6 @@ 
 		spi-tx-bus-width = <4>;
 		spi-rx-bus-width = <4>;
 		m25p,fast-read;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition@0 {
-				label = "loader_prg";
-				reg = <0x00000000 0x00040000>;
-				read-only;
-			};
-			partition@40000 {
-				label = "user_prg";
-				reg = <0x00040000 0x00400000>;
-				read-only;
-			};
-			partition@440000 {
-				label = "flash_fs";
-				reg = <0x00440000 0x03bc0000>;
-			};
-		};
 	};
 };
 
diff --git a/arch/arm/boot/dts/r8a7792-wheat.dts b/arch/arm/boot/dts/r8a7792-wheat.dts
index db01de7a3811..93f78716225a 100644
--- a/arch/arm/boot/dts/r8a7792-wheat.dts
+++ b/arch/arm/boot/dts/r8a7792-wheat.dts
@@ -217,27 +217,6 @@ 
 		spi-cpol;
 		spi-cpha;
 		m25p,fast-read;
-
-		partitions {
-			compatible = "fixed-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>;
-			};
-		};
 	};
 };
 
diff --git a/arch/arm/boot/dts/r8a7793-gose.dts b/arch/arm/boot/dts/r8a7793-gose.dts
index aa209f6e5d71..b2dd54fbe40c 100644
--- a/arch/arm/boot/dts/r8a7793-gose.dts
+++ b/arch/arm/boot/dts/r8a7793-gose.dts
@@ -676,27 +676,6 @@ 
 		spi-cpol;
 		spi-cpha;
 		m25p,fast-read;
-
-		partitions {
-			compatible = "fixed-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>;
-			};
-		};
 	};
 };
 
diff --git a/arch/arm/boot/dts/r8a7794-alt.dts b/arch/arm/boot/dts/r8a7794-alt.dts
index e17027532941..1d044ed598f3 100644
--- a/arch/arm/boot/dts/r8a7794-alt.dts
+++ b/arch/arm/boot/dts/r8a7794-alt.dts
@@ -419,26 +419,5 @@ 
 		spi-cpol;
 		spi-cpha;
 		m25p,fast-read;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition@0 {
-				label = "loader";
-				reg = <0x00000000 0x00040000>;
-				read-only;
-			};
-			partition@40000 {
-				label = "system";
-				reg = <0x00040000 0x00040000>;
-				read-only;
-			};
-			partition@80000 {
-				label = "user";
-				reg = <0x00080000 0x03f80000>;
-			};
-		};
 	};
 };
diff --git a/arch/arm/boot/dts/r8a7794-silk.dts b/arch/arm/boot/dts/r8a7794-silk.dts
index 7808aaee6644..b8163a0e2190 100644
--- a/arch/arm/boot/dts/r8a7794-silk.dts
+++ b/arch/arm/boot/dts/r8a7794-silk.dts
@@ -444,27 +444,6 @@ 
 		spi-cpol;
 		spi-cpha;
 		m25p,fast-read;
-
-		partitions {
-			compatible = "fixed-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>;
-			};
-		};
 	};
 };