After fixing to the lpass-tx-macro driver to use the correct v9.4 configuration, some control names have changed and therefore need to be updated.
* "TX SWR_ADC" 0-3 becomes "TX SWR_INPUT" 0-3 * "TX SWR_DMIC" 0-7 becomes "TX SWR_INPUT" 4-11 Update all usages in dts. Signed-off-by: Luca Weiss <[email protected]> --- arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 2 +- .../boot/dts/qcom/qcs6490-radxa-dragon-q6a.dts | 2 +- arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts | 22 +++++++++++----------- .../dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi | 22 +++++++++++----------- .../dts/qcom/sc7280-herobrine-villager-r1.dtsi | 22 +++++++++++----------- arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 22 +++++++++++----------- 6 files changed, 46 insertions(+), 46 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts index bdc02260f902..565f7db91e77 100644 --- a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts +++ b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts @@ -860,7 +860,7 @@ &sound { "TX DMIC0", "MIC BIAS1", "TX DMIC1", "MIC BIAS2", "TX DMIC2", "MIC BIAS3", - "TX SWR_ADC1", "ADC2_OUTPUT", + "TX SWR_INPUT1", "ADC2_OUTPUT", "VA DMIC0", "VA MIC BIAS3", "VA DMIC1", "VA MIC BIAS3", "VA DMIC2", "VA MIC BIAS1", diff --git a/arch/arm64/boot/dts/qcom/qcs6490-radxa-dragon-q6a.dts b/arch/arm64/boot/dts/qcom/qcs6490-radxa-dragon-q6a.dts index bb5a42b038f1..a36bd6120ea2 100644 --- a/arch/arm64/boot/dts/qcom/qcs6490-radxa-dragon-q6a.dts +++ b/arch/arm64/boot/dts/qcom/qcs6490-radxa-dragon-q6a.dts @@ -736,7 +736,7 @@ &sound { audio-routing = "IN1_HPHL", "HPHL_OUT", "IN2_HPHR", "HPHR_OUT", "AMIC2", "MIC BIAS2", - "TX SWR_ADC1", "ADC2_OUTPUT"; + "TX SWR_INPUT1", "ADC2_OUTPUT"; wcd-playback-dai-link { link-name = "WCD Playback"; diff --git a/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts b/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts index c2cba9d7179b..ffe028bd0c72 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts @@ -101,17 +101,17 @@ &sound { "VA DMIC1", "MIC BIAS1", "VA DMIC2", "MIC BIAS3", "VA DMIC3", "MIC BIAS3", - "TX SWR_ADC0", "ADC1_OUTPUT", - "TX SWR_ADC1", "ADC2_OUTPUT", - "TX SWR_ADC2", "ADC3_OUTPUT", - "TX SWR_DMIC0", "DMIC1_OUTPUT", - "TX SWR_DMIC1", "DMIC2_OUTPUT", - "TX SWR_DMIC2", "DMIC3_OUTPUT", - "TX SWR_DMIC3", "DMIC4_OUTPUT", - "TX SWR_DMIC4", "DMIC5_OUTPUT", - "TX SWR_DMIC5", "DMIC6_OUTPUT", - "TX SWR_DMIC6", "DMIC7_OUTPUT", - "TX SWR_DMIC7", "DMIC8_OUTPUT"; + "TX SWR_INPUT0", "ADC1_OUTPUT", + "TX SWR_INPUT1", "ADC2_OUTPUT", + "TX SWR_INPUT2", "ADC3_OUTPUT", + "TX SWR_INPUT4", "DMIC1_OUTPUT", + "TX SWR_INPUT5", "DMIC2_OUTPUT", + "TX SWR_INPUT6", "DMIC3_OUTPUT", + "TX SWR_INPUT7", "DMIC4_OUTPUT", + "TX SWR_INPUT8", "DMIC5_OUTPUT", + "TX SWR_INPUT9", "DMIC6_OUTPUT", + "TX SWR_INPUT10", "DMIC7_OUTPUT", + "TX SWR_INPUT11", "DMIC8_OUTPUT"; }; &wcd9385 { diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi index ce48e4cda170..bc492346f7dc 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi @@ -20,17 +20,17 @@ sound: sound { "VA DMIC1", "MIC BIAS1", "VA DMIC2", "MIC BIAS3", "VA DMIC3", "MIC BIAS3", - "TX SWR_ADC0", "ADC1_OUTPUT", - "TX SWR_ADC1", "ADC2_OUTPUT", - "TX SWR_ADC2", "ADC3_OUTPUT", - "TX SWR_DMIC0", "DMIC1_OUTPUT", - "TX SWR_DMIC1", "DMIC2_OUTPUT", - "TX SWR_DMIC2", "DMIC3_OUTPUT", - "TX SWR_DMIC3", "DMIC4_OUTPUT", - "TX SWR_DMIC4", "DMIC5_OUTPUT", - "TX SWR_DMIC5", "DMIC6_OUTPUT", - "TX SWR_DMIC6", "DMIC7_OUTPUT", - "TX SWR_DMIC7", "DMIC8_OUTPUT"; + "TX SWR_INPUT0", "ADC1_OUTPUT", + "TX SWR_INPUT1", "ADC2_OUTPUT", + "TX SWR_INPUT2", "ADC3_OUTPUT", + "TX SWR_INPUT4", "DMIC1_OUTPUT", + "TX SWR_INPUT5", "DMIC2_OUTPUT", + "TX SWR_INPUT6", "DMIC3_OUTPUT", + "TX SWR_INPUT7", "DMIC4_OUTPUT", + "TX SWR_INPUT8", "DMIC5_OUTPUT", + "TX SWR_INPUT9", "DMIC6_OUTPUT", + "TX SWR_INPUT10", "DMIC7_OUTPUT", + "TX SWR_INPUT11", "DMIC8_OUTPUT"; #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dtsi index b25df5a99161..c6606b1eb71c 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dtsi @@ -23,15 +23,15 @@ &sound { "VA DMIC1", "vdd-micb", "VA DMIC2", "vdd-micb", "VA DMIC3", "vdd-micb", - "TX SWR_ADC0", "ADC1_OUTPUT", - "TX SWR_ADC1", "ADC2_OUTPUT", - "TX SWR_ADC2", "ADC3_OUTPUT", - "TX SWR_DMIC0", "DMIC1_OUTPUT", - "TX SWR_DMIC1", "DMIC2_OUTPUT", - "TX SWR_DMIC2", "DMIC3_OUTPUT", - "TX SWR_DMIC3", "DMIC4_OUTPUT", - "TX SWR_DMIC4", "DMIC5_OUTPUT", - "TX SWR_DMIC5", "DMIC6_OUTPUT", - "TX SWR_DMIC6", "DMIC7_OUTPUT", - "TX SWR_DMIC7", "DMIC8_OUTPUT"; + "TX SWR_INPUT0", "ADC1_OUTPUT", + "TX SWR_INPUT1", "ADC2_OUTPUT", + "TX SWR_INPUT2", "ADC3_OUTPUT", + "TX SWR_INPUT4", "DMIC1_OUTPUT", + "TX SWR_INPUT5", "DMIC2_OUTPUT", + "TX SWR_INPUT6", "DMIC3_OUTPUT", + "TX SWR_INPUT7", "DMIC4_OUTPUT", + "TX SWR_INPUT8", "DMIC5_OUTPUT", + "TX SWR_INPUT9", "DMIC6_OUTPUT", + "TX SWR_INPUT10", "DMIC7_OUTPUT", + "TX SWR_INPUT11", "DMIC8_OUTPUT"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi index 8cac4ce9c851..e54379147d2b 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi @@ -101,17 +101,17 @@ sound: sound { "VA DMIC1", "MIC BIAS3", "VA DMIC2", "MIC BIAS1", "VA DMIC3", "MIC BIAS1", - "TX SWR_ADC0", "ADC1_OUTPUT", - "TX SWR_ADC1", "ADC2_OUTPUT", - "TX SWR_ADC2", "ADC3_OUTPUT", - "TX SWR_DMIC0", "DMIC1_OUTPUT", - "TX SWR_DMIC1", "DMIC2_OUTPUT", - "TX SWR_DMIC2", "DMIC3_OUTPUT", - "TX SWR_DMIC3", "DMIC4_OUTPUT", - "TX SWR_DMIC4", "DMIC5_OUTPUT", - "TX SWR_DMIC5", "DMIC6_OUTPUT", - "TX SWR_DMIC6", "DMIC7_OUTPUT", - "TX SWR_DMIC7", "DMIC8_OUTPUT"; + "TX SWR_INPUT0", "ADC1_OUTPUT", + "TX SWR_INPUT1", "ADC2_OUTPUT", + "TX SWR_INPUT2", "ADC3_OUTPUT", + "TX SWR_INPUT4", "DMIC1_OUTPUT", + "TX SWR_INPUT5", "DMIC2_OUTPUT", + "TX SWR_INPUT6", "DMIC3_OUTPUT", + "TX SWR_INPUT7", "DMIC4_OUTPUT", + "TX SWR_INPUT8", "DMIC5_OUTPUT", + "TX SWR_INPUT9", "DMIC6_OUTPUT", + "TX SWR_INPUT10", "DMIC7_OUTPUT", + "TX SWR_INPUT11", "DMIC8_OUTPUT"; #address-cells = <1>; #size-cells = <0>; -- 2.54.0
