Commit c967c73c authored by Bjorn Andersson's avatar Bjorn Andersson
Browse files

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

Mergeback arm64-fixes-for-6.1 to avoid merge conflicts.
parents afcd946b cadaa773

arch/arm64/boot/dts/qcom/msm8996.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -3547,7 +3547,7 @@ frame@98c0000 { 
		};



		saw3: syscon@9a10000 {

			compatible = "qcom,tcsr-msm8996", "syscon";

			compatible = "syscon";

			reg = <0x09a10000 0x1000>;

		};

arch/arm64/boot/dts/qcom/sa8155p-adp.dts

+12 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ vreg_s4a_1p8: smps4 { 


		regulator-always-on;

		regulator-boot-on;

		regulator-allow-set-load;



		vin-supply = <&vreg_3p3>;

	};
@@ -137,6 +136,9 @@ vreg_l5a_0p88: ldo5 { 
			regulator-max-microvolt = <880000>;

			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;

			regulator-allow-set-load;

			regulator-allowed-modes =

			    <RPMH_REGULATOR_MODE_LPM

			     RPMH_REGULATOR_MODE_HPM>;

		};



		vreg_l7a_1p8: ldo7 {
@@ -152,6 +154,9 @@ vreg_l10a_2p96: ldo10 { 
			regulator-max-microvolt = <2960000>;

			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;

			regulator-allow-set-load;

			regulator-allowed-modes =

			    <RPMH_REGULATOR_MODE_LPM

			     RPMH_REGULATOR_MODE_HPM>;

		};



		vreg_l11a_0p8: ldo11 {
@@ -258,6 +263,9 @@ vreg_l5c_1p2: ldo5 { 
			regulator-max-microvolt = <1200000>;

			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;

			regulator-allow-set-load;

			regulator-allowed-modes =

			    <RPMH_REGULATOR_MODE_LPM

			     RPMH_REGULATOR_MODE_HPM>;

		};



		vreg_l7c_1p8: ldo7 {
@@ -273,6 +281,9 @@ vreg_l8c_1p2: ldo8 { 
			regulator-max-microvolt = <1200000>;

			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;

			regulator-allow-set-load;

			regulator-allowed-modes =

			    <RPMH_REGULATOR_MODE_LPM

			     RPMH_REGULATOR_MODE_HPM>;

		};



		vreg_l10c_3p3: ldo10 {

arch/arm64/boot/dts/qcom/sa8295p-adp.dts

+12 −0
Original line number Diff line number Diff line
@@ -90,6 +90,9 @@ vreg_l3c: ldo3 { 
			regulator-max-microvolt = <1200000>;

			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;

			regulator-allow-set-load;

			regulator-allowed-modes =

			    <RPMH_REGULATOR_MODE_LPM

			     RPMH_REGULATOR_MODE_HPM>;

		};



		vreg_l4c: ldo4 {
@@ -105,6 +108,9 @@ vreg_l6c: ldo6 { 
			regulator-max-microvolt = <1200000>;

			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;

			regulator-allow-set-load;

			regulator-allowed-modes =

			    <RPMH_REGULATOR_MODE_LPM

			     RPMH_REGULATOR_MODE_HPM>;

		};



		vreg_l7c: ldo7 {
@@ -120,6 +126,9 @@ vreg_l10c: ldo10 { 
			regulator-max-microvolt = <2504000>;

			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;

			regulator-allow-set-load;

			regulator-allowed-modes =

			    <RPMH_REGULATOR_MODE_LPM

			     RPMH_REGULATOR_MODE_HPM>;

		};



		vreg_l17c: ldo17 {
@@ -128,6 +137,9 @@ vreg_l17c: ldo17 { 
			regulator-max-microvolt = <2504000>;

			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;

			regulator-allow-set-load;

			regulator-allowed-modes =

			    <RPMH_REGULATOR_MODE_LPM

			     RPMH_REGULATOR_MODE_HPM>;

		};

	};

arch/arm64/boot/dts/qcom/sc7280.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -2340,7 +2340,8 @@ swr1: soundwire@3230000 { 


		lpass_audiocc: clock-controller@3300000 {

			compatible = "qcom,sc7280-lpassaudiocc";

			reg = <0 0x03300000 0 0x30000>;

			reg = <0 0x03300000 0 0x30000>,

			      <0 0x032a9000 0 0x1000>;

			clocks = <&rpmhcc RPMH_CXO_CLK>,

			       <&lpass_aon 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

+6 −0
Original line number Diff line number Diff line
@@ -170,6 +170,9 @@ vreg_l7c: ldo7 { 
			regulator-max-microvolt = <2504000>;

			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;

			regulator-allow-set-load;

			regulator-allowed-modes =

			    <RPMH_REGULATOR_MODE_LPM

			     RPMH_REGULATOR_MODE_HPM>;

		};



		vreg_l13c: ldo13 {
@@ -192,6 +195,9 @@ vreg_l3d: ldo3 { 
			regulator-max-microvolt = <1200000>;

			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;

			regulator-allow-set-load;

			regulator-allowed-modes =

			    <RPMH_REGULATOR_MODE_LPM

			     RPMH_REGULATOR_MODE_HPM>;

		};



		vreg_l4d: ldo4 {