Merge branch 'p-ti-android-3.8.y-video'

179 files changed, 48368 insertions, 1097 deletions

diff --git a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
index 374e145c2ef..9bac63e73eb 100644
--- a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
+++ b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
@@ -5,6 +5,7 @@ Required properties:
         "ti,dm646x-mcasp-audio" : for DM646x platforms
         "ti,da830-mcasp-audio"  : for both DA830 & DA850 platforms
         "ti,omap2-mcasp-audio"  : for OMAP2 platforms (TI81xx, AM33xx)
+        "ti,dra7-mcasp-audio"   : for DRA7xx platforms
 
 - reg : Should contain McASP registers offset and length
 - interrupts : Interrupt number for McASP
@@ -23,6 +24,10 @@ Optional properties:
 - rx-num-evt : FIFO levels.
 - sram-size-playback : size of sram to be allocated during playback
 - sram-size-capture  : size of sram to be allocated during capture
+- ti,tx-inactive-mode : Transmit pin mode while in an inactive slot (0 - Hi-Z,
+                2 - Low, 3 - High)
+- ti,rx-inactive-mode : Receive pin mode while in an inactive slot (0 - Hi-Z,
+                2 - Low, 3 - High)
 
 Example:
 
@@ -42,4 +47,6 @@ mcasp0: mcasp0@1d00000 {
                         2 0 0 0 >;
         tx-num-evt = <1>;
         rx-num-evt = <1>;
+        ti,tx-inactive-mode = <0>; /* 0: Hi-Z, 2: Low, 3: High */
+        ti,rx-inactive-mode = <0>; /* 0: Hi-Z, 2: Low, 3: High */
 };
diff --git a/Documentation/devicetree/bindings/sound/dra7-atl.txt b/Documentation/devicetree/bindings/sound/dra7-atl.txt
new file mode 100644
index 00000000000..cd85aa3477c
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/dra7-atl.txt
@@ -0,0 +1,42 @@
+* Texas Instruments DRA7 Audio Tracking Logic (ATL)
+
+Required properties:
+- compatible: "ti,dra7-atl"
+- ti,hwmods: Name of the hwmod associated with the ATL module
+
+
+Optional properties:
+- ti,atclk<n>-freq: Output clock frequency for ATL instance n.
+                ATL instance is disabled if this property is not set
+- ti,atl<n>-bws-input: ATL baseband word select input for ATL instance n.
+  Possible inputs are:
+         0 - McASP1 FSR
+         1 - McASP1 FSX
+         2 - McASP2 FSR
+         3 - McASP2 FSX
+         4 - McASP3 FSX
+         5 - McASP4 FSX
+         6 - McASP5 FSX
+         7 - McASP6 FSX
+         8 - McASP7 FSX
+         9 - McASP8 FSX
+        10 - McASP8 AHCLKX
+        11 - XREF_CLK3 input pad
+        12 - XREF_CLK0 input pad
+        13 - XREF_CLK1 input pad
+        14 - XREF_CLK2 input pad
+        15 - OSC1_X1 input pad
+- ti,atl<n>-aws-input: Audio word select input for ATL instance n.
+  Same inputs than BWS.
+
+
+Example:
+
+atl: atl@0x4843c000 {
+        compatible = "ti,dra7-atl";
+        reg = <0x4843c000 0x3ff>;
+        ti,hwmods = "atl";
+        ti,atclk1-freq = <11289600>;    /* 11.2896 MHz */
+        ti,atl1-bws-input = <2>;        /* McASP2 FSR */
+        ti,atl1-aws-input = <4>;        /* McASP3 FSX */
+};
diff --git a/Documentation/devicetree/bindings/sound/dra7-evm.txt b/Documentation/devicetree/bindings/sound/dra7-evm.txt
new file mode 100644
index 00000000000..1eeed6e6d67
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/dra7-evm.txt
@@ -0,0 +1,60 @@
+* Texas Instruments DRA7 EVM sound
+
+Required properties:
+- compatible: "ti,dra7-evm-sound"
+- ti,mode: Name of the sound card
+- ti,media-cpu: phandle for the McASP node in media link
+- ti,media-codec: phandle for the analog codec in media link
+- ti,media-mclk-freq: MCLK frequency for the analog codec in media link
+- ti,media-slots: Number of slots
+- ti,audio-routing: List of connections between audio components.
+  Each entry is a pair of strings, the first being the connection's sink,
+  the second being the connection's source.
+
+Available audio endpoints for the audio-routing table:
+
+Board connectors:
+ * Main Mic
+ * Line In
+ * Headphone
+ * Line Out
+
+tlv320aic3x pins:
+ * LLOUT
+ * RLOUT
+ * MONO_LOUT
+ * HPLOUT
+ * HPROUT
+ * HPLCOM
+ * HPCOM
+ * MIC3L
+ * MIC3R
+ * LINE1L
+ * LINE1R
+ * LINE2L
+ * LINE2R
+
+Example:
+
+sound {
+        compatible = "ti,dra7-evm-sound";
+        ti,model = "DRA7-EVM";
+
+        /* Media DAI link */
+        ti,media-cpu = <&mcasp3>;
+        ti,media-codec = <&tlv320aic3106>;
+        ti,media-mclk-freq = <1411200>;
+        ti,media-slots = <2>;
+
+        /* Audio routing */
+        ti,audio-routing =
+                        "LINE1L", "Line In",
+                        "LINE1R", "Line In",
+                        "MIC3L", "Main Mic",
+                        "MIC3R", "Main Mic",
+                        "Main Mic", "Mic Bias 2V",
+                        "Headphone", "HPLOUT",
+                        "Headphone", "HPROUT",
+                        "Line Out", "LLOUT",
+                        "Line Out", "RLOUT";
+};
diff --git a/Documentation/devicetree/bindings/usb/dwc3.txt b/Documentation/devicetree/bindings/usb/dwc3.txt
index 7a95c651ceb..2fd123e383b 100644
--- a/Documentation/devicetree/bindings/usb/dwc3.txt
+++ b/Documentation/devicetree/bindings/usb/dwc3.txt
@@ -10,7 +10,16 @@ Required properties:
 
 Optional properties:
  - tx-fifo-resize: determines if the FIFO *has* to be reallocated.
-
+ - dr_mode: tells Dual-Role USB controllers that we want to work on a
+                        particular mode. Valid arguments are "host",
+                        "peripheral" and "otg". In case this attribute isn't
+                        passed via DT, USB DRD controllers should default to
+                        OTG.
+- maximum-speed: tells USB controllers we want to work up to a certain
+                        speed. Valid arguments are "superspeed", "highspeed",
+                        "fullspeed" and "lowspeed". In case this isn't passed
+                        via DT, USB controllers should default to their maximum
+                        HW capability.
 This is usually a subnode to DWC3 glue to which it is connected.
 
 dwc3@4a030000 {
diff --git a/Documentation/devicetree/bindings/usb/omap-usb.txt b/Documentation/devicetree/bindings/usb/omap-usb.txt
index d4769f343d6..b5770b49c8e 100644
--- a/Documentation/devicetree/bindings/usb/omap-usb.txt
+++ b/Documentation/devicetree/bindings/usb/omap-usb.txt
@@ -83,7 +83,8 @@ Required properties:
    usb mailbox or usb3 phy power. omap4 has usb mailbox in control module to
    notify events to the musb core and omap5 has usb3 phy power register to
    power on usb3 phy. Should be "1" if it has mailbox and "2" if it has usb3
-   phy power.
+   phy power (usb3 phy power indicates the presense of a usb2 and usb3 phy),
+   should be "3" is it has only usb2 phy power.
 
 omap_control_usb: omap-control-usb@4a002300 {
         compatible = "ti,omap-control-usb";
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 101fed31981..a5c6e2af6ad 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -112,7 +112,6 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
         omap4-var-som.dtb \
         omap4-sdp.dtb \
         omap5-uevm.dtb \
-        omap5-sevm.dtb \
         am335x-evm.dtb \
         am335x-evmsk.dtb \
         am335x-bone.dtb \
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index 7a56b6d4ac2..2c902e95194 100644..100755
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -31,20 +31,114 @@
                 regulator-max-microvolt = <3000000>;
         };
 
+        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>;
+        };
+
         ocp {
                 gpu: gpu@0x56000000 {
-                        gpu-supply = <&avs_gpu>;
+                gpu-supply = <&avs_gpu>;
                 };
         };
 
+        vaudio_1v8: fixedregulator-vaudio-dig {
+                compatible = "regulator-fixed";
+                regulator-name = "vdac_fixed";
+                regulator-min-microvolt = <1800000>;
+                regulator-max-microvolt = <1800000>;
+                regulator-boot-on;
+        };
+
+        vaudio_3v3: fixedregulator-vaudio-anlg {
+                compatible = "regulator-fixed";
+                regulator-name = "vdac_fixed";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                regulator-boot-on;
+        };
+
+        sound {
+                compatible = "ti,dra7-evm-sound";
+                ti,model = "dra7evm";
+
+                /* Audio routing */
+                ti,audio-routing =
+                        "LINE1L", "Line In",
+                        "LINE1R", "Line In",
+                        "MIC3L", "Mic Bias 2V",
+                        "MIC3R", "Mic Bias 2V",
+                        "Mic Bias 2V", "Main Mic",
+                        "Headphone", "HPLOUT",
+                        "Headphone", "HPROUT",
+                        "Line Out", "LLOUT",
+                        "Line Out", "RLOUT";
+
+                /* Media DAI link */
+                ti,media-cpu = <&mcasp3>;
+                ti,media-codec = <&tlv320aic3106>;
+                ti,media-mclk-freq = <5644800>;
+                ti,media-slots = <2>;
+        };
+
+        sound_hdmi {
+                compatible = "ti,omap-hdmi-tpd12s015-audio";
+                ti,model = "OMAP5HDMI";
+                ti,hdmi_audio = <&hdmi>;
+                ti,level_shifter = <&tpd12s015>;
+        };
 };
 
 &dra7_pmx_core {
         pinctrl-names = "default";
         pinctrl-0 = <
+                &atl_pins
+                &mcasp3_pins
+                &mcasp6_pins
                 &vout1_pins
+                &usb_pins
         >;
 
+        atl_pins: pinmux_atl_pins {
+                pinctrl-single,pins = <
+                        0x298 0x00000005        /* xref_clk1.atl_clk1 OUTPUT | MODE5 */
+                        0x29c 0x00000005        /* xref_clk2.atl_clk2 OUTPUT | MODE5 */
+                >;
+        };
+
+        mcasp3_pins: pinmux_mcasp3_pins {
+                pinctrl-single,pins = <
+                        0x324 0x00000000        /* mcasp3_aclkx.mcasp3_aclkx OUTPUT | MODE0 */
+                        0x328 0x00000000        /* mcasp3_fsx.mcasp3_fsx OUTPUT | MODE0 */
+                        0x32c 0x00000000        /* mcasp3_axr0.mcasp3_axr0 OUTPUT | MODE0 */
+                        0x330 0x00040000        /* mcasp3_axr1.mcasp3_axr1 INPUT | MODE0 */
+                >;
+        };
+
+        mcasp6_pins: pinmux_mcasp6_pins {
+                pinctrl-single,pins = <
+                        0x2d4 0x00000001        /* mcasp1_axr8.mcasp6_axr0 OUTPUT | MODE1 */
+                        0x2d8 0x00040001        /* mcasp1_axr9.mcasp6_axr1 INPUT | MODE 1 */
+                        0x2dc 0x00000001        /* mcasp1_axr10.mcasp6_clkx OUTPUT | MODE1 */
+                        0x2e0 0x00000001        /* mcasp1_axr11.mcasp6_fsx OUTPUT | MODE1 */
+                >;
+        };
+
+        usb_pins: pinmux_usb_pins {
+                pinctrl-single,pins = <
+                        0x280   0xc0000 /* DRV1_VBUS SLEW | PULLDEN | MODE0 */
+                        0x284   0xc0000 /* DRV2_VBUS SLEW | PULLDEN | MODE0 */
+                >;
+        };
+
         i2c2_pins: pinmux_i2c2_pins {
                 pinctrl-single,pins = <
                         0x408   0x60000 /* i2c2_sda INPUT | MODE0 */
@@ -85,6 +179,11 @@
                         0x238   0x0     /* vout1_d23 OUTPUT | MODE0 */
                 >;
         };
+        display_layout {
+                compatible = "ti, omap4-dsscomp";
+                ti,num_displays = <2>;
+                ti,default_display = "lcd";
+        };
 };
 
 &i2c1 {
@@ -107,6 +206,15 @@
                 reg = <0x40>;
                 gpios = <&pcf_lcd 15 0>; /* P15, CON_LCD_PWR_DN */
         };
+
+        tlv320aic3106: tlv320aic3106@18 {
+                compatible = "ti,tlv320aic3x";
+                reg = <0x18>;
+                IOVDD-supply = <&vaudio_3v3>;
+                DVDD-supply = <&vaudio_1v8>;
+                AVDD-supply = <&vaudio_3v3>;
+                DRVDD-supply = <&vaudio_3v3>;
+        };
 };
 
 /include/ "tps659038.dtsi"
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 7f92247a03f..2e9e4b546d4 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -27,11 +27,11 @@
                         compatible = "arm,cortex-a15";
                         operating-points = <
                                 /* kHz    uV */
-                                /* The OPP_HIGH Only for DVFS enabled Samples Hence commenting*/
+                                /* The OPP_HIGH Only for DVFS enabled Samples */
                                 1000000 1090000
-                                /*      1176000 1210000         */
+                                1176000 1210000
                                 >;
-                                clocks = <&dpll_mpu>;
+                                clocks = <&dpll_mpu_ck>;
                                 clock-names = "cpu";
                         timer {
                                 compatible = "arm,armv7-timer";
@@ -108,7 +108,7 @@
                         pinctrl-single,function-mask = <0x3fffffff>;
                 };
 
-                dpll_mpu: dpll_mpu {
+                dpll_mpu_ck: dpll_mpu_ck {
                         #clock-cells = <0>;
                         compatible = "ti,omap-clock";
                 };
@@ -378,6 +378,98 @@
                         ti,hwmods = "wd_timer2";
                 };
 
