diff options
author | Arnd Bergmann <arnd@arndb.de> | 2018-01-05 13:45:45 +0300 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2018-01-05 13:45:45 +0300 |
commit | e4ccf203ff1f826709f72daa85b6ee90bd7de4ed (patch) | |
tree | 34f67bc44be33a3dc21849a395195a8e76bb8f17 /arch/arm/boot | |
parent | 5375ef7d1c343973d5a7fe7fff27e6386a7f68af (diff) | |
parent | 6e2797bd80001e7f6ffe6fa95efaa27338a43aae (diff) | |
download | linux-e4ccf203ff1f826709f72daa85b6ee90bd7de4ed.tar.xz |
Merge tag 'qcom-dts-for-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/dt
Pull "Qualcomm Device Tree Changes for v4.16" from Andy Gross:
* Add uSD slot nodes on msm8974-FP2 board
* tag 'qcom-dts-for-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/agross/linux:
ARM: dts: msm8974-FP2: Add uSD slot nodes
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts b/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts index d0a5df90b543..643c57f84818 100644 --- a/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts +++ b/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts @@ -265,6 +265,28 @@ bias-pull-up; }; }; + + sdhc2_cd_pin_a: sdhc2-cd-pin-active { + pins = "gpio62"; + function = "gpio"; + + drive-strength = <2>; + bias-disable; + }; + + sdhc2_pin_a: sdhc2-pin-active { + clk { + pins = "sdc2_clk"; + drive-strength = <10>; + bias-disable; + }; + + cmd-data { + pins = "sdc2_cmd", "sdc2_data"; + drive-strength = <6>; + bias-pull-up; + }; + }; }; sdhci@f9824900 { @@ -280,6 +302,18 @@ pinctrl-0 = <&sdhc1_pin_a>; }; + sdhci@f98a4900 { + status = "ok"; + + vmmc-supply = <&pm8941_l21>; + vqmmc-supply = <&pm8941_l13>; + + bus-width = <4>; + + pinctrl-names = "default"; + pinctrl-0 = <&sdhc2_pin_a>, <&sdhc2_cd_pin_a>; + }; + usb@f9a55000 { status = "ok"; |