Commit b130b0ad authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-arm64-fixes-for-5.7' of... 

Merge tag 'qcom-arm64-fixes-for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes

Qualcomm ARM64 DT fixes for v5.7

This reduces the (hard coded) CPU voltage to a safe level on MSM8996 and
updates the audio nodes on db820c, db845c and c630 to reflect audio
changes that landed late in the cycle.

* tag 'qcom-arm64-fixes-for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  arm64: dts: qcom: db820c: fix audio configuration
  arm64: dts: qcom: db845c: fix asm dai setup
  arm64: qcom: c630: fix asm dai setup
  arm64: dts: qcom: msm8996: Reduce vdd_apc voltage

Link: https://lore.kernel.org/r/20200429052932.GA2627045@builder.lan


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0e698dfa 7710f80e

arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi

+20 −3
Original line number Diff line number Diff line
@@ -658,8 +658,8 @@ 
	s11 {

		qcom,saw-leader;

		regulator-always-on;

		regulator-min-microvolt = <1230000>;

		regulator-max-microvolt = <1230000>;

		regulator-min-microvolt = <980000>;

		regulator-max-microvolt = <980000>;

	};

};
@@ -908,10 +908,27 @@ 
	status = "okay";

};



&q6asmdai {

	dai@0 {

		reg = <0>;

	};



	dai@1 {

		reg = <1>;

	};



	dai@2 {

		reg = <2>;

	};

};



&sound {

	compatible = "qcom,apq8096-sndcard";

	model = "DB820c";

	audio-routing =	"RX_BIAS", "MCLK";

	audio-routing =	"RX_BIAS", "MCLK",

		"MM_DL1",  "MultiMedia1 Playback",

		"MM_DL2",  "MultiMedia2 Playback",

		"MultiMedia3 Capture", "MM_UL3";



	mm1-dai-link {

		link-name = "MultiMedia1";

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

+2 −0
Original line number Diff line number Diff line
@@ -2066,6 +2066,8 @@ 
						reg = <APR_SVC_ASM>;

						q6asmdai: dais {

							compatible = "qcom,q6asm-dais";

							#address-cells = <1>;

							#size-cells = <0>;

							#sound-dai-cells = <1>;

							iommus = <&lpass_q6_smmu 1>;

						};

arch/arm64/boot/dts/qcom/sdm845-db845c.dts

+0 −3
Original line number Diff line number Diff line
@@ -442,17 +442,14 @@ 
&q6asmdai {

	dai@0 {

		reg = <0>;

		direction = <2>;

	};



	dai@1 {

		reg = <1>;

		direction = <2>;

	};



	dai@2 {

		reg = <2>;

		direction = <1>;

	};



	dai@3 {

arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts

+0 −2
Original line number Diff line number Diff line
@@ -359,12 +359,10 @@ 
&q6asmdai {

	dai@0 {

		reg = <0>;

		direction = <2>;

	};



	dai@1 {

		reg = <1>;

		direction = <1>;

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE