From patchwork Tue Dec 17 01:12:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 3358041 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B5C17C0D4A for ; Tue, 17 Dec 2013 01:12:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E2B04202AE for ; Tue, 17 Dec 2013 01:12:44 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BB226200ED for ; Tue, 17 Dec 2013 01:12:43 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VsjDE-0001Ar-Bx; Tue, 17 Dec 2013 01:12:40 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VsjDB-0003fg-Nw; Tue, 17 Dec 2013 01:12:37 +0000 Received: from mail-pb0-f51.google.com ([209.85.160.51]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VsjD7-0003cy-52 for linux-arm-kernel@lists.infradead.org; Tue, 17 Dec 2013 01:12:34 +0000 Received: by mail-pb0-f51.google.com with SMTP id up15so6219694pbc.24 for ; Mon, 16 Dec 2013 17:12:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ILIJy7K/A2FDZXQzUS9pFkarozldOR/cbiYGRr4Tz6M=; b=lajbvLfTtiz5Ue01f2OaigDHMDswG34ml2ILdopwoHKnQfd6BW/XzqA7ne+9RpvJKi IYCiCzPVx/Z5vI/M0Q2ABhRMZNz9Rlozx5B0RE2UeXkx7R9I23QPJ88kAwMwVXh0lbqm SBRQoDOI6q/oPJtNQ0Ki6kvHdwfQ/0s37EEhVZFHly6T+rOgUr3M1gZ24jLDP0QkkpoF Bj32urhQ/lckpaMYubKXskm8GwQsQXUYCjV35iotdFT4RPkzjpS1jXaXgPck7tIjU1Wr dlhfWjRFqCS9h8/r69OdiCQDfxBrU34Q3leAHcAjb2WQNmIcQPjpJaAYvLCa34nAQrcF gerw== X-Gm-Message-State: ALoCoQldu+8S2NmzaAGyIavkS6d59HbPT6y1GesR5JAk2NKCzDcSisWCAljAxmfCzVJ0IgOKG4Os X-Received: by 10.68.106.130 with SMTP id gu2mr23531354pbb.59.1387242730479; Mon, 16 Dec 2013 17:12:10 -0800 (PST) Received: from officeserver-2 ([63.226.49.26]) by mx.google.com with ESMTPSA id bh6sm40541313pad.20.2013.12.16.17.12.07 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 16 Dec 2013 17:12:08 -0800 (PST) Received: from tkisky by officeserver-2 with local (Exim 4.80) (envelope-from ) id 1VsjDd-0000OQ-S6; Mon, 16 Dec 2013 18:13:05 -0700 From: Troy Kisky To: shawn.guo@linaro.org Subject: [PATCH V2 01/13] ARM: dts: imx6qdl-sabrelite: move pcie to imx6qdl-sabrelite.dtsi Date: Mon, 16 Dec 2013 18:12:51 -0700 Message-Id: <1387242783-1462-2-git-send-email-troy.kisky@boundarydevices.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1387242783-1462-1-git-send-email-troy.kisky@boundarydevices.com> References: <1387242783-1462-1-git-send-email-troy.kisky@boundarydevices.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131216_201233_337983_D890EAA0 X-CRM114-Status: GOOD ( 10.03 ) X-Spam-Score: -2.6 (--) Cc: marex@denx.de, eric.nelson@boundarydevices.com, festevam@gmail.com, linux-arm-kernel@lists.infradead.org, Troy Kisky X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP PCIe is common to Quad, Dual, Dual Lite, and Solo variants of the processor. So, move enabling from imx6q-sabrelite.dts to imx6qdl-sabrelite.dtsi. Signed-off-by: Troy Kisky --- v2: new patch which can be squashed with 6bbb49ddfa8466a91a2ce1411a2ac969d0d0a614 ARM: dts: imx: sabrelite: add Dual Lite/Solo support if desired. --- arch/arm/boot/dts/imx6q-sabrelite.dts | 4 ---- arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/imx6q-sabrelite.dts b/arch/arm/boot/dts/imx6q-sabrelite.dts index 8128fb9..96e4688 100644 --- a/arch/arm/boot/dts/imx6q-sabrelite.dts +++ b/arch/arm/boot/dts/imx6q-sabrelite.dts @@ -19,10 +19,6 @@ compatible = "fsl,imx6q-sabrelite", "fsl,imx6q"; }; -&pcie { - status = "okay"; -}; - &sata { status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi index c4aa504..5394e02 100644 --- a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi @@ -187,6 +187,10 @@ }; }; +&pcie { + status = "okay"; +}; + &ssi1 { fsl,mode = "i2s-slave"; status = "okay";