diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-10-30 10:55:12 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-30 10:55:12 -0400 |
| commit | da984d754069818090511fc3b36ea2f9a0b538b5 (patch) | |
| tree | 2042448aac1ada99850430d35ba659a177f87ba0 | |
| parent | 36a247ba728b68383e53b4cf11111801ec3ceecd (diff) | |
| parent | cda80a82ac3e89309706c027ada6ab232be1d640 (diff) | |
Merge tag 'mvebu-fixes-4.14-3' of git://git.infradead.org/linux-mvebu into fixes
Pull "mvebu fixes for 4.14 (part 3)" from Gregory CLEMENT:
Fixing an old stability issue on Cortex A9 based mvebu SoC
* tag 'mvebu-fixes-4.14-3' of git://git.infradead.org/linux-mvebu:
ARM: dts: mvebu: pl310-cache disable double-linefill
| -rw-r--r-- | arch/arm/boot/dts/armada-375.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-38x.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-39x.dtsi | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/armada-375.dtsi b/arch/arm/boot/dts/armada-375.dtsi index 7225c7ce9a8d..2cb1bcd30976 100644 --- a/arch/arm/boot/dts/armada-375.dtsi +++ b/arch/arm/boot/dts/armada-375.dtsi | |||
| @@ -178,9 +178,9 @@ | |||
| 178 | reg = <0x8000 0x1000>; | 178 | reg = <0x8000 0x1000>; |
| 179 | cache-unified; | 179 | cache-unified; |
| 180 | cache-level = <2>; | 180 | cache-level = <2>; |
| 181 | arm,double-linefill-incr = <1>; | 181 | arm,double-linefill-incr = <0>; |
| 182 | arm,double-linefill-wrap = <0>; | 182 | arm,double-linefill-wrap = <0>; |
| 183 | arm,double-linefill = <1>; | 183 | arm,double-linefill = <0>; |
| 184 | prefetch-data = <1>; | 184 | prefetch-data = <1>; |
| 185 | }; | 185 | }; |
| 186 | 186 | ||
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi index 4960722aab32..00ff549d4e39 100644 --- a/arch/arm/boot/dts/armada-38x.dtsi +++ b/arch/arm/boot/dts/armada-38x.dtsi | |||
| @@ -143,9 +143,9 @@ | |||
| 143 | reg = <0x8000 0x1000>; | 143 | reg = <0x8000 0x1000>; |
| 144 | cache-unified; | 144 | cache-unified; |
| 145 | cache-level = <2>; | 145 | cache-level = <2>; |
| 146 | arm,double-linefill-incr = <1>; | 146 | arm,double-linefill-incr = <0>; |
| 147 | arm,double-linefill-wrap = <0>; | 147 | arm,double-linefill-wrap = <0>; |
| 148 | arm,double-linefill = <1>; | 148 | arm,double-linefill = <0>; |
| 149 | prefetch-data = <1>; | 149 | prefetch-data = <1>; |
| 150 | }; | 150 | }; |
| 151 | 151 | ||
diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi index ea657071e278..5218bd2a248d 100644 --- a/arch/arm/boot/dts/armada-39x.dtsi +++ b/arch/arm/boot/dts/armada-39x.dtsi | |||
| @@ -111,9 +111,9 @@ | |||
| 111 | reg = <0x8000 0x1000>; | 111 | reg = <0x8000 0x1000>; |
| 112 | cache-unified; | 112 | cache-unified; |
| 113 | cache-level = <2>; | 113 | cache-level = <2>; |
| 114 | arm,double-linefill-incr = <1>; | 114 | arm,double-linefill-incr = <0>; |
| 115 | arm,double-linefill-wrap = <0>; | 115 | arm,double-linefill-wrap = <0>; |
| 116 | arm,double-linefill = <1>; | 116 | arm,double-linefill = <0>; |
| 117 | prefetch-data = <1>; | 117 | prefetch-data = <1>; |
| 118 | }; | 118 | }; |
| 119 | 119 | ||