2015-09-11 16:32:00 +00:00
|
|
|
From 687c5493ee74d58ee1084d3e01a534a1329f5f70 Mon Sep 17 00:00:00 2001
|
2015-08-17 06:04:32 +00:00
|
|
|
From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
|
|
|
|
|
Date: Mon, 20 Jul 2015 12:27:17 +0200
|
2015-09-11 16:32:00 +00:00
|
|
|
Subject: [PATCH 138/171] bcm2835: Add firmware property to affected devices
|
2015-08-17 06:04:32 +00:00
|
|
|
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 {
|
