blob: dae3d097a81e4515fa7fc48cb844175b043d33e5 (
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
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
From 628dbab26b97ba2ea43791e2f1587115dc4e224b Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Wed, 27 May 2015 17:22:15 +0100
Subject: [PATCH 071/148] bcm2835-audio: Create the platform device if the DT
node is disabled
For backwards compatibility, allow the built-in ALSA driver to be enabled
either by loading the module from /etc/modules or by enabling the "/audio"
node in DT.
---
arch/arm/mach-bcm2708/bcm2708.c | 10 ++++++++--
arch/arm/mach-bcm2709/bcm2709.c | 10 ++++++++--
2 files changed, 16 insertions(+), 4 deletions(-)
--- a/arch/arm/mach-bcm2708/bcm2708.c
+++ b/arch/arm/mach-bcm2708/bcm2708.c
@@ -898,8 +898,14 @@ void __init bcm2708_init(void)
#endif
bcm2708_init_led();
bcm2708_init_uart1();
- for (i = 0; i < ARRAY_SIZE(bcm2708_alsa_devices); i++)
- bcm_register_device_dt(&bcm2708_alsa_devices[i]);
+
+ /* Only create the platform devices for the ALSA driver in the
+ absence of an enabled "audio" DT node */
+ if (!use_dt ||
+ !of_device_is_available(of_find_node_by_path("/audio"))) {
+ for (i = 0; i < ARRAY_SIZE(bcm2708_alsa_devices); i++)
+ bcm_register_device(&bcm2708_alsa_devices[i]);
+ }
bcm_register_device_dt(&bcm2708_spi_device);
--- a/arch/arm/mach-bcm2709/bcm2709.c
+++ b/arch/arm/mach-bcm2709/bcm2709.c
@@ -918,8 +918,14 @@ void __init bcm2709_init(void)
#endif
bcm2709_init_led();
bcm2709_init_uart1();
- for (i = 0; i < ARRAY_SIZE(bcm2708_alsa_devices); i++)
- bcm_register_device_dt(&bcm2708_alsa_devices[i]);
+
+ /* Only create the platform devices for the ALSA driver in the
+ absence of an enabled "audio" DT node */
+ if (!use_dt ||
+ !of_device_is_available(of_find_node_by_path("/audio"))) {
+ for (i = 0; i < ARRAY_SIZE(bcm2708_alsa_devices); i++)
+ bcm_register_device(&bcm2708_alsa_devices[i]);
+ }
bcm_register_device_dt(&bcm2708_spi_device);
|
