UPSTREAM: ARM: dts: rockchip: make rk3288-grf a simple-mfd

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / omap3-overo-tobi-common.dtsi

diff --git a/arch/arm/boot/dts/omap3-overo-tobi-common.dtsi b/arch/arm/boot/dts/omap3-overo-tobi-common.dtsi
index 13df50b394423c11a67319e15374f9edc7a86259..1b304e2f1bd2fd4fd5be23dafcd0f364991fd131 100644 (file)
--- a/arch/arm/boot/dts/omap3-overo-tobi-common.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-tobi-common.dtsi
@@ -11,6 +11,7 @@
  */
 
 #include "omap3-overo-common-peripherals.dtsi"
+#include "omap3-overo-common-dvi.dtsi"
 
 / {
        leds {
@@ -26,8 +27,6 @@
 #include "omap-gpmc-smsc9221.dtsi"
 
 &gpmc {
-       ranges = <5 0 0x2c000000 0x1000000>;    /* CS5 */
-
        ethernet@gpmc {
                reg = <5 0 0xff>;
                interrupt-parent = <&gpio6>;