tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'qcom-arm64-for-4.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/dt

Browse Source 
Qualcomm ARM64 Updates for v4.18 Part 2

* Fix UFS GDSC on msm8996
* Remove unused BT node regulator
* Correct WLAN PCIe regulator endpoint name

* tag 'qcom-arm64-for-4.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  arm64: dts: apq8096-db820c: Removed bt-en-1-8v regulator
  arm64: dts: fix regulator property name for wlan pcie endpoint
  arm64: dts: qcom: msm8996: Use UFS_GDSC for UFS

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
2018-05-26 11:58:30 -07:00
parent 760c53f278 d8f8d467f5
commit afc57b189c
3 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi
+1 -1
View File
@@ -4,7 +4,7 @@
&pm8994_gpios {
pinctrl-names = "default";
pinctrl-0 = <&ls_exp_gpio_f>;
pinctrl-0 = <&ls_exp_gpio_f &bt_en_gpios>;
ls_exp_gpio_f: pm8994_gpio5 {
pinconf {
arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
+1 -15
View File
@@ -179,19 +179,6 @@
pinctrl-0 = <&usb2_vbus_det_gpio>;
};
bt_en: bt-en-1-8v {
pinctrl-names = "default";
pinctrl-0 = <&bt_en_gpios>;
compatible = "regulator-fixed";
regulator-name = "bt-en-regulator";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
/* WLAN card specific delay */
startup-delay-us = <70000>;
enable-active-high;
};
wlan_en: wlan-en-1-8v {
pinctrl-names = "default";
pinctrl-0 = <&wlan_en_gpios>;
@@ -211,8 +198,7 @@
pcie@600000 {
status = "okay";
perst-gpio = <&msmgpio 35 GPIO_ACTIVE_LOW>;
vddpe-supply = <&wlan_en>;
vddpe1-supply = <&bt_en>;
vddpe-3v3-supply = <&wlan_en>;
};
pcie@608000 {
arch/arm64/boot/dts/qcom/msm8996.dtsi
+2 -2
View File
@@ -654,8 +654,6 @@
clocks = <&rpmcc RPM_SMD_LN_BB_CLK>,
<&gcc GCC_UFS_CLKREF_CLK>;
status = "disabled";
power-domains = <&gcc UFS_GDSC>;
};
ufshc@624000 {
@@ -674,6 +672,8 @@
vccq-max-microamp = <450000>;
vccq2-max-microamp = <450000>;
power-domains = <&gcc UFS_GDSC>;
clock-names =
"core_clk_src",
"core_clk",