bcm2835: Add firmware property to affected devices

Also move firmware depending devices to the rpi dtsi file since they depend on the Pi specific firmware. Signed-off-by: Noralf Trønnes <[email protected]>
raspberrypi · Aug 5, 2015 · 8af1742 · 8af1742
1 parent a15106c
commit 8af1742
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 19 deletions.
diff --git 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";

diff --git 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 {