raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-07 10:29:52 +00:00
Code Issues Projects Releases Wiki Activity

staging: bcm2835-audio: Add disable-headphones flag

Browse Source 
Add a property to allow the headphone output to be disabled. Use an
integer property rather than a boolean so that an overlay can clear it.

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
This commit is contained in:
Phil Elwell
2020-10-26 10:23:22 +00:00
committed by Dom Cobley
parent 1438bedfa8
commit ee90e47d88
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
View File

@@ -336,6 +336,7 @@ static int snd_bcm2835_alsa_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
int err; int err;
u32 disable_headphones = 0;
if (num_channels <= 0 || num_channels > MAX_SUBSTREAMS) { if (num_channels <= 0 || num_channels > MAX_SUBSTREAMS) {
num_channels = MAX_SUBSTREAMS; num_channels = MAX_SUBSTREAMS;
@@ -346,6 +347,11 @@ static int snd_bcm2835_alsa_probe(struct platform_device *pdev)
if (!of_property_read_bool(dev->of_node, "brcm,disable-hdmi")) if (!of_property_read_bool(dev->of_node, "brcm,disable-hdmi"))
set_hdmi_enables(dev); set_hdmi_enables(dev);
of_property_read_u32(dev->of_node,
"brcm,disable-headphones",
&disable_headphones);
enable_headphones = !disable_headphones;
err = bcm2835_devm_add_vchi_ctx(dev); err = bcm2835_devm_add_vchi_ctx(dev);
if (err) if (err)
return err; return err;