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

Commit c1386247 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 dtbo support for MSM8996 ufs device"

parents 4f5103fd 6e1b880a
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ dtbo-$(CONFIG_ARCH_MSM8996) += \
	msm8996-mtp-overlay.dtbo

msm8996-mtp-overlay.dtbo-base :=  msm8996pro-v1.1-pmi8996.dtb \
				msm8996-v3-pmi8996.dtb
				msm8996-v3-pmi8996.dtb \
				msm8996pro-v1.1-pmi8994.dtb

else
dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \
+40 −0
Original line number Diff line number Diff line
/* Copyright (c) 2019, 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 "msm8996pro-v1.1.dtsi"
#include "msm-pm8004.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. MSM 8996pro v1.1 + PMI8994";
	compatible = "qcom,msm8996";
	qcom,pmic-id = <0x20009 0x2000A 0x1000C 0x0>;
	qcom,msm-id = <305 0x10001>;
	qcom,pmic-name = "PMI8994";
};

/*
 * Override PMI8994 resources with proper PM8004 resources for MSM8996 with
 * PM8004.
 */
&pmi8994_s2 {
	status = "disabled";
};

&pm8004_s2 {
	status = "ok";
};

&gfx_cpr {
	vdd-supply = <&pm8004_s2>;
};