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

Merge tag 'qcom-arm64-for-5.13-3' of... 

Merge tag 'qcom-arm64-for-5.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/dt

Even more Qualcomm ARM64 updates for v5.13

This contains three audio related fixes for the sc7180 Trogdor devices.

* tag 'qcom-arm64-for-5.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  arm64: dts: qcom: sc7180: Update iommu property for simultaneous playback
  arm64: dts: qcom: sc7180: pompom: Add "dmic_clk_en" + sound model
  arm64: dts: qcom: sc7180: coachz: Add "dmic_clk_en"

Link: https://lore.kernel.org/r/20210419151637.861409-1-bjorn.andersson@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 6417554e 1b86cc73

arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts

+0 −13
Original line number Diff line number Diff line
@@ -138,17 +138,4 @@ &tlmm { 
			  "AP_TS_PEN_I2C_SCL",

			  "DP_HOT_PLUG_DET",

			  "EC_IN_RW_ODL";



	dmic_clk_en: dmic_clk_en {

		pinmux {

			pins = "gpio83";

			function = "gpio";

		};



		pinconf {

			pins = "gpio83";

			drive-strength = <8>;

			bias-pull-up;

		};

	};

};

arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi

+16 −0
Original line number Diff line number Diff line
@@ -93,6 +93,9 @@ &sound { 
	compatible = "google,sc7180-coachz";

	model = "sc7180-adau7002-max98357a";

	audio-routing = "PDM_DAT", "DMIC";



	pinctrl-names = "default";

	pinctrl-0 = <&dmic_clk_en>;

};



&sound_multimedia0_codec {
@@ -247,4 +250,17 @@ &tlmm { 
			  "AP_TS_PEN_I2C_SCL",

			  "DP_HOT_PLUG_DET",

			  "EC_IN_RW_ODL";



	dmic_clk_en: dmic_clk_en {

		pinmux {

			pins = "gpio83";

			function = "gpio";

		};



		pinconf {

			pins = "gpio83";

			drive-strength = <8>;

			bias-pull-up;

		};

	};

};

arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -139,6 +139,13 @@ &sdhc_2 { 
	status = "okay";

};



&sound {

	model = "sc7180-rt5682-max98357a-2mic";

	pinctrl-names = "default";

	pinctrl-0 = <&dmic_sel>;

	dmic-gpios = <&tlmm 86 GPIO_ACTIVE_HIGH>;

};



&usb_c1 {

	status = "disabled";

};

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

+2 −1
Original line number Diff line number Diff line
@@ -3566,7 +3566,8 @@ lpass_cpu: lpass@62f00000 { 
			reg = <0 0x62f00000 0 0x29000>;

			reg-names = "lpass-lpaif";



			iommus = <&apps_smmu 0x1020 0>;

			iommus = <&apps_smmu 0x1020 0>,

				<&apps_smmu 0x1021 0>;



			power-domains = <&lpass_hm LPASS_CORE_HM_GDSCR>;