summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoralf Trønnes <noralf@tronnes.org>2015-05-18 17:21:31 +0200
committerNoralf Trønnes <noralf@tronnes.org>2015-05-18 19:47:44 +0200
commit61021b5883fc0c64fad65e9d6c4d3fc4eb3c5274 (patch)
tree60196a8795beb834210fe2eca72acaf76dbb4052
parent8e4daae27742ef8bb1146e1b8a5c738aa6c4b9d5 (diff)
downloadlinux-61021b5883fc0c64fad65e9d6c4d3fc4eb3c5274.tar.gz
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>
-rw-r--r--arch/arm/boot/dts/bcm2708-rpi-b-plus.dts4
-rw-r--r--arch/arm/boot/dts/bcm2708-rpi-b.dts4
-rw-r--r--arch/arm/boot/dts/bcm2708_common.dtsi5
-rw-r--r--arch/arm/boot/dts/bcm2709-rpi-2-b.dts4
-rw-r--r--arch/arm/mach-bcm2708/bcm2708.c2
-rw-r--r--arch/arm/mach-bcm2709/bcm2709.c2
6 files changed, 19 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
index f25563aee35d..9a8fed03ada7 100644
--- 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
index 17b4b8c7d12a..cf67ec94e91c 100644
--- 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
index 1c8c1af9a1ff..c5ed34bda237 100644
--- 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
index c73249b2f2f0..1c865de5daf7 100644
--- 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
index 7cc47c1fdb71..cde2124566fe 100644
--- 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
index 2c0a664825f0..95db41ff2601 100644
--- 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);