+                omap_control_usb1: omap-control-usb@4a002300 {
+                        compatible = "ti,omap-control-usb";
+                        reg = <0x4a002300 0x4>,
+                              <0x4a002370 0x4>;
+                        reg-names = "control_dev_conf", "phy_power_usb";
+                        ti,type = <2>;
+                };
+
+                omap_dwc31: omap_dwc3@48880000 {
+                        compatible = "ti,dwc3";
+                        ti,hwmods = "usb_otg_ss1";
+                        reg = <0x48880000 0x1ff>;
+                        interrupts = <0 77 4>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        utmi-mode = <2>;
+                        ranges;
+                        dwc3@48890000 {
+                                compatible = "synopsys,dwc3";
+                                reg = <0x48890000 0xcfff>;
+                                interrupts = <0 76 4>;
+                                usb-phy = <&usb2_phy1>, <&usb3_phy>;
+                                tx-fifo-resize;
+                                dr_mode = "peripheral";
+                                maximum-speed = "superspeed";
+                        };
+                };
+
+                omap_control_usb2: omap-control-usb@4a002e74 {
+                        compatible = "ti,omap-control-usb";
+                        reg = <0x4a002e74 0x4>,
+                              <0x4a0086c0 0x4>;
+                        reg-names = "ctrl_core_srcomp_north_side", "dummy_reg";
+                        ti,type = <3>;
+                };
+
+                omap_dwc32: omap_dwc3@488c0000 {
+                        compatible = "ti,dwc3";
+                        ti,hwmods = "usb_otg_ss2";
+                        reg = <0x488c0000 0x1ff>;
+                        interrupts = <0 92 4>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        utmi-mode = <1>;
+                        ranges;
+                        dwc3@488d0000 {
+                                compatible = "synopsys,dwc3";
+                                reg = <0x488d0000 0xcfff>;
+                                interrupts = <0 78 4>;
+                                usb-phy = <&usb2_phy2>;
+                                tx-fifo-resize;
+                                dr_mode = "host";
+                                maximum-speed = "highspeed";
+                        };
+                };
+
+                ocp2scp {
+                        compatible = "ti,omap-ocp2scp";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges;
+                        ti,hwmods = "ocp2scp1";
+                        usb2_phy1: usb2_phy1@4a084000 {
+                                compatible = "ti,omap-usb2";
+                                reg = <0x4a084000 0x7c>;
+                                ctrl-module = <&omap_control_usb1>;
+                                wkupclk =  "usb_phy1_always_on_clk32k";
+                                optclk = "usb_otg_ss1_refclk960m";
+                        };
+
+                        usb3_phy: usb3_phy@4a084400 {
+                                compatible = "ti,omap-usb3";
+                                reg = <0x4a084400 0x80>,
+                                      <0x4a084800 0x64>,
+                                      <0x4a084c00 0x40>;
+                                reg-names = "phy_rx", "phy_tx", "pll_ctrl";
+                                ctrl-module = <&omap_control_usb1>;
+                                wkupclk =  "usb_phy1_always_on_clk32k";
+                                optclk = "usb_otg_ss1_refclk960m";
+                        };
+
+                        usb2_phy2: usb2_phy2@4a085000 {
+                                compatible = "ti,omap-usb2";
+                                reg = <0x4a085000 0x7c>;
+                                ctrl-module = <&omap_control_usb2>;
+                                wkupclk =  "usb_phy2_always_on_clk32k";
+                                optclk = "usb_otg_ss2_refclk960m";
+                        };
+
+                };
+
+
                 dmm: dmm@4e000000 {
                         compatible = "ti,omap5-dmm";
                         reg = <0x4e000000 0x800>;
@@ -505,6 +597,7 @@
                         efuse-settings = <1090000 8
                         1210000 12
                         1280000 16>;
+                        voltage-tolerance = <1>;
                 };
 
                 avs_core: regulator-avs@0x4A0025EC {
@@ -519,6 +612,7 @@
                         efuse-settings = <1090000 8
                         1210000 12
                         1280000 16>;
+                        voltage-tolerance = <1>;
                 };
 
                 avs_dspeve: regulator-avs@0x4A0025D8 {
@@ -574,5 +668,45 @@
                                 video-source = <1>;
                         };
                 };
+
+                atl: atl@0x4843c000 {
+                        compatible = "ti,dra7-atl";
+                        reg = <0x4843c000 0x3ff>;
+                        ti,hwmods = "atl";
+                        ti,atclk1-freq = <11289600>;
+                        ti,atl1-bws-input = <3>;        /* McASP2 FSX */
+                        ti,atl1-aws-input = <15>;       /* McASP6 FSX */
+                        ti,atclk2-freq = <5644800>;
+                        ti,atl2-bws-input = <3>;        /* McASP2 FSX */
+                        ti,atl2-aws-input = <4>;        /* McASP3 FSX */
+                };
+
+                mcasp3: mcasp@48468000 {
+                        compatible = "ti,dra7-mcasp-audio";
+                        reg = <0x48468000 0x2000>;
+                        interrupts = <0 108 0x4>, /* AREVT */
+                                     <0 109 0x4>; /* TXEVT */
+                        ti,hwmods = "mcasp3";
+                        op-mode = <0>;          /* MCASP_IIS_MODE */
+                        tdm-slots = <2>;
+                        num-serializer = <4>;
+                        serial-dir = <1 2 0 0>; /* 0:INACTIVE, 1:TX, 2:RX */
+                        ti,tx-inactive-mode = <2>; /* 0: Hi-Z, 2: Low, 3: High */
+                        ti,rx-inactive-mode = <2>; /* 0: Hi-Z, 2: Low, 3: High */
+                };
+
+                mcasp6: mcasp@48474000 {
+                        compatible = "ti,dra7-mcasp-audio";
+                        reg = <0x48474000 0x2000>;
+                        interrupts = <0 108 0x4>, /* AREVT */
+                                     <0 109 0x4>; /* TXEVT */
+                        ti,hwmods = "mcasp6";
+                        op-mode = <0>;          /* MCASP_IIS_MODE */
+                        tdm-slots = <8>;
+                        num-serializer = <4>;
+                        serial-dir = <1 2 0 0>; /* 0:INACTIVE, 1:TX, 2:RX */
+                        ti,tx-inactive-mode = <2>; /* 0: Hi-Z, 2: Low, 3: High */
+                        ti,rx-inactive-mode = <2>; /* 0: Hi-Z, 2: Low, 3: High */
+                };
         };
 };
diff --git a/arch/arm/boot/dts/omap5-sevm.dts b/arch/arm/boot/dts/omap5-sevm.dts
deleted file mode 100644
index 9d9bbb65190..00000000000
--- a/arch/arm/boot/dts/omap5-sevm.dts
+++ /dev/null
@@ -1,522 +0,0 @@
-/*
- * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-/dts-v1/;
-
-/include/ "omap5.dtsi"
-/include/ "samsung_k3pe0e000b.dtsi"
-
-/ {
-        model = "TI OMAP5 sEVM board";
-        compatible = "ti,omap5-sevm", "ti,omap5";
-
-        cpus {
-                cpu@0 {
-                        cpu0-supply = <&smps123_reg>;
-                };
-        };
-
-        memory {
-                device_type = "memory";
-                reg = <0x80000000 0x7F000000>; /* 2032 MB */
-        };
-
-        vmmcsd_fixed: fixedregulator-mmcsd {
-                compatible = "regulator-fixed";
-                regulator-name = "vmmcsd_fixed";
-                regulator-min-microvolt = <3000000>;
-                regulator-max-microvolt = <3000000>;
-        };
-
-        /* HS USB Port 2 RESET */
-        hsusb2_reset: hsusb2_reset_reg {
-                compatible = "regulator-fixed";
-                regulator-name = "hsusb2_reset";
-                regulator-min-microvolt = <3300000>;
-                regulator-max-microvolt = <3300000>;
-                gpio = <&gpio6 13 0>;   /* gpio6_173 HUB_NRESET */
-                startup-delay-us = <70000>;
-                enable-active-high;
-        };
-
-        /* HS USB Host PHY on PORT 2 */
-        hsusb2_phy: hsusb2_phy {
-                compatible = "usb-nop-xceiv";
-                reset-supply = <&hsusb2_reset>;
-        };
-
-        /* HS USB Port 3 RESET */
-        hsusb3_reset: hsusb3_reset_reg {
-                compatible = "regulator-fixed";
-                regulator-name = "hsusb3_reset";
-                regulator-min-microvolt = <3300000>;
-                regulator-max-microvolt = <3300000>;
-                gpio = <&gpio6 12 0>;   /* gpio6_172 ETH_NRESET */
-                startup-delay-us = <70000>;
-                enable-active-high;
-        };
-
-        /* HS USB Host PHY on PORT 3 */
-        hsusb3_phy: hsusb3_phy {
-                compatible = "usb-nop-xceiv";
-                reset-supply = <&hsusb3_reset>;
-        };
-
-        sound {
-                compatible = "ti,abe-twl6040";
-                ti,model = "OMAP5-sEVM";
-
-                ti,jack-detection = <1>;
-                ti,mclk-freq = <19200000>;
-
-                ti,mcpdm = <&mcpdm>;
-                ti,dmic = <&dmic>;
-                ti,mcasp = <&mcasp>;
-                ti,mcbsp1 = <&mcbsp1>;
-                ti,mcbsp2 = <&mcbsp2>;
-                ti,aess = <&aess>;
-
-                ti,twl6040 = <&twl6040>;
-
-                /* Audio routing */
-                ti,audio-routing =
-                        "Headset Stereophone", "HSOL",
-                        "Headset Stereophone", "HSOR",
-                        "Earphone Spk", "EP",
-                        "Ext Spk", "HFL",
-                        "Ext Spk", "HFR",
-                        "Line Out", "AUXL",
-                        "Line Out", "AUXR",
-                        "HSMIC", "Headset Mic",
-                        "Headset Mic", "Headset Mic Bias",
-                        "MAINMIC", "Main Handset Mic",
-                        "Main Handset Mic", "Main Mic Bias",
-                        "SUBMIC", "Sub Handset Mic",
-                        "Sub Handset Mic", "Main Mic Bias",
-                        "AFML", "Line In",
-                        "AFMR", "Line In",
-                        "DMic", "Digital Mic",
-                        "Digital Mic", "Digital Mic1 Bias",
-                        "Headset Playback", "PDM_DL1",
-                        "Handsfree Playback", "PDM_DL2",
-                        "PDM_UL1", "Capture",
-                        "40122000.mcbsp Playback", "BT_VX_DL",
-                        "BT_VX_UL", "40122000.mcbsp Capture",
-                        "40124000.mcbsp Playback", "MM_EXT_DL",
-                        "MM_EXT_UL", "40124000.mcbsp Capture",
-                        "DMIC0", "omap-dmic-abe.0 Capture",
-                        "omap-dmic-abe.0 Capture", "Digital Mic1 Bias",
-                        "Digital Mic1 Bias", "Digital Mic 0",
-                        "DMIC1", "omap-dmic-abe.1 Capture",
-                        "omap-dmic-abe.1 Capture", "Digital Mic1 Bias",
-                        "Digital Mic1 Bias", "Digital Mic 1",
-                        "DMIC2", "omap-dmic-abe.2 Capture",
-                        "omap-dmic-abe.2 Capture", "Digital Mic1 Bias",
-                        "Digital Mic1 Bias", "Digital Mic 2";
-        };
-
-        sound_hdmi {
-                compatible = "ti,omap-hdmi-tpd12s015-audio";
-                ti,model = "OMAP5HDMI";
-
-                ti,hdmi_audio = <&hdmi>;
-                ti,level_shifter = <&tpd12s015>;
-        };
-
-};
-
-&omap5_pmx_core {
-        pinctrl-names = "default";
-        pinctrl-0 = <
-                        &twl6040_pins
-                        &mcpdm_pins
-                        &dmic_pins
-                        &mcbsp1_pins
-                        &mcbsp2_pins
-                        &usbhost_pins
-                        &lg4591_pins
-                        &dss_hdmi_pins
-                        &tpd12s015_pins
-                        &tca6424a_pins
-        >;
-
-        mmc1_pins: pinmux_mmc1_pins {
-                pinctrl-single,pins = <
-                        0x1a2 0x118     /* sdcard_clk.sdcard_clk INPUT PULLUP | MODE0 */
-                        0x1a4 0x118     /* sdcard_cmd.sdcard_cmd INPUT PULLUP | MODE0 */
-                        0x1a6 0x118     /* sdcard_data2.sdcard_data2 INPUT PULLUP | MODE0 */
-                        0x1a8 0x118     /* sdcard_data3.sdcard_data3 INPUT PULLUP | MODE0 */
-                        0x1aa 0x118     /* sdcard_data0.sdcard_data0 INPUT PULLUP | MODE0 */
-                        0x1ac 0x118     /* sdcard_data1.sdcard_data1 INPUT PULLUP | MODE0 */
-                >;
-        };
-
-        mmc2_pins: pinmux_mmc2_pins {
-                pinctrl-single,pins = <
-                        0x0 0x118       /* emmc_clk.emmc_clk INPUT PULLUP | MODE0 */
-                        0x2 0x118       /* emmc_cmd.emmc_cmd INPUT PULLUP | MODE0 */
-                        0x4 0x118       /* emmc_data0.emmc_data0 INPUT PULLUP | MODE0 */
-                        0x6 0x118       /* emmc_data1.emmc_data1 INPUT PULLUP | MODE0 */
-                        0x8 0x118       /* emmc_data2.emmc_data2 INPUT PULLUP | MODE0 */
-                        0xa 0x118       /* emmc_data3.emmc_data3 INPUT PULLUP | MODE0 */
-                        0xc 0x118       /* emmc_data4.emmc_data4 INPUT PULLUP | MODE0 */
-                        0xe 0x118       /* emmc_data5.emmc_data5 INPUT PULLUP | MODE0 */
-                        0x10 0x118      /* emmc_data6.emmc_data6 INPUT PULLUP | MODE0 */
-                        0x12 0x118      /* emmc_data7.emmc_data7 INPUT PULLUP | MODE0 */
-                >;
-        };
-
-        twl6040_pins: pinmux_twl6040_pins {
-                pinctrl-single,pins = <
-                        0x18a 0x6       /* perslimbus2_clock.gpio5_145 OUTPUT | MODE6 */
-                >;
-        };
-
-        mcpdm_pins: pinmux_mcpdm_pins {
-                pinctrl-single,pins = <
-                        0x142 0x108     /* abe_clks.abe_clks INPUT PULLDOWN | MODE0 */
-                        0x15c 0x108     /* abemcpdm_ul_data.abemcpdm_ul_data INPUT PULLDOWN | MODE0 */
-                        0x15e 0x108     /* abemcpdm_dl_data.abemcpdm_dl_data INPUT PULLDOWN | MODE0 */
-                        0x160 0x118     /* abemcpdm_frame.abemcpdm_frame INPUT PULLUP | MODE0 */
-                        0x162 0x108     /* abemcpdm_lb_clk.abemcpdm_lb_clk INPUT PULLDOWN | MODE0 */
-                >;
-        };
-
-        dmic_pins: pinmux_dmic_pins {
-                pinctrl-single,pins = <
-                        0x144 0x100     /* abedmic_din1.abedmic_din1 INPUT | MODE0 */
-                        0x146 0x100     /* abedmic_din2.abedmic_din2 INPUT | MODE0 */
-                        0x148 0x100     /* abedmic_din3.abedmic_din3 INPUT | MODE0 */
-                        0x14a 0         /* abedmic_clk1.abedmic_clk1 OUTPUT | MODE0 */
-                >;
-        };
-
-        mcbsp1_pins: pinmux_mcbsp1_pins {
-                pinctrl-single,pins = <
-                        0x14c 0x101     /* abedmic_clk2.abemcbsp1_fsx INPUT | MODE1 */
-                        0x14e 0x9       /* abedmic_clk3.abemcbsp1_dx OUTPUT PULLDOWN | MODE1 */
-                        0x150 0x101     /* abeslimbus1_clock.abemcbsp1_clkx INPUT | MODE0 */
-                        0x152 0x109     /* abeslimbus1_data.abemcbsp1_dr INPUT PULLDOWN | MODE1 */
-                >;
-        };
-
-        mcbsp2_pins: pinmux_mcbsp2_pins {
-                pinctrl-single,pins = <
-                        0x154 0x108     /* abemcbsp2_dr.abemcbsp2_dr INPUT PULLDOWN | MODE0 */
-                        0x156 0x8       /* abemcbsp2_dx.abemcbsp2_dx OUTPUT PULLDOWN | MODE0 */
-                        0x158 0x100     /* abemcbsp2_fsx.abemcbsp2_fsx INPUT | MODE0 */
-                        0x15a 0x100     /* abemcbsp2_clkx.abemcbsp2_clkx INPUT | MODE0 */
-                >;
-        };
-
-        usbhost_pins: pinmux_usbhost_pins {
-                pinctrl-single,pins = <
-                        0x84 0x100      /* usbb2_hsic_strobe INPUT | MODE 0 */
-                        0x86 0x100      /* usbb2_hsic_data INPUT | MODE 0 */
-
-                        0x19e 0x100     /* usbb3_hsic_strobe INPUT | MODE 0 */
-                        0x1a0 0x100     /* usbb3_hsic_data INPUT | MODE 0 */
-
-                        0xD4 0x6        /* gpio6_173 OUTPUT | MODE 6 HUB_NRESET */
-                        0xD6 0x6        /* gpio6_172 OUTPUT | MODE 6 ETH_NRESET */
-                >;
-        };
-
-        i2c1_pins: pinmux_i2c1_pins {
-                pinctrl-single,pins = <
-                        0x1b2 0x118        /* i2c1_scl PULLUP | INPUTENABLE | MODE0 */
-                        0x1b4 0x118        /* i2c1_sda PULLUP | INPUTENABLE | MODE0 */
-                >;
-        };
-
-        i2c2_pins: pinmux_i2c2_pins {
-                pinctrl-single,pins = <
-                        0x178 0x100        /* i2c2_scl INPUTENABLE | MODE0 */
-                        0x17a 0x100        /* i2c2_sda INPUTENABLE | MODE0 */
-                >;
-        };
-
-        i2c3_pins: pinmux_i2c3_pins {
-                pinctrl-single,pins = <
-                        0x13a 0x100        /* i2c3_scl INPUTENABLE | MODE0 */
-                        0x13c 0x100     /* i2c3_sda INPUTENABLE | MODE0 */
-                >;
-        };
-
-        i2c4_pins: pinmux_i2c4_pins {
-                pinctrl-single,pins = <
-                        0xb8 0x100        /* i2c4_scl INPUTENABLE | MODE0 */
-                        0xba 0x100     /* i2c4_sda INPUTENABLE | MODE0 */
-                >;
-        };
-
-        i2c5_pins: pinmux_i2c5_pins {
-                pinctrl-single,pins = <
-                        0x184 0x100        /* i2c5_scl INPUTENABLE | MODE0 */
-                        0x186 0x100     /* i2c5_sda INPUTENABLE | 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 */
-                >;
-        };
-
-        lg4591_pins: pinmux_lg4591_pins {
-                pinctrl-single,pins = <
-                        0xf2 0x8        /* perslimbus2_clock.gpio6_183 OUTPUT PULLDOWN | MODE0 */
-                >;
-        };
-
-        dss_hdmi_pins: pinmux_dss_hdmi_pins {
-                pinctrl-single,pins = <
-                        0x0fc 0x118     /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */
-                        0x100 0x118     /* hdmi_scl.hdmi_scl INPUT PULLUP | MODE 0 */
-                        0x102 0x118     /* hdmi_sda.hdmi_sda INPUT PULLUP | MODE 0 */
-                >;
-        };
-
-        tpd12s015_pins: pinmux_tpd12s015_pins {
-                pinctrl-single,pins = <
-                        0x0fe 0x116     /* hdmi_hpd.gpio7_193 INPUT PULLDOWN | MODE6 */
-                >;
-        };
-
-        tca6424a_pins: pinmux_tca6424a_pins {
-                pinctrl-single,pins = <
-                        0x186 0x100     /* i2c5_scl.i2c5_scl INPUT | MODE0 */
-                        0x188 0x100     /* i2c5_sda.i2c5_sda INPUT | MODE0 */
-                >;
-        };
-
-};
-
-&mmc1 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mmc1_pins>;
-        vmmc-supply = <&vmmcsd_fixed>;
-        vmmc-aux-supply = <&ldo9_reg>;
-        bus-width = <4>;
-        cd-gpios = <&gpio3 3 0>; /* gpio 67 */
-};
-
-&mmc2 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mmc2_pins>;
-        vmmc-supply = <&vmmcsd_fixed>;
-        vmmc-aux-supply = <&ldo9_reg>;
-        bus-width = <8>;
-        ti,non-removable;
-};
-
-&mmc3 {
-        bus-width = <4>;
-        ti,non-removable;
-        status = "disabled";
-};
-
-&mmc4 {
-        status = "disabled";
-};
-
-&mmc5 {
-        status = "disabled";
-};
-
-&i2c1 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&i2c1_pins>;
-
-        clock-frequency = <400000>;
-};
-
-&i2c2 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&i2c2_pins>;
-
-        clock-frequency = <400000>;
-
-        /* Pressure Sensor */
-        bmp085@77 {
-                compatible = "bosch,bmp085";
-                reg = <0x77>;
-        };
-};
-
-&i2c3 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&i2c3_pins>;
-
-        clock-frequency = <400000>;
-};
-
-&i2c4 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&i2c4_pins>;
-
-        clock-frequency = <400000>;
-
-        /* Temperature Sensor */
-        tmp102@48{
-                compatible = "ti,tmp102";
-                reg = <0x48>;
-        };
-};
-
-&i2c5 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&i2c5_pins>;
-        clock-frequency = <400000>;
-
-        tca6424a: tca6424a@22 {
-                compatible = "ti,tca6424a";
-                reg = <0x22>;
-                gpio-controller;
-                #gpio-cells = <2>;
-        };
-};
-
-&keypad {
-        keypad,num-rows = <8>;
-        keypad,num-columns = <8>;
-        linux,keymap = <0x02020073      /* VOLUP */
-                        0x02030072      /* VOLDOWM */
-                        0x020400e7      /* SEND */
-                        0x02050066      /* HOME */
-                        0x0206006b      /* END */
-                        0x020700d9>;    /* SEARCH */
-        linux,input-no-autorepeat;
-};
-
-&mcbsp3 {
-        status = "disabled";
-};
-
-&emif1 {
-        cs1-used;
-        device-handle = <&samsung_K3PE0E000B>;
-};
-
-&emif2 {
-        cs1-used;
-        device-handle = <&samsung_K3PE0E000B>;
-};
-
-&usbhshost {
-        port2-mode = "ehci-hsic";
-        port3-mode = "ehci-hsic";
-};
-
-&usbhsehci {
-        phys = <0 &hsusb2_phy &hsusb3_phy>;
-};
-
-&i2c1 {
-        clock-frequency = <400000>;
-
-        palmas: palmas@48 {
-                reg = <0x48>;
-                /* SPI = 0, IRQ# = 7, 4 = active high level-sensitive */
-                interrupts = <0 7 4>; /* IRQ_SYS_1N cascaded to gic */
-                interrupt-parent = <&gic>;
-        };
-
-        twl6040: twl@4b {
-                compatible = "ti,twl6040";
-
-                interrupts = <0 119 4>; /* IRQ_SYS_2N cascaded to gic */
-                interrupt-parent = <&gic>;
-                ti,audpwron-gpio = <&gpio5 17 0>;  /* gpio line 145 */
-
-                vio-supply = <&smps7_reg>;
-                v2v1-supply = <&smps9_reg>;
-                enable-active-high;
-        };
-};
-
-/include/ "palmas.dtsi"
-
-&mcspi1 {
-
-};
-
-&mcspi2 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mcspi2_pins>;
-};
-
-&mcspi3 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mcspi3_pins>;
-};
-
-&mcspi4 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mcspi4_pins>;
-};
-
-/include/ "twl6040.dtsi"
-
-&dsi1 {
-        lcd {
-                compatible = "ti,lg4591";
-
-                lanes = <
-                        0       /* clk + */
-                        1       /* clk - */
-                        2       /* data1 + */
-                        3       /* data1 - */
-                        4       /* data2 + */
-                        5       /* data2 - */
-                        6       /* data3 + */
-                        7       /* data3 - */
-                        8       /* data4 + */
-                        9       /* data4 - */
-                >;
-
-                vdds_foo-supply = <&ldo2_reg>;
-
-                gpios = <&gpio6 23 0>;  /* 183, reset */
-        };
-};
-
-&hdmi {
-        tpd12s015: tpd12s015 {
-                compatible = "ti,tpd12s015";
-
-                gpios = <&tca6424a 0 0>,        /* TCA6424A P01, CT_CP_HDP */
-                        <&tca6424a 1 0>,        /* TCA6424A P00, LS_OE*/
-                        <&gpio7 1 0>;           /* 193, HPD */
-
-                hdmi-monitor {
-                        compatible = "ti,hdmi_panel";
-                };
-
-        };
-};
diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts
index 7b7b5347ef1..a339f321c2a 100644
--- a/arch/arm/boot/dts/omap5-uevm.dts
+++ b/arch/arm/boot/dts/omap5-uevm.dts
@@ -7,9 +7,22 @@
  */
 /dts-v1/;
 
