Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8460ae70bb6bf1729bd247465c02b7a8c986c61d

Authored by Risto Suominen
Committed by Takashi Iwai
1 parent b6aa63eeb3
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

ALSA: powermac - Allow input from microphone on Tumbler 

Allow input from microphone on remaining PowerBooks and iBooks with Tumbler.
Tested only with PowerBook G4 Gigabit Ethernet (PowerBook3,3).

[Fixed to use of_machine_is_compatible by tiwai]

Signed-off-by: Risto Suominen <Risto.Suominen@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Showing 1 changed file with 5 additions and 1 deletions Side-by-side Diff

... ... @@ -1034,7 +1034,11 @@
1034 1034 if (of_device_is_compatible(sound, "tumbler")) {
1035 1035 chip->model = PMAC_TUMBLER;
1036 1036 chip->can_capture = of_machine_is_compatible("PowerMac4,2")
1037   - || of_machine_is_compatible("PowerBook4,1");
  1037 + || of_machine_is_compatible("PowerBook3,2")
  1038 + || of_machine_is_compatible("PowerBook3,3")
  1039 + || of_machine_is_compatible("PowerBook4,1")
  1040 + || of_machine_is_compatible("PowerBook4,2")
  1041 + || of_machine_is_compatible("PowerBook4,3");
1038 1042 chip->can_duplex = 0;
1039 1043 // chip->can_byte_swap = 0; /* FIXME: check this */
1040 1044 chip->num_freqs = ARRAY_SIZE(tumbler_freqs);