From patchwork Mon Jun 9 08:49:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 31536 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f197.google.com (mail-pd0-f197.google.com [209.85.192.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 26FA420675 for ; Mon, 9 Jun 2014 09:15:02 +0000 (UTC) Received: by mail-pd0-f197.google.com with SMTP id y10sf6984693pdj.8 for ; Mon, 09 Jun 2014 02:15:01 -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: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=z6wtwuBuXXnUKDJY6N1OMRiZtxALl2nOTbnTKaWiAek=; b=H6AJdYFNa/de7rwz8NGucSbewQAu46DISITALzULQA8ABZEI/u6aiCF962TxrLdogf cahXrRQ5Gn72C00BTwJ90k0QRjblTZmYp3cUB1NozzQIbOrtAOASRzdHGZiYxd/QNRgQ lWQpOprCllKXAqjn6TU4BuWA04YnzheEvZsAfFT6q33WJOIBvdLDEWjw3RDTsdix+bQt xoAbDgjNk6iwicJiQrKjrYDPS8gy4T+6cr3Azsg2YxPQQF6f7XLpLvhneCBNjlIeUR6P v/DL6Rdl3mQuSiD4bGRfbk7BeUy9pBEOhNAVk96qb5ZGv76lZjSc+bIdxdmksz2p4KtX bSsw== X-Gm-Message-State: ALoCoQnOYUs3CNJT63YMGtVaBoFqSd2wOWZ3eSLkM06hvParzWfkcRYULoSZyX6SQsO6dCXnkOw1 X-Received: by 10.66.137.2 with SMTP id qe2mr1574434pab.43.1402305301478; Mon, 09 Jun 2014 02:15:01 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.93.115 with SMTP id c106ls1531931qge.55.gmail; Mon, 09 Jun 2014 02:15:01 -0700 (PDT) X-Received: by 10.58.68.129 with SMTP id w1mr2194378vet.49.1402305301254; Mon, 09 Jun 2014 02:15:01 -0700 (PDT) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id kt17si2361727veb.84.2014.06.09.02.15.01 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 09 Jun 2014 02:15:01 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.175 as permitted sender) client-ip=209.85.128.175; Received: by mail-ve0-f175.google.com with SMTP id us18so4031924veb.34 for ; Mon, 09 Jun 2014 02:15:01 -0700 (PDT) X-Received: by 10.58.143.13 with SMTP id sa13mr23092764veb.44.1402305301150; Mon, 09 Jun 2014 02:15:01 -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 vs6csp127446vcb; Mon, 9 Jun 2014 02:15:00 -0700 (PDT) X-Received: by 10.66.137.109 with SMTP id qh13mr3211599pab.39.1402305300223; Mon, 09 Jun 2014 02:15:00 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id sg3si1664607pac.93.2014.06.09.02.14.59; Mon, 09 Jun 2014 02:14:59 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-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 S933859AbaFIJO5 (ORCPT + 27 others); Mon, 9 Jun 2014 05:14:57 -0400 Received: from ip4-83-240-18-248.cust.nbox.cz ([83.240.18.248]:58417 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754858AbaFIIvY (ORCPT ); Mon, 9 Jun 2014 04:51:24 -0400 Received: from ku by ip4-83-240-18-248.cust.nbox.cz with local (Exim 4.80.1) (envelope-from ) id 1WtvIX-0007be-Qt; Mon, 09 Jun 2014 10:51:21 +0200 From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Leif Lindholm , linux-mips@linux-mips.org, devicetree@vger.kernel.org, Mark Rutland , Grant Likely , Jiri Slaby Subject: [PATCH 3.12 013/146] mips: dts: Fix missing device_type="memory" property in memory nodes Date: Mon, 9 Jun 2014 10:49:08 +0200 Message-Id: <923aef0f16d9930bb275aa2fdbffdc732411ed2b.1402303820.git.jslaby@suse.cz> X-Mailer: git-send-email 1.9.3 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linux-kernel-owner@vger.kernel.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.175 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 3.12-stable review patch. If anyone has any objections, please let me 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>; };