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

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

Merge "apq8098: rename apq8998 to apq8098"

parents 1ac435a7 77082ccb

Documentation/devicetree/bindings/arm/msm/msm.txt

+4 −4
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ SoCs: 
  compatible = "qcom,apqtitanium"



- APQ8998

  compatible = "qcom,apq8998"

  compatible = "qcom,apq8098"



- MDM9630

  compatible = "qcom,mdm9630"
@@ -195,9 +195,9 @@ compatible = "qcom,apq8037-cdp" 
compatible = "qcom,apq8037-mtp"

compatible = "qcom,apqtitanium-cdp"

compatible = "qcom,apqtitanium-mtp"

compatible = "qcom,apq8998-cdp"

compatible = "qcom,apq8998-mtp"

compatible = "qcom,apq8998-qrd"

compatible = "qcom,apq8098-cdp"

compatible = "qcom,apq8098-mtp"

compatible = "qcom,apq8098-qrd"

compatible = "qcom,mdm9630-cdp"

compatible = "qcom,mdm9630-mtp"

compatible = "qcom,mdm9630-sim"

arch/arm/boot/dts/qcom/Makefile

+10 −10
Original line number Diff line number Diff line
@@ -134,19 +134,19 @@ dtb-$(CONFIG_ARCH_MSM8998) += msm8998-sim.dtb \ 
	msm8998-v2-qrd-vr1.dtb \

	msm8998-v2-qrd-skuk-evt3.dtb \

	msm8998-v2-qrd-skuk-hdk.dtb \

	apq8998-mtp.dtb \

	apq8998-cdp.dtb \

	apq8998-v2-mtp.dtb \

	apq8998-v2-cdp.dtb \

	apq8998-v2-qrd.dtb \

	apq8998-v2-qrd-skuk-hdk.dtb \

	apq8098-mtp.dtb \

	apq8098-cdp.dtb \

	apq8098-v2-mtp.dtb \

	apq8098-v2-cdp.dtb \

	apq8098-v2-qrd.dtb \

	apq8098-v2-qrd-skuk-hdk.dtb \

	msm8998-v2.1-mtp.dtb \

	msm8998-v2.1-cdp.dtb \

	msm8998-v2.1-qrd.dtb \

	apq8998-v2.1-mtp.dtb \

	apq8998-v2.1-cdp.dtb \

	apq8998-v2.1-qrd.dtb \

	apq8998-v2.1-mediabox.dtb \

	apq8098-v2.1-mtp.dtb \

	apq8098-v2.1-cdp.dtb \

	apq8098-v2.1-qrd.dtb \

	apq8098-v2.1-mediabox.dtb \

	msm8998-v2.1-interposer-sdm660-cdp.dtb \

	msm8998-v2.1-interposer-sdm660-mtp.dtb \

	msm8998-v2.1-interposer-sdm660-qrd.dtb

arch/arm/boot/dts/qcom/apq8998-cdp.dts→arch/arm/boot/dts/qcom/apq8098-cdp.dts

+4 −4
Original line number Diff line number Diff line 
/* Copyright (c) 2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-2017, 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
@@ -12,11 +12,11 @@ 


/dts-v1/;



#include "apq8998.dtsi"

#include "apq8098.dtsi"

#include "msm8998-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ 8998 CDP";

	compatible = "qcom,apq8998-cdp", "qcom,apq8998", "qcom,cdp";

	model = "Qualcomm Technologies, Inc. APQ 8098 CDP";

	compatible = "qcom,apq8098-cdp", "qcom,apq8098", "qcom,cdp";

	qcom,board-id = <1 0>;

};

arch/arm/boot/dts/qcom/apq8998-mtp.dts→arch/arm/boot/dts/qcom/apq8098-mtp.dts

+4 −4
Original line number Diff line number Diff line 
/* Copyright (c) 2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-2017, 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
@@ -12,11 +12,11 @@ 


/dts-v1/;



#include "apq8998.dtsi"

#include "apq8098.dtsi"

#include "msm8998-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ 8998 MTP";

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

	model = "Qualcomm Technologies, Inc. APQ 8098 MTP";

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

	qcom,board-id = <8 0>;

};

arch/arm/boot/dts/qcom/apq8998-v2.1-cdp.dts→arch/arm/boot/dts/qcom/apq8098-v2-cdp.dts

+4 −4
Original line number Diff line number Diff line 
/* Copyright (c) 2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-2017, 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
@@ -12,11 +12,11 @@ 


/dts-v1/;



#include "apq8998-v2.1.dtsi"

#include "apq8098-v2.dtsi"

#include "msm8998-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ 8998 V2.1 CDP";

	compatible = "qcom,apq8998-cdp", "qcom,apq8998", "qcom,cdp";

	model = "Qualcomm Technologies, Inc. APQ 8098 V2 CDP";

	compatible = "qcom,apq8098-cdp", "qcom,apq8098", "qcom,cdp";

	qcom,board-id = <1 0>;

};