From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: [PATCH 3.14 111/228] arm: dts: Fix missing device_type="memory" for ste-ccu8540 Date: Wed, 4 Jun 2014 16:22:20 -0700 Message-ID: <20140604232351.618108720@linuxfoundation.org> References: <20140604232347.966798903@linuxfoundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20140604232347.966798903@linuxfoundation.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: linux-kernel@vger.kernel.org Cc: Mark Rutland , devicetree@vger.kernel.org, Greg Kroah-Hartman , Linus Walleij , Leif Lindholm , stable@vger.kernel.org, Grant Likely , Lee Jones , linux-arm-kernel@lists.infradead.org List-Id: devicetree@vger.kernel.org 3.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Leif Lindholm commit bfaed5abad998bfc88a66e6e71c7b08dcf82f04e upstream. The current .dts for ste-ccu8540 lacks a 'device_type = "memory"' for its memory node, relying on an old ppc quirk in order to discover its memory. Fix the data so that all parsing code can handle it correctly. Signed-off-by: Leif Lindholm Acked-by: Lee Jones Acked-by: Linus Walleij Cc: linux-arm-kernel@lists.infradead.org Cc: devicetree@vger.kernel.org Cc: Mark Rutland Signed-off-by: Grant Likely Signed-off-by: Greg Kroah-Hartman --- arch/arm/boot/dts/ste-ccu8540.dts | 1 + 1 file changed, 1 insertion(+) --- a/arch/arm/boot/dts/ste-ccu8540.dts +++ b/arch/arm/boot/dts/ste-ccu8540.dts @@ -18,6 +18,7 @@ compatible = "st-ericsson,ccu8540", "st-ericsson,u8540"; memory@0 { + device_type = "memory"; reg = <0x20000000 0x1f000000>, <0xc0000000 0x3f000000>; };