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

Commit 7ddb49ff 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: msm: Change pmi8950 version information for msmgold"

parents 65a031ea 3dcbe528

arch/arm/boot/dts/qcom/msmgold-pmi8950-cdp.dts

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

/*

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

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

 *

 *

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

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -21,5 +21,5 @@ 
	model = "Qualcomm Technologies, Inc. MSMGOLD-PMI8950 CDP";

	model = "Qualcomm Technologies, Inc. MSMGOLD-PMI8950 CDP";

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

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

	qcom,board-id= <1 0>;

	qcom,board-id= <1 0>;

	qcom,pmic-id = <0x10019 0x020011 0x0 0x0>;

	qcom,pmic-id = <0x10019 0x010011 0x0 0x0>;

};
 
};

arch/arm/boot/dts/qcom/msmgold-pmi8950-mtp.dts

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

/*

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

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

 *

 *

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

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -21,5 +21,5 @@ 
	model = "Qualcomm Technologies, Inc. MSMGOLD-PMI8950 MTP";

	model = "Qualcomm Technologies, Inc. MSMGOLD-PMI8950 MTP";

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

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

	qcom,board-id= <8 0>;

	qcom,board-id= <8 0>;

	qcom,pmic-id = <0x10019 0x020011 0x0 0x0>;

	qcom,pmic-id = <0x10019 0x010011 0x0 0x0>;

};
 
};

arch/arm/boot/dts/qcom/msmgold-pmi8950-rcm.dts

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

/*

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

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

 *

 *

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

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -20,5 +20,5 @@ 
	model = "Qualcomm Technologies, Inc. MSMGOLD-PMI8950 RCM";

	model = "Qualcomm Technologies, Inc. MSMGOLD-PMI8950 RCM";

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

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

	qcom,board-id= <21 0>;

	qcom,board-id= <21 0>;

	qcom,pmic-id = <0x10019 0x020011 0x0 0x0>;

	qcom,pmic-id = <0x10019 0x010011 0x0 0x0>;

};
 
};