blob: 3c3074571415019c021dd6c5dd910465eaf524e5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
From af217539bab20a3bba6e1bbd4e4c8f68e7644e50 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.com>
Date: Mon, 26 Oct 2020 10:23:22 +0000
Subject: [PATCH] staging: bcm2835-audio: Add disable-headphones flag
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>
---
drivers/staging/vc04_services/bcm2835-audio/bcm2835.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
@@ -381,11 +381,16 @@ static int snd_bcm2835_alsa_probe(struct
}
if (!enable_compat_alsa) {
+ // In this mode, enable analog output by default
+ u32 disable_headphones = 0;
+
if (!of_property_read_bool(dev->of_node, "brcm,disable-hdmi"))
set_hdmi_enables(dev);
- // In this mode, always enable analog output
- enable_headphones = true;
+ of_property_read_u32(dev->of_node,
+ "brcm,disable-headphones",
+ &disable_headphones);
+ enable_headphones = !disable_headphones;
} else {
enable_hdmi0 = enable_hdmi;
}
|
