Skip to content

L
linux
Commit c967c73c authored by Bjorn Andersson's avatar Bjorn Andersson
Browse files
Options

Merge branch 'arm64-fixes-for-6.1' into HEAD 

Mergeback arm64-fixes-for-6.1 to avoid merge conflicts.
parents afcd946b cadaa773
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 31 deletions
arch/arm64/boot/dts/qcom/msm8996.dtsi
View file @ c967c73c
...@@ -3547,7 +3547,7 @@ frame@98c0000 { ...@@ -3547,7 +3547,7 @@ frame@98c0000 {
}; };
saw3: syscon@9a10000 { saw3: syscon@9a10000 {
compatible = "qcom,tcsr-msm8996", "syscon"; compatible = "syscon";
reg = <0x09a10000 0x1000>; reg = <0x09a10000 0x1000>;
}; };
......
arch/arm64/boot/dts/qcom/sa8155p-adp.dts
View file @ c967c73c
...@@ -43,7 +43,6 @@ vreg_s4a_1p8: smps4 { ...@@ -43,7 +43,6 @@ vreg_s4a_1p8: smps4 {
regulator-always-on; regulator-always-on;
regulator-boot-on; regulator-boot-on;
regulator-allow-set-load;
vin-supply = <&vreg_3p3>; vin-supply = <&vreg_3p3>;
}; };
...@@ -137,6 +136,9 @@ vreg_l5a_0p88: ldo5 { ...@@ -137,6 +136,9 @@ vreg_l5a_0p88: ldo5 {
regulator-max-microvolt = <880000>; regulator-max-microvolt = <880000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
regulator-allow-set-load; regulator-allow-set-load;
regulator-allowed-modes =
<RPMH_REGULATOR_MODE_LPM
RPMH_REGULATOR_MODE_HPM>;
}; };
vreg_l7a_1p8: ldo7 { vreg_l7a_1p8: ldo7 {
...@@ -152,6 +154,9 @@ vreg_l10a_2p96: ldo10 { ...@@ -152,6 +154,9 @@ vreg_l10a_2p96: ldo10 {
regulator-max-microvolt = <2960000>; regulator-max-microvolt = <2960000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
regulator-allow-set-load; regulator-allow-set-load;
regulator-allowed-modes =
<RPMH_REGULATOR_MODE_LPM
RPMH_REGULATOR_MODE_HPM>;
}; };
vreg_l11a_0p8: ldo11 { vreg_l11a_0p8: ldo11 {
...@@ -258,6 +263,9 @@ vreg_l5c_1p2: ldo5 { ...@@ -258,6 +263,9 @@ vreg_l5c_1p2: ldo5 {
regulator-max-microvolt = <1200000>; regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
regulator-allow-set-load; regulator-allow-set-load;
regulator-allowed-modes =
<RPMH_REGULATOR_MODE_LPM
RPMH_REGULATOR_MODE_HPM>;
}; };
vreg_l7c_1p8: ldo7 { vreg_l7c_1p8: ldo7 {
...@@ -273,6 +281,9 @@ vreg_l8c_1p2: ldo8 { ...@@ -273,6 +281,9 @@ vreg_l8c_1p2: ldo8 {
regulator-max-microvolt = <1200000>; regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
regulator-allow-set-load; regulator-allow-set-load;
regulator-allowed-modes =
<RPMH_REGULATOR_MODE_LPM
RPMH_REGULATOR_MODE_HPM>;
}; };
vreg_l10c_3p3: ldo10 { vreg_l10c_3p3: ldo10 {
......
arch/arm64/boot/dts/qcom/sa8295p-adp.dts
View file @ c967c73c
...@@ -90,6 +90,9 @@ vreg_l3c: ldo3 { ...@@ -90,6 +90,9 @@ vreg_l3c: ldo3 {
regulator-max-microvolt = <1200000>; regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
regulator-allow-set-load; regulator-allow-set-load;
regulator-allowed-modes =
<RPMH_REGULATOR_MODE_LPM
RPMH_REGULATOR_MODE_HPM>;
}; };
vreg_l4c: ldo4 { vreg_l4c: ldo4 {
...@@ -105,6 +108,9 @@ vreg_l6c: ldo6 { ...@@ -105,6 +108,9 @@ vreg_l6c: ldo6 {
regulator-max-microvolt = <1200000>; regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
regulator-allow-set-load; regulator-allow-set-load;
regulator-allowed-modes =
<RPMH_REGULATOR_MODE_LPM
RPMH_REGULATOR_MODE_HPM>;
}; };
vreg_l7c: ldo7 { vreg_l7c: ldo7 {
...@@ -120,6 +126,9 @@ vreg_l10c: ldo10 { ...@@ -120,6 +126,9 @@ vreg_l10c: ldo10 {
regulator-max-microvolt = <2504000>; regulator-max-microvolt = <2504000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
regulator-allow-set-load; regulator-allow-set-load;
regulator-allowed-modes =
<RPMH_REGULATOR_MODE_LPM
RPMH_REGULATOR_MODE_HPM>;
}; };
vreg_l17c: ldo17 { vreg_l17c: ldo17 {
...@@ -128,6 +137,9 @@ vreg_l17c: ldo17 { ...@@ -128,6 +137,9 @@ vreg_l17c: ldo17 {
regulator-max-microvolt = <2504000>; regulator-max-microvolt = <2504000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
regulator-allow-set-load; regulator-allow-set-load;
regulator-allowed-modes =
<RPMH_REGULATOR_MODE_LPM
RPMH_REGULATOR_MODE_HPM>;
}; };
}; };
......
arch/arm64/boot/dts/qcom/sc7280.dtsi
View file @ c967c73c
...@@ -2340,7 +2340,8 @@ swr1: soundwire@3230000 { ...@@ -2340,7 +2340,8 @@ swr1: soundwire@3230000 {
lpass_audiocc: clock-controller@3300000 { lpass_audiocc: clock-controller@3300000 {
compatible = "qcom,sc7280-lpassaudiocc"; compatible = "qcom,sc7280-lpassaudiocc";
reg = <0 0x03300000 0 0x30000>; reg = <0 0x03300000 0 0x30000>,
<0 0x032a9000 0 0x1000>;
clocks = <&rpmhcc RPMH_CXO_CLK>, clocks = <&rpmhcc RPMH_CXO_CLK>,
<&lpass_aon LPASS_AON_CC_MAIN_RCG_CLK_SRC>; <&lpass_aon LPASS_AON_CC_MAIN_RCG_CLK_SRC>;
clock-names = "bi_tcxo", "lpass_aon_cc_main_rcg_clk_src"; clock-names = "bi_tcxo", "lpass_aon_cc_main_rcg_clk_src";
......
arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
View file @ c967c73c
...@@ -170,6 +170,9 @@ vreg_l7c: ldo7 { ...@@ -170,6 +170,9 @@ vreg_l7c: ldo7 {
regulator-max-microvolt = <2504000>; regulator-max-microvolt = <2504000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
regulator-allow-set-load; regulator-allow-set-load;
regulator-allowed-modes =
<RPMH_REGULATOR_MODE_LPM
RPMH_REGULATOR_MODE_HPM>;
}; };
vreg_l13c: ldo13 { vreg_l13c: ldo13 {
...@@ -192,6 +195,9 @@ vreg_l3d: ldo3 { ...@@ -192,6 +195,9 @@ vreg_l3d: ldo3 {
regulator-max-microvolt = <1200000>; regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
regulator-allow-set-load; regulator-allow-set-load;
regulator-allowed-modes =
<RPMH_REGULATOR_MODE_LPM
RPMH_REGULATOR_MODE_HPM>;
}; };
vreg_l4d: ldo4 { vreg_l4d: ldo4 {
......
arch/arm64/boot/dts/qcom/sc8280xp.dtsi
View file @ c967c73c
...@@ -1368,13 +1368,13 @@ ufs_mem_hc: ufs@1d84000 { ...@@ -1368,13 +1368,13 @@ ufs_mem_hc: ufs@1d84000 {
ufs_mem_phy: phy@1d87000 { ufs_mem_phy: phy@1d87000 {
compatible = "qcom,sc8280xp-qmp-ufs-phy"; compatible = "qcom,sc8280xp-qmp-ufs-phy";
reg = <0 0x01d87000 0 0xe10>; reg = <0 0x01d87000 0 0x1c8>;
#address-cells = <2>; #address-cells = <2>;
#size-cells = <2>; #size-cells = <2>;
ranges; ranges;
clock-names = "ref", clock-names = "ref",
"ref_aux"; "ref_aux";
clocks = <&rpmhcc RPMH_CXO_CLK>, clocks = <&gcc GCC_UFS_REF_CLKREF_CLK>,
<&gcc GCC_UFS_PHY_PHY_AUX_CLK>; <&gcc GCC_UFS_PHY_PHY_AUX_CLK>;
resets = <&ufs_mem_hc 0>; resets = <&ufs_mem_hc 0>;
...@@ -1436,13 +1436,13 @@ ufs_card_hc: ufs@1da4000 { ...@@ -1436,13 +1436,13 @@ ufs_card_hc: ufs@1da4000 {
ufs_card_phy: phy@1da7000 { ufs_card_phy: phy@1da7000 {
compatible = "qcom,sc8280xp-qmp-ufs-phy"; compatible = "qcom,sc8280xp-qmp-ufs-phy";
reg = <0 0x01da7000 0 0xe10>; reg = <0 0x01da7000 0 0x1c8>;
#address-cells = <2>; #address-cells = <2>;
#size-cells = <2>; #size-cells = <2>;
ranges; ranges;
clock-names = "ref", clock-names = "ref",
"ref_aux"; "ref_aux";
clocks = <&gcc GCC_UFS_1_CARD_CLKREF_CLK>, clocks = <&gcc GCC_UFS_REF_CLKREF_CLK>,
<&gcc GCC_UFS_CARD_PHY_AUX_CLK>; <&gcc GCC_UFS_CARD_PHY_AUX_CLK>;
resets = <&ufs_card_hc 0>; resets = <&ufs_card_hc 0>;
...@@ -1655,26 +1655,16 @@ usb_0_qmpphy: phy-wrapper@88ec000 { ...@@ -1655,26 +1655,16 @@ usb_0_qmpphy: phy-wrapper@88ec000 {
usb_0_ssphy: usb3-phy@88eb400 { usb_0_ssphy: usb3-phy@88eb400 {
reg = <0 0x088eb400 0 0x100>, reg = <0 0x088eb400 0 0x100>,
<0 0x088eb600 0 0x3ec>, <0 0x088eb600 0 0x3ec>,
<0 0x088ec400 0 0x1f0>, <0 0x088ec400 0 0x364>,
<0 0x088eba00 0 0x100>, <0 0x088eba00 0 0x100>,
<0 0x088ebc00 0 0x3ec>, <0 0x088ebc00 0 0x3ec>,
<0 0x088ec700 0 0x64>; <0 0x088ec200 0 0x18>;
#phy-cells = <0>; #phy-cells = <0>;
#clock-cells = <0>; #clock-cells = <0>;
clocks = <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>; clocks = <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>;
clock-names = "pipe0"; clock-names = "pipe0";
clock-output-names = "usb0_phy_pipe_clk_src"; clock-output-names = "usb0_phy_pipe_clk_src";
}; };
usb_0_dpphy: dp-phy@88ed200 {
reg = <0 0x088ed200 0 0x200>,
<0 0x088ed400 0 0x200>,
<0 0x088eda00 0 0x200>,
<0 0x088ea600 0 0x200>,
<0 0x088ea800 0 0x200>;
#clock-cells = <1>;
#phy-cells = <0>;
};
}; };
usb_1_hsphy: phy@8902000 { usb_1_hsphy: phy@8902000 {
...@@ -1716,8 +1706,8 @@ usb_1_qmpphy: phy-wrapper@8904000 { ...@@ -1716,8 +1706,8 @@ usb_1_qmpphy: phy-wrapper@8904000 {
usb_1_ssphy: usb3-phy@8903400 { usb_1_ssphy: usb3-phy@8903400 {
reg = <0 0x08903400 0 0x100>, reg = <0 0x08903400 0 0x100>,
<0 0x08903c00 0 0x3ec>, <0 0x08903600 0 0x3ec>,
<0 0x08904400 0 0x1f0>, <0 0x08904400 0 0x364>,
<0 0x08903a00 0 0x100>, <0 0x08903a00 0 0x100>,
<0 0x08903c00 0 0x3ec>, <0 0x08903c00 0 0x3ec>,
<0 0x08904200 0 0x18>; <0 0x08904200 0 0x18>;
...@@ -1727,16 +1717,6 @@ usb_1_ssphy: usb3-phy@8903400 { ...@@ -1727,16 +1717,6 @@ usb_1_ssphy: usb3-phy@8903400 {
clock-names = "pipe0"; clock-names = "pipe0";
clock-output-names = "usb1_phy_pipe_clk_src"; clock-output-names = "usb1_phy_pipe_clk_src";
}; };
usb_1_dpphy: dp-phy@8904200 {
reg = <0 0x08904200 0 0x200>,
<0 0x08904400 0 0x200>,
<0 0x08904a00 0 0x200>,
<0 0x08904600 0 0x200>,
<0 0x08904800 0 0x200>;
#clock-cells = <1>;
#phy-cells = <0>;
};
}; };
system-cache-controller@9200000 { system-cache-controller@9200000 {
......
arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi
View file @ c967c73c
...@@ -348,6 +348,9 @@ vreg_l6c_2p9: ldo6 { ...@@ -348,6 +348,9 @@ vreg_l6c_2p9: ldo6 {
regulator-max-microvolt = <2960000>; regulator-max-microvolt = <2960000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
regulator-allow-set-load; regulator-allow-set-load;
regulator-allowed-modes =
<RPMH_REGULATOR_MODE_LPM
RPMH_REGULATOR_MODE_HPM>;
}; };
vreg_l7c_3p0: ldo7 { vreg_l7c_3p0: ldo7 {
...@@ -367,6 +370,9 @@ vreg_l9c_2p9: ldo9 { ...@@ -367,6 +370,9 @@ vreg_l9c_2p9: ldo9 {
regulator-max-microvolt = <2960000>; regulator-max-microvolt = <2960000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
regulator-allow-set-load; regulator-allow-set-load;
regulator-allowed-modes =
<RPMH_REGULATOR_MODE_LPM
RPMH_REGULATOR_MODE_HPM>;
}; };
vreg_l10c_3p3: ldo10 { vreg_l10c_3p3: ldo10 {
......
arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi
View file @ c967c73c
...@@ -317,6 +317,9 @@ vreg_l6c_2p9: ldo6 { ...@@ -317,6 +317,9 @@ vreg_l6c_2p9: ldo6 {
regulator-max-microvolt = <2960000>; regulator-max-microvolt = <2960000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
regulator-allow-set-load; regulator-allow-set-load;
regulator-allowed-modes =
<RPMH_REGULATOR_MODE_LPM
RPMH_REGULATOR_MODE_HPM>;
}; };
vreg_l7c_2p85: ldo7 { vreg_l7c_2p85: ldo7 {
...@@ -339,6 +342,9 @@ vreg_l9c_2p9: ldo9 { ...@@ -339,6 +342,9 @@ vreg_l9c_2p9: ldo9 {
regulator-max-microvolt = <2960000>; regulator-max-microvolt = <2960000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
regulator-allow-set-load; regulator-allow-set-load;
regulator-allowed-modes =
<RPMH_REGULATOR_MODE_LPM
RPMH_REGULATOR_MODE_HPM>;
}; };
vreg_l10c_3p3: ldo10 { vreg_l10c_3p3: ldo10 {
......
arch/arm64/boot/dts/qcom/sm8250.dtsi
View file @ c967c73c
...@@ -334,6 +334,7 @@ CLUSTER_SLEEP_0: cluster-sleep-0 { ...@@ -334,6 +334,7 @@ CLUSTER_SLEEP_0: cluster-sleep-0 {
exit-latency-us = <6562>; exit-latency-us = <6562>;
min-residency-us = <9987>; min-residency-us = <9987>;
local-timer-stop; local-timer-stop;
status = "disabled";
}; };
}; };
}; };
......
arch/arm64/boot/dts/qcom/sm8350-hdk.dts
View file @ c967c73c
...@@ -107,6 +107,9 @@ vreg_l5b_0p88: ldo5 { ...@@ -107,6 +107,9 @@ vreg_l5b_0p88: ldo5 {
regulator-max-microvolt = <888000>; regulator-max-microvolt = <888000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
regulator-allow-set-load; regulator-allow-set-load;
regulator-allowed-modes =
<RPMH_REGULATOR_MODE_LPM
RPMH_REGULATOR_MODE_HPM>;
}; };
vreg_l6b_1p2: ldo6 { vreg_l6b_1p2: ldo6 {
...@@ -115,6 +118,9 @@ vreg_l6b_1p2: ldo6 { ...@@ -115,6 +118,9 @@ vreg_l6b_1p2: ldo6 {
regulator-max-microvolt = <1208000>; regulator-max-microvolt = <1208000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
regulator-allow-set-load; regulator-allow-set-load;
regulator-allowed-modes =
<RPMH_REGULATOR_MODE_LPM
RPMH_REGULATOR_MODE_HPM>;
}; };
vreg_l7b_2p96: ldo7 { vreg_l7b_2p96: ldo7 {
...@@ -123,6 +129,9 @@ vreg_l7b_2p96: ldo7 { ...@@ -123,6 +129,9 @@ vreg_l7b_2p96: ldo7 {
regulator-max-microvolt = <2504000>; regulator-max-microvolt = <2504000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
regulator-allow-set-load; regulator-allow-set-load;
regulator-allowed-modes =
<RPMH_REGULATOR_MODE_LPM
RPMH_REGULATOR_MODE_HPM>;
}; };
vreg_l9b_1p2: ldo9 { vreg_l9b_1p2: ldo9 {
...@@ -131,6 +140,9 @@ vreg_l9b_1p2: ldo9 { ...@@ -131,6 +140,9 @@ vreg_l9b_1p2: ldo9 {
regulator-max-microvolt = <1200000>; regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
regulator-allow-set-load; regulator-allow-set-load;
regulator-allowed-modes =
<RPMH_REGULATOR_MODE_LPM
RPMH_REGULATOR_MODE_HPM>;
}; };
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7