From patchwork Wed Sep 3 16:03:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 36613 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f72.google.com (mail-pa0-f72.google.com [209.85.220.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 489272039B for ; Wed, 3 Sep 2014 16:04:39 +0000 (UTC) Received: by mail-pa0-f72.google.com with SMTP id eu11sf84919098pac.11 for ; Wed, 03 Sep 2014 09:04: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=4Zt8HppusYCEbroEpIA1ZujQvywSKbYe4ASFF0Q+pYY=; b=KUJRPYFXVGECZIdo+sKX+gJ85Q8JBcGbGBtzJS/hZxKMy8c9djVhCW6hxp6Gm+Aq0e 85fHg46cBA7oJvtmPe6AXj/Hm0+KO5EZLDNz/50UnHH10VwPSK9QCIUW8+y9TY+O0y73 E1ubA6HoOYU202KlT0mO0Z7jUnC0eVcF00k411i9IRGPKQRz2r0oGXeaIEHbD9ok6T0y ylX3zLscxRhwj4ONxBfEG4PHxEakomtbe//T1qUPw/Qq4G4coumI5bp0XC8wXqv+j53p kDRheVVnJrPQCKy2gi4ZqmERXy1B0F78m2qja0wFaVOgZeFhqLJCJ230VJBlfbFZYWxQ pU/Q== X-Gm-Message-State: ALoCoQmp5y/ZcGWhZ1LdF6WK1N6ygAeVQ1LjM5HpuEvd/ywmoj4kn+3Jt5BinH6Au88ow+47JixC X-Received: by 10.70.40.172 with SMTP id y12mr11576920pdk.8.1409760276646; Wed, 03 Sep 2014 09:04:36 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.89.231 with SMTP id v94ls2855059qgd.14.gmail; Wed, 03 Sep 2014 09:04:36 -0700 (PDT) X-Received: by 10.220.105.201 with SMTP id u9mr36054420vco.11.1409760276413; Wed, 03 Sep 2014 09:04:36 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id n3si3869955vcj.92.2014.09.03.09.04.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 03 Sep 2014 09:04:36 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.179 as permitted sender) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id hy4so8897871vcb.24 for ; Wed, 03 Sep 2014 09:04:36 -0700 (PDT) X-Received: by 10.220.77.65 with SMTP id f1mr1290391vck.48.1409760276015; Wed, 03 Sep 2014 09:04:36 -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 uj3csp703177vcb; Wed, 3 Sep 2014 09:04:35 -0700 (PDT) X-Received: by 10.220.168.210 with SMTP id v18mr35971472vcy.3.1409760275683; Wed, 03 Sep 2014 09:04:35 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id do5si11972018pbb.112.2014.09.03.09.04.30 for ; Wed, 03 Sep 2014 09:04:30 -0700 (PDT) Received-SPF: none (google.com: linux-omap-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 S932778AbaICQDk (ORCPT + 5 others); Wed, 3 Sep 2014 12:03:40 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:53643 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932547AbaICQDi (ORCPT ); Wed, 3 Sep 2014 12:03:38 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id s83G3CFs029152; Wed, 3 Sep 2014 11:03:12 -0500 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s83G3CJ4031563; Wed, 3 Sep 2014 11:03:12 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.174.1; Wed, 3 Sep 2014 11:03:11 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s83G3CbW010730; Wed, 3 Sep 2014 11:03:12 -0500 From: Nishanth Menon To: =?UTF-8?q?Beno=C3=AEt=20Cousson?= , Tony Lindgren CC: Tom Rini , , , , , Nishanth Menon Subject: [PATCH] ARM: dts: am335x-bone*: Fix model name and update compatibility information Date: Wed, 3 Sep 2014 11:03:10 -0500 Message-ID: <1409760190-17275-1-git-send-email-nm@ti.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-omap@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.179 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: , Beaglebone white and beaglebone black differ in tiny little aspects. This is the reason why we maintain seperate dts for these platforms. However, there is no real way to decode from dtb which platform it is since compatible and model name are the same for both platforms. Fix this so that beaglebone black and beaglebone are identifiable, while maintaining compatibility for older zImages which might use old beaglebone compatible flag for black as well. Reported-by: Tom Rini Signed-off-by: Nishanth Menon --- Based on v3.17-rc1: Before: beaglebone-black: Boot PASS: http://paste.ubuntu.org.cn/1473558 beaglebone: Boot PASS: http://paste.ubuntu.org.cn/1473559 After: beaglebone-black: Boot PASS: http://paste.ubuntu.org.cn/1473480 beaglebone: Boot PASS: http://paste.ubuntu.org.cn/1473481 Side notes: Sorry, new IT policies, new paste website needed :( arch/arm/boot/dts/am335x-bone-common.dtsi | 3 --- arch/arm/boot/dts/am335x-bone.dts | 5 +++++ arch/arm/boot/dts/am335x-boneblack.dts | 5 +++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi index bde1777..d9d9869 100644 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi @@ -7,9 +7,6 @@ */ / { - model = "TI AM335x BeagleBone"; - compatible = "ti,am335x-bone", "ti,am33xx"; - cpus { cpu@0 { cpu0-supply = <&dcdc2_reg>; diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts index 94ee427..83d40f7 100644 --- a/arch/arm/boot/dts/am335x-bone.dts +++ b/arch/arm/boot/dts/am335x-bone.dts @@ -10,6 +10,11 @@ #include "am33xx.dtsi" #include "am335x-bone-common.dtsi" +/ { + model = "TI AM335x BeagleBone"; + compatible = "ti,am335x-bone", "ti,am33xx"; +}; + &ldo3_reg { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts index 305975d..901739f 100644 --- a/arch/arm/boot/dts/am335x-boneblack.dts +++ b/arch/arm/boot/dts/am335x-boneblack.dts @@ -10,6 +10,11 @@ #include "am33xx.dtsi" #include "am335x-bone-common.dtsi" +/ { + model = "TI AM335x BeagleBone Black"; + compatible = "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx"; +}; + &ldo3_reg { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>;