diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2017-01-17 17:10:32 -0800 |
|---|---|---|
| committer | Florian Fainelli <f.fainelli@gmail.com> | 2017-01-18 17:20:32 -0800 |
| commit | c5a8e3add28ca4063410353acfbe6e650174e432 (patch) | |
| tree | baa200c7c63994636026e3530a4f9db2eb7840fe | |
| parent | 3b4b6252f0b57776511b47bbe554a51d365fa98d (diff) | |
| parent | 5ab1a37c6027c114a87a1ae32cfc5ef303d643c5 (diff) | |
Merge tag 'bcm2835-dt-next-2017-01-17' into devicetree/next
This pull request brings in the DT changes for VEC (TV-out) on
Raspberry Pi.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
| -rw-r--r-- | arch/arm/boot/dts/bcm2835-rpi.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/bcm283x.dtsi | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi index 6ddf7dfe3f72..38e6050035bc 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -87,3 +87,8 @@ power-domains = <&power RPI_POWER_DOMAIN_HDMI>; status = "okay"; }; + +&vec { + power-domains = <&power RPI_POWER_DOMAIN_VEC>; + status = "okay"; +}; diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi index 9a44da190897..a3106aa446c6 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -476,6 +476,14 @@ status = "disabled"; }; + vec: vec@7e806000 { + compatible = "brcm,bcm2835-vec"; + reg = <0x7e806000 0x1000>; + clocks = <&clocks BCM2835_CLOCK_VEC>; + interrupts = <2 27>; + status = "disabled"; + }; + pixelvalve@7e807000 { compatible = "brcm,bcm2835-pixelvalve2"; reg = <0x7e807000 0x100>; |