diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-04-19 17:37:38 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-04-19 17:37:38 +0200 |
| commit | a85a8d52bf5007b14cbe70f9197bda25c78cab53 (patch) | |
| tree | ac5b150add6cf918a2e9efce0e2ca57db653b482 | |
| parent | 6417554e3d34e238566b91e3e1632acb63a9cf29 (diff) | |
| parent | 1b86cc7330895b11df0a7dc15fbbbef60be9f7bb (diff) | |
| download | linux-stable-a85a8d52bf5007b14cbe70f9197bda25c78cab53.tar.gz linux-stable-a85a8d52bf5007b14cbe70f9197bda25c78cab53.tar.bz2 linux-stable-a85a8d52bf5007b14cbe70f9197bda25c78cab53.zip | |
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: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts | 13 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 16 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 7 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sc7180.dtsi | 3 |
4 files changed, 25 insertions, 14 deletions
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts index 86619f6c1134..1b1dbdb2a82f 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts @@ -138,17 +138,4 @@ "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; - }; - }; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi index e2ffe71c2d52..4c6e433c8226 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi @@ -93,6 +93,9 @@ ap_ts_pen_1v8: &i2c4 { 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 @@ ap_ts_pen_1v8: &i2c4 { "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; + }; + }; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi index d253a08f6fc8..622b5f1b88a2 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi @@ -139,6 +139,13 @@ ap_ts_pen_1v8: &i2c4 { 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"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index a6da78d31fdd..6228ba2d8513 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -3566,7 +3566,8 @@ 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>; |