Commit 486d4991 authored Sep 20, 2020 by Iskren Chernev Committed by Bjorn Andersson Oct 26, 2020

ARM: dts: qcom: msm8974-klte: Merge pinctrl nodes



commit cd13c72c ("ARM: dts: qcom: msm8974-klte: Add max77826
pmic node") and commit 8bf7a360 ("ARM: dts: qcom:
msm8974-klte: Add sdhci1 node") both added pinctrl node. This patch merges
the two nodes.

Signed-off-by: Iskren Chernev <iskren.chernev@gmail.com>
Link: https://lore.kernel.org/r/20200920144859.813032-2-iskren.chernev@gmail.com


Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

parent 3650b228

arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts

+10 −12

Original line number	Diff line number	Diff line
		@@ -258,6 +258,16 @@
		bias-pull-up;
		};
		};

		i2c6_pins: i2c6 {
		mux {
		pins = "gpio29", "gpio30";
		function = "blsp_i2c6";

		drive-strength = <2>;
		bias-disable;
		};
		};
		};

		sdhci@f9824900 {
		@@ -298,18 +308,6 @@
		};
		};

		pinctrl@fd510000 {
		i2c6_pins: i2c6 {
		mux {
		pins = "gpio29", "gpio30";
		function = "blsp_i2c6";

		drive-strength = <2>;
		bias-disable;
		};
		};
		};

		i2c@f9928000 {
		status = "okay";

Admin message