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

This project is archived. Its data is read-only.

Commit 897db080 authored Dec 18, 2018 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Dec 18, 2018

Merge "ARM: dts: msm: Update mi2s group port id for msm8996"

parents da581774 24c58ec4

Documentation/devicetree/bindings/sound/qcom-audio-dev.txt

+6 −6

Original line number	Diff line number	Diff line
		@@ -2703,12 +2703,12 @@ Required properties:
		The size of the array is determined by
		the value in msm-cpudai-mi2s-group-num-ports.
		Each group supports up to 4 ports:
		Secondary RX: 4160, 4162, 4164, 4174,
		Secondary TX: 4161, 4163, 4165, 4175,
		Tertiary RX: 4168, 4170, 4172, 4176,
		Tertiary TX: 4169, 4171, 4173, 4177,
		Quaternary RX: 4102, 4128, 4130, 4132,
		Quaternary TX: 4103, 4129, 4131, 4133,
		Secondary RX: 4160, 4162, 4164, 4166,
		Secondary TX: 4161, 4163, 4165, 4167,
		Tertiary RX: 4168, 4170, 4172, 4174,
		Tertiary TX: 4169, 4171, 4173, 4175,
		Quaternary RX: 4128, 4130, 4132, 4134,
		Quaternary TX: 4129, 4131, 4133, 4135,

		- qcom,msm-cpudai-mi2s-channel-mode: group mi2s line channel mode.
		I2S_SD0 : 0x1

arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi

+4 −4

Original line number	Diff line number	Diff line
		@@ -767,13 +767,13 @@
		"msm-dai-q6-tdm.36915", "msm-dai-q6-tdm.36917",
		"msm-dai-q6-tdm.36919", "msm-dai-q6-mi2s.4160",
		"msm-dai-q6-mi2s.4162", "msm-dai-q6-mi2s.4164",
		"msm-dai-q6-mi2s.4174", "msm-dai-q6-mi2s.4161",
		"msm-dai-q6-mi2s.4166", "msm-dai-q6-mi2s.4161",
		"msm-dai-q6-mi2s.4163", "msm-dai-q6-mi2s.4165",
		"msm-dai-q6-mi2s.4175", "msm-dai-q6-mi2s.4168",
		"msm-dai-q6-mi2s.4167", "msm-dai-q6-mi2s.4168",
		"msm-dai-q6-mi2s.4170", "msm-dai-q6-mi2s.4172",
		"msm-dai-q6-mi2s.4176", "msm-dai-q6-mi2s.4169",
		"msm-dai-q6-mi2s.4174", "msm-dai-q6-mi2s.4169",
		"msm-dai-q6-mi2s.4171", "msm-dai-q6-mi2s.4173",
		"msm-dai-q6-mi2s.4177", "msm-dai-q6-mi2s.4128",
		"msm-dai-q6-mi2s.4175", "msm-dai-q6-mi2s.4128",
		"msm-dai-q6-mi2s.4130", "msm-dai-q6-mi2s.4132",
		"msm-dai-q6-mi2s.4134", "msm-dai-q6-mi2s.4129",
		"msm-dai-q6-mi2s.4131", "msm-dai-q6-mi2s.4133",

arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi

+4 −4

Original line number	Diff line number	Diff line
		@@ -1144,13 +1144,13 @@
		"msm-dai-q6-tdm.36915", "msm-dai-q6-tdm.36917",
		"msm-dai-q6-tdm.36919", "msm-dai-q6-mi2s.4160",
		"msm-dai-q6-mi2s.4162", "msm-dai-q6-mi2s.4164",
		"msm-dai-q6-mi2s.4174", "msm-dai-q6-mi2s.4161",
		"msm-dai-q6-mi2s.4166", "msm-dai-q6-mi2s.4161",
		"msm-dai-q6-mi2s.4163", "msm-dai-q6-mi2s.4165",
		"msm-dai-q6-mi2s.4175", "msm-dai-q6-mi2s.4168",
		"msm-dai-q6-mi2s.4167", "msm-dai-q6-mi2s.4168",
		"msm-dai-q6-mi2s.4170", "msm-dai-q6-mi2s.4172",
		"msm-dai-q6-mi2s.4176", "msm-dai-q6-mi2s.4169",
		"msm-dai-q6-mi2s.4174", "msm-dai-q6-mi2s.4169",
		"msm-dai-q6-mi2s.4171", "msm-dai-q6-mi2s.4173",
		"msm-dai-q6-mi2s.4177", "msm-dai-q6-mi2s.4128",
		"msm-dai-q6-mi2s.4175", "msm-dai-q6-mi2s.4128",
		"msm-dai-q6-mi2s.4130", "msm-dai-q6-mi2s.4132",
		"msm-dai-q6-mi2s.4134", "msm-dai-q6-mi2s.4129",
		"msm-dai-q6-mi2s.4131", "msm-dai-q6-mi2s.4133",

arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi

+4 −4

Original line number	Diff line number	Diff line
		@@ -997,13 +997,13 @@
		"msm-dai-q6-tdm.36915", "msm-dai-q6-tdm.36917",
		"msm-dai-q6-tdm.36919", "msm-dai-q6-mi2s.4160",
		"msm-dai-q6-mi2s.4162", "msm-dai-q6-mi2s.4164",
		"msm-dai-q6-mi2s.4174", "msm-dai-q6-mi2s.4161",
		"msm-dai-q6-mi2s.4166", "msm-dai-q6-mi2s.4161",
		"msm-dai-q6-mi2s.4163", "msm-dai-q6-mi2s.4165",
		"msm-dai-q6-mi2s.4175", "msm-dai-q6-mi2s.4168",
		"msm-dai-q6-mi2s.4167", "msm-dai-q6-mi2s.4168",
		"msm-dai-q6-mi2s.4170", "msm-dai-q6-mi2s.4172",
		"msm-dai-q6-mi2s.4176", "msm-dai-q6-mi2s.4169",
		"msm-dai-q6-mi2s.4174", "msm-dai-q6-mi2s.4169",
		"msm-dai-q6-mi2s.4171", "msm-dai-q6-mi2s.4173",
		"msm-dai-q6-mi2s.4177", "msm-dai-q6-mi2s.4128",
		"msm-dai-q6-mi2s.4175", "msm-dai-q6-mi2s.4128",
		"msm-dai-q6-mi2s.4130", "msm-dai-q6-mi2s.4132",
		"msm-dai-q6-mi2s.4134", "msm-dai-q6-mi2s.4129",
		"msm-dai-q6-mi2s.4131", "msm-dai-q6-mi2s.4133",

arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi

+4 −4

Original line number	Diff line number	Diff line
		@@ -592,13 +592,13 @@
		"msm-dai-q6-tdm.36915", "msm-dai-q6-tdm.36917",
		"msm-dai-q6-tdm.36919", "msm-dai-q6-mi2s.4160",
		"msm-dai-q6-mi2s.4162", "msm-dai-q6-mi2s.4164",
		"msm-dai-q6-mi2s.4174", "msm-dai-q6-mi2s.4161",
		"msm-dai-q6-mi2s.4166", "msm-dai-q6-mi2s.4161",
		"msm-dai-q6-mi2s.4163", "msm-dai-q6-mi2s.4165",
		"msm-dai-q6-mi2s.4175", "msm-dai-q6-mi2s.4168",
		"msm-dai-q6-mi2s.4167", "msm-dai-q6-mi2s.4168",
		"msm-dai-q6-mi2s.4170", "msm-dai-q6-mi2s.4172",
		"msm-dai-q6-mi2s.4176", "msm-dai-q6-mi2s.4169",
		"msm-dai-q6-mi2s.4174", "msm-dai-q6-mi2s.4169",
		"msm-dai-q6-mi2s.4171", "msm-dai-q6-mi2s.4173",
		"msm-dai-q6-mi2s.4177", "msm-dai-q6-mi2s.4128",
		"msm-dai-q6-mi2s.4175", "msm-dai-q6-mi2s.4128",
		"msm-dai-q6-mi2s.4130", "msm-dai-q6-mi2s.4132",
		"msm-dai-q6-mi2s.4134", "msm-dai-q6-mi2s.4129",
		"msm-dai-q6-mi2s.4131", "msm-dai-q6-mi2s.4133",