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

Commit 9520fe01 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 SM6150"

parents a5aef474 42b8e534
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -236,4 +236,9 @@
&mdss_mdp {
	connectors = <&sde_rscc &dsi_dp1 &sde_wb>;
};

&slpi_tlmm {
	status = "ok";
};

#include "sa6155-pcie.dtsi"
+4 −0
Original line number Diff line number Diff line
@@ -259,6 +259,10 @@
	connectors = <&sde_rscc &dsi_dp1 &sde_wb>;
};

&slpi_tlmm {
	status = "ok";
};

/* Audio device tree */
#include "sa6155-audio.dtsi"
#include "sa6155-pcie.dtsi"
+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@62B40000 {
		compatible = "qcom,slpi-pinctrl";
		reg = <0x62B40000 0x20000>;
		qcom,num-pins = <32>;
		status = "disabled";
	};
};
+1 −0
Original line number Diff line number Diff line
@@ -2923,6 +2923,7 @@
#include "pm6150.dtsi"
#include "pm6150l.dtsi"
#include "sm6150-pinctrl.dtsi"
#include "sm6150-slpi-pinctrl.dtsi"
#include "sm6150-regulator.dtsi"
#include "sm6150-pm.dtsi"
#include "sm6150-gdsc.dtsi"