github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 01:53:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

This pull requests adds the missing devicetree parts for the

Browse Source 
new BCM2835 PM driver which depends on the driver changes.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJcVI97AAoJEFXEMs9xUwyNS90QAI4WstcYAy2K2rMpWgekT9k5
 paT2Mp2hKElSixqmPrUi85V/9OhbNqJI1CK/ud/GE6LWaxp5mDbpiKQRPo2m21BV
 IMV3lGjRBOUHxtovqv4F2mMCwxw83VPGW0PI4MxtjRQvwYqaZcNaRHcY9iM9zW9X
 0jWNXVTHPD8f6Qs1ub2aTdQ9V4Tt6ismcQCSMDwAzr/ir4hcFKDubABlctzhhCW3
 iIqO60uR4Ly/zDKe74ZnuJlMPm+nqmF7eJvBV9dSnh6Mym0iFK0C4Z+Ox/tHqpcV
 mDJR3/IrLttwFq4H0ZVw1sG1jda7YClNBM4J+eHnt+9CxqWjkEp6tB5iH3jxC5Nq
 bgUQgLFIts1cCb0aDU+W3EYXM1DrHPzbALEz93e2oEihvgQDUK1GhhOdz6GVe6SF
 CPR0StIuGSs7joTd6MahjVijlUAj/NlX8A4tiXqW3n/uUw95inhhbpN4t93Q50Ls
 q9CR5GOhQNDGSM1GWwRPBtUVPKJ0Bjh4ceSVdUsp4zaV7vn+k9NqY4mZdowCx+b7
 7w3a4IiTcPs4u+kGXFB25vt7hsfGuT+ZZq05Uv6dRayvpu/dmeLpJnx5/g6U1JsC
 rcJcRmZvMuxrx7zYx6ec3yXEcPTKZv+RJeq0HHVduOrA4kfMSZwOld9s35aFqrzE
 BZV7u53L+q9O7XoiBbhf
 =cWAj
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAlxUnhwACgkQh9CWnEQH
 BwQ1vw/8CNGxg3uQh1h3LktgcmSRGuI4O1/r2vBeekC+FKniwjyqFNdIgOgmCu4U
 esyIhj9DRyXUyUGvAZ+N+KAN1VaZuF+Dh1fiEntvxk6n0UF3Z5nsIWQvkUeS73tu
 YsHZK2d4ArWvIqvVtLDB+9E7zm1xO+eGU85qZx5pc6PPDrboHUVWo2kN/SrMaVEr
 R7ICBxK7psnPPDmf+XAz865llIP0vm7qnjUKjoMNK5ZQzDB4qo6CWIijzfUPIsGN
 eGPjMu+K/2bw9WPEIRRli6ELICV9sNBKBdFqMA6Jd0ngqHsHLPLXr0peiA8fw17M
 Zwo5/Wh/NWJXQPfeihyLUnq7eMpxfD2xS25X26vI3HwHYCmpQ0hEdEVFhunkNYes
 asdlYp2YNuX9U+bnQmPda+VEWqG6XHXBp8f9GrmSVP1Jw3jMjUGRQ5EgVNTItygm
 swWSyRNhuApo3DdKcUjmbMQseZDKQC4++43kZCtZdZGzysNKK62rtqJwjNCze4F2
 xO17H2IYIMfaFYMJXDumBvRzdOMx1rfCj9QkgZq6rdw97zhNi7Jv5/mtkmqCUide
 cBOo8vh8ttWUXwbuvFvlWobWVY7/eVeT8jJCyJ1XK6Qqiy/1Pul7iU0qmYAB8smN
 lfQR8PsMilu6Cg6w1DH5umMsMtEj/4x4m5OxDLlRdpOWc+2DJ4Q=
 =H8Ub
 -----END PGP SIGNATURE-----

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: Florian Fainelli <f.fainelli@gmail.com>
This commit is contained in:
Florian Fainelli 2019-02-01 11:29:21 -08:00
commit 50de64947f
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/bcm2835-rpi.dtsi
View File

@ -87,10 +87,6 @@ &usb {
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";

17
arch/arm/boot/dts/bcm283x.dtsi
View File

@ -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 @@ intc: interrupt-controller@7e00b200 {
#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 @@ v3d: v3d@7ec00000 {
compatible = "brcm,bcm2835-v3d";
reg = <0x7ec00000 0x1000>;
interrupts = <1 10>;
power-domains = <&pm BCM2835_POWER_DOMAIN_GRAFX_V3D>;
};
vc4: gpu {