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
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
From 9be804b336947fd31728a74a34c7febf44d6b8a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
Date: Mon, 20 Jul 2015 12:27:17 +0200
Subject: [PATCH 138/148] bcm2835: Add firmware property to affected devices
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Also move firmware depending devices to the rpi dtsi file since
they depend on the Pi specific firmware.
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
---
arch/arm/boot/dts/bcm2835-rpi.dtsi | 22 ++++++++++++++++++----
arch/arm/boot/dts/bcm2835.dtsi | 15 ---------------
2 files changed, 18 insertions(+), 19 deletions(-)
--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
@@ -32,6 +32,24 @@
compatible = "raspberrypi,bcm2835-firmware";
mboxes = <&mailbox>;
};
+
+ fb: fb {
+ compatible = "brcm,bcm2708-fb";
+ firmware = <&firmware>;
+ };
+
+ thermal: thermal {
+ compatible = "brcm,bcm2835-thermal";
+ firmware = <&firmware>;
+ };
+
+ vchiq: vchiq {
+ compatible = "brcm,bcm2835-vchiq";
+ reg = <0x7e00b840 0xf>;
+ interrupts = <0 2>;
+ cache-line-size = <32>;
+ firmware = <&firmware>;
+ };
};
/* Onboard audio */
@@ -101,10 +119,6 @@
bus-width = <4>;
};
-&fb {
- status = "okay";
-};
-
/ {
__overrides__ {
i2s = <&i2s>,"status";
--- a/arch/arm/boot/dts/bcm2835.dtsi
+++ b/arch/arm/boot/dts/bcm2835.dtsi
@@ -160,21 +160,6 @@
arm-pmu {
compatible = "arm,arm1176-pmu";
};
-
- fb: fb {
- compatible = "brcm,bcm2708-fb";
- status = "disabled";
- };
-
- vchiq: vchiq {
- compatible = "brcm,bcm2835-vchiq";
- reg = <0x7e00b840 0xf>;
- interrupts = <0 2>;
- };
-
- thermal: thermal {
- compatible = "brcm,bcm2835-thermal";
- };
};
clocks {
|
