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

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

Merge "ARM: dts: msm: update UFS regulator for SA8155 V2"

parents 3fab00e8 8e44f6c0

arch/arm64/boot/dts/qcom/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ sm8150-mtp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2. 
sm8150-rumi-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

sm8150-qrd-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

sm8150-qrd-dvt-overlay.dtbo-base := sm8150-v2.dtb sm8150p-v2.dtb

sa8155-adp-star-overlay.dtbo-base := sa8155.dtb

sa8155p-adp-star-overlay.dtbo-base := sa8155p.dtb

sa8155-adp-star-overlay.dtbo-base := sa8155.dtb sa8155-v2.dtb

sa8155p-adp-star-overlay.dtbo-base := sa8155p.dtb sa8155p-v2.dtb

sm8150-sdx50m-cdp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

sm8150-sdx50m-mtp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

sm8150-sdx50m-mtp-2.5k-panel-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb
@@ -51,6 +51,8 @@ dtb-$(CONFIG_ARCH_SM8150) += sm8150-rumi.dtb \ 
	sm8150-qrd.dtb \

	sa8155-adp-star.dtb \

        sa8155p-adp-star.dtb \

        sa8155-v2-adp-star.dtb \

        sa8155p-v2-adp-star.dtb \

	sm8150-v2-rumi.dtb \

	sm8150-v2-mtp.dtb \

	sm8150-v2-cdp.dtb \

arch/arm64/boot/dts/qcom/sa8155-adp-star.dts

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
 */



/dts-v1/;

#include "sa8155.dtsi"

#include "sa8155-v1.dtsi"

#include "sa8155-adp-star.dtsi"



/ {

arch/arm64/boot/dts/qcom/sa8155-adp-star.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ 
&ufsphy_mem {

	compatible = "qcom,ufs-phy-qmp-v4";



	vdda-phy-supply = <&pm8150_2_l18>;

	vdda-pll-supply = <&pm8150_2_l8>;

	vdda-phy-max-microamp = <87100>;

	vdda-pll-max-microamp = <18300>;

arch/arm64/boot/dts/qcom/sa8155-v1.dtsi

0 → 100644
+21 −0
Original line number Diff line number Diff line 
/* Copyright (c) 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include "sm8150.dtsi"

#include "sa8155.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA8155";

	compatible = "qcom,sa8155";

	qcom,msm-name = "SA8155 V1";

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

};

arch/arm64/boot/dts/qcom/sa8155-v2-adp-star.dts

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/* Copyright (c) 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



/dts-v1/;



#include "sa8155-v2.dtsi"

#include "sa8155-adp-star.dtsi"



/ {

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

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

	qcom,board-id = <25 0>;

};