From patchwork Sun Oct 2 02:38:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy McNicoll X-Patchwork-Id: 9359545 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3E4986075E for ; Sun, 2 Oct 2016 02:39:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 29AE928C5F for ; Sun, 2 Oct 2016 02:39:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1E79828C68; Sun, 2 Oct 2016 02:39:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 94DC528C5F for ; Sun, 2 Oct 2016 02:39:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752218AbcJBCjT (ORCPT ); Sat, 1 Oct 2016 22:39:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37534 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751789AbcJBCjM (ORCPT ); Sat, 1 Oct 2016 22:39:12 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 567253D95F; Sun, 2 Oct 2016 02:39:12 +0000 (UTC) Received: from mini-rhel.redhat.com (ovpn-116-88.phx2.redhat.com [10.3.116.88]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u922cwZU018910; Sat, 1 Oct 2016 22:39:11 -0400 From: Jeremy McNicoll To: robh+dt@kernel.org, andy.gross@linaro.org, sboyd@codeaurora.org, arnd@arndb.de, bjorn.andersson@linaro.org, git@kchr.de Cc: jeremymc@redhat.com, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, devicetree@vger.kernel.org Subject: [RFC V2 PATCH 09/12] arm64: dts: move Huawei Angler (Nexus 6P) to qcom directory Date: Sat, 1 Oct 2016 19:38:36 -0700 Message-Id: <1475375919-618-10-git-send-email-jmcnicol@redhat.com> In-Reply-To: <1475375919-618-1-git-send-email-jmcnicol@redhat.com> References: <1475375919-618-1-git-send-email-jmcnicol@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Sun, 02 Oct 2016 02:39:12 +0000 (UTC) Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Given that this is a MSM SoC and not a specific vendor created SoC moving associated device tree files to qcom directory. Signed-off-by: Jeremy McNicoll --- arch/arm64/boot/dts/huawei/Makefile | 5 ----- arch/arm64/boot/dts/qcom/Makefile | 4 ++-- arch/arm64/boot/dts/{huawei => qcom}/msm8994-angler-rev-101.dts | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 arch/arm64/boot/dts/huawei/Makefile rename arch/arm64/boot/dts/{huawei => qcom}/msm8994-angler-rev-101.dts (96%) diff --git a/arch/arm64/boot/dts/huawei/Makefile b/arch/arm64/boot/dts/huawei/Makefile deleted file mode 100644 index 4b31ff4..0000000 --- a/arch/arm64/boot/dts/huawei/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -dtb-$(CONFIG_MACH_HUAWEI) += msm8994-angler-rev-101.dtb - -always := $(dtb-y) -subdir-y := $(dts-dirs) -clean-files := *.dtb diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index cee6bcc..84f102d 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -1,5 +1,5 @@ -dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc.dtb msm8916-mtp.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8996-mtp.dtb msm8992-bullhead-rev-101.dtb +dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc.dtb msm8916-mtp.dtb msm8996-mtp.dtb +dtb-$(CONFIG_ARCH_QCOM) += msm8992-bullhead-rev-101.dtb msm8994-angler-rev-101.dtb always := $(dtb-y) subdir-y := $(dts-dirs) diff --git a/arch/arm64/boot/dts/huawei/msm8994-angler-rev-101.dts b/arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts similarity index 96% rename from arch/arm64/boot/dts/huawei/msm8994-angler-rev-101.dts rename to arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts index 07a71d6..5cff29f 100644 --- a/arch/arm64/boot/dts/huawei/msm8994-angler-rev-101.dts +++ b/arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts @@ -13,7 +13,7 @@ /dts-v1/; -#include "../qcom/msm8994-v2.0.dtsi" +#include "msm8994-v2.0.dtsi" / { model = "HUAWEI MSM8994 ANGLER rev-1.01";