From patchwork Fri Jun 6 12:49:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 31485 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f72.google.com (mail-oa0-f72.google.com [209.85.219.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 971C8202DA for ; Fri, 6 Jun 2014 12:51:50 +0000 (UTC) Received: by mail-oa0-f72.google.com with SMTP id l6sf12577719oag.7 for ; Fri, 06 Jun 2014 05:51:50 -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=1K/ZtkClqEAtyRlCmmj2v3INjoDJ1wokB+yPdpBYQbs=; b=kYMXSFoQqJxTMQSsYcCDIoc10EJXCGWe7XTPhMCDgcj5UrcbalmWhdR0RMYoRx+v1U OtJdI8sShy/sOVuJfoGl9+lm2ZvhRhnCWCAb9h1zlhMgmox/6JWEwpsu4pSoJFXYrW5V nGSHWcFpDaln3k4gpxX2w2n3ff8rKxC9zNcnGaH4HzF3Q+/GEYMO8BAiQNZh3FCjQxwP DbvtEG6tTPhcvCmTis8pdQ/rCDADLXk8NDLwFwW3cSkdSZAnSBVjUGWeeSrL+PeBsRQ1 K0Okp0i8uFcngb7Sy8L2fLo1/sSsBLNqh033xHZ6o6waoyYSOdEAjv1yPbJWi1LeXU4p T+Nw== X-Gm-Message-State: ALoCoQn4PzkoijTmLAf4G2bwAcPfJlbjlM4Cr+890gCGfgeQKgXLwkBpoKDbd+JRW9aDTsLmeFfk X-Received: by 10.182.24.104 with SMTP id t8mr2453349obf.34.1402059110147; Fri, 06 Jun 2014 05:51:50 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.50.143 with SMTP id s15ls681573qga.33.gmail; Fri, 06 Jun 2014 05:51:50 -0700 (PDT) X-Received: by 10.220.123.201 with SMTP id q9mr2405537vcr.77.1402059110040; Fri, 06 Jun 2014 05:51:50 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id ky16si6155944vdb.106.2014.06.06.05.51.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 06 Jun 2014 05:51:50 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 as permitted sender) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id la4so2918618vcb.28 for ; Fri, 06 Jun 2014 05:51:49 -0700 (PDT) X-Received: by 10.53.10.234 with SMTP id ed10mr3346870vdd.86.1402059109925; Fri, 06 Jun 2014 05:51:49 -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 vs6csp97486vcb; Fri, 6 Jun 2014 05:51:49 -0700 (PDT) X-Received: by 10.69.25.69 with SMTP id io5mr690763pbd.22.1402059108769; Fri, 06 Jun 2014 05:51:48 -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.51.48; Fri, 06 Jun 2014 05:51:48 -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 S1751434AbaFFMvo (ORCPT + 8 others); Fri, 6 Jun 2014 08:51:44 -0400 Received: from ip4-83-240-18-248.cust.nbox.cz ([83.240.18.248]:52011 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751936AbaFFMvd (ORCPT ); Fri, 6 Jun 2014 08:51:33 -0400 Received: from ku by ip4-83-240-18-248.cust.nbox.cz with local (Exim 4.80.1) (envelope-from ) id 1WstcJ-0008C9-6b; Fri, 06 Jun 2014 14:51:31 +0200 From: Jiri Slaby To: stable@vger.kernel.org Cc: Leif Lindholm , linux-mips@linux-mips.org, devicetree@vger.kernel.org, Mark Rutland , Grant Likely , Jiri Slaby Subject: [patch added to the 3.12 stable tree] mips: dts: Fix missing device_type="memory" property in memory nodes Date: Fri, 6 Jun 2014 14:49:17 +0200 Message-Id: <1402059090-31277-13-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.220.169 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 dfc44f8030653b345fc6fb337558c3a07536823f upstream. A few platforms lack a 'device_type = "memory"' for their memory nodes, relying on an old ppc quirk in order to discover its memory. Add the missing data so that all parsing code can find memory nodes correctly. Signed-off-by: Leif Lindholm Cc: linux-mips@linux-mips.org Cc: devicetree@vger.kernel.org Cc: Mark Rutland Acked-by: John Crispin Signed-off-by: Grant Likely Signed-off-by: Jiri Slaby --- arch/mips/lantiq/dts/easy50712.dts | 1 + arch/mips/ralink/dts/mt7620a_eval.dts | 1 + arch/mips/ralink/dts/rt2880_eval.dts | 1 + arch/mips/ralink/dts/rt3052_eval.dts | 1 + arch/mips/ralink/dts/rt3883_eval.dts | 1 + 5 files changed, 5 insertions(+) diff --git a/arch/mips/lantiq/dts/easy50712.dts b/arch/mips/lantiq/dts/easy50712.dts index fac1f5b178eb..143b8a37b5e4 100644 --- a/arch/mips/lantiq/dts/easy50712.dts +++ b/arch/mips/lantiq/dts/easy50712.dts @@ -8,6 +8,7 @@ }; memory@0 { + device_type = "memory"; reg = <0x0 0x2000000>; }; diff --git a/arch/mips/ralink/dts/mt7620a_eval.dts b/arch/mips/ralink/dts/mt7620a_eval.dts index 35eb874ab7f1..709f58132f5c 100644 --- a/arch/mips/ralink/dts/mt7620a_eval.dts +++ b/arch/mips/ralink/dts/mt7620a_eval.dts @@ -7,6 +7,7 @@ model = "Ralink MT7620A evaluation board"; memory@0 { + device_type = "memory"; reg = <0x0 0x2000000>; }; diff --git a/arch/mips/ralink/dts/rt2880_eval.dts b/arch/mips/ralink/dts/rt2880_eval.dts index 322d7002595b..0a685db093d4 100644 --- a/arch/mips/ralink/dts/rt2880_eval.dts +++ b/arch/mips/ralink/dts/rt2880_eval.dts @@ -7,6 +7,7 @@ model = "Ralink RT2880 evaluation board"; memory@0 { + device_type = "memory"; reg = <0x8000000 0x2000000>; }; diff --git a/arch/mips/ralink/dts/rt3052_eval.dts b/arch/mips/ralink/dts/rt3052_eval.dts index 0ac73ea28198..ec9e9a035541 100644 --- a/arch/mips/ralink/dts/rt3052_eval.dts +++ b/arch/mips/ralink/dts/rt3052_eval.dts @@ -7,6 +7,7 @@ model = "Ralink RT3052 evaluation board"; memory@0 { + device_type = "memory"; reg = <0x0 0x2000000>; }; diff --git a/arch/mips/ralink/dts/rt3883_eval.dts b/arch/mips/ralink/dts/rt3883_eval.dts index 2fa6b330bf4f..e8df21a5d10d 100644 --- a/arch/mips/ralink/dts/rt3883_eval.dts +++ b/arch/mips/ralink/dts/rt3883_eval.dts @@ -7,6 +7,7 @@ model = "Ralink RT3883 evaluation board"; memory@0 { + device_type = "memory"; reg = <0x0 0x2000000>; };