diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-01-11 13:26:37 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-01-11 13:26:37 +0100 |
| commit | 4dd041b6f68ad942b843038e4ff6932c6571ccad (patch) | |
| tree | d949a0798ca030ea1bd0edf4ad452c8a1fcdcc16 | |
| parent | 0c6623e35992c08d0462504253c669363d3f7ccb (diff) | |
| parent | 8bc403b78ffb774d8dc944abb0826c46c0dca09d (diff) | |
Merge tag 'renesas-dt-fixes-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
Merge "Renesas ARM Based SoC DT Fixes for v4.5" from Simon Horman:
* Add compatible property to "partitions" node
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.
* tag 'renesas-dt-fixes-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: dts: silk: Add compatible property to "partitions" node
ARM: dts: gose: Add compatible property to "partitions" node
ARM: dts: porter: Add compatible property to "partitions" node
ARM: dts: koelsch: Add compatible property to "partitions" node
ARM: dts: lager: Add compatible property to "partitions" node
ARM: dts: bockw: Add compatible property to "partitions" node
| -rw-r--r-- | arch/arm/boot/dts/r8a7778-bockw.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/r8a7790-lager.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/r8a7791-koelsch.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/r8a7791-porter.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/r8a7793-gose.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/r8a7794-silk.dts | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/r8a7778-bockw.dts b/arch/arm/boot/dts/r8a7778-bockw.dts index b1aa02599229..a52b359e2ae2 100644 --- a/arch/arm/boot/dts/r8a7778-bockw.dts +++ b/arch/arm/boot/dts/r8a7778-bockw.dts @@ -199,6 +199,7 @@ m25p,fast-read; partitions { + compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts index 44ba69b974a2..052dcee4790d 100644 --- a/arch/arm/boot/dts/r8a7790-lager.dts +++ b/arch/arm/boot/dts/r8a7790-lager.dts @@ -449,6 +449,7 @@ m25p,fast-read; partitions { + compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts index c94a0fb807a2..45256f3cc835 100644 --- a/arch/arm/boot/dts/r8a7791-koelsch.dts +++ b/arch/arm/boot/dts/r8a7791-koelsch.dts @@ -489,6 +489,7 @@ m25p,fast-read; partitions { + compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; diff --git a/arch/arm/boot/dts/r8a7791-porter.dts b/arch/arm/boot/dts/r8a7791-porter.dts index 71ba7b6b3a33..6713b1ea732b 100644 --- a/arch/arm/boot/dts/r8a7791-porter.dts +++ b/arch/arm/boot/dts/r8a7791-porter.dts @@ -200,6 +200,7 @@ m25p,fast-read; partitions { + compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; diff --git a/arch/arm/boot/dts/r8a7793-gose.dts b/arch/arm/boot/dts/r8a7793-gose.dts index 3e3122490650..baa59fe84298 100644 --- a/arch/arm/boot/dts/r8a7793-gose.dts +++ b/arch/arm/boot/dts/r8a7793-gose.dts @@ -115,6 +115,7 @@ m25p,fast-read; partitions { + compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; diff --git a/arch/arm/boot/dts/r8a7794-silk.dts b/arch/arm/boot/dts/r8a7794-silk.dts index 5a8dcac37c8e..5153e3af25d9 100644 --- a/arch/arm/boot/dts/r8a7794-silk.dts +++ b/arch/arm/boot/dts/r8a7794-silk.dts @@ -204,6 +204,7 @@ m25p,fast-read; partitions { + compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; |