Merge pull request #1421 from anholt/rpi-4.5.y

vc4 updates for 4.5
raspberrypi · Apr 22, 2016 · 15b6777 · 15b6777
2 parents 22a3d4e + fc7b011
commit 15b6777
Show file tree

Hide file tree

Showing 17 changed files with 1,880 additions and 671 deletions.
diff --git a/arch/arm/boot/dts/bcm2708_common.dtsi b/arch/arm/boot/dts/bcm2708_common.dtsi
@@ -285,6 +285,12 @@
 			mboxes = <&mailbox>;
 		};
 
+		power: power {
+			compatible = "raspberrypi,bcm2835-power";
+			firmware = <&firmware>;
+			#power-domain-cells = <1>;
+		};
+
 		leds: leds {
 			compatible = "gpio-leds";
 		};

diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
@@ -6,6 +6,7 @@
 /plugin/;
 
 #include "dt-bindings/clock/bcm2835.h"
+#include "dt-bindings/power/raspberrypi-power.h"
 #include "dt-bindings/gpio/gpio.h"
 
 / {
@@ -72,12 +73,14 @@
 				clocks = <&cprman BCM2835_PLLH_PIX>,
 					 <&cprman BCM2835_CLOCK_HSM>;
 				clock-names = "pixel", "hdmi";
+				power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
 			};
 
 			v3d@7ec00000 {
 				compatible = "brcm,vc4-v3d";
 				reg = <0x7ec00000 0x1000>;
 				interrupts = <1 10>;
+				power-domains = <&power RPI_POWER_DOMAIN_V3D>;
 			};
 
 			gpu@7e4c0000 {
@@ -89,7 +92,7 @@
 	fragment@4 {
 		target-path = "/chosen";
 		__overlay__ {
-			bootargs = "cma=256M@512M";
+			bootargs = "cma=256M@256M";
 		};
 	};
 };
diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
@@ -71,6 +71,7 @@ CONFIG_NEON=y
 CONFIG_KERNEL_MODE_NEON=y
 CONFIG_BINFMT_MISC=m
 # CONFIG_SUSPEND is not set
+CONFIG_PM=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
@@ -1109,6 +1110,7 @@ CONFIG_FB_TFT_FBTFT_DEVICE=m
 CONFIG_MAILBOX=y
 CONFIG_BCM2835_MBOX=y
 # CONFIG_IOMMU_SUPPORT is not set
+CONFIG_RASPBERRYPI_POWER=y
 CONFIG_EXTCON=m
 CONFIG_EXTCON_ARIZONA=m
 CONFIG_IIO=m

diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
@@ -64,6 +64,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 CONFIG_VFP=y
 CONFIG_BINFMT_MISC=m
 # CONFIG_SUSPEND is not set
+CONFIG_PM=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
@@ -1116,6 +1117,7 @@ CONFIG_FB_TFT_FBTFT_DEVICE=m
 CONFIG_MAILBOX=y
 CONFIG_BCM2835_MBOX=y
 # CONFIG_IOMMU_SUPPORT is not set
+CONFIG_RASPBERRYPI_POWER=y
 CONFIG_EXTCON=m
 CONFIG_EXTCON_ARIZONA=m
 CONFIG_IIO=m