diff options
| author | Arnd Bergmann | 2017-07-03 14:09:06 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2017-07-03 14:09:06 +0200 |
| commit | ff9e0e3b091291a6694c52074940c5fabd693467 (patch) | |
| tree | cf70ec1e024df522f48a94556f82337390ff31f5 /arch/arm | |
| parent | 0281bafa39198be39283543c90e490545901e1a5 (diff) | |
| parent | 4fcee14d3802b60f22baf1aeab9f1cff08834c56 (diff) | |
Merge tag 'mvebu-fixes-4.12-2' of git://git.infradead.org/linux-mvebu into next/fixes-non-critical
mvebu fixes for 4.12 (part 2)
Fix Openblock A6 (kirkwood base board) nand partition overlap
* tag 'mvebu-fixes-4.12-2' of git://git.infradead.org/linux-mvebu:
ARM: dts: kirkwood: Fix Openblock A6 nand partition overlap
arm64: marvell: dts: fix interrupts in 7k/8k crypto nodes
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts index 94e49f32d5f9..c75da5f0ca48 100644 --- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts +++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts @@ -141,7 +141,7 @@ partition@d4000 { label = "test"; - reg = <0xd4000 0x24000>; + reg = <0xd4000 0x20000>; }; partition@f4000 { |