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

Commit e8f731d7 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: Disable defer regulator_disable() for sdm670 GPU SMMU"

parents 0b50abf6 c7df241c

arch/arm64/boot/dts/qcom/msm-arm-smmu-sdm670.dtsi

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

/* Copyright (c) 2017-2018,2020 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
@@ -25,7 +25,6 @@ 
		#global-interrupts = <2>;

		#global-interrupts = <2>;

		qcom,regulator-names = "vdd";

		qcom,regulator-names = "vdd";

		vdd-supply = <&gpu_cx_gdsc>;

		vdd-supply = <&gpu_cx_gdsc>;

		qcom,deferred-regulator-disable-delay = <80>;

		interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>,

		interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 231 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 231 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 364 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 364 IRQ_TYPE_LEVEL_HIGH>,