[PATCH v2 0/9] ARM: dts: Add compatible property to "partitions" node

[PATCH v2 0/9] ARM: dts: Add compatible property to "partitions" node

[Geert Uytterhoeven]

	Hi,

As of commit e488ca9f8d4f62c2 ("doc: dt: mtd: partitions: add compatible
property to "partitions" node"), which is in v4.4-rc6, the "partitions"
subnode of an SPI FLASH device node must have a compatible property. The
partitions are no longer detected if it is not present.

However, several DTSes in -next have already been converted to the
"partitions" subnode without "compatible" property, introduced by
commits 5cfdedb7b9a0fe38 ("mtd: ofpart: move ofpart partitions to a
dedicated dt node") and fe2585e9c29a650a ("doc: dt: mtd: support
partitions in a special 'partitions' subnode"). Hence all of these are
now broken in -next, and will be broken in upstream during the merge
window.

This series fixes all users in next-20151221.
Tested on r8a7791/koelsch.

Changes since v1:
  - Add Acked-by,
  - Fix new users in -next (kirkwood, ci20).

Most of these are in arm-soc/for-next. Exceptions are kirkwood (in
mvebu/for-next), and ci20 (in mips/mips-for-linux-next).

Given we're late in the v4.4-rc cycle, perhaps it's easiest if the
arm-soc maintainers take all applicable patches directly, bypassing the
mvebu and shmobile maintainers?

Thanks for queuing for v4.5!

Geert Uytterhoeven (9):
  ARM: mvebu: ix4-300d: Add compatible property to "partitions" node
  ARM: mvebu: kirkwood: Add compatible property to "partitions" node
  ARM: shmobile: bockw dts: Add compatible property to "partitions" node
  ARM: shmobile: lager dts: Add compatible property to "partitions" node
  ARM: shmobile: koelsch dts: Add compatible property to "partitions"
    node
  ARM: shmobile: porter dts: Add compatible property to "partitions"
    node
  ARM: shmobile: gose dts: Add compatible property to "partitions" node
  ARM: shmobile: silk dts: Add compatible property to "partitions" node
  MIPS: dts: jz4780/ci20: Add compatible property to "partitions" node

 arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts  | 1 +
 arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts | 1 +
 arch/arm/boot/dts/r8a7778-bockw.dts              | 1 +
 arch/arm/boot/dts/r8a7790-lager.dts              | 1 +
 arch/arm/boot/dts/r8a7791-koelsch.dts            | 1 +
 arch/arm/boot/dts/r8a7791-porter.dts             | 1 +
 arch/arm/boot/dts/r8a7793-gose.dts               | 1 +
 arch/arm/boot/dts/r8a7794-silk.dts               | 1 +
 arch/mips/boot/dts/ingenic/ci20.dts              | 1 +
 9 files changed, 9 insertions(+)

-- 
1.9.1

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

[PATCH v2 1/9] ARM: mvebu: ix4-300d: Add compatible property to "partitions" node

[Geert Uytterhoeven]

As of commit e488ca9f8d4f62c2 ("doc: dt: mtd: partitions: add compatible
property to "partitions" node"), the "partitions" subnode of an SPI
FLASH device node must have a compatible property. The partitions are no
longer detected if it is not present.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Brian Norris <computersforpeace@gmail.com>
---
v2:
  - Add Acked-by.
---
 arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
index 13cf69a8d0fb392b..fb9e1bbf23385b85 100644
--- a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
+++ b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
@@ -152,6 +152,7 @@
 				nand-on-flash-bbt;
 
 				partitions {
+					compatible = "fixed-partitions";
 					#address-cells = <1>;
 					#size-cells = <1>;
 
-- 
1.9.1

Re: [PATCH v2 1/9] ARM: mvebu: ix4-300d: Add compatible property to "partitions" node

[Gregory CLEMENT]

Hi Geert,
 
 On lun., déc. 21 2015, Geert Uytterhoeven <geert+renesas@glider.be> wrote:

> As of commit e488ca9f8d4f62c2 ("doc: dt: mtd: partitions: add compatible
> property to "partitions" node"), the "partitions" subnode of an SPI
> FLASH device node must have a compatible property. The partitions are no
> longer detected if it is not present.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Acked-by: Brian Norris <computersforpeace@gmail.com>

Applied on mvebu/dt (with the hope that it is still time to push it to
arm-soc)

Thanks,

Gregory

> ---
> v2:
>   - Add Acked-by.
> ---
>  arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
> index 13cf69a8d0fb392b..fb9e1bbf23385b85 100644
> --- a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
> +++ b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
> @@ -152,6 +152,7 @@
>  				nand-on-flash-bbt;
>  
>  				partitions {
> +					compatible = "fixed-partitions";
>  					#address-cells = <1>;
>  					#size-cells = <1>;
>  
> -- 
> 1.9.1
>

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

Re: [PATCH v2 1/9] ARM: mvebu: ix4-300d: Add compatible property to "partitions" node

[Olof Johansson]

On Mon, Dec 21, 2015 at 05:48:48PM +0100, Gregory CLEMENT wrote:
> Hi Geert,
>  
>  On lun., d??c. 21 2015, Geert Uytterhoeven <geert+renesas@glider.be> wrote:
> 
> > As of commit e488ca9f8d4f62c2 ("doc: dt: mtd: partitions: add compatible
> > property to "partitions" node"), the "partitions" subnode of an SPI
> > FLASH device node must have a compatible property. The partitions are no
> > longer detected if it is not present.
> >
> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> > Acked-by: Brian Norris <computersforpeace@gmail.com>
> 
> Applied on mvebu/dt (with the hope that it is still time to push it to
> arm-soc)

I think we should just take this directly, so feel free to drop it. I'll
followup on 0/9.


-Olof

Re: [PATCH v2 1/9] ARM: mvebu: ix4-300d: Add compatible property to "partitions" node

[Gregory CLEMENT]

Hi Olof,
 
 On mar., déc. 22 2015, Olof Johansson <olof@lixom.net> wrote:

> On Mon, Dec 21, 2015 at 05:48:48PM +0100, Gregory CLEMENT wrote:
>> Hi Geert,
>>  
>>  On lun., d??c. 21 2015, Geert Uytterhoeven <geert+renesas@glider.be> wrote:
>> 
>> > As of commit e488ca9f8d4f62c2 ("doc: dt: mtd: partitions: add compatible
>> > property to "partitions" node"), the "partitions" subnode of an SPI
>> > FLASH device node must have a compatible property. The partitions are no
>> > longer detected if it is not present.
>> >
>> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
>> > Acked-by: Brian Norris <computersforpeace@gmail.com>
>> 
>> Applied on mvebu/dt (with the hope that it is still time to push it to
>> arm-soc)
>
> I think we should just take this directly, so feel free to drop it. I'll
> followup on 0/9.

OK I will drop it of my mvebu/dt and for-next branches.

Gregory


-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[PATCH v2 2/9] ARM: mvebu: kirkwood: Add compatible property to "partitions" node

[Geert Uytterhoeven]

As of commit e488ca9f8d4f62c2 ("doc: dt: mtd: partitions: add compatible
property to "partitions" node"), the "partitions" subnode of an SPI
FLASH device node must have a compatible property. The partitions are no
longer detected if it is not present.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
  - New.
---
 arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts b/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts
index 1db6f2c506cce320..8082d64266a37c33 100644
--- a/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts
+++ b/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts
@@ -131,6 +131,7 @@
 	chip-delay = <40>;
 	status = "okay";
 	partitions {
+		compatible = "fixed-partitions";
 		#address-cells = <1>;
 		#size-cells = <1>;
 
-- 
1.9.1

Re: [PATCH v2 2/9] ARM: mvebu: kirkwood: Add compatible property to "partitions" node

[Gregory CLEMENT]

Hi Geert,
 
 On lun., déc. 21 2015, Geert Uytterhoeven <geert+renesas@glider.be> wrote:

> As of commit e488ca9f8d4f62c2 ("doc: dt: mtd: partitions: add compatible
> property to "partitions" node"), the "partitions" subnode of an SPI
> FLASH device node must have a compatible property. The partitions are no
> longer detected if it is not present.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Applied on mvebu/dt

Thanks,

Gregory

> ---
> v2:
>   - New.
> ---
>  arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts b/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts
> index 1db6f2c506cce320..8082d64266a37c33 100644
> --- a/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts
> +++ b/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts
> @@ -131,6 +131,7 @@
>  	chip-delay = <40>;
>  	status = "okay";
>  	partitions {
> +		compatible = "fixed-partitions";
>  		#address-cells = <1>;
>  		#size-cells = <1>;
>  
> -- 
> 1.9.1
>

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[PATCH v2 3/9] ARM: shmobile: bockw dts: Add compatible property to "partitions" node

[Geert Uytterhoeven]

As of commit e488ca9f8d4f62c2 ("doc: dt: mtd: partitions: add compatible
property to "partitions" node"), the "partitions" subnode of an SPI
FLASH device node must have a compatible property. The partitions are no
longer detected if it is not present.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Brian Norris <computersforpeace@gmail.com>
---
v2:
  - Add Acked-by.
---
 arch/arm/boot/dts/r8a7778-bockw.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/r8a7778-bockw.dts b/arch/arm/boot/dts/r8a7778-bockw.dts
index 482228b8a984656e..06ceefe3cb500dc7 100644
--- a/arch/arm/boot/dts/r8a7778-bockw.dts
+++ b/arch/arm/boot/dts/r8a7778-bockw.dts
@@ -212,6 +212,7 @@
 		m25p,fast-read;
 
 		partitions {
+			compatible = "fixed-partitions";
 			#address-cells = <1>;
 			#size-cells = <1>;
 
-- 
1.9.1

[PATCH v2 4/9] ARM: shmobile: lager dts: Add compatible property to "partitions" node

[Geert Uytterhoeven]

As of commit e488ca9f8d4f62c2 ("doc: dt: mtd: partitions: add compatible
property to "partitions" node"), the "partitions" subnode of an SPI
FLASH device node must have a compatible property. The partitions are no
longer detected if it is not present.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Brian Norris <computersforpeace@gmail.com>
---
v2:
  - Add Acked-by.
---
 arch/arm/boot/dts/r8a7790-lager.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 7773cb1f10317d85..cdc0414f5f0716dd 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -457,6 +457,7 @@
 		m25p,fast-read;
 
 		partitions {
+			compatible = "fixed-partitions";
 			#address-cells = <1>;
 			#size-cells = <1>;
 
-- 
1.9.1

[PATCH v2 5/9] ARM: shmobile: koelsch dts: Add compatible property to "partitions" node

[Geert Uytterhoeven]

As of commit e488ca9f8d4f62c2 ("doc: dt: mtd: partitions: add compatible
property to "partitions" node"), the "partitions" subnode of an SPI
FLASH device node must have a compatible property. The partitions are no
longer detected if it is not present.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Brian Norris <computersforpeace@gmail.com>
---
v2:
  - Add Acked-by.
---
 arch/arm/boot/dts/r8a7791-koelsch.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index d949853a48edc956..9ff5d2b29788dfc1 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -500,6 +500,7 @@
 		m25p,fast-read;
 
 		partitions {
+			compatible = "fixed-partitions";
 			#address-cells = <1>;
 			#size-cells = <1>;
 
-- 
1.9.1

[PATCH v2 6/9] ARM: shmobile: porter dts: Add compatible property to "partitions" node

[Geert Uytterhoeven]

As of commit e488ca9f8d4f62c2 ("doc: dt: mtd: partitions: add compatible
property to "partitions" node"), the "partitions" subnode of an SPI
FLASH device node must have a compatible property. The partitions are no
longer detected if it is not present.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Brian Norris <computersforpeace@gmail.com>
---
v2:
  - Add Acked-by.
---
 arch/arm/boot/dts/r8a7791-porter.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/r8a7791-porter.dts b/arch/arm/boot/dts/r8a7791-porter.dts
index b93016896378c350..f8d8e2e2169a9c40 100644
--- a/arch/arm/boot/dts/r8a7791-porter.dts
+++ b/arch/arm/boot/dts/r8a7791-porter.dts
@@ -213,6 +213,7 @@
 		m25p,fast-read;
 
 		partitions {
+			compatible = "fixed-partitions";
 			#address-cells = <1>;
 			#size-cells = <1>;
 
-- 
1.9.1

[PATCH v2 7/9] ARM: shmobile: gose dts: Add compatible property to "partitions" node

[Geert Uytterhoeven]

As of commit e488ca9f8d4f62c2 ("doc: dt: mtd: partitions: add compatible
property to "partitions" node"), the "partitions" subnode of an SPI
FLASH device node must have a compatible property. The partitions are no
longer detected if it is not present.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Brian Norris <computersforpeace@gmail.com>
---
v2:
  - Add Acked-by.
---
 arch/arm/boot/dts/r8a7793-gose.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/r8a7793-gose.dts b/arch/arm/boot/dts/r8a7793-gose.dts
index 077ab9423f5e17d6..3d4bd3c02c4fece0 100644
--- a/arch/arm/boot/dts/r8a7793-gose.dts
+++ b/arch/arm/boot/dts/r8a7793-gose.dts
@@ -128,6 +128,7 @@
 		m25p,fast-read;
 
 		partitions {
+			compatible = "fixed-partitions";
 			#address-cells = <1>;
 			#size-cells = <1>;
 
-- 
1.9.1

[PATCH v2 8/9] ARM: shmobile: silk dts: Add compatible property to "partitions" node

[Geert Uytterhoeven]

As of commit e488ca9f8d4f62c2 ("doc: dt: mtd: partitions: add compatible
property to "partitions" node"), the "partitions" subnode of an SPI
FLASH device node must have a compatible property. The partitions are no
longer detected if it is not present.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Brian Norris <computersforpeace@gmail.com>
---
v2:
  - Add Acked-by.
---
 arch/arm/boot/dts/r8a7794-silk.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/r8a7794-silk.dts b/arch/arm/boot/dts/r8a7794-silk.dts
index eb608283a24c070c..c0ae94979a71b04c 100644
--- a/arch/arm/boot/dts/r8a7794-silk.dts
+++ b/arch/arm/boot/dts/r8a7794-silk.dts
@@ -217,6 +217,7 @@
 		m25p,fast-read;
 
 		partitions {
+			compatible = "fixed-partitions";
 			#address-cells = <1>;
 			#size-cells = <1>;
 
-- 
1.9.1

[PATCH v2 9/9] MIPS: dts: jz4780/ci20: Add compatible property to "partitions" node

[Geert Uytterhoeven]

As of commit e488ca9f8d4f62c2 ("doc: dt: mtd: partitions: add compatible
property to "partitions" node"), the "partitions" subnode of an SPI
FLASH device node must have a compatible property. The partitions are no
longer detected if it is not present.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
  - New.
---
 arch/mips/boot/dts/ingenic/ci20.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/mips/boot/dts/ingenic/ci20.dts b/arch/mips/boot/dts/ingenic/ci20.dts
index 782258c0e4fbba8e..1652d8d60b1e4b86 100644
--- a/arch/mips/boot/dts/ingenic/ci20.dts
+++ b/arch/mips/boot/dts/ingenic/ci20.dts
@@ -70,6 +70,7 @@
 			nand-on-flash-bbt;
 
 			partitions {
+				compatible = "fixed-partitions";
 				#address-cells = <2>;
 				#size-cells = <2>;
 
-- 
1.9.1

Re: [PATCH v2 9/9] MIPS: dts: jz4780/ci20: Add compatible property to "partitions" node

[Ralf Baechle]

On Mon, Dec 21, 2015 at 11:33:53AM +0100, Geert Uytterhoeven wrote:
> Date:   Mon, 21 Dec 2015 11:33:53 +0100
> From: Geert Uytterhoeven <geert+renesas@glider.be>
> To: arm@kernel.org, Andrew Lunn <andrew@lunn.ch>, Gregory Clement
>  <gregory.clement@free-electrons.com>, Sebastian Hesselbarth
>  <sebastian.hesselbarth@gmail.com>, Simon Horman <horms@verge.net.au>,
>  Magnus Damm <magnus.damm@gmail.com>, Ralf Baechle <ralf@linux-mips.org>,
>  Alex Smith <alex.smith@imgtec.com>
> Cc: Brian Norris <computersforpeace@gmail.com>, Rob Herring
>  <robh+dt@kernel.org>, devicetree@vger.kernel.org,
>  linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org,
>  linux-mips@linux-mips.org, linux-mtd@lists.infradead.org,
>  linux-kernel@vger.kernel.org, Geert Uytterhoeven <geert+renesas@glider.be>
> Subject: [PATCH v2 9/9] MIPS: dts: jz4780/ci20: Add compatible property to
>  "partitions" node
> 
> As of commit e488ca9f8d4f62c2 ("doc: dt: mtd: partitions: add compatible
> property to "partitions" node"), the "partitions" subnode of an SPI
> FLASH device node must have a compatible property. The partitions are no
> longer detected if it is not present.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> v2:
>   - New.
> ---
>  arch/mips/boot/dts/ingenic/ci20.dts | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/mips/boot/dts/ingenic/ci20.dts b/arch/mips/boot/dts/ingenic/ci20.dts
> index 782258c0e4fbba8e..1652d8d60b1e4b86 100644
> --- a/arch/mips/boot/dts/ingenic/ci20.dts
> +++ b/arch/mips/boot/dts/ingenic/ci20.dts
> @@ -70,6 +70,7 @@
>  			nand-on-flash-bbt;
>  
>  			partitions {
> +				compatible = "fixed-partitions";
>  				#address-cells = <2>;
>  				#size-cells = <2>;
>  
> -- 
> 1.9.1

Acked-by: Ralf Baechle <ralf@linux-mips.org>

  Ralf

Re: [PATCH v2 0/9] ARM: dts: Add compatible property to "partitions" node

[Olof Johansson]

Hi,

On Mon, Dec 21, 2015 at 11:33:44AM +0100, Geert Uytterhoeven wrote:
> 	Hi,
> 
> As of commit e488ca9f8d4f62c2 ("doc: dt: mtd: partitions: add compatible
> property to "partitions" node"), which is in v4.4-rc6, the "partitions"
> subnode of an SPI FLASH device node must have a compatible property. The
> partitions are no longer detected if it is not present.
> 
> However, several DTSes in -next have already been converted to the
> "partitions" subnode without "compatible" property, introduced by
> commits 5cfdedb7b9a0fe38 ("mtd: ofpart: move ofpart partitions to a
> dedicated dt node") and fe2585e9c29a650a ("doc: dt: mtd: support
> partitions in a special 'partitions' subnode"). Hence all of these are
> now broken in -next, and will be broken in upstream during the merge
> window.

So, if I understand this correctly, the partitions format was added for v4.4,
then this non-backwards compatible change was added in -rc6. But, there were
also DT files that had the new-for-v4.4 partitions nodes in them that then
stopped working in -rc6?

That sounds like a regression, so this should be picked up as fixes for v4.4.

Please confirm that I've understood the setup correctly, and I'll apply the
series directly to fixes.


-Olof

Re: [PATCH v2 0/9] ARM: dts: Add compatible property to "partitions" node

[Gregory CLEMENT]

Hi Olof,
 
 On mar., déc. 22 2015, Olof Johansson <olof@lixom.net> wrote:

> Hi,
>
> On Mon, Dec 21, 2015 at 11:33:44AM +0100, Geert Uytterhoeven wrote:
>> 	Hi,
>> 
>> As of commit e488ca9f8d4f62c2 ("doc: dt: mtd: partitions: add compatible
>> property to "partitions" node"), which is in v4.4-rc6, the "partitions"
>> subnode of an SPI FLASH device node must have a compatible property. The
>> partitions are no longer detected if it is not present.
>> 
>> However, several DTSes in -next have already been converted to the
>> "partitions" subnode without "compatible" property, introduced by
>> commits 5cfdedb7b9a0fe38 ("mtd: ofpart: move ofpart partitions to a
>> dedicated dt node") and fe2585e9c29a650a ("doc: dt: mtd: support
>> partitions in a special 'partitions' subnode"). Hence all of these are
>> now broken in -next, and will be broken in upstream during the merge
>> window.
>
> So, if I understand this correctly, the partitions format was added for v4.4,
> then this non-backwards compatible change was added in -rc6. But, there were
> also DT files that had the new-for-v4.4 partitions nodes in them that then
> stopped working in -rc6?

At least for the mvebu dts, the change was added for v4.5 not
v4.4. Currently it is only in the next branches (and also in your
arm-soc tree in next/dt).

>
> That sounds like a regression, so this should be picked up as fixes
> for v4.4.


It won't be a regression but a breakage of the bissectability between
the patch adding the partition subnode and the one using the compatible
"fixed-partitions".

If you really want avoiding this you could squash the patches, however
from my point of view it's not worth doing it.

>
> Please confirm that I've understood the setup correctly, and I'll apply the
> series directly to fixes.

I think it won't apply on v4.4 because the partition change was not made
at this moment.

Gregory

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

Re: [PATCH v2 0/9] ARM: dts: Add compatible property to "partitions" node

[Geert Uytterhoeven]

Hi Olof, Gregory,

On Wed, Dec 23, 2015 at 12:04 PM, Gregory CLEMENT
<gregory.clement@free-electrons.com> wrote:
>  On mar., déc. 22 2015, Olof Johansson <olof@lixom.net> wrote:
>> On Mon, Dec 21, 2015 at 11:33:44AM +0100, Geert Uytterhoeven wrote:
>>> As of commit e488ca9f8d4f62c2 ("doc: dt: mtd: partitions: add compatible
>>> property to "partitions" node"), which is in v4.4-rc6, the "partitions"
>>> subnode of an SPI FLASH device node must have a compatible property. The
>>> partitions are no longer detected if it is not present.
>>>
>>> However, several DTSes in -next have already been converted to the
>>> "partitions" subnode without "compatible" property, introduced by
>>> commits 5cfdedb7b9a0fe38 ("mtd: ofpart: move ofpart partitions to a
>>> dedicated dt node") and fe2585e9c29a650a ("doc: dt: mtd: support
>>> partitions in a special 'partitions' subnode"). Hence all of these are
>>> now broken in -next, and will be broken in upstream during the merge
>>> window.
>>
>> So, if I understand this correctly, the partitions format was added for v4.4,
>> then this non-backwards compatible change was added in -rc6. But, there were
>> also DT files that had the new-for-v4.4 partitions nodes in them that then
>> stopped working in -rc6?
>
> At least for the mvebu dts, the change was added for v4.5 not
> v4.4. Currently it is only in the next branches (and also in your
> arm-soc tree in next/dt).

The same is true for the shmobile changes: they are queued up for v4.5.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH v2 0/9] ARM: dts: Add compatible property to "partitions" node

[Simon Horman]

On Mon, Dec 21, 2015 at 11:33:44AM +0100, Geert Uytterhoeven wrote:
> 	Hi,
> 
> As of commit e488ca9f8d4f62c2 ("doc: dt: mtd: partitions: add compatible
> property to "partitions" node"), which is in v4.4-rc6, the "partitions"
> subnode of an SPI FLASH device node must have a compatible property. The
> partitions are no longer detected if it is not present.
> 
> However, several DTSes in -next have already been converted to the
> "partitions" subnode without "compatible" property, introduced by
> commits 5cfdedb7b9a0fe38 ("mtd: ofpart: move ofpart partitions to a
> dedicated dt node") and fe2585e9c29a650a ("doc: dt: mtd: support
> partitions in a special 'partitions' subnode"). Hence all of these are
> now broken in -next, and will be broken in upstream during the merge
> window.
> 
> This series fixes all users in next-20151221.
> Tested on r8a7791/koelsch.
> 
> Changes since v1:
>   - Add Acked-by,
>   - Fix new users in -next (kirkwood, ci20).
> 
> Most of these are in arm-soc/for-next. Exceptions are kirkwood (in
> mvebu/for-next), and ci20 (in mips/mips-for-linux-next).
> 
> Given we're late in the v4.4-rc cycle, perhaps it's easiest if the
> arm-soc maintainers take all applicable patches directly, bypassing the
> mvebu and shmobile maintainers?
> 
> Thanks for queuing for v4.5!
> 
> Geert Uytterhoeven (9):
>   ARM: mvebu: ix4-300d: Add compatible property to "partitions" node
>   ARM: mvebu: kirkwood: Add compatible property to "partitions" node
>   ARM: shmobile: bockw dts: Add compatible property to "partitions" node
>   ARM: shmobile: lager dts: Add compatible property to "partitions" node
>   ARM: shmobile: koelsch dts: Add compatible property to "partitions"
>     node
>   ARM: shmobile: porter dts: Add compatible property to "partitions"
>     node
>   ARM: shmobile: gose dts: Add compatible property to "partitions" node
>   ARM: shmobile: silk dts: Add compatible property to "partitions" node

Thanks, I have queued up the above "shmobile" patches for v4.6.

>   MIPS: dts: jz4780/ci20: Add compatible property to "partitions" node
> 
>  arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts  | 1 +
>  arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts | 1 +
>  arch/arm/boot/dts/r8a7778-bockw.dts              | 1 +
>  arch/arm/boot/dts/r8a7790-lager.dts              | 1 +
>  arch/arm/boot/dts/r8a7791-koelsch.dts            | 1 +
>  arch/arm/boot/dts/r8a7791-porter.dts             | 1 +
>  arch/arm/boot/dts/r8a7793-gose.dts               | 1 +
>  arch/arm/boot/dts/r8a7794-silk.dts               | 1 +
>  arch/mips/boot/dts/ingenic/ci20.dts              | 1 +
>  9 files changed, 9 insertions(+)
> 
> -- 
> 1.9.1
> 
> Gr{oetje,eeting}s,
> 
> 						Geert
> 
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
> 
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
> 							    -- Linus Torvalds
> 

Re: [PATCH v2 0/9] ARM: dts: Add compatible property to "partitions" node

[Geert Uytterhoeven]

Hi Simon,

On Mon, Dec 28, 2015 at 6:01 AM, Simon Horman <horms@verge.net.au> wrote:
> On Mon, Dec 21, 2015 at 11:33:44AM +0100, Geert Uytterhoeven wrote:
>> As of commit e488ca9f8d4f62c2 ("doc: dt: mtd: partitions: add compatible
>> property to "partitions" node"), which is in v4.4-rc6, the "partitions"
>> subnode of an SPI FLASH device node must have a compatible property. The
>> partitions are no longer detected if it is not present.
>>
>> However, several DTSes in -next have already been converted to the
>> "partitions" subnode without "compatible" property, introduced by
>> commits 5cfdedb7b9a0fe38 ("mtd: ofpart: move ofpart partitions to a
>> dedicated dt node") and fe2585e9c29a650a ("doc: dt: mtd: support
>> partitions in a special 'partitions' subnode"). Hence all of these are
>> now broken in -next, and will be broken in upstream during the merge
>> window.
>>
>> This series fixes all users in next-20151221.
>> Tested on r8a7791/koelsch.
>>
>> Changes since v1:
>>   - Add Acked-by,
>>   - Fix new users in -next (kirkwood, ci20).
>>
>> Most of these are in arm-soc/for-next. Exceptions are kirkwood (in
>> mvebu/for-next), and ci20 (in mips/mips-for-linux-next).
>>
>> Given we're late in the v4.4-rc cycle, perhaps it's easiest if the
>> arm-soc maintainers take all applicable patches directly, bypassing the
>> mvebu and shmobile maintainers?
>>
>> Thanks for queuing for v4.5!
>>
>> Geert Uytterhoeven (9):
>>   ARM: mvebu: ix4-300d: Add compatible property to "partitions" node
>>   ARM: mvebu: kirkwood: Add compatible property to "partitions" node
>>   ARM: shmobile: bockw dts: Add compatible property to "partitions" node
>>   ARM: shmobile: lager dts: Add compatible property to "partitions" node
>>   ARM: shmobile: koelsch dts: Add compatible property to "partitions"
>>     node
>>   ARM: shmobile: porter dts: Add compatible property to "partitions"
>>     node
>>   ARM: shmobile: gose dts: Add compatible property to "partitions" node
>>   ARM: shmobile: silk dts: Add compatible property to "partitions" node
>
> Thanks, I have queued up the above "shmobile" patches for v4.6.

I'm afraid v4.6 is too late, leaving all SPI FLASHes broken in v4.5.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH v2 0/9] ARM: dts: Add compatible property to "partitions" node

[Simon Horman]

On Mon, Dec 28, 2015 at 11:15:30AM +0100, Geert Uytterhoeven wrote:
> Hi Simon,
> 
> On Mon, Dec 28, 2015 at 6:01 AM, Simon Horman <horms@verge.net.au> wrote:
> > On Mon, Dec 21, 2015 at 11:33:44AM +0100, Geert Uytterhoeven wrote:
> >> As of commit e488ca9f8d4f62c2 ("doc: dt: mtd: partitions: add compatible
> >> property to "partitions" node"), which is in v4.4-rc6, the "partitions"
> >> subnode of an SPI FLASH device node must have a compatible property. The
> >> partitions are no longer detected if it is not present.
> >>
> >> However, several DTSes in -next have already been converted to the
> >> "partitions" subnode without "compatible" property, introduced by
> >> commits 5cfdedb7b9a0fe38 ("mtd: ofpart: move ofpart partitions to a
> >> dedicated dt node") and fe2585e9c29a650a ("doc: dt: mtd: support
> >> partitions in a special 'partitions' subnode"). Hence all of these are
> >> now broken in -next, and will be broken in upstream during the merge
> >> window.
> >>
> >> This series fixes all users in next-20151221.
> >> Tested on r8a7791/koelsch.
> >>
> >> Changes since v1:
> >>   - Add Acked-by,
> >>   - Fix new users in -next (kirkwood, ci20).
> >>
> >> Most of these are in arm-soc/for-next. Exceptions are kirkwood (in
> >> mvebu/for-next), and ci20 (in mips/mips-for-linux-next).
> >>
> >> Given we're late in the v4.4-rc cycle, perhaps it's easiest if the
> >> arm-soc maintainers take all applicable patches directly, bypassing the
> >> mvebu and shmobile maintainers?
> >>
> >> Thanks for queuing for v4.5!
> >>
> >> Geert Uytterhoeven (9):
> >>   ARM: mvebu: ix4-300d: Add compatible property to "partitions" node
> >>   ARM: mvebu: kirkwood: Add compatible property to "partitions" node
> >>   ARM: shmobile: bockw dts: Add compatible property to "partitions" node
> >>   ARM: shmobile: lager dts: Add compatible property to "partitions" node
> >>   ARM: shmobile: koelsch dts: Add compatible property to "partitions"
> >>     node
> >>   ARM: shmobile: porter dts: Add compatible property to "partitions"
> >>     node
> >>   ARM: shmobile: gose dts: Add compatible property to "partitions" node
> >>   ARM: shmobile: silk dts: Add compatible property to "partitions" node
> >
> > Thanks, I have queued up the above "shmobile" patches for v4.6.
> 
> I'm afraid v4.6 is too late, leaving all SPI FLASHes broken in v4.5.

Thanks. I'll re-queue them up as fixes for v4.5.

Re: [PATCH v2 0/9] ARM: dts: Add compatible property to "partitions" node

[Gregory CLEMENT]

Hi Olof,
 
 On dim., janv. 03 2016, Simon Horman <horms@verge.net.au> wrote:

> On Mon, Dec 28, 2015 at 11:15:30AM +0100, Geert Uytterhoeven wrote:

>> >> Most of these are in arm-soc/for-next. Exceptions are kirkwood (in
>> >> mvebu/for-next), and ci20 (in mips/mips-for-linux-next).
>> >>
>> >> Given we're late in the v4.4-rc cycle, perhaps it's easiest if the
>> >> arm-soc maintainers take all applicable patches directly, bypassing the
>> >> mvebu and shmobile maintainers?
>> >>
>> >> Thanks for queuing for v4.5!
>> >>
>> >> Geert Uytterhoeven (9):
>> >>   ARM: mvebu: ix4-300d: Add compatible property to "partitions" node
>> >>   ARM: mvebu: kirkwood: Add compatible property to "partitions" node
>> >>   ARM: shmobile: bockw dts: Add compatible property to "partitions" node
>> >>   ARM: shmobile: lager dts: Add compatible property to "partitions" node
>> >>   ARM: shmobile: koelsch dts: Add compatible property to "partitions"
>> >>     node
>> >>   ARM: shmobile: porter dts: Add compatible property to "partitions"
>> >>     node
>> >>   ARM: shmobile: gose dts: Add compatible property to "partitions" node
>> >>   ARM: shmobile: silk dts: Add compatible property to "partitions" node
>> >
>> > Thanks, I have queued up the above "shmobile" patches for v4.6.
>> 
>> I'm afraid v4.6 is too late, leaving all SPI FLASHes broken in v4.5.
>
> Thanks. I'll re-queue them up as fixes for v4.5.

I thought you planned to directly apply them for v4.5 but I did not see
them in the for-next branch of arm-soc. So as Simon I will submit them
as fix for 4.5.

Gregory


-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com