From patchwork Fri Jun 6 12:50:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 31486 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f200.google.com (mail-ob0-f200.google.com [209.85.214.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AC0B9202DA for ; Fri, 6 Jun 2014 12:52:41 +0000 (UTC) Received: by mail-ob0-f200.google.com with SMTP id wo20sf12089197obc.7 for ; Fri, 06 Jun 2014 05:52:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=Wa2tXFQ6B4+GFyW/I3YDwfq+S3a2Bb+KcZB0oDtddzE=; b=Ss39UDzjZE3kuji0mSGGCcgSqAkak67czDsByz/IQk1sQ6b0v4omq3rX6VNSFNze7b FZOGat62DhROjvDvBZHPLdnURH4QfWn6lBB/IFUW68R7QPlt+IrMvCuOUPYogf+3Cxrd mUiEasBhS69mMHOOQKnSsqIcOtGJpoqhlgxasFUuIgy6uz7hu43CKE4zw4csIoT0FVVe 83eTojskrmt6wOGYtoM2EXnYQ+O+NFBdZj0ASY9svJg+bFI2Xm2QVd81HxELgV9iaxtU QHMauq7Di7tcP+WAWOyyaJqffq0U1Vhw5XU6pAy0n158barFLYVLGylbX5ZiLORsH36q RfIg== X-Gm-Message-State: ALoCoQlmHMx+drnqP8OlSSGENckZcjmwVle0yb1JHIZxWGJc9RuLQnu+fxtaQFnVdTHJMHxcB8QF X-Received: by 10.182.125.4 with SMTP id mm4mr2469247obb.49.1402059161329; Fri, 06 Jun 2014 05:52:41 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.29.225 with SMTP id b88ls653406qgb.32.gmail; Fri, 06 Jun 2014 05:52:41 -0700 (PDT) X-Received: by 10.58.29.76 with SMTP id i12mr2774227veh.67.1402059161206; Fri, 06 Jun 2014 05:52:41 -0700 (PDT) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id i5si4923662vcp.33.2014.06.06.05.52.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 06 Jun 2014 05:52:41 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.177 as permitted sender) client-ip=209.85.128.177; Received: by mail-ve0-f177.google.com with SMTP id db11so3047800veb.36 for ; Fri, 06 Jun 2014 05:52:41 -0700 (PDT) X-Received: by 10.58.2.74 with SMTP id 10mr3040290ves.61.1402059161069; Fri, 06 Jun 2014 05:52:41 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.54.6 with SMTP id vs6csp97527vcb; Fri, 6 Jun 2014 05:52:40 -0700 (PDT) X-Received: by 10.68.213.198 with SMTP id nu6mr697878pbc.21.1402059160137; Fri, 06 Jun 2014 05:52:40 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gn5si19290062pbb.200.2014.06.06.05.52.39; Fri, 06 Jun 2014 05:52:39 -0700 (PDT) Received-SPF: none (google.com: devicetree-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752184AbaFFMw3 (ORCPT + 8 others); Fri, 6 Jun 2014 08:52:29 -0400 Received: from ip4-83-240-18-248.cust.nbox.cz ([83.240.18.248]:52190 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752144AbaFFMvj (ORCPT ); Fri, 6 Jun 2014 08:51:39 -0400 Received: from ku by ip4-83-240-18-248.cust.nbox.cz with local (Exim 4.80.1) (envelope-from ) id 1WstcQ-0008N3-DC; Fri, 06 Jun 2014 14:51:38 +0200 From: Jiri Slaby To: stable@vger.kernel.org Cc: Leif Lindholm , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Mark Rutland , Grant Likely , Jiri Slaby Subject: [patch added to the 3.12 stable tree] arm: dts: Fix missing device_type="memory" for ste-ccu8540 Date: Fri, 6 Jun 2014 14:50:19 +0200 Message-Id: <1402059090-31277-75-git-send-email-jslaby@suse.cz> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1402059090-31277-1-git-send-email-jslaby@suse.cz> References: <1402059090-31277-1-git-send-email-jslaby@suse.cz> Sender: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Leif Lindholm This patch has been added to the 3.12 stable tree. If you have any objections, please let us know. =============== 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: Jiri Slaby --- arch/arm/boot/dts/ste-ccu8540.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/boot/dts/ste-ccu8540.dts b/arch/arm/boot/dts/ste-ccu8540.dts index 7f3baf51a3a9..32dd55e5f4e6 100644 --- 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>; };