Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / rk3036-kylin.dts

diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts
index 6251d10..1df1557 100644 (file)
--- a/arch/arm/boot/dts/rk3036-kylin.dts
+++ b/arch/arm/boot/dts/rk3036-kylin.dts
@@ -46,6 +46,11 @@
        model = "Rockchip RK3036 KylinBoard";
        compatible = "rockchip,rk3036-kylin", "rockchip,rk3036";
 
+       memory {
+               device_type = "memory";
+               reg = <0x60000000 0x20000000>;
+       };
+
        leds: gpio-leds {
                compatible = "gpio-leds";
 
@@ -130,6 +135,10 @@
        status = "okay";
 };
 
+&hdmi {
+       status = "okay";
+};
+
 &i2c1 {
        clock-frequency = <400000>;
 
@@ -341,7 +350,6 @@
 &sdio {
        status = "okay";
 
-       broken-cd;
        bus-width = <4>;
        cap-sd-highspeed;
        cap-sdio-irq;
@@ -385,6 +393,14 @@
        status = "okay";
 };
 
+&vop {
+       status = "okay";
+};
+
+&vop_mmu {
+       status = "okay";
+};
+
 &pinctrl {
        leds {
                led_ctl: led-ctl {