2016-09-10 12:54:26 +00:00
|
|
|
From 593366c81d96fb54152093ab5ca3d62607440cf8 Mon Sep 17 00:00:00 2001
|
2016-06-08 09:59:37 +00:00
|
|
|
From: popcornmix <popcornmix@gmail.com>
|
|
|
|
|
Date: Fri, 29 Apr 2016 17:27:33 +0100
|
2016-09-10 12:54:26 +00:00
|
|
|
Subject: [PATCH] Revert "bcm2835: log which channel map is set"
|
2016-06-08 09:59:37 +00:00
|
|
|
|
|
|
|
|
This reverts commit cd560b8658868d9652ab31754e02f86daf6831ba.
|
|
|
|
|
---
|
|
|
|
|
sound/arm/bcm2835-vchiq.c | 5 -----
|
|
|
|
|
1 file changed, 5 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/sound/arm/bcm2835-vchiq.c
|
|
|
|
|
+++ b/sound/arm/bcm2835-vchiq.c
|
|
|
|
|
@@ -596,11 +596,8 @@ int bcm2835_audio_set_params(bcm2835_als
|
|
|
|
|
instance->result = -1;
|
|
|
|
|
|
|
|
|
|
if (alsa_stream->chip->cea_chmap >= 0) {
|
|
|
|
|
- LOG_INFO("Using application requested channel map: %d\n",
|
|
|
|
|
- alsa_stream->chip->cea_chmap);
|
|
|
|
|
chmap_value = (unsigned)alsa_stream->chip->cea_chmap << 24;
|
|
|
|
|
} else {
|
|
|
|
|
- LOG_INFO("Using fallback channel map.\n");
|
|
|
|
|
/* fallback layouts for applications which do not use chmap API */
|
|
|
|
|
chmap_value = 0x00;
|
|
|
|
|
switch (channels) {
|
|
|
|
|
@@ -617,8 +614,6 @@ int bcm2835_audio_set_params(bcm2835_als
|
|
|
|
|
for (i = 0; i < 8; i++)
|
|
|
|
|
chmap_value |= alsa_stream->chip->map_channels[i] << (i * 3);
|
|
|
|
|
|
|
|
|
|
- LOG_INFO("Requesting AUDS channel map: 0x%lx\n", (long)chmap_value);
|
|
|
|
|
-
|
|
|
|
|
m.type = VC_AUDIO_MSG_TYPE_CONFIG;
|
|
|
|
|
m.u.config.channels = channels;
|
|
|
|
|
m.u.config.samplerate = samplerate;
|
