Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 50de6494 authored by Florian Fainelli's avatar Florian Fainelli
Browse files

Merge tag 'tags/bcm2835-drivers-next-2019-02-01' into drivers/next 



This pull requests adds the missing devicetree parts for the
new BCM2835 PM driver which depends on the driver changes.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents 722f7610 e1dc2b2e

arch/arm/boot/dts/bcm2835-rpi.dtsi

+0 −4
Original line number Diff line number Diff line
@@ -87,10 +87,6 @@ 
	power-domains = <&power RPI_POWER_DOMAIN_USB>;

};



&v3d {

	power-domains = <&power RPI_POWER_DOMAIN_V3D>;

};



&hdmi {

	power-domains = <&power RPI_POWER_DOMAIN_HDMI>;

	status = "okay";

arch/arm/boot/dts/bcm283x.dtsi

+14 −3
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include <dt-bindings/clock/bcm2835-aux.h>

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/soc/bcm2835-pm.h>



/* firmware-provided startup stubs live here, where the secondary CPUs are

 * spinning.
@@ -120,9 +121,18 @@ 
			#interrupt-cells = <2>;

		};



		watchdog@7e100000 {

			compatible = "brcm,bcm2835-pm-wdt";

			reg = <0x7e100000 0x28>;

		pm: watchdog@7e100000 {

			compatible = "brcm,bcm2835-pm", "brcm,bcm2835-pm-wdt";

			#power-domain-cells = <1>;

			#reset-cells = <1>;

			reg = <0x7e100000 0x114>,

			      <0x7e00a000 0x24>;

			clocks = <&clocks BCM2835_CLOCK_V3D>,

				 <&clocks BCM2835_CLOCK_PERI_IMAGE>,

				 <&clocks BCM2835_CLOCK_H264>,

				 <&clocks BCM2835_CLOCK_ISP>;

			clock-names = "v3d", "peri_image", "h264", "isp";

			system-power-controller;

		};



		clocks: cprman@7e101000 {
@@ -629,6 +639,7 @@ 
			compatible = "brcm,bcm2835-v3d";

			reg = <0x7ec00000 0x1000>;

			interrupts = <1 10>;

			power-domains = <&pm BCM2835_POWER_DOMAIN_GRAFX_V3D>;

		};



		vc4: gpu {