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

Commit a77f430f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: support smartPA AW8896 for SDM429w"

parents 3b265aaf da4fed46
Loading
Loading
Loading
Loading
+21 −0
Original line number Diff line number Diff line
AW8896 SmartpA

Required properties:

  - compatible : "awinic,aw8896_smartpa"

  - reg : I2C address of the device

  - reset-gpio: gpio used for HW reset

Optional properties:

  - irq-gpio: gpio used for irq indicator

Examples:

	i2c_smartpa@34 {
		compatible = "awinic,i2c_smartpa";
		reg = <0x34>;
		reset-gpio = <&tlmm 68 0>;
	};
+1 −0
Original line number Diff line number Diff line
@@ -321,3 +321,4 @@ zte ZTE Corp.
zyxel	ZyXEL Communications Corp.
inven   InvenSense, Inc.
cy      Parade.
awinic  Shanghai Awinic Technology Co., Ltd.
+22 −0
Original line number Diff line number Diff line
@@ -514,6 +514,7 @@
	/delete-property/ qcom,split-a2dp;
	asoc-wsa-codec-names;
	asoc-wsa-codec-prefixes;
	ext_pa_aw8896;
	qcom,audio-routing =
		"CDC_CONN", "MCLK",
		"QUAT_MI2S_RX", "DIGITAL_REGULATOR",
@@ -582,3 +583,24 @@
&wsa881x_i2c_45 {
	status = "disabled";
};

&wsa881x_analog_vi_gpio {
	status = "disabled";
};

&wsa881x_analog_clk_gpio {
	status = "disabled";
};

&wsa881x_analog_reset_gpio {
	status = "disabled";
};

&i2c_2 {
	aw8896_smartpa@34 {
		compatible = "awinic,aw8896_smartpa";
		reg = <0x34>;
		reset-gpio = <&tlmm 68 0>;
		status = "okay";
	};
};
+7 −0
Original line number Diff line number Diff line
@@ -203,6 +203,7 @@ config SND_SOC_ALL_CODECS
	select SND_SOC_WM9705 if SND_SOC_AC97_BUS
	select SND_SOC_WM9712 if SND_SOC_AC97_BUS
	select SND_SOC_WM9713 if SND_SOC_AC97_BUS
	select SND_SOC_AW8896 if I2C
        help
          Normally ASoC codec drivers are only built if a machine driver which
          uses them is also built since they are only usable with a machine
@@ -1089,4 +1090,10 @@ config SND_SOC_TPA6130A2
	tristate "Texas Instruments TPA6130A2 headphone amplifier"
	depends on I2C

config SND_SOC_AW8896
	tristate "SoC Audio for awinic aw8896 series"
	depends on I2C
	help
	  Enables support for aw8896 series Smart PA.

endmenu
+2 −0
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ snd-soc-max9877-objs := max9877.o
snd-soc-max98504-objs := max98504.o
snd-soc-tpa6130a2-objs := tpa6130a2.o
snd-soc-tas2552-objs := tas2552.o
snd-soc-aw8896-objs := aw8896.o

obj-$(CONFIG_SND_SOC_88PM860X)	+= snd-soc-88pm860x.o
obj-$(CONFIG_SND_SOC_AB8500_CODEC)	+= snd-soc-ab8500-codec.o
@@ -440,3 +441,4 @@ obj-$(CONFIG_SND_SOC_WM_HUBS) += snd-soc-wm-hubs.o
obj-$(CONFIG_SND_SOC_MAX9877)	+= snd-soc-max9877.o
obj-$(CONFIG_SND_SOC_MAX98504)	+= snd-soc-max98504.o
obj-$(CONFIG_SND_SOC_TPA6130A2)	+= snd-soc-tpa6130a2.o
obj-$(CONFIG_SND_SOC_AW8896)	+= snd-soc-aw8896.o
Loading