system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-20 19:17:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Even more Qualcomm ARM64 updates for v5.13

Browse source 
This contains three audio related fixes for the sc7180 Trogdor devices.
 -----BEGIN PGP SIGNATURE-----
 
 iQJPBAABCAA5FiEEBd4DzF816k8JZtUlCx85Pw2ZrcUFAmB9npMbHGJqb3JuLmFu
 ZGVyc3NvbkBsaW5hcm8ub3JnAAoJEAsfOT8Nma3Fn0QQAJXtkbYx09JwzQ8gOfl0
 jPt8iyJuqW+HxpyCKmsHzpwj+kpCSi54XJIfyfFSfvSnIZM4viJ4nTpMsYw9OpYi
 QPsx5nnUahIvJcwPz5RJ+E7EFfhD0wDXy4QtQF0a3bDgZ+2Y+1EPWcV/lP6qoXkW
 ds/dsz/JsuqAAjjydPjSeFfqI6yxWelwCz52Zj0uSqjVJR90EjSj6JmIF9FTMHHM
 RuXK6MinvKLeDn2sxNYy+uVu7XuEKMU5y/YzDkPgq+h8NVwYWMAmMRhjhICfWH5G
 rBHSiFLNxqz8X5/Hb+R4AS4sBfhTZ92YcJT9HAYCrlI3yRwNw4CtUaQQud25SC0g
 mdQsMqffDGCedJcHijCURVTUHXVjgahOO1p321zS7R2JJpYz8jP3ZSC81pCwTPK1
 9dtMGEQNXdThUuVoh8iDjCSK0y6zCb21eEU50g/rkkWyIab6xZTa2ZZATRCzTW2z
 8+2bnfaLCHKor5b6iXd6cDFQU/ihx1oxoRSb6av34+r7uo7Yh+FJsNUjl9w2FLSJ
 aRmOBDWoi5uf5/+XpfXD/OKJYCtS8aZ9sxJpfAjLviv9R2FcOMmu1pCJ1os7g1zR
 HmROEwMf0pgtOMshQLutxgid4cvI1neml/lR8FrgqSBhL11oSWDQtzV9Jvyi+aVk
 psSIbQyNcQQL6n2CbRwPt3wb
 =LhLX
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Arnd Bergmann 2021-04-19 17:37:38 +02:00
parent 6417554e3d 1b86cc7330
commit a85a8d52bf
4 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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;
};
};
};

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

@ -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;
};
};
};

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

@ -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";
};

3
arch/arm64/boot/dts/qcom/sc7180.dtsi
View file

@ -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>;