Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / aspeed-g4.dtsi

diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index 8e04303..b3dafbc 100644 (file)
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -192,6 +192,11 @@
                                        status = "disabled";
                                };
 
+                               silicon-id@7c {
+                                       compatible = "aspeed,ast2400-silicon-id", "aspeed,silicon-id";
+                                       reg = <0x7c 0x4>;
+                               };
+
                                pinctrl: pinctrl@80 {
                                        reg = <0x80 0x18>, <0xa0 0x10>;
                                        compatible = "aspeed,ast2400-pinctrl";
@@ -219,6 +224,16 @@
                                reg = <0x1e720000 0x8000>;      // 32K
                        };
 
+                       video: video@1e700000 {
+                               compatible = "aspeed,ast2400-video-engine";
+                               reg = <0x1e700000 0x1000>;
+                               clocks = <&syscon ASPEED_CLK_GATE_VCLK>,
+                                        <&syscon ASPEED_CLK_GATE_ECLK>;
+                               clock-names = "vclk", "eclk";
+                               interrupts = <7>;
+                               status = "disabled";
+                       };
+
                        sdmmc: sd-controller@1e740000 {
                                compatible = "aspeed,ast2400-sd-controller";
                                reg = <0x1e740000 0x100>;