Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3775b29 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: qcom: Rename 8909w/8009w dts files"

parents 2c974d26 5401defc

arch/arm/boot/dts/qcom/Makefile

+10 −22
Original line number Diff line number Diff line
@@ -304,34 +304,22 @@ dtb-$(CONFIG_ARCH_MSM8909) += msm8909-pm8916-mtp.dtb \ 
        msm8909-1gb-qrd-skuc.dtb \

        msm8909-1gb-qrd-skue.dtb \

        msm8909-qrd-skue.dtb \

	msm8909w-wtp.dtb \

	apq8009w-wtp.dtb \

	sdw2100-msm8909w-wtp.dtb \

	sdw2100-apq8009w-wtp.dtb \

	apq8009w-cdp.dtb \

	msm8909w-swoctp.dtb \

	sdw2100-msm8909w-swoctp.dtb \

	msm8909w-swoctp-circpanel.dtb \

	apq8009w-swoctp.dtb \

	apq8009w-swoctp-circpanel.dtb \

	apq8009w-nowgr-swoctp.dtb \

	apq8009w-nowgr-swoctp-circpanel.dtb \

	sdw2100-apq8009w-nowgr-swoctp-circpanel.dtb \

	msm8909-pm8916-cdp.dtb \

	msm8909w-cdp.dtb \

	msm8909w-1gb-wtp.dtb \

	apq8009w-1gb-wtp.dtb \

	msm8909w-1gb-cdp.dtb \

	apq8009w-1gb-cdp.dtb \

	msm8909w-1gb-swoctp.dtb \

	msm8909w-1gb-swoctp-circpanel.dtb \

	apq8009w-1gb-swoctp.dtb \

	apq8009w-1gb-swoctp-circpanel.dtb \

	apq8009w-1gb-nowgr-swoctp.dtb \

	apq8009w-1gb-nowgr-swoctp-circpanel.dtb \

	msm8909w-bg-wtp-v1.dtb \

	msm8909w-bg-wtp-v2.dtb \

	msm8909w-wtp-pm660-v2k.dtb \

	apq8009w-bg-wtp-v1.dtb \

	apq8009w-bg-wtp-v2.dtb \

	apq8009w-bg-alpha.dtb \

	apq8009w-wtp-pm660-v2k.dtb \

	sdw2100-msm8909w-1gb-swoctp-circpanel.dtb \

	sdw3100-msm8909w-wtp.dtb \

	sdw2500-msm8909w-wtp.dtb \

	sdw3100-apq8009w-wtp.dtb \

	sdw3100-apq8009w-alpha.dtb \

	sdw2500-apq8009w-wtp.dtb \

	apq8009-mtp-wcd9326.dtb \

	msm8909-mtp-wcd9326.dtb \

	msm8909-mtp-wcd9326-refboard.dtb \

arch/arm/boot/dts/qcom/apq8009w-nowgr-swoctp-circpanel.dts→arch/arm/boot/dts/qcom/sdw2100-apq8009w-nowgr-swoctp-circpanel.dts

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016  The Linux Foundation. All rights reserved.

 * Copyright (c) 2016, 2018 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -18,7 +18,7 @@ 


/ {

	model = "Qualcomm Technologies, Inc. APQ8009W-PM8916 \

						SWOC CIRC PANEL NOWGR MTP";

					SWOC CIRC PANEL NOWGR MTP SDW2100";

	compatible = "qcom,apq8009-mtp", "qcom,apq8009", "qcom,mtp";

	qcom,msm-id = <265 0>,

		      <301 0>;

arch/arm/boot/dts/qcom/apq8009w-wtp.dts→arch/arm/boot/dts/qcom/sdw2100-apq8009w-wtp.dts

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, 2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -21,7 +21,7 @@ 
#include "apq8009w-memory.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ8009W-PM8916 MTP";

	model = "Qualcomm Technologies, Inc. APQ8009W-PM8916 MTP SDW2100";

	compatible = "qcom,apq8009-mtp", "qcom,apq8009", "qcom,mtp";

	qcom,msm-id = <265 0>,

		      <301 0>;

arch/arm/boot/dts/qcom/msm8909w-1gb-swoctp-circpanel.dts→arch/arm/boot/dts/qcom/sdw2100-msm8909w-1gb-swoctp-circpanel.dts

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016  The Linux Foundation. All rights reserved.

 * Copyright (c) 2016, 2018 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -17,7 +17,7 @@ 


/ {

	model = "Qualcomm Technologies, Inc. MSM8909W-PM8916 \

						1GB SWOC CIRC PANEL MTP";

						SWOC CIRC PANEL MTP SDW2100";

	compatible = "qcom,msm8909-mtp", "qcom,msm8909", "qcom,mtp";

	qcom,msm-id =   <245 0>,

			<258 0>,

arch/arm/boot/dts/qcom/msm8909w-swoctp.dts→arch/arm/boot/dts/qcom/sdw2100-msm8909w-swoctp.dts

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016, 2018 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -16,7 +16,7 @@ 
#include "msm8909w-swoctp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8909W-PM8916 SWOC MTP";

	model = "Qualcomm Technologies, Inc. MSM8909W-PM8916 SWOC MTP SDW2100";

	compatible = "qcom,msm8909-mtp", "qcom,msm8909", "qcom,mtp";

	qcom,msm-id =   <245 0>,

			<258 0>,