ARM: dts: DRA7/OMAP5: reserve carveout buffers & fix carveout size

[android-sdk/kernel-video.git] / arch / arm / boot / dts / omap5-uevm.dts

diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts
index 109e61605c3b94252dff398a30d4b57d81ae7c63..5694a6fc052e7eaf951a5f65c50ad097fb130239 100644 (file)
--- a/arch/arm/boot/dts/omap5-uevm.dts
+++ b/arch/arm/boot/dts/omap5-uevm.dts
@@ -7,13 +7,32 @@
  */
 /dts-v1/;
 
+/*
+ * Following are the carveout addresses and the sizes for ION. SMC is not reserved for now
+ * C0000000 - SDRAM+1G
+ * BFD00000 - SMC (3MB)
+ * BA300000 - ION (90MB)
+ * B4300000 - TILER SECURE (81 MB)
+ * B3400000 - TILER NONSECURE (15 MB)
+*/
+/memreserve/ 0xba300000 0x5a00000;
+/memreserve/ 0xb5200000 0x5100000;
+/memreserve/ 0xb4300000 0xf00000;
+
 /include/ "omap5.dtsi"
 /include/ "samsung_k3pe0e000b.dtsi"
 
+
 / {
        model = "TI OMAP5 uEVM board";
        compatible = "ti,omap5-uevm", "ti,omap5";
 
+       cpus {
+               cpu@0 {
+                       cpu0-supply = <&smps123_reg>;
+               };
+       };
+
        memory {
                device_type = "memory";
                reg = <0x80000000 0x7F000000>; /* 2032 MB */
@@ -68,6 +87,19 @@
                clock-frequency = <19200000>; /* 19.2 MHz */
        };
 
+       ion_config {
+               compatible = "ti,ion-omap";
+               ti,omap_ion_heap_secure_input_base = <0xba300000>;
+               ti,omap_ion_heap_tiler_base = <0xb4300000>;
+               ti,omap_ion_heap_nonsecure_tiler_base = <0xf00000>;
+               /*90 MB*/
+               ti,omap_ion_heap_secure_input_size = <0x5A00000>;
+               /*96 MB*/
+               ti,omap_ion_heap_tiler_size = <0x6000000>;
+               /*15 MB*/
+               ti,omap_ion_heap_nonsecure_tiler_size = <0xF00000>;
+       };
+
        sound {
                compatible = "ti,abe-twl6040";
                ti,model = "PandaBoard5";
@@ -107,6 +139,16 @@
                ti,hdmi_audio = <&hdmi>;
                ti,level_shifter = <&tpd12s015>;
        };
+
+       leds {
+               compatible = "gpio-leds";
+               led@1 {
+                       label = "omap5:blue:usr1";
+                       gpios = <&gpio5 25 0>;  /* gpio5_153 D1 LED */
+                       linux,default-trigger = "heartbeat";
+                       default-state = "off";
+               };
+       };
 };
 
 &omap5_pmx_core {
@@ -121,6 +163,8 @@
                        &dss_hdmi_pins
                        &tpd12s015_pins
                        &tca6424a_pins
+                       &palmas_pins
+                       &led_gpio_pins
        >;
 
        twl6040_pins: pinmux_twl6040_pins {
@@ -183,8 +227,8 @@
        dss_hdmi_pins: pinmux_dss_hdmi_pins {
                pinctrl-single,pins = <
                        0x0fc 0x118     /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */
-                       0x100 0x100     /* hdmi_scl.hdmi_scl INPUT | MODE 0 */
-                       0x102 0x100     /* hdmi_sda.hdmi_sda INPUT | MODE 0 */
+                       0x100 0x106     /* GPIO7_194, DDC-SCL */
+                       0x102 0x106     /* GPIO7_195, DDC-SDA */
                >;
        };
 
@@ -200,6 +244,70 @@
                        0x188 0x100     /* i2c5_sda.i2c5_sda INPUT | MODE0 */
                >;
        };
+
+       uart1_pins: pinmux_uart1_pins {
+               pinctrl-single,pins = <
+                       0x60 0x0        /* uart1_tx.uart1_cts MODE0 */
+                       0x62 0x118      /* uart1_tx.uart1_cts INPUT | PULLUP | MODE0 */
+                       0x64 0x118      /* uart1_rx.uart1_rts INPUT | PULLUP | MODE0 */
+                       0x66 0          /* uart1_rx.uart1_rts MODE0 */
+               >;
+       };
+
+       uart3_pins: pinmux_uart3_pins {
+               pinctrl-single,pins = <
+                       0x19a 0x0       /* uart3_rts_irsd.uart3_tx_irtx MODE0 */
+                       0x19c 0x118     /* uart3_rx_irrx.uart3_usbb3_hsic INPUT | PULLUP | MODE0 */
+               >;
+       };
+
+       uart5_pins: pinmux_uart5_pins {
+               pinctrl-single,pins = <
+                       0x170 0x118     /* uart5_rx.uart5_rx INPUT | PULLUP | MODE0 */
+                       0x172 0x0       /* uart5_tx.uart5_tx MODE0 */
+                       0x174 0x118     /* uart5_cts.uart5_rts INPUT | PULLUP | MODE0 */
+                       0x176 0x0       /* uart5_cts.uart5_rts MODE0 */
+               >;
+       };
+
+       mcspi2_pins: pinmux_mcspi2_pins {
+               pinctrl-single,pins = <
+                       0xbc 0x100      /*  MCSPI2_CLK INPUTENABLE | MODE0 */
+                       0xbe 0x100      /*  MCSPI2_SIMO INPUTENABLE | MODE0 */
+                       0xc0 0x118      /*  MCSPI2_SOMI PULLUP | INPUTENABLE | MODE0*/
+                       0xc2 0x0        /*  MCSPI2_CS MODE0*/
+               >;
+       };
+
+       mcspi3_pins: pinmux_mcspi3_pins {
+               pinctrl-single,pins = <
+                       0x78 0x101      /*  MCSPI2_SOMI INPUTENABLE | MODE1 */
+                       0x7a 0x101      /*  MCSPI2_CS INPUTENABLE | MODE1 */
+                       0x7c 0x101      /*  MCSPI2_SIMO INPUTENABLE | MODE1 */
+                       0x7e 0x101      /*  MCSPI2_CLK INPUTENABLE | MODE1 */
+               >;
+       };
+
+       mcspi4_pins: pinmux_mcspi4_pins {
+               pinctrl-single,pins = <
+                       0x164 0x101     /*  MCSPI2_CLK INPUTENABLE | MODE1 */
+                       0x168 0x101     /*  MCSPI2_SIMO INPUTENABLE | MODE1 */
+                       0x16a 0x101     /*  MCSPI2_SOMI INPUTENABLE | MODE1 */
+                       0x16c 0x101     /*  MCSPI2_CS INPUTENABLE | MODE1 */
+                >;
+       };
+
+       palmas_pins: pinmux_palmas_pins {
+               pinctrl-single,pins = <
+                       0x140 0x11f     /* MSLEEP INPUT | PULLUP | MODE7 */
+               >;
+       };
+
+       led_gpio_pins: pinmux_led_gpio_pins {
+               pinctrl-single,pins = <
+                       0x196 0x6       /* uart3_cts_rctx.gpio5_153 OUTPUT | MODE6 */
+               >;
+       };
 };
 
 &omap5_pmx_wkup {
@@ -213,7 +321,6 @@
                        0x1A 0x0        /* fref_clk1_out OUTPUT | MODE 7 for USB hub clk */
                >;
        };
-
 };
 
 &mmc1 {
@@ -230,6 +337,7 @@
 &mmc3 {
        bus-width = <4>;
        ti,non-removable;
+       status = "disabled";
 };
 
 &mmc4 {
@@ -304,7 +412,10 @@
 
                gpios = <&tca6424a 0 0>,        /* TCA6424A P01, CT_CP_HDP */
                        <&tca6424a 1 0>,        /* TCA6424A P00, LS_OE*/
-                       <&gpio7 1 0>;           /* 193, HPD */
+                       <&gpio7 1 0>,           /* 193, HPD */
+                       <&gpio7 2 0>,           /* 194, SCL */
+                       <&gpio7 3 0>;           /* 195, SDA */
+
 
                hdmi-monitor {
                        compatible = "ti,hdmi_panel";
@@ -312,3 +423,33 @@
 
        };
 };
+
+&uart1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart1_pins>;
+};
+
+&uart3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart3_pins>;
+};
+
+&uart5 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart5_pins>;
+};
+
+&mcspi2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&mcspi2_pins>;
+};
+
+&mcspi3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&mcspi3_pins>;
+};
+
+&mcspi4 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&mcspi4_pins>;
+};