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

Commit 3e15f887 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: Add support for APQ8096A"

parents 38b693f4 d26af6de

arch/arm/boot/dts/qcom/apq8096pro-auto-cdp.dts

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-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
@@ -20,7 +20,7 @@ 
/ {

	model = "Qualcomm Technologies, Inc. APQ 8096 pro AUTO CDP";

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

	qcom,msm-id = <316 0x10000>;

	qcom,msm-id = <316 0x10000>, <387 0x10000>;

	qcom,board-id = <0x03010001 0>;

};

arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp-lite.dts

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
/ {

	model = "Qualcomm Technologies, Inc. APQ 8096pro V1.1 AUTO ADP LITE";

	compatible = "qcom,apq8096-adp", "qcom,msm8996", "qcom,adp";

	qcom,msm-id = <316 0x10001>;

	qcom,msm-id = <316 0x10001>, <387 0x10001>;

	qcom,board-id = <0x03010019 0>;

};

arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp.dts

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
/ {

	model = "Qualcomm Technologies, Inc. MSM 8996pro AUTO ADP";

	compatible = "qcom,apq8096-adp", "qcom,msm8996", "qcom,adp";

	qcom,msm-id = <316 0x10001>;

	qcom,msm-id = <316 0x10001>, <387 0x10001> ;

	qcom,board-id = <0x02010019 0>, <0x00010001 0>;

};

arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-cdp.dts

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-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
@@ -20,7 +20,7 @@ 
/ {

	model = "Qualcomm Technologies, Inc. APQ 8096 pro v1.1 AUTO CDP";

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

	qcom,msm-id = <316 0x10001>;

	qcom,msm-id = <316 0x10001>, <387 0x10001>;

	qcom,board-id = <0x03010001 0>, <0x00010001 0>;

};