Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0abf1af authored by yungwenpeng's avatar yungwenpeng
Browse files

Merge branch vanilla into gms 

* ssh://ch-git3.arimacomm.com.tw:29418/kernel/msm-4.9:
  Audio porting for smart amp TAS2557.
Change-Id: I202b549ed3ae11d30e7c3276453f185af0aaa743
parents 45202bb0 bde46d69

arch/arm64/boot/dts/qcom/msm8953-mtp.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -72,6 +72,17 @@ 
	        status = "okay";

	    };

	    /* AWINIC AW8898 Smart PA End */



	    tas2557@4c {

		sound-dai-cells = <1>;

		compatible = "ti,tas2557";

		reg = <0x4c>;

		ti,cdc-reset-gpio = <&tlmm 21 0>;

		ti,irq-gpio = <&tlmm 20 0>;

		ti,i2s-bits = <16>;

		ti,bypass-tmax = <0>;

		status = "ok";

	    };

};

//[FairPhone][Audio][jinjia]=2018.11.21=smart amp porting. -e

arch/arm64/configs/msm8953-perf_defconfig

+6 −0
Original line number Diff line number Diff line
@@ -696,4 +696,10 @@ CONFIG_ELAN_FINGERPRINT=y 
#add aw8898 smartpa

CONFIG_SND_SMARTPA_AW8898=y

#[FairPhone][Audio][jinjia]=2018.11.21=smart amp porting. -e

#[FairPhone][Audio][jinjia]=2020.05.19=2nd smart amp porting. -s

CONFIG_SND_SOC_TAS2557=y

CONFIG_TAS2557_REGMAP=y

CONFIG_TAS2557_CODEC=y

CONFIG_TAS2557_MISC=y

#[FairPhone][Audio][jinjia]=2020.05.19=2nd smart amp porting. -e

arch/arm64/configs/msm8953_defconfig

+6 −0
Original line number Diff line number Diff line
@@ -760,4 +760,10 @@ CONFIG_ELAN_FINGERPRINT=y 
#add aw8898 smartpa

CONFIG_SND_SMARTPA_AW8898=y

#[FairPhone][Audio][jinjia]=2018.11.21=smart amp porting. -e

#[FairPhone][Audio][jinjia]=2020.05.19=2nd smart amp porting. -s

CONFIG_SND_SOC_TAS2557=y

CONFIG_TAS2557_REGMAP=y

CONFIG_TAS2557_CODEC=y

CONFIG_TAS2557_MISC=y

#[FairPhone][Audio][jinjia]=2020.05.19=2nd smart amp porting. -e

sound/soc/codecs/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -1105,6 +1105,8 @@ config SND_SMARTPA_AW8898 
		This option enables support for aw8898 series Smart PA.

#[FairPhone][Audio][jinjia]=2018.11.21=smart amp porting. -e



source "sound/soc/codecs/tas2557/Kconfig"



config SND_SOC_TFA98XX

	tristate "NXP Semiconductors TFA98XX amplifier"

	depends on I2C

sound/soc/codecs/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -451,3 +451,4 @@ obj-$(CONFIG_SND_SOC_TFA98XX) += snd-soc-tfa98xx.o 
#for AWINIC AW8898 Smart PA

obj-y += aw/aw8898.o

#[FairPhone][Audio][jinjia]=2018.11.21=smart amp porting. -e

obj-$(CONFIG_SND_SOC_TAS2557) += tas2557/