+/*
+ * Following are the carveout addresses and the sizes. SMC is not reserved for now
+ * C0000000 - SDRAM+1G
+ * BFD00000 - SMC (3MB)
+ * BA300000 - ION (90MB)
+ * B4300000 - TILER SECURE (96 MB)
+ * B3400000 - TILER NONSECURE (15 MB)
+*/
+/memreserve/ 0xba300000 0x5a00000;
+/memreserve/ 0xb4300000 0x6000000;
+/memreserve/ 0xb3400000 0xf00000;
+
 /include/ "omap5.dtsi"
 /include/ "samsung_k3pe0e000b.dtsi"
 
+
 / {
         model = "TI OMAP5 uEVM board";
         compatible = "ti,omap5-uevm", "ti,omap5";
@@ -74,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";
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 3f1846ae98a..2d91a16310a 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -43,7 +43,7 @@
                                 1000000 1060000
                                 1500000 1250000
                         >;
-                        clocks = <&dpll_mpu>;
+                        clocks = <&dpll_mpu_ck>;
                         clock-names = "cpu";
                         clock-latency = <300000>; /* From omap-cpufreq driver */
                 };
@@ -104,7 +104,7 @@
                         ti,hwmods = "counter_32k";
                 };
 
-                dpll_mpu: dpll_mpu {
+                dpll_mpu_ck: dpll_mpu_ck {
                         #clock-cells = <0>;
                         compatible = "ti,omap-clock";
                 };
@@ -679,6 +679,9 @@
                                 compatible = "ti,omap-usb2";
                                 reg = <0x4a084000 0x7c>;
                                 ctrl-module = <&omap_control_usb>;
+                                wkupclk =  "usb_phy_cm_clk32k";
+                                optclk = "usb_otg_ss_refclk960m";
+
                         };
 
                         usb3_phy: usb3phy@4a084400 {
@@ -688,6 +691,8 @@
                                       <0x4a084c00 0x40>;
                                 reg-names = "phy_rx", "phy_tx", "pll_ctrl";
                                 ctrl-module = <&omap_control_usb>;
+                                wkupclk =  "usb_phy_cm_clk32k";
+                                optclk = "usb_otg_ss_refclk960m";
                         };
                 };
 
diff --git a/arch/arm/configs/android_omap_defconfig b/arch/arm/configs/android_omap_defconfig
index e952fa9429b..dfda9624155 100644
--- a/arch/arm/configs/android_omap_defconfig
+++ b/arch/arm/configs/android_omap_defconfig
@@ -22,6 +22,7 @@ CONFIG_MODULE_SRCVERSION_ALL=y
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_ARCH_OMAP=y
+CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_OMAP_RESET_CLOCKS=y
 CONFIG_OMAP_MUX_DEBUG=y
 CONFIG_SOC_OMAP5=y
@@ -30,9 +31,10 @@ CONFIG_ARM_THUMBEE=y
 CONFIG_ARM_ERRATA_411920=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=2
+CONFIG_PREEMPT=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO0,115200 init=/init androidboot.console=ttyO0 early_printk"
+CONFIG_CMDLINE="root=/dev/mmcblk0p2 rw rootwait console=ttyO0,115200 androidboot.console=ttyO0 vmalloc=496M init=/init omapfb.fb_opt=-1,-1,-1,1,1280,720 cma=64M no_console_suspend"
 CONFIG_CMDLINE_FORCE=y
 CONFIG_KEXEC=y
 CONFIG_CPU_FREQ=y
@@ -175,6 +177,7 @@ CONFIG_REGULATOR_TPS65023=y
 CONFIG_REGULATOR_TPS6507X=y
 CONFIG_REGULATOR_TPS65217=y
 CONFIG_REGULATOR_TPS65910=y
+CONFIG_REGULATOR_TIAVSCLASS0=y
 CONFIG_MEDIA_SUPPORT=m
 CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_VIDEO_DEV=m
@@ -186,17 +189,19 @@ CONFIG_MEDIA_USB_SUPPORT=y
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 CONFIG_USB_GSPCA=m
-CONFIG_DRM=y
-CONFIG_DRM_OMAP=y
 CONFIG_DRM_OMAP_NUM_CRTCS=3
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y
+CONFIG_DSSCOMP=y
+CONFIG_DSSCOMP_DEBUG_LOG=y
 CONFIG_OMAP2_DSS=y
 CONFIG_OMAP2_DSS_DRA7XX_DPI=y
 CONFIG_OMAP2_DSS_RFBI=y
 CONFIG_OMAP2_DSS_SDI=y
 CONFIG_OMAP2_DSS_DSI=y
+CONFIG_FB_OMAP2=y
+CONFIG_OMAPLFB=y
 CONFIG_PANEL_GENERIC_DPI=y
 CONFIG_PANEL_TFP410=y
 CONFIG_PANEL_LGPHILIPS_LB035Q02=y
@@ -213,32 +218,39 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=y
 CONFIG_LCD_PLATFORM=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
 CONFIG_LOGO=y
-CONFIG_SOUND=m
-CONFIG_SND=m
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
 CONFIG_SND_MIXER_OSS=m
 CONFIG_SND_PCM_OSS=m
 CONFIG_SND_VERBOSE_PRINTK=y
+CONFIG_SND_COMPRESS_OFFLOAD=y
 CONFIG_SND_DEBUG=y
 CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_SOC=m
-CONFIG_SND_OMAP_SOC=m
+CONFIG_SND_SOC=y
+CONFIG_SND_DAVINCI_SOC_MCASP=y
+CONFIG_SND_OMAP_SOC=y
+CONFIG_SND_OMAP_SOC_HDMI=y
 CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
 CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
+CONFIG_SND_OMAP_SOC_OMAP_HDMI=y
 CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
