diff options
| author | Iskren Chernev <[email protected]> | 2020-09-20 17:48:53 +0300 |
|---|---|---|
| committer | Bjorn Andersson <[email protected]> | 2020-10-26 09:52:36 -0500 |
| commit | 486d49914307e4e1ff0f5087f803cfa1e44a13bf (patch) | |
| tree | 8699cc49e033485c0ac7177fb235b09f31d463dc | |
| parent | 3650b228f83adda7e5ee532e2b90429c03f7b9ec (diff) | |
ARM: dts: qcom: msm8974-klte: Merge pinctrl nodes
commit cd13c72c1853f219e1f ("ARM: dts: qcom: msm8974-klte: Add max77826
pmic node") and commit 8bf7a360a92cc6b2aebc8 ("ARM: dts: qcom:
msm8974-klte: Add sdhci1 node") both added pinctrl node. This patch merges
the two nodes.
Signed-off-by: Iskren Chernev <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Bjorn Andersson <[email protected]>
| -rw-r--r-- | arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts b/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts index d4dc98214225..9520c6e7910c 100644 --- a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts +++ b/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts @@ -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"; |