From patchwork Tue May 20 09:46:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime COQUELIN X-Patchwork-Id: 30411 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f199.google.com (mail-ob0-f199.google.com [209.85.214.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B92C8202FE for ; Tue, 20 May 2014 09:48:01 +0000 (UTC) Received: by mail-ob0-f199.google.com with SMTP id wm4sf840757obc.6 for ; Tue, 20 May 2014 02:48: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:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=EH0E0klpUPsNq4D+7MesCR507gc4xtXLQNFpvkIuvMc=; b=iD3A8kPRUJ9+bEYcNtqU6GBu1zcNRz/NYxEh0WDg23ImJXJO8L5OCp+cNyDKcOFd2x lNQS1zbbFGBXM6ktgMkas+fmT8Wun6Rda/tMmCrZCtoTNKYUZPdxrYD6dJ9g0QgMzRaq kW32Ar2/rEe+H1DPKcCFF3JzwQTvGo1P+DMnOx7i3SxdagaJjTLgQnfsll9tzyLPmew8 dkdFbncidZ1Q75HKwVvWrzEcxfh/buIT0BRe6m0oO5sPfWdwj5ycW6RHfZ7BFBPGBfbU L2cGqFvnc5PA3Uyq7Ctls7rFn19uuwP8SV/KpfBqDVG7jVJ3PYWnM/e0BdbrJuK2B2Sl KQUA== X-Gm-Message-State: ALoCoQkd01g2eybE60btVFppTZGz/YPVyD3ax4QNFX4XUEMcBeKDH0ZeUcdIq2nn2wDkFtx/6jfR X-Received: by 10.42.6.71 with SMTP id 7mr13418538icz.25.1400579281335; Tue, 20 May 2014 02:48:01 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.48.112 with SMTP id n103ls169864qga.86.gmail; Tue, 20 May 2014 02:48:01 -0700 (PDT) X-Received: by 10.220.250.203 with SMTP id mp11mr2783044vcb.2.1400579281230; Tue, 20 May 2014 02:48:01 -0700 (PDT) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id o6si330811vcn.83.2014.05.20.02.48.01 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 20 May 2014 02:48:01 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 as permitted sender) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id ld13so258638vcb.26 for ; Tue, 20 May 2014 02:48:01 -0700 (PDT) X-Received: by 10.220.250.203 with SMTP id mp11mr2783039vcb.2.1400579281108; Tue, 20 May 2014 02:48: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.220.221.72 with SMTP id ib8csp16083vcb; Tue, 20 May 2014 02:48:00 -0700 (PDT) X-Received: by 10.66.163.164 with SMTP id yj4mr49444860pab.91.1400579280211; Tue, 20 May 2014 02:48:00 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cc3si23846151pad.47.2014.05.20.02.47.59; Tue, 20 May 2014 02:47:59 -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 S1751733AbaETJr6 (ORCPT + 8 others); Tue, 20 May 2014 05:47:58 -0400 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:60426 "EHLO mx08-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750714AbaETJrz (ORCPT ); Tue, 20 May 2014 05:47:55 -0400 Received: from pps.filterd (m0046661.ppops.net [127.0.0.1]) by mx08-00178001.pphosted.com (8.14.5/8.14.5) with SMTP id s4K99X3V031182; Tue, 20 May 2014 11:47:06 +0200 Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx08-00178001.pphosted.com with ESMTP id 1kyhx3wft7-1 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); Tue, 20 May 2014 11:47:05 +0200 Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 8D51167; Tue, 20 May 2014 09:46:46 +0000 (GMT) Received: from mail7.sgp.st.com (unknown [164.129.223.81]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 40C402CB56; Tue, 20 May 2014 09:46:46 +0000 (GMT) Received: from lmenx29l.st.com ([10.201.23.80]) by mail7.sgp.st.com (MOS 4.3.3-GA) with ESMTP id BZI34843 (AUTH lme00137); Tue, 20 May 2014 11:46:44 +0200 From: Maxime COQUELIN To: Olof Johansson , Rob Landley , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Russell King , Srinivas Kandagatla , Linus Walleij , Giuseppe Cavallaro , Maxime Coquelin , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@stlinux.com Cc: lee.jones@linaro.org Subject: [PATCH v6 2/4] ARM: dts: Fix STi boards compatibles Date: Tue, 20 May 2014 11:46:30 +0200 Message-Id: <1400579192-17620-3-git-send-email-maxime.coquelin@st.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1400579192-17620-1-git-send-email-maxime.coquelin@st.com> References: <1400579192-17620-1-git-send-email-maxime.coquelin@st.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.11.96, 1.0.14, 0.0.0000 definitions=2014-05-19_03:2014-05-19, 2014-05-19, 1970-01-01 signatures=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: maxime.coquelin@st.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.181 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: , The compatible strings have to be ordered from specific to generic. This patch fixes this for STi boards, which did the exact opposite. Cc: Olof Johansson Signed-off-by: Maxime Coquelin Acked-by: Lee Jones --- arch/arm/boot/dts/stih415-b2000.dts | 2 +- arch/arm/boot/dts/stih415-b2020.dts | 2 +- arch/arm/boot/dts/stih416-b2000.dts | 3 +-- arch/arm/boot/dts/stih416-b2020.dts | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/stih415-b2000.dts b/arch/arm/boot/dts/stih415-b2000.dts index d4af531..bdfbd37 100644 --- a/arch/arm/boot/dts/stih415-b2000.dts +++ b/arch/arm/boot/dts/stih415-b2000.dts @@ -11,5 +11,5 @@ #include "stih41x-b2000.dtsi" / { model = "STiH415 B2000 Board"; - compatible = "st,stih415", "st,stih415-b2000"; + compatible = "st,stih415-b2000", "st,stih415"; }; diff --git a/arch/arm/boot/dts/stih415-b2020.dts b/arch/arm/boot/dts/stih415-b2020.dts index 442b019..71903a8 100644 --- a/arch/arm/boot/dts/stih415-b2020.dts +++ b/arch/arm/boot/dts/stih415-b2020.dts @@ -11,5 +11,5 @@ #include "stih41x-b2020.dtsi" / { model = "STiH415 B2020 Board"; - compatible = "st,stih415", "st,stih415-b2020"; + compatible = "st,stih415-b2020", "st,stih415"; }; diff --git a/arch/arm/boot/dts/stih416-b2000.dts b/arch/arm/boot/dts/stih416-b2000.dts index a5eb6ee..488e80a 100644 --- a/arch/arm/boot/dts/stih416-b2000.dts +++ b/arch/arm/boot/dts/stih416-b2000.dts @@ -9,8 +9,7 @@ /dts-v1/; #include "stih416.dtsi" #include "stih41x-b2000.dtsi" - / { - compatible = "st,stih416", "st,stih416-b2000"; model = "STiH416 B2000"; + compatible = "st,stih416-b2000", "st,stih416"; }; diff --git a/arch/arm/boot/dts/stih416-b2020.dts b/arch/arm/boot/dts/stih416-b2020.dts index 276f28d..4e2df66 100644 --- a/arch/arm/boot/dts/stih416-b2020.dts +++ b/arch/arm/boot/dts/stih416-b2020.dts @@ -11,6 +11,5 @@ #include "stih41x-b2020.dtsi" / { model = "STiH416 B2020"; - compatible = "st,stih416", "st,stih416-b2020"; - + compatible = "st,stih416-b2020", "st,stih416"; };