evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ARM: dts: msm: Resolve TSIF GPIO conflicts for APQ8098"

Browse source
This commit is contained in:
Linux Build Service Account 2017-01-28 00:46:57 -08:00 • committed by Gerrit - the friendly Code Review server
commit 8e5d555ab3
2 changed files with 55 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
arch/arm/boot/dts/qcom/apq8998-v2.1-mediabox.dts
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
/* Copyright (c) 2016-2017 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
@ -46,3 +46,31 @@
};
};
};
&mdss_dsi {
status = "disabled";
};
&sdhc_2 {
vdd-supply = <&pm8998_l21>;
qcom,vdd-voltage-level = <2950000 2960000>;
qcom,vdd-current-level = <200 800000>;
vdd-io-supply = <&pm8998_l13>;
qcom,vdd-io-voltage-level = <1808000 2960000>;
qcom,vdd-io-current-level = <200 22000>;
pinctrl-names = "active", "sleep";
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on
&sdc2_cd_on_mediabox>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off
&sdc2_cd_off_mediabox>;
qcom,clk-rates = <400000 20000000 25000000
50000000 100000000 200000000>;
qcom,bus-speed-mode = "SDR12", "SDR25", "SDR50", "DDR50", "SDR104";
cd-gpios = <&tlmm 86 0x1>;
status = "ok";
};

26
arch/arm/boot/dts/qcom/msm8998-pinctrl.dtsi
View file

@ -3143,5 +3143,31 @@
};
};
};
sdc2_cd_on_mediabox: sdc2_cd_on_mediabox {
mux {
pins = "gpio86";
function = "gpio";
};
config {
pins = "gpio86";
bias-pull-up; /* pull up */
drive-strength = <2>; /* 2 MA */
};
};
sdc2_cd_off_mediabox: sdc2_cd_off_mediabox {
mux {
pins = "gpio86";
function = "gpio";
};
config {
pins = "gpio86";
bias-pull-up; /* pull up */
drive-strength = <2>; /* 2 MA */
};
};
};
};