summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2018-03-13 21:44:16 +0300
committerFlorian Fainelli <f.fainelli@gmail.com>2018-03-13 21:44:16 +0300
commite5c851ef012b4b63ea50228da3451f3cfb690c45 (patch)
tree17bb2a241367bf3825ce94b3ac08ec67678facda
parent3746fd75cbb7ccfa79d330859354754263268653 (diff)
parentae67cfc4f6abb379e5bbe9a5616f00b23bbecb01 (diff)
downloadlinux-e5c851ef012b4b63ea50228da3451f3cfb690c45.tar.xz
Merge tag 'bcm2835-dt-next-2018-03-13' into devicetree/next
This pull request brings in one last patch to add the BCM2835 DPI controller to the device tree. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
-rw-r--r--arch/arm/boot/dts/bcm283x.dtsi11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
index b0d2dc04aa63..9605c5599ead 100644
--- a/arch/arm/boot/dts/bcm283x.dtsi
+++ b/arch/arm/boot/dts/bcm283x.dtsi
@@ -441,6 +441,17 @@
interrupts = <2 14>; /* pwa1 */
};
+ dpi: dpi@7e208000 {
+ compatible = "brcm,bcm2835-dpi";
+ reg = <0x7e208000 0x8c>;
+ clocks = <&clocks BCM2835_CLOCK_VPU>,
+ <&clocks BCM2835_CLOCK_DPI>;
+ clock-names = "core", "pixel";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
dsi0: dsi@7e209000 {
compatible = "brcm,bcm2835-dsi0";
reg = <0x7e209000 0x78>;