BCM270x_DT: Add bcm2708-fb device

Add bcm2708-fb to Device Tree and don't add the platform device when booting in DT mode. Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
raspberrypi · May 18, 2015 · 61021b5 · 61021b5
1 parent 8e4daae
commit 61021b5
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 2 deletions.
diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
@@ -49,6 +49,10 @@
 	bus-width = <4>;
 };
 
+&fb {
+	status = "okay";
+};
+
 &spi0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&spi0_pins>;

diff --git a/arch/arm/boot/dts/bcm2708-rpi-b.dts b/arch/arm/boot/dts/bcm2708-rpi-b.dts
@@ -49,6 +49,10 @@
 	bus-width = <4>;
 };
 
+&fb {
+	status = "okay";
+};
+
 &spi0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&spi0_pins>;

diff --git a/arch/arm/boot/dts/bcm2708_common.dtsi b/arch/arm/boot/dts/bcm2708_common.dtsi
@@ -109,6 +109,11 @@
 		leds: leds {
 			compatible = "gpio-leds";
 		};
+
+		fb: fb {
+			compatible = "brcm,bcm2708-fb";
+			status = "disabled";
+		};
 	};
 
 	clocks {

diff --git a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
@@ -49,6 +49,10 @@
 	bus-width = <4>;
 };
 
+&fb {
+	status = "okay";
+};
+
 &spi0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&spi0_pins>;

diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c
@@ -928,7 +928,7 @@ void __init bcm2708_init(void)
 	bcm_register_device_dt(&w1_device);
 #endif
 	bcm_register_device(&bcm2708_systemtimer_device);
-	bcm_register_device(&bcm2708_fb_device);
+	bcm_register_device_dt(&bcm2708_fb_device);
 	bcm_register_device(&bcm2708_usb_device);
 	bcm_register_device(&bcm2708_uart1_device);
 	bcm_register_device(&bcm2708_powerman_device);

diff --git a/arch/arm/mach-bcm2709/bcm2709.c b/arch/arm/mach-bcm2709/bcm2709.c
@@ -951,7 +951,7 @@ void __init bcm2709_init(void)
 #ifdef SYSTEM_TIMER
 	bcm_register_device(&bcm2708_systemtimer_device);
 #endif
-	bcm_register_device(&bcm2708_fb_device);
+	bcm_register_device_dt(&bcm2708_fb_device);
 	bcm_register_device(&bcm2708_usb_device);
 	bcm_register_device(&bcm2708_uart1_device);
 	bcm_register_device(&bcm2708_powerman_device);