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

Commit ad00a179 authored Nov 22, 2018 by qctecmdr Service Committed by Gerrit - the friendly Code Review server Nov 22, 2018

Merge "ARM: dts: msm: Include rpm-regulator header in trinket regulator files"

parents fec20bc2 d318eb47

arch/arm64/boot/dts/qcom/trinket-regulator.dtsi

+1 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@
		*/

		#include <dt-bindings/interrupt-controller/arm-gic.h>
		#include <dt-bindings/regulator/qcom,rpm-smd-regulator.h>

		&rpm_bus {
		/* PM6125 S3/S4 - VDD_CX supply */

arch/arm64/boot/dts/qcom/trinket-stub-regulator.dtsi

+2 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,8 @@
		* GNU General Public License for more details.
		*/

		#include <dt-bindings/regulator/qcom,rpm-smd-regulator.h>

		/* Stub regulators */

		/ {

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@
		#include <dt-bindings/clock/qcom,dispcc-trinket.h>
		#include <dt-bindings/clock/qcom,gpucc-trinket.h>
		#include <dt-bindings/clock/qcom,videocc-sm6150.h>
		#include <dt-bindings/regulator/qcom,rpm-smd-regulator.h>
		#include <dt-bindings/spmi/spmi.h>

		/ {