+CONFIG_SND_DRA7_SOC_ATL=y
+CONFIG_SND_SOC_DRA7_EVM=y
+CONFIG_SND_SOC_I2C_AND_SPI=y
+CONFIG_SND_SOC_OMAP_HDMI_CODEC=y
+CONFIG_SND_SOC_TLV320AIC3X=y
 CONFIG_USB=y
-CONFIG_USB_DEBUG=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_SUSPEND=y
 CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_DWC3=m
-CONFIG_USB_DWC3_DEBUG=y
-CONFIG_USB_DWC3_VERBOSE=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_DWC3=y
 CONFIG_USB_MUSB_HDRC=m
 CONFIG_USB_MUSB_OMAP2PLUS=m
 CONFIG_USB_MUSB_AM35X=m
@@ -249,22 +261,15 @@ CONFIG_USB_WDM=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_TEST=y
 CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_DEBUG=y
 CONFIG_USB_GADGET_DEBUG_FILES=y
 CONFIG_USB_GADGET_DEBUG_FS=y
-CONFIG_USB_ZERO=m
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_G_MULTI=m
-CONFIG_USB_G_MULTI_CDC=y
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_EEM=y
-CONFIG_OMAP_USB2=m
-CONFIG_OMAP_USB3=m
+CONFIG_OMAP_USB2=y
+CONFIG_OMAP_USB3=y
 CONFIG_OMAP_CONTROL_USB=y
 CONFIG_TWL4030_USB=m
 CONFIG_TWL6030_USB=m
 CONFIG_NOP_USB_XCEIV=y
-CONFIG_PALMAS_USB=m
+CONFIG_PALMAS_USB=y
 CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_SDIO_UART=y
@@ -280,6 +285,8 @@ CONFIG_LEDS_TRIGGER_BACKLIGHT=y
 CONFIG_LEDS_TRIGGER_CPU=y
 CONFIG_LEDS_TRIGGER_GPIO=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+CONFIG_SWITCH=y
+CONFIG_SWITCH_GPIO=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_PALMAS=y
 CONFIG_RTC_DRV_TWL92330=y
@@ -289,6 +296,11 @@ CONFIG_DMADEVICES=y
 CONFIG_TI_EDMA=y
 CONFIG_DMA_OMAP=y
 CONFIG_STAGING=y
+CONFIG_FB=y
+CONFIG_DRM=y
+CONFIG_DRM_OMAP=y
+CONFIG_DRM_OMAP_DISPLAY=n
+CONFIG_DRM_OMAP_DMM_TILER=y
 CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ASHMEM=y
@@ -298,6 +310,8 @@ CONFIG_ANDROID_TIMED_GPIO=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
 CONFIG_ANDROID_INTF_ALARM_DEV=y
+CONFIG_USB_G_ANDROID=y
+CONFIG_USB_LIBCOMPOSITE=y
 CONFIG_TI_SOC_THERMAL=y
 CONFIG_TI_THERMAL=y
 CONFIG_OMAP4_THERMAL=y
@@ -309,6 +323,7 @@ CONFIG_EXT3_FS=y
 CONFIG_EXT4_FS=y
 CONFIG_QUOTA=y
 CONFIG_QFMT_V2=y
+CONFIG_FUSE_FS=y
 CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_TMPFS=y
@@ -333,9 +348,6 @@ CONFIG_TIMER_STATS=y
 CONFIG_PROVE_LOCKING=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
 CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_LL=y
-CONFIG_DEBUG_LL_UART_NONE=y
-CONFIG_EARLY_PRINTK=y
 CONFIG_SECURITY=y
 CONFIG_CRYPTO_MICHAEL_MIC=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
@@ -344,5 +356,9 @@ CONFIG_CRC_T10DIF=y
 CONFIG_CRC_ITU_T=y
 CONFIG_CRC7=y
 CONFIG_LIBCRC32C=y
+CONFIG_ION=y
+CONFIG_ION_OMAP=y
+CONFIG_CMA=y
 CONFIG_TI_DAVINCI_MDIO=y
 CONFIG_TI_DAVINCI_CPDMA=y
+CONFIG_PM_WAKELOCKS=y
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
index e3514f7e7c0..3ef11817cf1 100644
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -220,26 +220,34 @@ CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
 CONFIG_LOGO=y
-CONFIG_SOUND=m
-CONFIG_SND=m
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
 CONFIG_SND_MIXER_OSS=m
 CONFIG_SND_PCM_OSS=m
 CONFIG_SND_VERBOSE_PRINTK=y
+CONFIG_SND_COMPRESS_OFFLOAD=y
 CONFIG_SND_DEBUG=y
 CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_SOC=m
-CONFIG_SND_OMAP_SOC=m
+CONFIG_SND_SOC=y
+CONFIG_SND_DAVINCI_SOC_MCASP=y
+CONFIG_SND_OMAP_SOC=y
+CONFIG_SND_OMAP_SOC_HDMI=y
 CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
 CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
+CONFIG_SND_OMAP_SOC_OMAP_HDMI=y
 CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
+CONFIG_SND_DRA7_SOC_ATL=y
+CONFIG_SND_SOC_DRA7_EVM=y
+CONFIG_SND_SOC_I2C_AND_SPI=y
+CONFIG_SND_SOC_OMAP_HDMI_CODEC=y
+CONFIG_SND_SOC_TLV320AIC3X=y
 CONFIG_USB=y
-CONFIG_USB_DEBUG=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_SUSPEND=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_DWC3=m
-CONFIG_USB_DWC3_DEBUG=y
-CONFIG_USB_DWC3_VERBOSE=y
 CONFIG_USB_MUSB_HDRC=m
 CONFIG_USB_MUSB_OMAP2PLUS=m
 CONFIG_USB_MUSB_AM35X=m
@@ -250,7 +258,6 @@ CONFIG_USB_WDM=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_TEST=y
 CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_DEBUG=y
 CONFIG_USB_GADGET_DEBUG_FILES=y
 CONFIG_USB_GADGET_DEBUG_FS=y
 CONFIG_USB_ZERO=m
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index eca7a77df80..8af6b54ab66 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -240,7 +240,7 @@ static const char *omap5_boards_compat[] __initdata = {
         NULL,
 };
 
-DT_MACHINE_START(OMAP5_DT, "Generic OMAP5 (Flattened Device Tree)")
+DT_MACHINE_START(OMAP5_DT, "OMAP5 Panda board")
         .reserve        = omap_reserve,
         .smp            = smp_ops(omap4_smp_ops),
         .map_io         = omap5_map_io,
diff --git a/arch/arm/mach-omap2/cclock54xx_data.c b/arch/arm/mach-omap2/cclock54xx_data.c
index 4a17f12caa9..4228e2ba37a 100644
--- a/arch/arm/mach-omap2/cclock54xx_data.c
+++ b/arch/arm/mach-omap2/cclock54xx_data.c
@@ -1018,12 +1018,14 @@ static const char *gpu_core_gclk_mux_parents[] = {
         "dpll_core_h14x2_ck", "dpll_per_h14x2_ck",
 };
 
