From patchwork Mon May 11 14:12:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 48303 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 05C6821550 for ; Mon, 11 May 2015 14:13:11 +0000 (UTC) Received: by wizk4 with SMTP id k4sf26271048wiz.2 for ; Mon, 11 May 2015 07:13:10 -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:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=r0oTP17R6qUH8cpQY/8g5NP4SII/nJSLrPgI0YhOQKA=; b=TVrwRclC7SlkEZT7pJbvSeeBStdVCLwbDvePe+4OCDXnpzBrpBuwdZWfWw/cP/lHGY aY/Tyv6ZjtCjLjHzQtWbk3DHlU3cS9TFNlxCkWLfDK2hMZzXRr2uYls5lOnVLLat9EEq MD4NBrn87gnhfMBIRfW7ne9+DXvRXkpi72CDEPlypdFEi+SZ8YJTlrv6ckpjFmwbfV3f OJf2sqjP3pkAG9d/Li5oTSbsLJYSrcD0f4b8feouseQnapahFtE94tAXKzjVUqRHz9AL 5j81dM5jGQF7Ut+Tb5PARjxcpoENmgbIEsSf65s3YksIIphCJQHs7bh1PYXSELfdiaGJ XFDw== X-Gm-Message-State: ALoCoQlQSu5Ca2xrpW7ZKD48dP4quFuDcxj0vCq0KZPN4vMumTqNiTLewQtHo0let1Tnij+bkeql X-Received: by 10.152.43.116 with SMTP id v20mr7596758lal.3.1431353590293; Mon, 11 May 2015 07:13:10 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.6.100 with SMTP id z4ls536236laz.57.gmail; Mon, 11 May 2015 07:13:10 -0700 (PDT) X-Received: by 10.112.72.104 with SMTP id c8mr8402020lbv.77.1431353590122; Mon, 11 May 2015 07:13:10 -0700 (PDT) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id qh5si8439216lbb.28.2015.05.11.07.13.10 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 May 2015 07:13:10 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by laat2 with SMTP id t2so94124439laa.1 for ; Mon, 11 May 2015 07:13:10 -0700 (PDT) X-Received: by 10.112.150.100 with SMTP id uh4mr8065232lbb.112.1431353589919; Mon, 11 May 2015 07:13:09 -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.112.108.230 with SMTP id hn6csp1530080lbb; Mon, 11 May 2015 07:13:08 -0700 (PDT) X-Received: by 10.66.185.168 with SMTP id fd8mr19418218pac.27.1431353588171; Mon, 11 May 2015 07:13:08 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id yf4si18035404pbc.185.2015.05.11.07.13.07; Mon, 11 May 2015 07:13:08 -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 S1754461AbbEKONB (ORCPT + 28 others); Mon, 11 May 2015 10:13:01 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:33359 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753361AbbEKOM7 (ORCPT ); Mon, 11 May 2015 10:12:59 -0400 Received: by wief7 with SMTP id f7so87296248wie.0 for ; Mon, 11 May 2015 07:12:58 -0700 (PDT) X-Received: by 10.180.78.135 with SMTP id b7mr19533459wix.65.1431353578625; Mon, 11 May 2015 07:12:58 -0700 (PDT) Received: from localhost.localdomain (host81-129-169-99.range81-129.btcentralplus.com. [81.129.169.99]) by mx.google.com with ESMTPSA id k9sm4354wia.6.2015.05.11.07.12.56 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 May 2015 07:12:57 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: kernel@stlinux.com, devicetree@vger.kernel.org, Lee Jones Subject: [PATCH] ARM: STi: DT: STih407: Re-order #include <*.dtsi> files Date: Mon, 11 May 2015 15:12:49 +0100 Message-Id: <1431353569-13291-1-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.9.1 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: lee.jones@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.215.52 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: , This patch fixes a regression where serial is enabled by the first (board) DTSI, then disabled by the second (SoC) file. To enable serial and keep it enabled, we need to include the file which enables it last. Reported-by: LAVA [via Peter Griffin ] Signed-off-by: Lee Jones Acked-by: Peter Griffin --- arch/arm/boot/dts/stih407-b2120.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/stih407-b2120.dts b/arch/arm/boot/dts/stih407-b2120.dts index af48714..6d93475 100644 --- a/arch/arm/boot/dts/stih407-b2120.dts +++ b/arch/arm/boot/dts/stih407-b2120.dts @@ -7,8 +7,8 @@ * published by the Free Software Foundation. */ /dts-v1/; -#include "stihxxx-b2120.dtsi" #include "stih407.dtsi" +#include "stihxxx-b2120.dtsi" / { model = "STiH407 B2120"; compatible = "st,stih407-b2120", "st,stih407";