| Message ID | 1475375919-618-10-git-send-email-jmcnicol@redhat.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | Andy Gross |
| Headers | show |
On Sat, Oct 01, 2016 at 07:38:36PM -0700, Jeremy McNicoll wrote: > 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 <jeremymc@redhat.com> > --- > 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 +- What tree are you based on? There's no huawei dir in mainline. You need to rebase everything. > 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%) -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 2016-10-08 6:28 PM, Rob Herring wrote: > On Sat, Oct 01, 2016 at 07:38:36PM -0700, Jeremy McNicoll wrote: >> 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 <jeremymc@redhat.com> >> --- >> 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 +- > > What tree are you based on? There's no huawei dir in mainline. You need > to rebase everything. One change was made to 8/12 and explicitly documented, unfortunately the list was getting long. A way to deal with this situation was discussed on IRC with a few people regarding the best way to deal with this, and this is how they instructed me to deal with this type of scenario. -jeremy > >> 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%) -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Oct 10, 2016 at 5:21 PM, Jeremy McNicoll <jmcnicol@redhat.com> wrote: > On 2016-10-08 6:28 PM, Rob Herring wrote: >> >> On Sat, Oct 01, 2016 at 07:38:36PM -0700, Jeremy McNicoll wrote: >>> >>> 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 <jeremymc@redhat.com> >>> --- >>> 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 +- >> >> >> What tree are you based on? There's no huawei dir in mainline. You need >> to rebase everything. > > > One change was made to 8/12 and explicitly documented, unfortunately the > list was getting long. A way to deal with this situation was discussed on > IRC with a few people regarding the best way to deal with this, and this is > how they instructed me to deal with this type of scenario. You are not changing anything important here. Squash this, maintain the original author, and just note that you moved the location before your signoff. No one wants to see the original out of tree code. Rob -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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";
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 <jeremymc@redhat.com> --- 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%)