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

Commit 434fa263 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: sa4155p: Add support for new soc id"

parents 4cfc2629 804422fc

arch/arm64/boot/dts/qcom/sa6155p-adp-air-overlay.dts

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

/* Copyright (c) 2018-2019, 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,6 +21,6 @@ 
/ {

/ {

	model = "Qualcomm Technologies, Inc. SA6155P ADP-AIR";

	model = "Qualcomm Technologies, Inc. SA6155P ADP-AIR";

	compatible = "qcom,sa6155p-adp-air", "qcom,sa6155p", "qcom,adp-air";

	compatible = "qcom,sa6155p-adp-air", "qcom,sa6155p", "qcom,adp-air";

	qcom,msm-id = <377 0x0>;

	qcom,msm-id = <377 0x0>, <380 0>;

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

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

};
 
};

arch/arm64/boot/dts/qcom/sa6155p-adp-star-overlay.dts

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

/* Copyright (c) 2018-2019, 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,6 +21,6 @@ 
/ {

/ {

	model = "Qualcomm Technologies, Inc. SA6155P ADP-STAR";

	model = "Qualcomm Technologies, Inc. SA6155P ADP-STAR";

	compatible = "qcom,sa6155p-adp-star", "qcom,sa6155p", "qcom,adp-star";

	compatible = "qcom,sa6155p-adp-star", "qcom,sa6155p", "qcom,adp-star";

	qcom,msm-id = <377 0x0>;

	qcom,msm-id = <377 0x0>, <380 0>;

	qcom,board-id = <25 0>;

	qcom,board-id = <25 0>;

};
 
};

arch/arm64/boot/dts/qcom/sa6155p-v2-adp-air-overlay.dts

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

/ {

	model = "Qualcomm Technologies, Inc. SA6155P ADP-AIR V2";

	model = "Qualcomm Technologies, Inc. SA6155P ADP-AIR V2";

	compatible = "qcom,sa6155p-adp-air", "qcom,sa6155p", "qcom,adp-air";

	compatible = "qcom,sa6155p-adp-air", "qcom,sa6155p", "qcom,adp-air";

	qcom,msm-id = <377 0x0>;

	qcom,msm-id = <377 0x0>, <380 0>;

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

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

};
 
};

arch/arm64/boot/dts/qcom/sa6155p-v2-adp-star-overlay.dts

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

/ {

	model = "Qualcomm Technologies, Inc. SA6155P ADP-STAR V2";

	model = "Qualcomm Technologies, Inc. SA6155P ADP-STAR V2";

	compatible = "qcom,sa6155p-adp-star", "qcom,sa6155p", "qcom,adp-star";

	compatible = "qcom,sa6155p-adp-star", "qcom,sa6155p", "qcom,adp-star";

	qcom,msm-id = <377 0x0>;

	qcom,msm-id = <377 0x0>, <380 0>;

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

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

};
 
};

arch/arm64/boot/dts/qcom/sa6155p.dtsi

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

/* Copyright (c) 2018-2019, 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
@@ -18,7 +18,7 @@ 
/ {

/ {

	model = "Qualcomm Technologies, Inc. SA6155P";

	model = "Qualcomm Technologies, Inc. SA6155P";

	qcom,msm-name = "SA6155P";

	qcom,msm-name = "SA6155P";

	qcom,msm-id = <377 0>;

	qcom,msm-id = <377 0>, <380 0>;





	aliases {

	aliases {

		pci-domain0 = &pcie0; /* PCIe0 domain */

		pci-domain0 = &pcie0; /* PCIe0 domain */