From patchwork Thu Aug 28 20:45:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 36262 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f69.google.com (mail-qa0-f69.google.com [209.85.216.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EAFE6202DD for ; Thu, 28 Aug 2014 20:45:39 +0000 (UTC) Received: by mail-qa0-f69.google.com with SMTP id v10sf5468139qac.8 for ; Thu, 28 Aug 2014 13:45:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :mime-version:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe:content-type; bh=SFOzfvX4W50J9yILB4fCRprE6/7TIbW7VTFKjzSEjD4=; b=WEjF/lbYjqlJHd28DhK8eOZiuvxiudodAG+dr7l6zl179Yhtcv6pIKumdI5r2SaCjd 06Sg8zBH0t6zFa1AymnEeAfZUwqInSFWGSlBuO5vQ8tHRwAoDQ4qFenOls/QHekobA2x yUyAhEnUTnPTF6mVQRt6M5tSZMyA2Mh6le/WevZ0wuUPmbuVdvUfqq9bUYprBSNuUPFM /y9ohpxLyk90A3hyMir9c17t0Aj/3LM2YFMpz0gE7260DdG5yC78hbwtG4XFw2RDIFKT m3qJua7bvB1IzyeIIA7zXpbb/yjvl+jC7N8vdL/6jhg4ruhrPcTF0UHCfCNLdvY0y/S6 mAXg== X-Gm-Message-State: ALoCoQnxYxUll93xuPo1ClOaCx49mXuzeJfvt6W0LqydSG7xF5x7+2I5Z+3UhcH8W6XXmfb/E4U9 X-Received: by 10.236.23.230 with SMTP id v66mr1508685yhv.53.1409258738863; Thu, 28 Aug 2014 13:45:38 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.44.119 with SMTP id f110ls342182qga.96.gmail; Thu, 28 Aug 2014 13:45:38 -0700 (PDT) X-Received: by 10.52.102.204 with SMTP id fq12mr5351691vdb.26.1409258738783; Thu, 28 Aug 2014 13:45:38 -0700 (PDT) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id cd8si5146793vcb.83.2014.08.28.13.45.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 28 Aug 2014 13:45:38 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.182 as permitted sender) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id im17so1560518vcb.27 for ; Thu, 28 Aug 2014 13:45:38 -0700 (PDT) X-Received: by 10.52.73.202 with SMTP id n10mr3227573vdv.86.1409258738574; Thu, 28 Aug 2014 13:45:38 -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.45.67 with SMTP id uj3csp294419vcb; Thu, 28 Aug 2014 13:45:38 -0700 (PDT) X-Received: by 10.66.178.231 with SMTP id db7mr9477823pac.63.1409258737743; Thu, 28 Aug 2014 13:45:37 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gp10si8954378pbc.44.2014.08.28.13.45.37 for ; Thu, 28 Aug 2014 13:45:37 -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 S1751633AbaH1Upg (ORCPT + 6 others); Thu, 28 Aug 2014 16:45:36 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:34326 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751329AbaH1Upf (ORCPT ); Thu, 28 Aug 2014 16:45:35 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id s7SKj6sD005356; Thu, 28 Aug 2014 15:45:06 -0500 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s7SKj6j7001595; Thu, 28 Aug 2014 15:45:06 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.174.1; Thu, 28 Aug 2014 15:45:05 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s7SKj5nE014238; Thu, 28 Aug 2014 15:45:05 -0500 From: Nishanth Menon To: =?UTF-8?q?Beno=C3=AEt=20Cousson?= , Tony Lindgren CC: , , , , Nishanth Menon Subject: [PATCH] ARM: dts: omap4-panda: Fix model and SoC family details Date: Thu, 28 Aug 2014 15:45:03 -0500 Message-ID: <1409258703-21188-1-git-send-email-nm@ti.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 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: nm@ti.com 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.182 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: , Currently we claim that omap4-panda and omap4-panda-es are essentially the same, but they are not since PandaBoard-ES uses OMAP4460 and PandaBoard uses OMAP4430. So, split the common definition and make the model name available. Signed-off-by: Nishanth Menon --- Based on v3.17-rc2 Testing logs: (boot test): Before Patch(v3.17-rc2) 1: pandaboard-es: Boot PASS: http://slexy.org/raw/s209HfpVTs 2: pandaboard-vanilla: Boot PASS: http://slexy.org/raw/s21YNmOhQL After Patch 1: pandaboard-es: Boot PASS: http://slexy.org/raw/s20FH76BTn 2: pandaboard-vanilla: Boot PASS: http://slexy.org/raw/s2vFLcfkBu Note: 'ti,omap4-panda-es' is not documented in bindings, not entirely sure if we should be doing the same for every board compatibility. arch/arm/boot/dts/omap4-panda-common.dtsi | 3 --- arch/arm/boot/dts/omap4-panda-es.dts | 5 +++++ arch/arm/boot/dts/omap4-panda.dts | 5 +++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi index 8cfa3c8..1505135 100644 --- a/arch/arm/boot/dts/omap4-panda-common.dtsi +++ b/arch/arm/boot/dts/omap4-panda-common.dtsi @@ -8,9 +8,6 @@ #include "elpida_ecb240abacn.dtsi" / { - model = "TI OMAP4 PandaBoard"; - compatible = "ti,omap4-panda", "ti,omap4430", "ti,omap4"; - memory { device_type = "memory"; reg = <0x80000000 0x40000000>; /* 1 GB */ diff --git a/arch/arm/boot/dts/omap4-panda-es.dts b/arch/arm/boot/dts/omap4-panda-es.dts index 816d1c9..2f1dabc 100644 --- a/arch/arm/boot/dts/omap4-panda-es.dts +++ b/arch/arm/boot/dts/omap4-panda-es.dts @@ -10,6 +10,11 @@ #include "omap4460.dtsi" #include "omap4-panda-common.dtsi" +/ { + model = "TI OMAP4 PandaBoard-ES"; + compatible = "ti,omap4-panda-es", "ti,omap4-panda", "ti,omap4460", "ti,omap4430", "ti,omap4"; +}; + /* Audio routing is differnet between PandaBoard4430 and PandaBoardES */ &sound { ti,model = "PandaBoardES"; diff --git a/arch/arm/boot/dts/omap4-panda.dts b/arch/arm/boot/dts/omap4-panda.dts index 6189a8b..a0e28b2 100644 --- a/arch/arm/boot/dts/omap4-panda.dts +++ b/arch/arm/boot/dts/omap4-panda.dts @@ -9,3 +9,8 @@ #include "omap443x.dtsi" #include "omap4-panda-common.dtsi" + +/ { + model = "TI OMAP4 PandaBoard"; + compatible = "ti,omap4-panda", "ti,omap4430", "ti,omap4"; +};