From patchwork Thu Sep 12 16:37:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kumar Gala X-Patchwork-Id: 2879131 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 61B729F1C0 for ; Thu, 12 Sep 2013 16:37:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 352A920342 for ; Thu, 12 Sep 2013 16:37:52 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0157A20320 for ; Thu, 12 Sep 2013 16:37:51 +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 1VK9ts-0003Ep-IU; Thu, 12 Sep 2013 16:37:48 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VK9tq-0007Eo-By; Thu, 12 Sep 2013 16:37:46 +0000 Received: from smtp.codeaurora.org ([198.145.11.231]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VK9to-0007Dx-RA for linux-arm-kernel@lists.infradead.org; Thu, 12 Sep 2013 16:37:45 +0000 Received: from smtp.codeaurora.org (localhost [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id 249FD13EED2; Thu, 12 Sep 2013 16:37:24 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 486) id 134A913F00C; Thu, 12 Sep 2013 16:37:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from kgala-ubuntu.qualcomm.com (rrcs-67-52-129-61.west.biz.rr.com [67.52.129.61]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: galak@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id E97B213EED2; Thu, 12 Sep 2013 16:37:22 +0000 (UTC) From: Kumar Gala To: davidb@codeaurora.org, Rob Herring , Pawel Moll , Mark Rutland , Stephen Warren , Ian Campbell , Russell King , olof@lixom.net Subject: [PATCH] ARM: msm: Move msm devicetrees under a Qualcomm dir Date: Thu, 12 Sep 2013 11:37:19 -0500 Message-Id: <1379003839-16068-1-git-send-email-galak@codeaurora.org> X-Mailer: git-send-email 1.8.2.1 X-Virus-Scanned: ClamAV using ClamSMTP X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130912_123744_967673_85D8A6B3 X-CRM114-Status: GOOD ( 12.86 ) X-Spam-Score: -2.8 (--) Cc: devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Kumar Gala 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-Virus-Scanned: ClamAV using ClamSMTP Use the Qualcomm vendor prefix (qcom) as the directory name for Qualcomm MSM devicetrees going forward. Signed-off-by: Kumar Gala --- arch/arm/boot/dts/Makefile | 4 ++-- arch/arm/boot/dts/{ => qcom}/msm8660-surf.dts | 2 +- arch/arm/boot/dts/{ => qcom}/msm8960-cdp.dts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename arch/arm/boot/dts/{ => qcom}/msm8660-surf.dts (97%) rename arch/arm/boot/dts/{ => qcom}/msm8960-cdp.dts (97%) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index cc0f1fb..d784ba0 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -101,8 +101,8 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \ kirkwood-ts219-6282.dtb \ kirkwood-openblocks_a6.dtb dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb -dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \ - msm8960-cdp.dtb +dtb-$(CONFIG_ARCH_MSM) += qcom/msm8660-surf.dtb \ + qcom/msm8960-cdp.dtb dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \ armada-370-mirabox.dtb \ armada-370-netgear-rn102.dtb \ diff --git a/arch/arm/boot/dts/msm8660-surf.dts b/arch/arm/boot/dts/qcom/msm8660-surf.dts similarity index 97% rename from arch/arm/boot/dts/msm8660-surf.dts rename to arch/arm/boot/dts/qcom/msm8660-surf.dts index 386d428..8c5ea9a 100644 --- a/arch/arm/boot/dts/msm8660-surf.dts +++ b/arch/arm/boot/dts/qcom/msm8660-surf.dts @@ -1,6 +1,6 @@ /dts-v1/; -/include/ "skeleton.dtsi" +/include/ "../skeleton.dtsi" / { model = "Qualcomm MSM8660 SURF"; diff --git a/arch/arm/boot/dts/msm8960-cdp.dts b/arch/arm/boot/dts/qcom/msm8960-cdp.dts similarity index 97% rename from arch/arm/boot/dts/msm8960-cdp.dts rename to arch/arm/boot/dts/qcom/msm8960-cdp.dts index 93e9f7e..fe2659a 100644 --- a/arch/arm/boot/dts/msm8960-cdp.dts +++ b/arch/arm/boot/dts/qcom/msm8960-cdp.dts @@ -1,6 +1,6 @@ /dts-v1/; -/include/ "skeleton.dtsi" +/include/ "../skeleton.dtsi" / { model = "Qualcomm MSM8960 CDP";