tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ASoC: Rename controls with a / in wm_hubs

This renames from a character / to : of controls. A / occurs below error
messages.

ASoC: Failed to create IN2RP/VXRP debugfs file
ASoC: Failed to create IN2LP/VXRN debugfs file

Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

authored by

Joonyoung Shim and committed by
Mark Brown 34825948 efd9eb96

+8 -8
unified split
+8 -8
sound/soc/codecs/wm_hubs.c
··· 438 438 SND_SOC_DAPM_INPUT("IN1LN"), 439 439 SND_SOC_DAPM_INPUT("IN1LP"), 440 440 SND_SOC_DAPM_INPUT("IN2LN"), 441 - SND_SOC_DAPM_INPUT("IN2LP/VXRN"), 441 + SND_SOC_DAPM_INPUT("IN2LP:VXRN"), 442 442 SND_SOC_DAPM_INPUT("IN1RN"), 443 443 SND_SOC_DAPM_INPUT("IN1RP"), 444 444 SND_SOC_DAPM_INPUT("IN2RN"), 445 - SND_SOC_DAPM_INPUT("IN2RP/VXRP"), 445 + SND_SOC_DAPM_INPUT("IN2RP:VXRP"), 446 446 447 447 SND_SOC_DAPM_MICBIAS("MICBIAS2", WM8993_POWER_MANAGEMENT_1, 5, 0), 448 448 SND_SOC_DAPM_MICBIAS("MICBIAS1", WM8993_POWER_MANAGEMENT_1, 4, 0), ··· 537 537 { "IN1R PGA", "IN1RP Switch", "IN1RP" }, 538 538 { "IN1R PGA", "IN1RN Switch", "IN1RN" }, 539 539 540 - { "IN2L PGA", "IN2LP Switch", "IN2LP/VXRN" }, 540 + { "IN2L PGA", "IN2LP Switch", "IN2LP:VXRN" }, 541 541 { "IN2L PGA", "IN2LN Switch", "IN2LN" }, 542 542 543 - { "IN2R PGA", "IN2RP Switch", "IN2RP/VXRP" }, 543 + { "IN2R PGA", "IN2RP Switch", "IN2RP:VXRP" }, 544 544 { "IN2R PGA", "IN2RN Switch", "IN2RN" }, 545 545 546 - { "Direct Voice", NULL, "IN2LP/VXRN" }, 547 - { "Direct Voice", NULL, "IN2RP/VXRP" }, 546 + { "Direct Voice", NULL, "IN2LP:VXRN" }, 547 + { "Direct Voice", NULL, "IN2RP:VXRP" }, 548 548 549 549 { "MIXINL", "IN1L Switch", "IN1L PGA" }, 550 550 { "MIXINL", "IN2L Switch", "IN2L PGA" }, ··· 565 565 { "Left Output Mixer", "Right Input Switch", "MIXINR" }, 566 566 { "Left Output Mixer", "IN2RN Switch", "IN2RN" }, 567 567 { "Left Output Mixer", "IN2LN Switch", "IN2LN" }, 568 - { "Left Output Mixer", "IN2LP Switch", "IN2LP/VXRN" }, 568 + { "Left Output Mixer", "IN2LP Switch", "IN2LP:VXRN" }, 569 569 { "Left Output Mixer", "IN1L Switch", "IN1L PGA" }, 570 570 { "Left Output Mixer", "IN1R Switch", "IN1R PGA" }, 571 571 ··· 573 573 { "Right Output Mixer", "Right Input Switch", "MIXINR" }, 574 574 { "Right Output Mixer", "IN2LN Switch", "IN2LN" }, 575 575 { "Right Output Mixer", "IN2RN Switch", "IN2RN" }, 576 - { "Right Output Mixer", "IN2RP Switch", "IN2RP/VXRP" }, 576 + { "Right Output Mixer", "IN2RP Switch", "IN2RP:VXRP" }, 577 577 { "Right Output Mixer", "IN1L Switch", "IN1L PGA" }, 578 578 { "Right Output Mixer", "IN1R Switch", "IN1R PGA" }, 579 579