From: Linus Walleij Date: Tue, 26 Jan 2016 10:42:25 +0000 (+0100) Subject: ARM: realview: fix up PB11MP flash compat strings X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=1f138b18936d406361591a77903386c6d940a91a;p=deliverable%2Flinux.git ARM: realview: fix up PB11MP flash compat strings The two flash memories in the PB11MPCore have their VPP/WP lines controlled from the system controller add-on in the MTD subsystem. "arm,versatile-flash" is the first compatible string to use to get the right support. Cc: Arnd Bergmann Signed-off-by: Linus Walleij --- diff --git a/arch/arm/boot/dts/arm-realview-pb11mp.dts b/arch/arm/boot/dts/arm-realview-pb11mp.dts index da755c9851a7..63d6a051839f 100644 --- a/arch/arm/boot/dts/arm-realview-pb11mp.dts +++ b/arch/arm/boot/dts/arm-realview-pb11mp.dts @@ -230,14 +230,14 @@ flash0@40000000 { /* 2 * 32MiB NOR Flash memory */ - compatible = "arm,vexpress-flash", "cfi-flash"; + compatible = "arm,versatile-flash", "cfi-flash"; reg = <0x40000000 0x04000000>; bank-width = <4>; }; flash1@44000000 { // 2 * 32MiB NOR Flash memory - compatible = "arm,vexpress-flash", "cfi-flash"; + compatible = "arm,versatile-flash", "cfi-flash"; reg = <0x44000000 0x04000000>; bank-width = <4>; };