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

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

Merge "ARM: dts: msm: Add SLPI pinctrl for SM8150"

parents 57af67e4 c84f75e7
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -70,6 +70,10 @@
/* Add regulator nodes specific to SA8155 */
#include "sa8155-regulator.dtsi"

&slpi_tlmm {
	status = "ok";
};

&cam_csiphy0 {
	mipi-csi-vdd-supply = <&pm8150_2_l8>;
};
+20 −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.
 */

&soc {
	slpi_tlmm: slpi_pinctrl@02B40000 {
		compatible = "qcom,slpi-pinctrl";
		reg = <0x2B40000 0x20000>;
		qcom,num-pins = <14>;
		status = "disabled";
	};
};
+1 −0
Original line number Diff line number Diff line
@@ -4027,6 +4027,7 @@
	status = "ok";
};
#include "sm8150-pinctrl.dtsi"
#include "sm8150-slpi-pinctrl.dtsi"
#include "sm8150-regulator.dtsi"
#include "sm8150-ion.dtsi"
#include "sm8150-bus.dtsi"