mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-10 10:39:26 +00:00
Code Issues Releases Wiki Activity

Qualcomm ARM64 Updates for v4.18 Part 2

Browse source 
* Fix UFS GDSC on msm8996
 * Remove unused BT node regulator
 * Correct WLAN PCIe regulator endpoint name
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJbCH6iAAoJEFKiBbHx2RXVI1AP+QGWA4mubpf2+n4nNuUNS0Xk
 mt7Hs4/QcDpo3TEfnt3c77223dPAAv+TeCUFpQ5q3xvP/PqdSN21dNdXXKSAUg3d
 8ZJDOSD8cpOtI6GpKTyJAVjIy7WT/CsWYz5aDhpKySfmnI/q50eq6anp0baV4KnE
 jqUmRDlAaU2+jiNb26QOOu85stMSa4nKum2LWBr5IyCFIa8TIAkhjrGoAU6FJlTB
 +Y/SMSqZQBvYOVXhohjL/Y1vTh8jc3AEjPQySXkLFARE0CRdLKLOU+CTU95SIlsB
 DlJ+xOB7mnIgcKMp21x3EdX9u8Xx46gFwmP1Omk09BjhyHSGB10yJ9B47U97GrSI
 6QHDlBzS8qnhTlqFNBItHlbt2Y0iALSSRxm7mWehZSMoAXS52uQeNeIoebxzYS59
 aWuI8oRtQlzt2wE+O/9XUufH3LD6mwKA3//uyS2Db5I3LvDbvfBJ2D2Wf3PnO6+/
 1Agp3y1cZHgkbqudVqfM4iQyogjfn70Vb6GQDcOnYjDYaSjg2uLvN5Ii7VHFCDTw
 8yl4drecZzLKBiwL5mur4l1ecFiFrw7IHQ1ngcRkBemuxm1azoZTC0IBFRJdWAUu
 5quOIfl9eGJQzz8ardjKX7O3glT4uHv6aYVFprREbTF3qI+XvNL+seGFFgSRvHDu
 nAK4s0RHZtEvIhUaknk5
 =Arzb
 -----END PGP SIGNATURE-----

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

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
commit afc57b189c
3 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi
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 {

16
arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
View file

@ -179,19 +179,6 @@ usb2_id: usb2-id {
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 @@ agnoc@0 {
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 {

4
arch/arm64/boot/dts/qcom/msm8996.dtsi
View file

@ -654,8 +654,6 @@ ufsphy: phy@627000 {
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 @@ ufshc@624000 {
vccq-max-microamp = <450000>;
vccq2-max-microamp = <450000>;
power-domains = <&gcc UFS_GDSC>;
clock-names =
"core_clk_src",
"core_clk",