From nobody Mon May 11 11:28:47 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 34F11C433EF for ; Fri, 8 Apr 2022 15:05:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237001AbiDHPHG (ORCPT ); Fri, 8 Apr 2022 11:07:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237369AbiDHPHC (ORCPT ); Fri, 8 Apr 2022 11:07:02 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id B22031E5A7C for ; Fri, 8 Apr 2022 08:04:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649430297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Nf3doDTjAQOJeXMo+td/oIn+T9zeQzKA6cjU7aYrP9I=; b=RJbv4h0Pbnil4Ii/WTd2EJEwqt9/Sr9vCV84XRnK7EhCnNxokArHoy9iDYklWypG/OVrbF 19Rd+KNixzWpq7POBP7xztM2KXuc5QBsYKElaXFEuUjm01CjO6Y7+v9vzllP69pIKwhX4N iNKe5dlkFwJba8y5jY545MSwsvX/uR8= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-280-tNJqkt45MUWuqfztnYAd0g-1; Fri, 08 Apr 2022 11:04:56 -0400 X-MC-Unique: tNJqkt45MUWuqfztnYAd0g-1 Received: by mail-qk1-f199.google.com with SMTP id c19-20020a05620a0cf300b005f17891c015so3774292qkj.18 for ; Fri, 08 Apr 2022 08:04:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Nf3doDTjAQOJeXMo+td/oIn+T9zeQzKA6cjU7aYrP9I=; b=DAhk+TFucQT/tIQBzZdTjPgeCSqRB+1BrMgIGJytqrmH2rHQLjYoRf78+VifgYrGwO HB9lhspn82OC6RdcW1myBNHV0yFKiPzZld2d5cR83hu5XbXrxl60FCM9qoIvE4CnbnHw 4D1QV/3hd5hFDTwo/ePLcrYEHDk503EXsaffBM8DlUhkKR5TGH1R46LbaFzr88AEUTgt DWrZiLNh7EhmwtzP3/e3x2bNGEBqHkJrebb/vamMGCNTFqZWcNbGHFo/ONc9dwblVENa MOB16Jwxq6A6BOjvtqodF02nkcsxgnIxabRTynQBqKYnJ89bo8WMKM/+0XpdPlgURZHW dpgQ== X-Gm-Message-State: AOAM531CpWqsoAYVX1X1bpiaO4QYFKvLIQ98gDcxTlTgKHQh436OQyae dw59PtS0b3yrLfGIcWRgeKjWIa6RKOjZWWImJ+ibbhBuGxIHpKEzBp1NpV0WjQlgSTUkqzJ4Azf buNxuvUWrzM8LMuCYGvGMsFY3 X-Received: by 2002:ad4:5d48:0:b0:440:ef43:3667 with SMTP id jk8-20020ad45d48000000b00440ef433667mr16347227qvb.110.1649430295310; Fri, 08 Apr 2022 08:04:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzCVc7ORoGlnJj5uukafi+K7qBY9LttNX9++JT3/dAotS3gtzJ8mGW4F4g7a6PbpA5LgjzL4g== X-Received: by 2002:ad4:5d48:0:b0:440:ef43:3667 with SMTP id jk8-20020ad45d48000000b00440ef433667mr16347198qvb.110.1649430295084; Fri, 08 Apr 2022 08:04:55 -0700 (PDT) Received: from fedora.hitronhub.home (modemcable200.11-22-96.mc.videotron.ca. [96.22.11.200]) by smtp.gmail.com with ESMTPSA id g9-20020a05620a108900b0067b13036bd5sm13700748qkk.52.2022.04.08.08.04.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 08:04:54 -0700 (PDT) From: Adrien Thierry To: Greg Kroah-Hartman , Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, Nicolas Saenz Julienne Cc: Adrien Thierry , linux-staging@lists.linux.dev, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] staging: bcm2835-audio: remove compat ALSA card Date: Fri, 8 Apr 2022 11:03:58 -0400 Message-Id: <20220408150359.26661-1-athierry@redhat.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove compat ALSA card, which has overlapping functionality with the two other cards described by the driver (HDMI and headphones) This handles TODO item "Revisit multi-cards options and PCM route mixer control". Move the S/PDIF device that was part of the compat ALSA card to the HDMI card. Only enable headphones card by default, because HDMI breaks when using both vc4 and bcm2835-audio with HDMI card enabled. Signed-off-by: Adrien Thierry --- I was able to test PCM output on 3.5mm and HDMI on a Raspberry Pi 4. However, I couldn't test the HDMI S/PDIF device since I don't own a S/PDIF capable speaker. .../vc04_services/bcm2835-audio/bcm2835-ctl.c | 86 ++----------------- .../vc04_services/bcm2835-audio/bcm2835.c | 33 ++----- 2 files changed, 15 insertions(+), 104 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c b/dr= ivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c index 3703409715da..1c1f040122d7 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c @@ -117,15 +117,6 @@ static const struct snd_kcontrol_new snd_bcm2835_ctl[]= =3D { .get =3D snd_bcm2835_ctl_get, .put =3D snd_bcm2835_ctl_put, }, - { - .iface =3D SNDRV_CTL_ELEM_IFACE_MIXER, - .name =3D "PCM Playback Route", - .access =3D SNDRV_CTL_ELEM_ACCESS_READWRITE, - .private_value =3D PCM_PLAYBACK_DEVICE, - .info =3D snd_bcm2835_ctl_info, - .get =3D snd_bcm2835_ctl_get, - .put =3D snd_bcm2835_ctl_put, - }, }; =20 static int snd_bcm2835_spdif_default_info(struct snd_kcontrol *kcontrol, @@ -220,7 +211,14 @@ static int create_ctls(struct bcm2835_chip *chip, size= _t size, return 0; } =20 -int snd_bcm2835_new_ctl(struct bcm2835_chip *chip) +int snd_bcm2835_new_headphones_ctl(struct bcm2835_chip *chip) +{ + strscpy(chip->card->mixername, "Broadcom Mixer", sizeof(chip->card->mixer= name)); + return create_ctls(chip, ARRAY_SIZE(snd_bcm2835_ctl), + snd_bcm2835_ctl); +} + +int snd_bcm2835_new_hdmi_ctl(struct bcm2835_chip *chip) { int err; =20 @@ -232,71 +230,3 @@ int snd_bcm2835_new_ctl(struct bcm2835_chip *chip) snd_bcm2835_spdif); } =20 -static const struct snd_kcontrol_new snd_bcm2835_headphones_ctl[] =3D { - { - .iface =3D SNDRV_CTL_ELEM_IFACE_MIXER, - .name =3D "Headphone Playback Volume", - .index =3D 0, - .access =3D SNDRV_CTL_ELEM_ACCESS_READWRITE | - SNDRV_CTL_ELEM_ACCESS_TLV_READ, - .private_value =3D PCM_PLAYBACK_VOLUME, - .info =3D snd_bcm2835_ctl_info, - .get =3D snd_bcm2835_ctl_get, - .put =3D snd_bcm2835_ctl_put, - .count =3D 1, - .tlv =3D {.p =3D snd_bcm2835_db_scale} - }, - { - .iface =3D SNDRV_CTL_ELEM_IFACE_MIXER, - .name =3D "Headphone Playback Switch", - .index =3D 0, - .access =3D SNDRV_CTL_ELEM_ACCESS_READWRITE, - .private_value =3D PCM_PLAYBACK_MUTE, - .info =3D snd_bcm2835_ctl_info, - .get =3D snd_bcm2835_ctl_get, - .put =3D snd_bcm2835_ctl_put, - .count =3D 1, - } -}; - -int snd_bcm2835_new_headphones_ctl(struct bcm2835_chip *chip) -{ - strscpy(chip->card->mixername, "Broadcom Mixer", sizeof(chip->card->mixer= name)); - return create_ctls(chip, ARRAY_SIZE(snd_bcm2835_headphones_ctl), - snd_bcm2835_headphones_ctl); -} - -static const struct snd_kcontrol_new snd_bcm2835_hdmi[] =3D { - { - .iface =3D SNDRV_CTL_ELEM_IFACE_MIXER, - .name =3D "HDMI Playback Volume", - .index =3D 0, - .access =3D SNDRV_CTL_ELEM_ACCESS_READWRITE | - SNDRV_CTL_ELEM_ACCESS_TLV_READ, - .private_value =3D PCM_PLAYBACK_VOLUME, - .info =3D snd_bcm2835_ctl_info, - .get =3D snd_bcm2835_ctl_get, - .put =3D snd_bcm2835_ctl_put, - .count =3D 1, - .tlv =3D {.p =3D snd_bcm2835_db_scale} - }, - { - .iface =3D SNDRV_CTL_ELEM_IFACE_MIXER, - .name =3D "HDMI Playback Switch", - .index =3D 0, - .access =3D SNDRV_CTL_ELEM_ACCESS_READWRITE, - .private_value =3D PCM_PLAYBACK_MUTE, - .info =3D snd_bcm2835_ctl_info, - .get =3D snd_bcm2835_ctl_get, - .put =3D snd_bcm2835_ctl_put, - .count =3D 1, - } -}; - -int snd_bcm2835_new_hdmi_ctl(struct bcm2835_chip *chip) -{ - strscpy(chip->card->mixername, "Broadcom Mixer", sizeof(chip->card->mixer= name)); - return create_ctls(chip, ARRAY_SIZE(snd_bcm2835_hdmi), - snd_bcm2835_hdmi); -} - diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/driver= s/staging/vc04_services/bcm2835-audio/bcm2835.c index 628732d7bf6a..00bc898b0189 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c @@ -10,17 +10,13 @@ #include "bcm2835.h" =20 static bool enable_hdmi; -static bool enable_headphones; -static bool enable_compat_alsa =3D true; +static bool enable_headphones =3D true; static int num_channels =3D MAX_SUBSTREAMS; =20 module_param(enable_hdmi, bool, 0444); MODULE_PARM_DESC(enable_hdmi, "Enables HDMI virtual audio device"); module_param(enable_headphones, bool, 0444); MODULE_PARM_DESC(enable_headphones, "Enables Headphones virtual audio devi= ce"); -module_param(enable_compat_alsa, bool, 0444); -MODULE_PARM_DESC(enable_compat_alsa, - "Enables ALSA compatibility virtual audio device"); module_param(num_channels, int, 0644); MODULE_PARM_DESC(num_channels, "Number of audio channels (default: 8)"); =20 @@ -63,19 +59,20 @@ struct bcm2835_audio_driver { enum snd_bcm2835_route route; }; =20 -static int bcm2835_audio_alsa_newpcm(struct bcm2835_chip *chip, +static int bcm2835_audio_dual_newpcm(struct bcm2835_chip *chip, const char *name, enum snd_bcm2835_route route, u32 numchannels) { int err; =20 - err =3D snd_bcm2835_new_pcm(chip, "bcm2835 ALSA", 0, AUDIO_DEST_AUTO, - numchannels - 1, false); + err =3D snd_bcm2835_new_pcm(chip, name, 0, route, + numchannels, false); + if (err) return err; =20 - err =3D snd_bcm2835_new_pcm(chip, "bcm2835 IEC958/HDMI", 1, 0, 1, true); + err =3D snd_bcm2835_new_pcm(chip, "IEC958", 1, route, 1, true); if (err) return err; =20 @@ -90,18 +87,6 @@ static int bcm2835_audio_simple_newpcm(struct bcm2835_ch= ip *chip, return snd_bcm2835_new_pcm(chip, name, 0, route, numchannels, false); } =20 -static struct bcm2835_audio_driver bcm2835_audio_alsa =3D { - .driver =3D { - .name =3D "bcm2835_alsa", - .owner =3D THIS_MODULE, - }, - .shortname =3D "bcm2835 ALSA", - .longname =3D "bcm2835 ALSA", - .minchannels =3D 2, - .newpcm =3D bcm2835_audio_alsa_newpcm, - .newctl =3D snd_bcm2835_new_ctl, -}; - static struct bcm2835_audio_driver bcm2835_audio_hdmi =3D { .driver =3D { .name =3D "bcm2835_hdmi", @@ -110,7 +95,7 @@ static struct bcm2835_audio_driver bcm2835_audio_hdmi = =3D { .shortname =3D "bcm2835 HDMI", .longname =3D "bcm2835 HDMI", .minchannels =3D 1, - .newpcm =3D bcm2835_audio_simple_newpcm, + .newpcm =3D bcm2835_audio_dual_newpcm, .newctl =3D snd_bcm2835_new_hdmi_ctl, .route =3D AUDIO_DEST_HDMI }; @@ -134,10 +119,6 @@ struct bcm2835_audio_drivers { }; =20 static struct bcm2835_audio_drivers children_devices[] =3D { - { - .audio_driver =3D &bcm2835_audio_alsa, - .is_enabled =3D &enable_compat_alsa, - }, { .audio_driver =3D &bcm2835_audio_hdmi, .is_enabled =3D &enable_hdmi, base-commit: 1831fed559732b132aef0ea8261ac77e73f7eadf --=20 2.35.1