leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
commit cd13c72c18 ("ARM: dts: qcom: msm8974-klte: Add max77826
pmic node") and commit 8bf7a360a9 ("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>
This commit is contained in:
Iskren Chernev
2020-09-20 17:48:53 +03:00
committed by Bjorn Andersson
parent 3650b228f8
commit 486d499143
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts
View File

@@ -258,6 +258,16 @@
bias-pull-up; bias-pull-up;
}; };
}; };
i2c6_pins: i2c6 {
mux {
pins = "gpio29", "gpio30";
function = "blsp_i2c6";
drive-strength = <2>;
bias-disable;
};
};
}; };
sdhci@f9824900 { 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 { i2c@f9928000 {
status = "okay"; status = "okay";