-DEFINE_CLK_MUX(gpu_core_gclk_mux, gpu_core_gclk_mux_parents, NULL, 0x0,
-               OMAP54XX_CM_GPU_GPU_CLKCTRL, OMAP54XX_CLKSEL_GPU_CORE_GCLK_SHIFT,
+DEFINE_CLK_MUX(gpu_core_gclk_mux, gpu_core_gclk_mux_parents, NULL,
+               CLK_SET_RATE_PARENT, OMAP54XX_CM_GPU_GPU_CLKCTRL,
+               OMAP54XX_CLKSEL_GPU_CORE_GCLK_SHIFT,
                OMAP54XX_CLKSEL_GPU_CORE_GCLK_WIDTH, 0x0, NULL);
 
-DEFINE_CLK_MUX(gpu_hyd_gclk_mux, gpu_core_gclk_mux_parents, NULL, 0x0,
-               OMAP54XX_CM_GPU_GPU_CLKCTRL, OMAP54XX_CLKSEL_GPU_HYD_GCLK_SHIFT,
+DEFINE_CLK_MUX(gpu_hyd_gclk_mux, gpu_core_gclk_mux_parents, NULL,
+               CLK_SET_RATE_PARENT, OMAP54XX_CM_GPU_GPU_CLKCTRL,
+               OMAP54XX_CLKSEL_GPU_HYD_GCLK_SHIFT,
                OMAP54XX_CLKSEL_GPU_HYD_GCLK_WIDTH, 0x0, NULL);
 
 DEFINE_CLK_DIVIDER(hsi_fclk, "dpll_per_m2x2_ck", &dpll_per_m2x2_ck, 0x0,
diff --git a/arch/arm/mach-omap2/cclock7xx_data.c b/arch/arm/mach-omap2/cclock7xx_data.c
index e77d58771c7..70bbe2c7760 100644
--- a/arch/arm/mach-omap2/cclock7xx_data.c
+++ b/arch/arm/mach-omap2/cclock7xx_data.c
@@ -40,8 +40,9 @@
 #include "prm-regbits-7xx.h"
 #include "control.h"
 
-#define DRA7_DPLL_ABE_DEFFREQ                   361267200
+#define DRA7_DPLL_ABE_DEFFREQ                   180633600
 #define DRA7_DPLL_GMAC_DEFFREQ                  1000000000
+#define DRA7_DPLL_USB_DEFFREQ                   960000000
 
 /* Root clocks */
 
@@ -51,7 +52,7 @@ DEFINE_CLK_FIXED_RATE(atl_clkin1_ck, CLK_IS_ROOT, 0, 0x0);
 
 DEFINE_CLK_FIXED_RATE(atl_clkin2_ck, CLK_IS_ROOT, 0, 0x0);
 
-DEFINE_CLK_FIXED_RATE(atlclkin3_ck, CLK_IS_ROOT, 0, 0x0);
+DEFINE_CLK_FIXED_RATE(atl_clkin3_ck, CLK_IS_ROOT, 0, 0x0);
 
 DEFINE_CLK_FIXED_RATE(hdmi_clkin_ck, CLK_IS_ROOT, 0, 0x0);
 
@@ -1245,7 +1246,7 @@ static struct clk_hw_omap hdmi_div_clk_hw = {
 DEFINE_STRUCT_CLK(hdmi_div_clk, hdmi_dclk_div_parents, apll_pcie_clkvcoldo_ops);
 
 DEFINE_CLK_MUX(hdmi_dpll_clk_mux, abe_dpll_sys_clk_mux_parents, NULL, 0x0,
-               DRA7XX_CM_CLKSEL_HDMI_CLK_CLKOUTMUX, DRA7XX_CLKSEL_SHIFT,
+               DRA7XX_CM_CLKSEL_HDMI_PLL_SYS, DRA7XX_CLKSEL_SHIFT,
                DRA7XX_CLKSEL_WIDTH, 0x0, NULL);
 
 static struct clk l3_iclk_div;
@@ -1525,13 +1526,15 @@ static const char *gpu_core_gclk_mux_parents[] = {
         "dpll_core_h14x2_ck", "dpll_per_h14x2_ck", "dpll_gpu_m2_ck",
 };
 
-DEFINE_CLK_MUX(gpu_core_gclk_mux, gpu_core_gclk_mux_parents, NULL, 0x0,
-               DRA7XX_CM_GPU_GPU_CLKCTRL, DRA7XX_CLKSEL_CORE_CLK_SHIFT,
-               DRA7XX_CLKSEL_CORE_CLK_WIDTH, 0x0, NULL);
+DEFINE_CLK_MUX(gpu_core_gclk_mux, gpu_core_gclk_mux_parents, NULL,
+               CLK_SET_RATE_PARENT, DRA7XX_CM_GPU_GPU_CLKCTRL,
+               DRA7XX_CLKSEL_CORE_CLK_SHIFT, DRA7XX_CLKSEL_CORE_CLK_WIDTH,
+               0x0, NULL);
 
-DEFINE_CLK_MUX(gpu_hyd_gclk_mux, gpu_core_gclk_mux_parents, NULL, 0x0,
-               DRA7XX_CM_GPU_GPU_CLKCTRL, DRA7XX_CLKSEL_HYD_CLK_SHIFT,
-               DRA7XX_CLKSEL_HYD_CLK_WIDTH, 0x0, NULL);
+DEFINE_CLK_MUX(gpu_hyd_gclk_mux, gpu_core_gclk_mux_parents, NULL,
+               CLK_SET_RATE_PARENT, DRA7XX_CM_GPU_GPU_CLKCTRL,
+               DRA7XX_CLKSEL_HYD_CLK_SHIFT, DRA7XX_CLKSEL_HYD_CLK_WIDTH,
+               0x0, NULL);
 
 static const char *ipu1_gfclk_mux_parents[] = {
         "dpll_abe_m2x2_ck", "dpll_core_h22x2_ck",
@@ -1555,9 +1558,9 @@ DEFINE_CLK_DIVIDER_TABLE(l3instr_ts_gclk_div, "wkupaon_iclk_mux",
 
 static const char *mcasp1_ahclkr_mux_parents[] = {
         "abe_24m_fclk", "abe_sys_clk_div", "func_24m_clk",
-        "atlclkin3", "atl_clkin2", "atl_clkin1",
-        "atl_clkin0", "sys_clkin2", "ref_clkin0",
-        "ref_clkin1", "ref_clkin2", "ref_clkin3",
+        "atl_clkin3_ck", "atl_clkin2_ck", "atl_clkin1_ck",
+        "atl_clkin0_ck", "sys_clkin2", "ref_clkin0_ck",
+        "ref_clkin1_ck", "ref_clkin2_ck", "ref_clkin3_ck",
         "mlb_clk", "mlbp_clk",
 };
 
@@ -1692,8 +1695,8 @@ DEFINE_CLK_DIVIDER(qspi_gfclk_div, "qspi_gfclk_mux", &qspi_gfclk_mux, 0x0,
 
 static const char *timer10_gfclk_mux_parents[] = {
         "timer_sys_clk_div", "sys_32k_ck", "sys_clkin2",
-        "ref_clkin0", "ref_clkin1", "ref_clkin2",
-        "ref_clkin3", "abe_giclk_div", "video1_div_clk",
+        "ref_clkin0_ck", "ref_clkin1_ck", "ref_clkin2_ck",
+        "ref_clkin3_ck", "abe_giclk_div", "video1_div_clk",
         "video2_div_clk", "hdmi_div_clk",
 };
 
@@ -1739,8 +1742,8 @@ DEFINE_CLK_MUX(timer4_gfclk_mux, timer10_gfclk_mux_parents, NULL, 0x0,
 
 static const char *timer5_gfclk_mux_parents[] = {
         "timer_sys_clk_div", "sys_32k_ck", "sys_clkin2",
-        "ref_clkin0", "ref_clkin1", "ref_clkin2",
-        "ref_clkin3", "abe_giclk_div", "video1_div_clk",
+        "ref_clkin0_ck", "ref_clkin1_ck", "ref_clkin2_ck",
+        "ref_clkin3_ck", "abe_giclk_div", "video1_div_clk",
         "video2_div_clk", "hdmi_div_clk", "clkoutmux0_clk_mux",
 };
 
@@ -1828,7 +1831,7 @@ static struct omap_clk dra7xx_clks[] = {
         CLK(NULL,       "atl_clkin0_ck",                &atl_clkin0_ck, CK_7XX),
         CLK(NULL,       "atl_clkin1_ck",                &atl_clkin1_ck, CK_7XX),
         CLK(NULL,       "atl_clkin2_ck",                &atl_clkin2_ck, CK_7XX),
-        CLK(NULL,       "atlclkin3_ck",                 &atlclkin3_ck,  CK_7XX),
+        CLK(NULL,       "atl_clkin3_ck",                &atl_clkin3_ck, CK_7XX),
         CLK(NULL,       "hdmi_clkin_ck",                &hdmi_clkin_ck, CK_7XX),
         CLK(NULL,       "mlb_clkin_ck",                 &mlb_clkin_ck,  CK_7XX),
         CLK(NULL,       "mlbp_clkin_ck",                &mlbp_clkin_ck, CK_7XX),
@@ -2123,7 +2126,9 @@ static struct reparent_init_clks reparent_clks[] = {
 
 static struct rate_init_clks rate_clks[] = {
         { .name = "dpll_abe_ck", .rate =  DRA7_DPLL_ABE_DEFFREQ },
+        { .name = "dpll_abe_m2x2_ck", .rate =  DRA7_DPLL_ABE_DEFFREQ * 2 },
         { .name = "dpll_gmac_ck", .rate =  DRA7_DPLL_GMAC_DEFFREQ },
+        { .name = "dpll_usb_ck", .rate =  DRA7_DPLL_USB_DEFFREQ },
 };
 
 int __init dra7xx_clk_init(void)
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 2d4f9c02dcc..a8f1557a225 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -22,6 +22,8 @@
 #include <linux/platform_data/omap_ocp2scp.h>
 #include <linux/usb/omap_control_usb.h>
 #include <linux/platform_data/mailbox-omap.h>
+#include <linux/platform_data/omap_gcx.h>
+#include "omap-pm.h"
 
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>
@@ -447,6 +449,70 @@ static void __init omap_init_dmic(void)
 static inline void omap_init_dmic(void) {}
 #endif
 
+static int gcxxx_scale_dev(struct device *dev, unsigned long val);
+static int gcxxx_set_l3_bw(struct device *dev, unsigned long val);
+
+static struct omap_gcx_platform_data omap_gcxxx = {
+        .get_context_loss_count = omap_pm_get_dev_context_loss_count,
+        .scale_dev = gcxxx_scale_dev,
+        .set_bw = gcxxx_set_l3_bw,
+};
+
+struct omap_device_pm_latency omap_gcxxx_latency[] = {
+        {
+                .deactivate_func = omap_device_idle_hwmods,
+                .activate_func   = omap_device_enable_hwmods,
+                .flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
+        }
+};
+
+static int gcxxx_scale_dev(struct device *dev, unsigned long val)
+{
+        /*omap_device_scale(dev, val) is not supported, returning with no-op
+         * for now. */
+        return 0;
+}
+
+static int gcxxx_set_l3_bw(struct device *dev, unsigned long val)
+{
+        return omap_pm_set_min_bus_tput(dev, OCP_INITIATOR_AGENT, val);
+}
+
+int __init gcxxx_init(void)
+{
+        int retval = 0;
+        struct omap_hwmod *oh;
+        struct platform_device *pdev;
+        /*struct omap_device *od;
+        struct device *dev;*/
+        const char *oh_name = "bb2d";
+        const char *dev_name = "gccore";
+
+        /*
+         * Hwmod lookup will fail in case our platform doesn't support the
+         * hardware spinlock module, so it is safe to run this initcall
+         * on all omaps
+         */
+        oh = omap_hwmod_lookup(oh_name);
+        if (oh == NULL)
+                return -EINVAL;
+
+        omap_gcxxx.regbase = omap_hwmod_get_mpu_rt_va(oh);
+        omap_gcxxx.is_hw_present = (soc_is_omap543x()
+                                || soc_is_dra7xx()) ? true : false;
+        pdev = omap_device_build(dev_name, 0, oh, &omap_gcxxx,
+                                sizeof(omap_gcxxx), omap_gcxxx_latency,
+                                ARRAY_SIZE(omap_gcxxx_latency), false);
+        if (IS_ERR(pdev)) {
+                pr_err("Can't build omap_device for %s:%s\n", dev_name,
+                                                                oh_name);
+                retval = PTR_ERR(pdev);
+        }
+
+        return retval;
+}
+
+
 #if defined(CONFIG_SND_OMAP_SOC_ABE) || \
         defined(CONFIG_SND_OMAP_SOC_ABE_MODULE)
 
@@ -683,6 +749,7 @@ static int __init omap2_init_devices(void)
         omap_init_audio();
         omap_init_camera();
         omap_init_mbox();
+        gcxxx_init();
         /* If dtb is there, the devices will be created dynamically */
         if (!of_have_populated_dt()) {
                 omap_init_control_usb();
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index 502196efd57..fe0dd68f40f 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -129,8 +129,6 @@ static __init int omapdrm_init(void)
         struct omap_hwmod *oh;
         int r = 0;
 
-        /* create DRM and DMM device */
-        if (omap_drm_device != NULL) {
                 if (!of_find_compatible_node(NULL, NULL, "ti,omap4-dmm") &&
                         !of_find_compatible_node(NULL, NULL, "ti,omap5-dmm")) {
 
@@ -144,6 +142,9 @@ static __init int omapdrm_init(void)
                                         oh->name);
                 }
 
+        /* create DRM and DMM device */
+        if (omap_drm_device != NULL) {
+
                 platform_drm_data.omaprev = GET_OMAP_TYPE;
 
                 r = platform_device_register(omap_drm_device);
@@ -427,6 +428,13 @@ int __init omap_display_init(struct omap_dss_board_info *board_data)
                 return -ENODEV;
         }
 
+        /* create DMM and DRM device */
+        r = omapdrm_init();
+        if (r < 0) {
+                pr_err("Unable to register omapdrm/dmm device\n");
+                return r;
+        }
+
         board_data->version = ver;
         board_data->dsi_enable_pads = omap_dsi_enable_pads;
         board_data->dsi_disable_pads = omap_dsi_disable_pads;
@@ -536,13 +544,6 @@ int __init omap_display_init(struct omap_dss_board_info *board_data)
 
         }
 
-        /* create DMM and DRM device */
-        r = omapdrm_init();
-        if (r < 0) {
-                pr_err("Unable to register omapdrm device\n");
-                return r;
-        }
-
         return 0;
 }
 
@@ -739,6 +740,13 @@ int __init omapdss_init_of(void)
                 return -ENODEV;
         }
 
+        /* create omapdrm devices */
+        r = omapdrm_init();
+        if (r < 0) {
+                pr_err("Unable to create omapdrm/dmm device\n");
+                return r;
+        }
+
         board_data.version = ver;
 
         /* find the main dss node  */
@@ -768,12 +776,5 @@ int __init omapdss_init_of(void)
 
         hdmi_init_of();
 
-        /* create omapdrm devices */
-        r = omapdrm_init();
-        if (r < 0) {
-                pr_err("Unable to create omapdrm device\n");
-                return r;
-        }
-
         return 0;
 }
diff --git a/arch/arm/mach-omap2/fb.c b/arch/arm/mach-omap2/fb.c
index d9bd965f6d0..14455b824c2 100644
--- a/arch/arm/mach-omap2/fb.c
+++ b/arch/arm/mach-omap2/fb.c
@@ -108,6 +108,11 @@ static struct platform_device omap_fb_device = {
         .num_resources = 0,
 };
 
+void omapfb_set_platform_data(struct omapfb_platform_data *data)
+{
+        omapfb_config = *data;
+}
+
 static int __init omap_init_fb(void)
 {
         return platform_device_register(&omap_fb_device);
@@ -116,3 +121,4 @@ static int __init omap_init_fb(void)
 arch_initcall(omap_init_fb);
 
 #endif
+
diff --git a/arch/arm/mach-omap2/include/mach/tiler.h b/arch/arm/mach-omap2/include/mach/tiler.h
new file mode 100644
index 00000000000..9ece8f533ec
--- /dev/null
+++ b/arch/arm/mach-omap2/include/mach/tiler.h
@@ -0,0 +1,570 @@
+/*
+ * tiler.h
+ *
+ * TILER driver support functions for TI TILER hardware block.
+ *
+ * Authors: Lajos Molnar <molnar@ti.com>
+ *          David Sin <davidsin@ti.com>
+ *
+ * Copyright (C) 2009-2011 Texas Instruments, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of Texas Instruments Incorporated nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef TILER_H
+#define TILER_H
+
+#include <linux/mm.h>
+
+/*
+ * ----------------------------- API Definitions -----------------------------
+ */
+
+/* return true if physical address is in the tiler container */
+bool is_tiler_addr(u32 phys);
+
+enum tiler_fmt {
+        TILFMT_MIN     = -2,
+        TILFMT_INVALID = -2,
+        TILFMT_NONE    = -1,
+        TILFMT_8BIT    = 0,
+        TILFMT_16BIT   = 1,
+        TILFMT_32BIT   = 2,
+        TILFMT_PAGE    = 3,
+        TILFMT_MAX     = 3,
+        TILFMT_8AND16  = 4,     /* used to mark NV12 reserve block */
+};
+
+/* tiler block info */
+struct tiler_block_t {
+        u32 phys;               /* system space (L3) tiler addr */
+        u32 width;              /* width */
+        u32 height;             /* height */
+        u32 key;                /* secret key */
+        u32 id;                 /* unique block ID */
+};
+
+/* tiler (image/video frame) view */
+struct tiler_view_t {
+        u32 tsptr;              /* tiler space addr */
+        u32 width;              /* width */
+        u32 height;             /* height */
+        u32 bpp;                /* bytes per pixel */
+        s32 h_inc;              /* horizontal increment */
+        s32 v_inc;              /* vertical increment */
+};
+
+/* get the tiler format for a physical address or TILFMT_INVALID */
+enum tiler_fmt tiler_fmt(u32 phys);
+
+/* get the modified (1 for page mode) bytes-per-pixel for a tiler block */
+u32 tiler_bpp(const struct tiler_block_t *b);
+
+/* get tiler block physical stride */
+u32 tiler_pstride(const struct tiler_block_t *b);
+
+/* get tiler block virtual stride */
+static inline u32 tiler_vstride(const struct tiler_block_t *b)
+{
+        return PAGE_ALIGN((b->phys & ~PAGE_MASK) + tiler_bpp(b) * b->width);
+}
+
+/* returns the virtual size of the block (for mmap) */
+static inline u32 tiler_size(const struct tiler_block_t *b)
+{
+        return b->height * tiler_vstride(b);
+}
+
+/* Event types */
+#define TILER_DEVICE_CLOSE      0
+
+/**
+ * Registers a notifier block with TILER driver.
+ *
+ * @param nb            notifier_block
+ *
+ * @return error status
+ */
+s32 tiler_reg_notifier(struct notifier_block *nb);
+
+/**
+ * Un-registers a notifier block with TILER driver.
+ *
+ * @param nb            notifier_block
+ *
+ * @return error status
+ */
+s32 tiler_unreg_notifier(struct notifier_block *nb);
+
+/**
+ * Get the physical address for a given user va.
+ *
+ * @param usr   user virtual address
+ *
+ * @return valid pa or 0 for error
+ */
+u32 tiler_virt2phys(u32 usr);
+
+/**
+ * Reserves a 1D or 2D TILER block area and memory for the
+ * current process with group ID 0.
+ *
+ * @param blk   pointer to tiler block data.  This must be set up ('phys' member
+ *              must be 0) with the tiler block information. 'height' must be 1
+ *              for 1D block.
+ * @param fmt   TILER block format
+ *
+ * @return error status
+ */
+s32 tiler_alloc(struct tiler_block_t *blk, enum tiler_fmt fmt);
+
+/**
+ * Reserves a 1D or 2D TILER block area and memory for a set process and group
+ * ID.
+ *
+ * @param blk   pointer to tiler block data.  This must be set up ('phys' member
+ *              must be 0) with the tiler block information. 'height' must be 1
+ *              for 1D block.
+ * @param fmt   TILER block format
+ * @param gid   group ID
+ * @param pid   process ID
+ *
+ * @return error status
+ */
+s32 tiler_allocx(struct tiler_block_t *blk, enum tiler_fmt fmt,
+                                        u32 gid, pid_t pid);
+
+/**
+ * Mmaps a portion of a tiler block to a virtual address.  Use this method in
+ * your driver's mmap function to potentially combine multiple tiler blocks as
+ * one virtual buffer.
+ *
+ * @param blk           pointer to tiler block data
+ * @param offs          offset from where to map (must be page aligned)
+ * @param size          size of area to map (must be page aligned)
+ * @param vma           VMM memory area to map to
+ * @param voffs         offset (from vm_start) in the VMM memory area to start
+ *                      mapping at
+ *
+ * @return error status
+ */
+s32 tiler_mmap_blk(struct tiler_block_t *blk, u32 offs, u32 size,
+                                struct vm_area_struct *vma, u32 voffs);
+
+/**
+ * Ioremaps a portion of a tiler block.  Use this method in your driver instead
+ * of ioremap to potentially combine multiple tiler blocks as one virtual
+ * buffer.
+ *
+ * @param blk           pointer to tiler block data
+ * @param offs          offset from where to map (must be page aligned)
+ * @param size          size of area to map (must be page aligned)
+ * @param addr          virtual address
+ * @param mtype         ioremap memory type (e.g. MT_DEVICE)
+ *
+ * @return error status
+ */
+s32 tiler_ioremap_blk(struct tiler_block_t *blk, u32 offs, u32 size, u32 addr,
+                                                        u32 mtype);
+
+/**
+ * Maps an existing buffer to a 1D or 2D TILER area for the
+ * current process with group ID 0.
+ *
+ * Currently, only 1D area mapping is supported.
+ *
+ * NOTE: alignment is always PAGE_SIZE and offset is 0 as full pages are mapped
+ * into tiler container.
+ *
+ * @param blk           pointer to tiler block data.  This must be set up
+ *                      ('phys' member must be 0) with the tiler block
+ *                      information. 'height' must be 1 for 1D block.
+ * @param fmt           TILER format
+ * @param usr_addr      user space address of existing buffer.
+ *
+ * @return error status
+ */
+s32 tiler_map(struct tiler_block_t *blk, enum tiler_fmt fmt, u32 usr_addr);
+
+/**
+ * Maps an existing buffer to a 1D or 2D TILER area for a set process and group
+ * ID.
+ *
+ * Currently, only 1D area mapping is supported.
+ *
+ * NOTE: alignment is always PAGE_SIZE and offset is 0 as full pages are mapped
+ * into tiler container.
+ *
+ * @param blk           pointer to tiler block data.  This must be set up
+ *                      ('phys' member must be 0) with the tiler block
+ *                      information. 'height' must be 1 for 1D block.
+ * @param fmt           TILER format
+ * @param gid           group ID
+ * @param pid           process ID
+ * @param usr_addr      user space address of existing buffer.
+ *
+ * @return error status
+ */
+s32 tiler_mapx(struct tiler_block_t *blk, enum tiler_fmt fmt,
+                                        u32 gid, pid_t pid, u32 usr_addr);
+
+/**
+ * Frees TILER memory.  Since there may be multiple references for the same area
+ * if duplicated by tiler_dup, the area is only actually freed if all references
+ * have been freed.
+ *
+ * @param blk   pointer to a tiler block data as filled by tiler_alloc,
+ *              tiler_map or tiler_dup.  'phys' and 'id' members will be set to
+ *              0 on success.
+ */
+void tiler_free(struct tiler_block_t *blk);
+
+/**
+ * Reserves tiler area for n identical blocks for the current process.  Use this
+ * method to get optimal placement of multiple identical tiler blocks; however,
+ * it may not reserve area if tiler_alloc is equally efficient.
+ *
+ * @param n             number of identical set of blocks
+ * @param fmt           TILER format
+ * @param width         block width
+ * @param height        block height (must be 1 for 1D)
+ */
+void tiler_reserve(u32 n, enum tiler_fmt fmt, u32 width, u32 height);
+
+/**
+ * Reserves tiler area for n identical blocks.  Use this method to get optimal
+ * placement of multiple identical tiler blocks; however, it may not reserve
+ * area if tiler_alloc is equally efficient.
+ *
+ * @param n             number of identical set of blocks
+ * @param fmt           TILER bit mode
+ * @param width         block width
+ * @param height        block height (must be 1 for 1D)
+ * @param gid           group ID
+ * @param pid           process ID
+ */
+void tiler_reservex(u32 n, enum tiler_fmt fmt, u32 width, u32 height,
+                                u32 gid, pid_t pid);
+
+/**
+ * Reserves tiler area for n identical NV12 blocks for the current process.  Use
+ * this method to get optimal placement of multiple identical NV12 tiler blocks;
+ * however, it may not reserve area if tiler_alloc is equally efficient.
+ *
+ * @param n             number of identical set of blocks
+ * @param width         block width (Y)
+ * @param height        block height (Y)
+ */
+void tiler_reserve_nv12(u32 n, u32 width, u32 height);
+
+/**
+ * Reserves tiler area for n identical NV12 blocks.  Use this method to get
+ * optimal placement of multiple identical NV12 tiler blocks; however, it may
+ * not reserve area if tiler_alloc is equally efficient.
+ *
+ * @param n             number of identical set of blocks
+ * @param width         block width (Y)
+ * @param height        block height (Y)
+ * @param gid           group ID
+ * @param pid           process ID
+ */
+void tiler_reservex_nv12(u32 n, u32 width, u32 height, u32 gid, pid_t pid);
+
+/**
+ * Create a view based on a tiler address and width and height
+ *
+ * This method should only be used as a last resort, e.g. if tilview object
+ * cannot be passed because of incoherence with other view 2D objects that must
+ * be supported.
+ *
+ * @param view          Pointer to a view where the information will be stored
+ * @param ssptr         MUST BE a tiler address
+ * @param width         view width
+ * @param height        view height
+ */
+void tilview_create(struct tiler_view_t *view, u32 phys, u32 width, u32 height);
+
+/**
+ * Obtains the view information for a tiler block
+ *
+ * @param view          Pointer to a view where the information will be stored
+ * @param blk           Pointer to an existing allocated tiler block
+ */
+void tilview_get(struct tiler_view_t *view, struct tiler_block_t *blk);
+
+/**
+ * Crops a tiler view to a rectangular portion. Crop area must be fully within
+ * the orginal tiler view: 0 <= left <= left + width <= view->width, also:
+ * 0 <= top <= top + height <= view->height.
+ *
+ * @param view          Pointer to tiler view to be cropped
+ * @param left          x of top-left corner
+ * @param top           y of top-left corner
+ * @param width         crop width
+ * @param height        crop height
+ *
+ * @return error status.  The view will be reduced to the crop region if the
+ *         crop region is correct.  Otherwise, no modifications are made.
+ */
+s32 tilview_crop(struct tiler_view_t *view, u32 left, u32 top, u32 width,
+                                                                u32 height);
+
+/**
+ * Rotates a tiler view clockwise by a specified degree.
+ *
+ * @param view          Pointer to tiler view to be cropped
+ * @param rotate        Degree of rotation (clockwise).  Must be a multiple of
+ *                      90.
+ * @return error status.  View is not modified on error; otherwise, it is
+ *         updated in place.
+ */
+s32 tilview_rotate(struct tiler_view_t *view, s32 rotation);
+
+/**
+ * Mirrors a tiler view horizontally and/or vertically.
+ *
+ * @param view          Pointer to tiler view to be cropped
+ * @param flip_x        Mirror horizontally (left-to-right)
+ * @param flip_y        Mirror vertically (top-to-bottom)
+ *
+ * @return error status.  View is not modified on error; otherwise, it is
+ *         updated in place.
+ */
+s32 tilview_flip(struct tiler_view_t *view, bool flip_x, bool flip_y);
+
+/*
+ * -------------------- TILER hooks for ION/HWC migration --------------------
+ */
+
+/* type of tiler memory */
+enum tiler_memtype {
+        TILER_MEM_ALLOCED,              /* tiler allocated the memory */
+        TILER_MEM_GOT_PAGES,            /* tiler used get_user_pages */
+        TILER_MEM_USING,                /* tiler is using the pages */
+};
+
+/* physical pages to pin - mem must be kmalloced */
+struct tiler_pa_info {
+        u32 num_pg;                     /* number of pages in page-list */
+        u32 *mem;                       /* list of phys page addresses */
+        enum tiler_memtype memtype;     /* how we got physical pages */
+};
+
+typedef struct mem_info *tiler_blk_handle;
+
+/**
+ * Allocate a 1D area of container space in the Tiler
+ *
+ * @param pa            ptr to tiler_pa_info structure
+ *
+ * @return handle       Handle to tiler block information.  NULL on error.
+ *
+ * NOTE: this will take ownership pa->mem (will free it)
+ *
+ */
+tiler_blk_handle tiler_map_1d_block(struct tiler_pa_info *pa);
+
+/**
+ * Allocate an area of container space in the Tiler
+ *
+ * @param fmt           Tiler bpp mode
+ * @param width         Width in pixels
+ * @param height        Height in pixels
+ * @param ssptr         Value of tiler physical address of allocation
+ * @param virt_array    Array of physical address for the start of each virtual
+                        page
+ *
+ * @return handle       Handle to tiler block information.  NULL on error.
+ *
+ * NOTE: For 1D allocations, specify the full size in the width field, and
+ *       specify a height of 1.
+ */
+tiler_blk_handle tiler_alloc_block_area(enum tiler_fmt fmt, u32 width,
+                                        u32 height, u32 *ssptr,
+                                        u32 *virt_array);
+
+/**
+ * Allocate an area of container space in the Tiler with a specific alignment
+ * and user specified security token
+ *
+ * @param fmt           Tiler bpp mode
+ * @param width         Width in pixels
+ * @param height        Height in pixels
+ * @param ssptr         Value of tiler physical address of allocation
+ * @param virt_array    Array of physical address for the start of each virtual
+                        page
+ * @align               Alignment in bytes
+ * @offset              Offset into 4KiB
+ * @token               Security token
+ *
+ * @return handle       Handle to tiler block information.  NULL on error.
+ *
+ * NOTE: For 1D allocations, specify the full size in the width field, and
+ *       specify a height of 1.
+ */
+tiler_blk_handle tiler_alloc_block_area_aligned(enum tiler_fmt fmt, u32 width,
+                        u32 height, u32 *ssptr, u32 *virt_array, u32 align,
+                        u32 offset, u32 token);
+
+/**
+ * Free a reserved area in the Tiler
+ *
+ * @param handle        Handle to tiler block information
+ *
+ */
+void tiler_free_block_area(tiler_blk_handle block);
+
+/**
+ * Pins a set of physical pages into the Tiler using the area defined in a
+ * handle
+ *
+ * @param handle        Handle to tiler block information
+ * @param addr_array    Array of addresses
+ * @param nents         Number of addresses in array
+ *
+ * @return error status.
+ */
+s32 tiler_pin_block(tiler_blk_handle handle, u32 *addr_array, u32 nents);
+
+/**
+ * Unpins a set of physical pages from the Tiler
+ *
+ * @param handle        Handle to tiler block information
+ *
+ */
+void tiler_unpin_block(tiler_blk_handle handle);
+
+/**
+ * Gives memory requirements for a given container allocation
+ *
+ * @param fmt           Tiler bpp mode
+ * @param width         Width in pixels
+ * @param height        Height in pixels
+ * @param alloc_pages   Number of pages required to back tiler container
+ * @param virt_pages    Number of pages required to back the virtual address space
+ *
+ * @return 0 for success.  Non zero for error
+ */
+s32 tiler_memsize(enum tiler_fmt fmt, u32 width, u32 height, u32 *alloc_pages,
+                  u32 *virt_pages);
+
+/**
+ * Gives back page memory requirements for a given container
+ * allocation
+ *
+ * @param fmt           Tiler bpp mode
+ * @param width         Width in pixels
+ * @param height        Height in pixels
+ *
+ * @return Number of pages required to back tiler container.
+ *         Returns 0 for error
+ */
+u32 tiler_backpages(enum tiler_fmt fmt, u32 width, u32 height);
+
+/**
+ * Returns virtual stride of a tiler block
+ *
+ * @param handle        Handle to tiler block allocation
+ *
+ * @return Size of virtual stride
+ */
+u32 tiler_block_vstride(tiler_blk_handle handle);
+
+/**
+ * Fills an array virtual size of a tiler block
+ *
+ * @param handle        Handle to tiler block allocation
+ * @param virt_array    Array of physical address for the start of each virtual
+ *                      page
+ * @param handle        Pointer to the size of the virt_array array
+ * @return 0 for success.  Non zero for error
+ */
+s32 tiler_fill_virt_array(tiler_blk_handle handle, u32 *virt_array,
+                u32 *array_size);
+
+/**
+ * Returns virtual size of a tiler block
+ *
+ * @param handle        Handle to tiler block allocation
+ *
+ * @return Size of buffer
+ */
+u32 tiler_block_vsize(tiler_blk_handle handle);
+
+struct tiler_pa_info *user_block_to_pa(u32 usr_addr, u32 num_pg);
+void tiler_pa_free(struct tiler_pa_info *pa);
+
+/*
+ * ---------------------------- IOCTL Definitions ----------------------------
+ */
+
+/* ioctls */
+#define TILIOC_GBLK  _IOWR('z', 100, struct tiler_block_info)
+#define TILIOC_FBLK   _IOW('z', 101, struct tiler_block_info)
+#define TILIOC_GSSP  _IOWR('z', 102, u32)
+#define TILIOC_MBLK  _IOWR('z', 103, struct tiler_block_info)
+#define TILIOC_UMBLK  _IOW('z', 104, struct tiler_block_info)
+#define TILIOC_QBUF  _IOWR('z', 105, struct tiler_buf_info)
+#define TILIOC_RBUF  _IOWR('z', 106, struct tiler_buf_info)
+#define TILIOC_URBUF _IOWR('z', 107, struct tiler_buf_info)
+#define TILIOC_QBLK  _IOWR('z', 108, struct tiler_block_info)
+#define TILIOC_PRBLK  _IOW('z', 109, struct tiler_block_info)
+#define TILIOC_URBLK  _IOW('z', 110, u32)
+
+struct area {
+        u16 width;
+        u16 height;
+};
+
+/* userspace tiler block info */
+struct tiler_block_info {
+        enum tiler_fmt fmt;
+        union {
+                struct area area;
+                u32 len;
+        } dim;
+        u32 stride;     /* stride is not maintained for 1D blocks */
+        void *ptr;      /* userspace address for mapping existing buffer */
+        u32 id;
+        u32 key;
+        u32 group_id;
+        u32 ssptr;      /* physical address, may not exposed by default */
+};
+
+#define TILER_MAX_NUM_BLOCKS 16
+
+/* userspace tiler buffer info */
+struct tiler_buf_info {
+        u32 num_blocks;
+        struct tiler_block_info blocks[TILER_MAX_NUM_BLOCKS];
+        u32 offset;
+        u32 length;     /* also used as number of buffers for reservation */
+};
+
+#endif
diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
index 1976fc952c5..ed3c35f9990 100644
--- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
@@ -600,7 +600,7 @@ static struct omap_hwmod_class dra7xx_hdmi_hwmod_class = {
 
 /* dss_hdmi */
 static struct omap_hwmod_irq_info dra7xx_dss_hdmi_irqs[] = {
-        { .irq = 101 + DRA7XX_IRQ_GIC_START },
+        { .irq = 96 + DRA7XX_IRQ_GIC_START },
         { .irq = -1 }
 };
 
@@ -1518,6 +1518,7 @@ static struct omap_hwmod dra7xx_mcasp1_hwmod = {
         .class          = &dra7xx_mcasp_hwmod_class,
         .clkdm_name     = "ipu_clkdm",
         .main_clk       = "mcasp1_ahclkx_mux",
+        .flags          = HWMOD_SWSUP_SIDLE,
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = DRA7XX_CM_IPU_MCASP1_CLKCTRL_OFFSET,
@@ -1533,6 +1534,7 @@ static struct omap_hwmod dra7xx_mcasp2_hwmod = {
         .class          = &dra7xx_mcasp_hwmod_class,
         .clkdm_name     = "l4per2_clkdm",
         .main_clk       = "mcasp2_ahclkr_mux",
+        .flags          = HWMOD_SWSUP_SIDLE,
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = DRA7XX_CM_L4PER2_MCASP2_CLKCTRL_OFFSET,
@@ -1542,12 +1544,21 @@ static struct omap_hwmod dra7xx_mcasp2_hwmod = {
         },
 };
 
+/* HACK: Taken from UART6 since they're not used in dra7-evm */
+static struct omap_hwmod_dma_info dra7xx_mcasp3_sdma_reqs[] = {
+        { .name = "tx", .dma_req = 78 + DRA7XX_DMA_REQ_START },
+        { .name = "rx", .dma_req = 79 + DRA7XX_DMA_REQ_START },
+        { .dma_req = -1 }
+};
+
 /* mcasp3 */
 static struct omap_hwmod dra7xx_mcasp3_hwmod = {
         .name           = "mcasp3",
         .class          = &dra7xx_mcasp_hwmod_class,
         .clkdm_name     = "l4per2_clkdm",
         .main_clk       = "mcasp3_ahclkx_mux",
+        .sdma_reqs      = dra7xx_mcasp3_sdma_reqs,
+        .flags          = HWMOD_SWSUP_SIDLE,
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = DRA7XX_CM_L4PER2_MCASP3_CLKCTRL_OFFSET,
@@ -1563,6 +1574,7 @@ static struct omap_hwmod dra7xx_mcasp4_hwmod = {
         .class          = &dra7xx_mcasp_hwmod_class,
         .clkdm_name     = "l4per2_clkdm",
         .main_clk       = "mcasp4_ahclkx_mux",
+        .flags          = HWMOD_SWSUP_SIDLE,
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = DRA7XX_CM_L4PER2_MCASP4_CLKCTRL_OFFSET,
@@ -1578,6 +1590,7 @@ static struct omap_hwmod dra7xx_mcasp5_hwmod = {
         .class          = &dra7xx_mcasp_hwmod_class,
         .clkdm_name     = "l4per2_clkdm",
         .main_clk       = "mcasp5_ahclkx_mux",
+        .flags          = HWMOD_SWSUP_SIDLE,
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = DRA7XX_CM_L4PER2_MCASP5_CLKCTRL_OFFSET,
@@ -1587,12 +1600,21 @@ static struct omap_hwmod dra7xx_mcasp5_hwmod = {
         },
 };
 
+/* HACK: Taken from UART5 since they're not used in dra7-evm */
+static struct omap_hwmod_dma_info dra7xx_mcasp6_sdma_reqs[] = {
+        { .name = "tx", .dma_req = 62 + DRA7XX_DMA_REQ_START },
+        { .name = "rx", .dma_req = 63 + DRA7XX_DMA_REQ_START },
+        { .dma_req = -1 }
+};
+
 /* mcasp6 */
 static struct omap_hwmod dra7xx_mcasp6_hwmod = {
         .name           = "mcasp6",
         .class          = &dra7xx_mcasp_hwmod_class,
         .clkdm_name     = "l4per2_clkdm",
         .main_clk       = "mcasp6_ahclkx_mux",
+        .sdma_reqs      = dra7xx_mcasp6_sdma_reqs,
+        .flags          = HWMOD_SWSUP_SIDLE,
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = DRA7XX_CM_L4PER2_MCASP6_CLKCTRL_OFFSET,
@@ -1608,6 +1630,7 @@ static struct omap_hwmod dra7xx_mcasp7_hwmod = {
         .class          = &dra7xx_mcasp_hwmod_class,
         .clkdm_name     = "l4per2_clkdm",
         .main_clk       = "mcasp7_ahclkx_mux",
+        .flags          = HWMOD_SWSUP_SIDLE,
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = DRA7XX_CM_L4PER2_MCASP7_CLKCTRL_OFFSET,
@@ -1623,6 +1646,7 @@ static struct omap_hwmod dra7xx_mcasp8_hwmod = {
         .class          = &dra7xx_mcasp_hwmod_class,
         .clkdm_name     = "l4per2_clkdm",
         .main_clk       = "mcasp8_ahclk_mux",
+        .flags          = HWMOD_SWSUP_SIDLE,
         .prcm = {
                 .omap4 = {
                         .clkctrl_offs = DRA7XX_CM_L4PER2_MCASP8_CLKCTRL_OFFSET,
diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
index 4077d23a860..1877b54ad7f 100644
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@@ -15,3 +15,6 @@ obj-$(CONFIG_OMAP_DEBUG_LEDS) += debug-leds.o
 i2c-omap-$(CONFIG_I2C_OMAP) := i2c.o
 obj-y += $(i2c-omap-m) $(i2c-omap-y)
 
+obj-$(CONFIG_DSSCOMP) += omap_dsscomp.o
+obj-$(CONFIG_ION_OMAP) += sgx_omaplfb.o
+obj-$(CONFIG_ION_OMAP) += android-display.o
diff --git a/arch/arm/plat-omap/android-display.c b/arch/arm/plat-omap/android-display.c
new file mode 100644
index 00000000000..815ba4b3217
--- /dev/null
+++ b/arch/arm/plat-omap/android-display.c
@@ -0,0 +1,206 @@
+/*
+ * Android display memory setup for OMAP4+ displays
+ *
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * Author: Lajos Molnar
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/mm.h>
+#include <linux/platform_device.h>
+
+#include <video/omapdss.h>
+
+#include <plat/android-display.h>
+#include <plat/dsscomp.h>
+//#include <plat/vram.h>
+
+struct omap_android_display_data {
+        /* members with default values */
+        u32 width;
+        u32 height;
+        u32 bpp;                /* must be 2 or 4 */
+
+        /* members with no default value */
+        u32 tiler1d_mem;
+};
+
+/*
+ * We need to peek at omapdss settings so that we have enough memory for swap
+ * chain and vram.  While this could be done by omapdss, omapdss could be
+ * compiled as a module, which is too late to get this information.
+ */
+static char default_display[16];
+static int __init get_default_display(char *str)
+{
+        strncpy(default_display, str, sizeof(default_display));
+        if (strlen(str) >= sizeof(default_display))
+                pr_warn("android_display: cannot set default display larger "
+                        "than %d characters", sizeof(default_display) - 1);
+        default_display[sizeof(default_display) - 1] = '\0';
+        return 0;
+}
+early_param("omapdss.def_disp", get_default_display);
+
+static unsigned int hdmi_width, hdmi_height;
+static int __init get_hdmi_options(char *str)
+{
+        unsigned int width, height;
+        char dummy;
+        if (sscanf(str, "%ux%u%c", &width, &height, &dummy) == 2) {
+                hdmi_width = width;
+                hdmi_height = height;
+        }
+        return 0;
+}
+early_param("omapdss.hdmi_options", get_hdmi_options);
+
+static void get_display_size(struct omap_dss_device *device,
+                                struct omap_android_display_data *mem)
+{
+        if (!device)
+                goto done;
+
+        if (device->type == OMAP_DISPLAY_TYPE_HDMI &&
+            hdmi_width && hdmi_height) {
+                mem->width = hdmi_width;
+                mem->height = hdmi_height;
+        } else if (device->panel.timings.x_res && device->panel.timings.y_res) {
+                mem->width = device->panel.timings.x_res;
+                mem->height = device->panel.timings.y_res;
+        }
+        if (device->ctrl.pixel_size)
+                mem->bpp = ALIGN(device->ctrl.pixel_size, 16) >> 3;
+
+        pr_info("android_display: setting %s resolution to %u*%u, bpp=%u\n",
+                device->name, mem->width, mem->height, mem->bpp);
+done:
+        return;
+}
+
+static void set_tiler1d_slot_size(struct dsscomp_platform_data *dsscomp,
+                                  struct omap_android_display_data *mem)
+{
+        struct dsscomp_platform_data data = {
+                .tiler1d_slotsz = 0,
+        };
+
+        if (dsscomp)
+                data = *dsscomp;
+
+        /* do not change board specified value if given */
+        if (data.tiler1d_slotsz)
+                goto done;
+
+        /*
+         * 4 bytes per pixel, and ICS factor of 4.  The ICS factor
+         * is chosen somewhat arbitrarily to support the home screen layers
+         * to be displayed by DSS.  The size of the home screen layers is
+         * roughly (1 + 2.5 + 0.1 + 0.1) * size_of_the_screen
+         * for the icons, wallpaper, status bar and navigation bar.  Boards
+         * that wish to use a different factor should supply their tiler1D
+         * slot size directly.
+         */
+        data.tiler1d_slotsz =
+                PAGE_ALIGN(mem->width * mem->height * 4 * 4);
+
+done:
+        if (dsscomp)
+                *dsscomp = data;
+        //dsscomp_set_platform_data(&data);
+
+        /* remember setting for ion carveouts */
+        mem->tiler1d_mem =
+                NUM_ANDROID_TILER1D_SLOTS * data.tiler1d_slotsz;
+        pr_info("android_display: tiler1d %u\n", mem->tiler1d_mem);
+}
+
+static u32 vram_size(struct omap_android_display_data *mem)
+{
+        /* calculate required VRAM */
+        return PAGE_ALIGN(ALIGN(mem->width, 64) * mem->height * mem->bpp);
+}
+
+static void set_vram_sizes(struct sgx_omaplfb_config *sgx_config,
+                           struct omapfb_mem_region *region,
+                           struct omap_android_display_data *mem,
+                           unsigned fbnum)
+{
+        u32 num_vram_buffers;
+        u32 vram = 0;
+
+        if (!sgx_config || !region || !mem)
+                return;
+
+        /* Need at least 1 VRAM buffer for fb0 */
+        num_vram_buffers = max(sgx_config->vram_buffers, 1u);
+
+        vram += sgx_config->vram_reserve;
+        vram += num_vram_buffers * vram_size(mem);
+
+        /* set fb vram needs */
+        region->size = vram;
+        pr_info("android_display: setting fb%u.vram to %u\n", fbnum, vram);
+}
+
+/* coordinate between sgx, omapdss, dsscomp and ion needs */
+void omap_android_display_setup(struct omap_dss_board_info *dss,
+                               struct dsscomp_platform_data *dsscomp,
+                               struct sgx_omaplfb_platform_data *sgx,
+                               struct omapfb_platform_data *fb)
+{
+        struct sgx_omaplfb_config *p_sgx_config = NULL;
+        int i = 0;
+        u32 omapfb_vram = 0;
+        u32 num_configs = 1;
+
+        if (sgx)
+                num_configs = sgx->num_configs;
+
+        for (i = 0; i < num_configs; ++i) {
+                if (!sgx || !sgx->configs)
+                        p_sgx_config = sgx_omaplfb_get(i);
+                else
+                        p_sgx_config = &(sgx->configs[i]);
+
+                struct omap_android_display_data mem = {
+                        .bpp = 4,
+                        .width = 1280,
+                        .height = 720,
+                };
+
+                if (i == 0 && i < dss->num_devices)
+                        get_display_size(dss->devices[i], &mem);
+
+                if (dsscomp)
+                        set_tiler1d_slot_size(dsscomp, &mem);
+
+                /* skip region if no sgx_config associated with it
+                * or it has size pre-set by board configuration
+                */
+                if (i < fb->mem_desc.region_cnt &&
+                !fb->mem_desc.region[i].size)
+                        set_vram_sizes(p_sgx_config, &fb->mem_desc.region[i],
+                                        &mem, i);
+                sgx_omaplfb_set(i, p_sgx_config);
+        }
+
+        /* set global vram needs incl. additional regions specified */
+        for (i = 0; i < fb->mem_desc.region_cnt; i++)
+                if (!fb->mem_desc.region[i].paddr)
+                        omapfb_vram += fb->mem_desc.region[i].size;
+
+        pr_info("android_display: setting vram to %u\n", omapfb_vram);
+        //omap_vram_set_sdram_vram(omapfb_vram, 0);
+}
diff --git a/arch/arm/plat-omap/include/plat/android-display.h b/arch/arm/plat-omap/include/plat/android-display.h
new file mode 100644
index 00000000000..e336282eb7d
--- /dev/null
+++ b/arch/arm/plat-omap/include/plat/android-display.h
@@ -0,0 +1,31 @@
+/*
+ * arch/arm/mach-omap2/android_display.h
+ *
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * Author: Lajos Molnar
+ *
+ * OMAP2 platform device setup/initialization
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef __ARCH_ARM_MACH_OMAP_ANDROID_DISPLAY_H
+#define __ARCH_ARM_MACH_OMAP_ANDROID_DISPLAY_H
+
+#include <linux/omapfb.h>
+#include <video/omapdss.h>
+#include <plat/sgx_omaplfb.h>
+#include <plat/dsscomp.h>
+
+#define NUM_ANDROID_TILER1D_SLOTS 2
+
+void omap_android_display_setup(struct omap_dss_board_info *dss,
+                                struct dsscomp_platform_data *dsscomp,
+                                struct sgx_omaplfb_platform_data *sgx,
+                                struct omapfb_platform_data *fb);
+
+#endif
diff --git a/arch/arm/plat-omap/include/plat/board.h b/arch/arm/plat-omap/include/plat/board.h
new file mode 100644
index 00000000000..d5eb4c87db9
--- /dev/null
+++ b/arch/arm/plat-omap/include/plat/board.h
@@ -0,0 +1,174 @@
+/*
+ *  arch/arm/plat-omap/include/mach/board.h
+ *
+ *  Information structures for board-specific data
+ *
+ *  Copyright (C) 2004  Nokia Corporation
+ *  Written by Juha Yrjölä <juha.yrjola@nokia.com>
+ */
+
+#ifndef _OMAP_BOARD_H
+#define _OMAP_BOARD_H
+
+#include <linux/types.h>
+
+#include <plat/gpio-switch.h>
+
+/*
+ * OMAP35x EVM revision
+ * Run time detection of EVM revision is done by reading Ethernet
+ * PHY ID -
+ *      GEN_1   = 0x01150000
+ *      GEN_2   = 0x92200000
+ */
+enum {
+        OMAP3EVM_BOARD_GEN_1 = 0,       /* EVM Rev between  A - D */
+        OMAP3EVM_BOARD_GEN_2,           /* EVM Rev >= Rev E */
+};
+
+/* Different peripheral ids */
+#define OMAP_TAG_CLOCK          0x4f01
+#define OMAP_TAG_GPIO_SWITCH    0x4f06
+#define OMAP_TAG_STI_CONSOLE    0x4f09
+#define OMAP_TAG_CAMERA_SENSOR  0x4f0a
+
+#define OMAP_TAG_BOOT_REASON    0x4f80
+#define OMAP_TAG_FLASH_PART     0x4f81
+#define OMAP_TAG_VERSION_STR    0x4f82
+
+struct omap_clock_config {
+        /* 0 for 12 MHz, 1 for 13 MHz and 2 for 19.2 MHz */
+        u8 system_clock_type;
+};
+
+struct omap_serial_console_config {
+        u8 console_uart;
+        u32 console_speed;
+};
+
+struct omap_sti_console_config {
+        unsigned enable:1;
+        u8 channel;
+};
+
+struct omap_camera_sensor_config {
+        u16 reset_gpio;
+        int (*power_on)(void * data);
+        int (*power_off)(void * data);
+};
+
+struct omap_usb_config {
+        /* Configure drivers according to the connectors on your board:
+         *  - "A" connector (rectagular)
+         *      ... for host/OHCI use, set "register_host".
+         *  - "B" connector (squarish) or "Mini-B"
+         *      ... for device/gadget use, set "register_dev".
+         *  - "Mini-AB" connector (very similar to Mini-B)
+         *      ... for OTG use as device OR host, initialize "otg"
+         */
+        unsigned        register_host:1;
+        unsigned        register_dev:1;
+        u8              otg;    /* port number, 1-based:  usb1 == 2 */
+
+        u8              hmc_mode;
+
+        /* implicitly true if otg:  host supports remote wakeup? */
+        u8              rwc;
+
+        /* signaling pins used to talk to transceiver on usbN:
+         *  0 == usbN unused
+         *  2 == usb0-only, using internal transceiver
+         *  3 == 3 wire bidirectional
+         *  4 == 4 wire bidirectional
+         *  6 == 6 wire unidirectional (or TLL)
+         */
+        u8              pins[3];
+
+        struct platform_device *udc_device;
+        struct platform_device *ohci_device;
+        struct platform_device *otg_device;
+
+        u32 (*usb0_init)(unsigned nwires, unsigned is_device);
+        u32 (*usb1_init)(unsigned nwires);
+        u32 (*usb2_init)(unsigned nwires, unsigned alt_pingroup);
+};
+
+struct omap_lcd_config {
+        char panel_name[16];
+        char ctrl_name[16];
+        s16  nreset_gpio;
+        u8   data_lines;
+};
+
+struct device;
+struct fb_info;
+struct omap_backlight_config {
+        int default_intensity;
+        int (*set_power)(struct device *dev, int state);
+};
+
+struct omap_fbmem_config {
+        u32 start;
+        u32 size;
+};
+
+struct omap_pwm_led_platform_data {
+        const char *name;
+        int intensity_timer;
+        int blink_timer;
+        void (*set_power)(struct omap_pwm_led_platform_data *self, int on_off);
+};
+
+struct omap_uart_config {
+        /* Bit field of UARTs present; bit 0 --> UART1 */
+        unsigned int enabled_uarts;
+};
+
+
+struct omap_flash_part_config {
+        char part_table[0];
+};
+
+struct omap_boot_reason_config {
+        char reason_str[12];
+};
+
+struct omap_version_config {
+        char component[12];
+        char version[12];
+};
+
+struct omap_board_config_entry {
+        u16 tag;
+        u16 len;
+        u8  data[0];
+};
+
+struct omap_board_config_kernel {
+        u16 tag;
+        const void *data;
+};
+
+extern const void *__init __omap_get_config(u16 tag, size_t len, int nr);
+
+#define omap_get_config(tag, type) \
+        ((const type *) __omap_get_config((tag), sizeof(type), 0))
+#define omap_get_nr_config(tag, type, nr) \
+        ((const type *) __omap_get_config((tag), sizeof(type), (nr)))
+
+extern const void *__init omap_get_var_config(u16 tag, size_t *len);
+
+extern struct omap_board_config_kernel *omap_board_config;
+extern int omap_board_config_size;
+
+
+/* for TI reference platforms sharing the same debug card */
+extern int debug_card_init(u32 addr, unsigned gpio);
+
+/* OMAP3EVM revision */
+#if defined(CONFIG_MACH_OMAP3EVM)
+u8 get_omap3_evm_rev(void);
+#else
+#define get_omap3_evm_rev() (-EINVAL)
+#endif
+#endif
diff --git a/arch/arm/plat-omap/include/plat/dsscomp.h b/arch/arm/plat-omap/include/plat/dsscomp.h
new file mode 100644
index 00000000000..2dcf2636d44
--- /dev/null
+++ b/arch/arm/plat-omap/include/plat/dsscomp.h
@@ -0,0 +1,52 @@
+/*
+ * arch/arm/plat-omap/include/plat/dsscomp.h
+ *
+ * DSS Composition platform specific header
+ *
+ * Copyright (C) 2011 Texas Instruments, Inc
+ * Author: Lajos Molnar <molnar@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef _ARCH_ARM_PLAT_OMAP_DSSCOMP_H
+#define _ARCH_ARM_PLAT_OMAP_DSSCOMP_H
+
+#include <video/omapdss.h>
+#include <video/dsscomp.h>
+
+struct dsscomp_platform_data {
+        unsigned int tiler1d_slotsz;
+};
+
+/* queuing operations */
+struct dsscomp;
+struct dsscomp *dsscomp_new(struct omap_overlay_manager *mgr);
+u32 dsscomp_get_ovls(struct dsscomp *comp);
+int dsscomp_set_ovl(struct dsscomp *comp, struct dss2_ovl_info *ovl);
+int dsscomp_get_ovl(struct dsscomp *comp, u32 ix, struct dss2_ovl_info *ovl);
+int dsscomp_set_mgr(struct dsscomp *comp, struct dss2_mgr_info *mgr);
+int dsscomp_get_mgr(struct dsscomp *comp, struct dss2_mgr_info *mgr);
+int dsscomp_setup(struct dsscomp *comp, enum dsscomp_setup_mode mode,
+                        struct dss2_rect_t win);
+int dsscomp_delayed_apply(struct dsscomp *comp);
+void dsscomp_drop(struct dsscomp *c);
+
+struct tiler_pa_info;
+int dsscomp_gralloc_queue(struct dsscomp_setup_dispc_data *d,
+                        struct tiler_pa_info **pas,
+                        bool early_callback,
+                        void (*cb_fn)(void *, int), void *cb_arg);
+
+void dsscomp_set_platform_data(struct dsscomp_platform_data *data);
+
+#endif
diff --git a/arch/arm/plat-omap/include/plat/gpio-switch.h b/arch/arm/plat-omap/include/plat/gpio-switch.h
new file mode 100644
index 00000000000..10da0e07c0c
--- /dev/null
+++ b/arch/arm/plat-omap/include/plat/gpio-switch.h
@@ -0,0 +1,54 @@
+/*
+ * GPIO switch definitions
+ *
+ * Copyright (C) 2006 Nokia Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __ASM_ARCH_OMAP_GPIO_SWITCH_H
+#define __ASM_ARCH_OMAP_GPIO_SWITCH_H
+
+#include <linux/types.h>
+
+/* Cover:
+ *      high -> closed
+ *      low  -> open
+ * Connection:
+ *      high -> connected
+ *      low  -> disconnected
+ * Activity:
+ *      high -> active
+ *      low  -> inactive
+ *
+ */
+#define OMAP_GPIO_SWITCH_TYPE_COVER             0x0000
+#define OMAP_GPIO_SWITCH_TYPE_CONNECTION        0x0001
+#define OMAP_GPIO_SWITCH_TYPE_ACTIVITY          0x0002
+#define OMAP_GPIO_SWITCH_FLAG_INVERTED          0x0001
+#define OMAP_GPIO_SWITCH_FLAG_OUTPUT            0x0002
+
+struct omap_gpio_switch {
+        const char *name;
+        s16 gpio;
+        unsigned flags:4;
+        unsigned type:4;
+
+        /* Time in ms to debounce when transitioning from
+         * inactive state to active state. */
+        u16 debounce_rising;
+        /* Same for transition from active to inactive state. */
+        u16 debounce_falling;
+
+        /* notify board-specific code about state changes */
+        void (* notify)(void *data, int state);
+        void *notify_data;
+};
+
+/* Call at init time only */
+extern void omap_register_gpio_switches(const struct omap_gpio_switch *tbl,
+                                        int count);
+
+#endif
diff --git a/arch/arm/plat-omap/include/plat/sgx_omaplfb.h b/arch/arm/plat-omap/include/plat/sgx_omaplfb.h
new file mode 100644
index 00000000000..66d59b2d7a5
--- /dev/null
+++ b/arch/arm/plat-omap/include/plat/sgx_omaplfb.h
@@ -0,0 +1,71 @@
+/*
+ * SGX display class driver platform resources
+ *
+ * Copyright (C) 2012 Texas Instruments
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef _ARCH_ARM_PLAT_OMAP_SGX_OMAPLFB_H
+#define _ARCH_ARM_PLAT_OMAP_SGX_OMAPLFB_H
+
+enum sgx_omaplfb_flags {
+        /*
+         * This flag should be set when we do not want the primary display
+         * swap chain buffers to be used with an external display.
+         *
+         * The number of tiler2d and vram buffers need to be set appropriately
+         */
+        SGX_OMAPLFB_FLAGS_SDMA_TO_TILER2D_EXTERNAL = 0x00000001,
+};
+
+/*
+ * The settings this platform data entry will determine the type and number of
+ * buffers to use by omaplfb.
+ */
+struct sgx_omaplfb_config {
+        /*
+         * Number of tiler2d buffers required for display rendering,
+         * the number of buffers indicated by swap_chain_length will be used
+         * for the swap chain unless flags indicate otherwise
+         */
+        u32 tiler2d_buffers;
+        /*
+         * Number of vram buffers required for display rendering, if no tiler
+         * buffers are required or flags indicate then the number of buffers
+         * indicated by swap_chain_length will be used for the swap chain.
+         */
+        u32 vram_buffers;
+        /*
+         * Indicate any additional vram that needs to be reserved
+         */
+        u32 vram_reserve;
+        /*
+         * Tells omaplfb the number of buffers in the primary swapchain,
+         * if not set it defaults to 2.
+         */
+        u32 swap_chain_length;
+        enum sgx_omaplfb_flags flags;
+};
+
+struct sgx_omaplfb_platform_data {
+        u32 num_configs;
+        struct sgx_omaplfb_config *configs;
+};
+
+int sgx_omaplfb_set(unsigned int fbix, struct sgx_omaplfb_config *data);
+struct sgx_omaplfb_config *sgx_omaplfb_get(unsigned int fbix);
+
+#endif
diff --git a/arch/arm/plat-omap/omap_dsscomp.c b/arch/arm/plat-omap/omap_dsscomp.c
new file mode 100644
index 00000000000..e771a69cb7d
--- /dev/null
+++ b/arch/arm/plat-omap/omap_dsscomp.c
@@ -0,0 +1,56 @@
+/*
+ * File: arch/arm/plat-omap/omap_dsscomp.c
+ *
+ * dsscomp resources registration for TI OMAP platforms
+ *
+ * Copyright (C) 2012 Texas Instruments
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <plat/board.h>
+
+#include <video/dsscomp.h>
+#include <plat/dsscomp.h>
+
+static struct dsscomp_platform_data dsscomp_config = {
+                .tiler1d_slotsz = SZ_16M,
+};
+
+static struct platform_device omap_dsscomp_device = {
+        .name           = "dsscomp",
+        .id             = -1,
+        .dev = {
+                .platform_data          = &dsscomp_config,
+        },
+        .num_resources = 0,
+};
+
+void dsscomp_set_platform_data(struct dsscomp_platform_data *data)
+{
+        dsscomp_config = *data;
+}
+
+static int __init omap_init_dsscomp(void)
+{
+        return platform_device_register(&omap_dsscomp_device);
+}
+
+arch_initcall(omap_init_dsscomp);
+
diff --git a/arch/arm/plat-omap/sgx_omaplfb.c b/arch/arm/plat-omap/sgx_omaplfb.c
new file mode 100644
index 00000000000..e4cad796c80
--- /dev/null
+++ b/arch/arm/plat-omap/sgx_omaplfb.c
@@ -0,0 +1,86 @@
+/*
+ * SGX display class driver platform resources
+ *
+ * Copyright (C) 2012 Texas Instruments
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <plat/board.h>
+
+#include <plat/sgx_omaplfb.h>
+
+#if defined(CONFIG_FB_OMAP2_NUM_FBS)
+#define OMAPLFB_NUM_DEV CONFIG_FB_OMAP2_NUM_FBS
+#else
+#define OMAPLFB_NUM_DEV 1
+#endif
+
+static struct sgx_omaplfb_config omaplfb_config[OMAPLFB_NUM_DEV] = {
+        {
+        .vram_buffers = 4,
+        .swap_chain_length = 2,
+        },
+        {
+        .tiler2d_buffers = 0,
+        .vram_buffers = 4,
+        .swap_chain_length = 2,
+        }
+};
+
+static struct sgx_omaplfb_platform_data omaplfb_plat_data = {
+        .num_configs = OMAPLFB_NUM_DEV,
+        .configs = omaplfb_config,
+};
+
+static struct platform_device omaplfb_plat_device = {
+        .name           = "omaplfb",
+        .id             = -1,
+        .dev = {
+                .platform_data          = &omaplfb_plat_data,
+        },
+        .num_resources = 0,
+};
+
+int sgx_omaplfb_set(unsigned int fbix, struct sgx_omaplfb_config *data)
+{
+        if (fbix >= OMAPLFB_NUM_DEV) {
+                WARN(1, "Invalid FB device index");
+                return -ENOENT;
+        }
+        omaplfb_config[fbix] = *data;
+        return 0;
+}
+
+struct sgx_omaplfb_config *sgx_omaplfb_get(unsigned int fbix)
+{
+        if (fbix >= OMAPLFB_NUM_DEV) {
+                WARN(1, "Invalid FB device index");
+                return NULL;
+        }
+        return &omaplfb_config[fbix];
+}
+
+static int __init omap_init_omaplfb(void)
+{
+        return platform_device_register(&omaplfb_plat_device);
+}
+
+arch_initcall(omap_init_omaplfb);
diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c
index 50b2831e027..32ee0fc7ea5 100644
--- a/drivers/base/power/opp.c
+++ b/drivers/base/power/opp.c
@@ -162,7 +162,7 @@ unsigned long opp_get_voltage(struct opp *opp)
 
         return v;
 }
-EXPORT_SYMBOL(opp_get_voltage);
+EXPORT_SYMBOL_GPL(opp_get_voltage);
 
 /**
  * opp_get_freq() - Gets the frequency corresponding to an available opp
@@ -192,7 +192,7 @@ unsigned long opp_get_freq(struct opp *opp)
 
         return f;
 }
-EXPORT_SYMBOL(opp_get_freq);
+EXPORT_SYMBOL_GPL(opp_get_freq);
 
 /**
  * opp_get_opp_count() - Get number of opps available in the opp list
@@ -225,7 +225,7 @@ int opp_get_opp_count(struct device *dev)
 
         return count;
 }
-EXPORT_SYMBOL(opp_get_opp_count);
+EXPORT_SYMBOL_GPL(opp_get_opp_count);
 
 /**
  * opp_find_freq_exact() - search for an exact frequency
@@ -276,7 +276,7 @@ struct opp *opp_find_freq_exact(struct device *dev, unsigned long freq,
 
         return opp;
 }
-EXPORT_SYMBOL(opp_find_freq_exact);
+EXPORT_SYMBOL_GPL(opp_find_freq_exact);
 
 /**
  * opp_find_freq_ceil() - Search for an rounded ceil freq
@@ -323,7 +323,7 @@ struct opp *opp_find_freq_ceil(struct device *dev, unsigned long *freq)
 
         return opp;
 }
-EXPORT_SYMBOL(opp_find_freq_ceil);
+EXPORT_SYMBOL_GPL(opp_find_freq_ceil);
 
 /**
  * opp_find_freq_floor() - Search for a rounded floor freq
@@ -374,7 +374,7 @@ struct opp *opp_find_freq_floor(struct device *dev, unsigned long *freq)
 
         return opp;
 }
-EXPORT_SYMBOL(opp_find_freq_floor);
+EXPORT_SYMBOL_GPL(opp_find_freq_floor);
 
 /**
  * opp_add()  - Add an OPP table from a table definitions
@@ -568,7 +568,7 @@ int opp_enable(struct device *dev, unsigned long freq)
 {
         return opp_set_availability(dev, freq, true);
 }
-EXPORT_SYMBOL(opp_enable);
+EXPORT_SYMBOL_GPL(opp_enable);
 
 /**
  * opp_disable() - Disable a specific OPP
@@ -590,7 +590,7 @@ int opp_disable(struct device *dev, unsigned long freq)
 {
         return opp_set_availability(dev, freq, false);
 }
-EXPORT_SYMBOL(opp_disable);
+EXPORT_SYMBOL_GPL(opp_disable);
 
 #ifdef CONFIG_CPU_FREQ
 /**
@@ -661,6 +661,7 @@ int opp_init_cpufreq_table(struct device *dev,
 
         return 0;
 }
+EXPORT_SYMBOL_GPL(opp_init_cpufreq_table);
 
 /**
  * opp_free_cpufreq_table() - free the cpufreq table
@@ -678,6 +679,7 @@ void opp_free_cpufreq_table(struct device *dev,
         kfree(*table);
         *table = NULL;
 }
+EXPORT_SYMBOL_GPL(opp_free_cpufreq_table);
 #endif          /* CONFIG_CPU_FREQ */
 
 /**
@@ -738,4 +740,5 @@ int of_init_opp_table(struct device *dev)
 
         return 0;
 }