136 files changed, 7447 insertions, 395 deletions
diff --git a/Documentation/devicetree/bindings/arm/omap/timer.txt b/Documentation/devicetree/bindings/arm/omap/timer.txt
index d02e27c764ec..c5730b9e1434 100644
--- a/Documentation/devicetree/bindings/arm/omap/timer.txt
+++ b/Documentation/devicetree/bindings/arm/omap/timer.txt
@@ -32,6 +32,18 @@ Optional properties:
 - ti,timer-secure:      Indicates the timer is reserved on a secure OMAP device
                        and therefore cannot be used by the kernel.
+The following optional properties are _required_ only during "late attach" of
+remote processors, and only for those timers used by those remoteprocs:
+- ti,late-attach:       Flag to indicate the timer has already been configure by
+                        boot loader. This property is only relevant for initial
+                        boot, so is removed by the driver during the first
+                        probe.
+- ti,no-reset-on-init:  Flag to let the hwmod layer not reset the timer at init
+- ti,no-idle-on-init:   Flag to let the hwmod layer not idle and disable the
+                        timer at init
 Example:
 timer12: timer@48304000 {
diff --git a/Documentation/devicetree/bindings/chosen.txt b/Documentation/devicetree/bindings/chosen.txt
index 6ae9d82d4c37..b5e39af4ddc0 100644
--- a/Documentation/devicetree/bindings/chosen.txt
+++ b/Documentation/devicetree/bindings/chosen.txt
@@ -52,3 +52,48 @@ This property is set (currently only on PowerPC, and only needed on
 book3e) by some versions of kexec-tools to tell the new kernel that it
 is being booted by kexec, as the booting environment may differ (e.g.
 a different secondary CPU release mechanism)
+linux,usable-memory-range
+-------------------------
+This property (arm64 only) holds a base address and size, describing a
+limited region in which memory may be considered available for use by
+the kernel. Memory outside of this range is not available for use.
+This property describes a limitation: memory within this range is only
+valid when also described through another mechanism that the kernel
+would otherwise use to determine available memory (e.g. memory nodes
+or the EFI memory map). Valid memory may be sparse within the range.
+e.g.
+/ {
+        chosen {
+                linux,usable-memory-range = <0x9 0xf0000000 0x0 0x10000000>;
+        };
+};
+The main usage is for crash dump kernel to identify its own usable
+memory and exclude, at its boot time, any other memory areas that are
+part of the panicked kernel's memory.
+While this property does not represent a real hardware, the address
+and the size are expressed in #address-cells and #size-cells,
+respectively, of the root node.
+linux,elfcorehdr
+----------------
+This property (currently used only on arm64) holds the memory range,
+the address and the size, of the elf core header which mainly describes
+the panicked kernel's memory layout as PT_LOAD segments of elf format.
+e.g.
+/ {
+        chosen {
+                linux,elfcorehdr = <0x9 0xfffff000 0x0 0x800>;
+        };
+};
+While this property does not represent a real hardware, the address
+and the size are expressed in #address-cells and #size-cells,
+respectively, of the root node.
diff --git a/Documentation/devicetree/bindings/hwlock/hwspinlock-user.txt b/Documentation/devicetree/bindings/hwlock/hwspinlock-user.txt
new file mode 100644
index 000000000000..0e5ab1e0b952
--- /dev/null
+++ b/Documentation/devicetree/bindings/hwlock/hwspinlock-user.txt
@@ -0,0 +1,20 @@
+Hardware spinlock user-space interface
+======================================
+A hwspinlock client that provides ioctls to lock and unlock the
+reserved hwlocks.
+Required properties:
+- compatible:           Should be "hwspinlock-user"
+- hwlocks:              An array of the phandle and hwlock number
+                        specifier tuple
+Example:
+gatemp {
+        compatible = "hwspinlock-user";
+        hwlocks = <&hwspinlock 0>,
+                  <&hwspinlock 1>,
+                  <&hwspinlock 2>,
+                  <&hwspinlock 3>;
+};
diff --git a/Documentation/devicetree/bindings/iommu/ti,omap-iommu.txt b/Documentation/devicetree/bindings/iommu/ti,omap-iommu.txt
index 4bd10dd881b8..407b2570bb72 100644
--- a/Documentation/devicetree/bindings/iommu/ti,omap-iommu.txt
+++ b/Documentation/devicetree/bindings/iommu/ti,omap-iommu.txt
@@ -28,6 +28,20 @@ Optional properties:
                        instance number should be 0 for DSP MDMA MMUs and 1 for
                        DSP EDMA MMUs.
+The following optional properties are _required_ only during "late attach":
+- ti,late-attach      : Flag to indicate IOMMU has already been configured by
+                        bootloader. This property is only relevant for initial
+                        boot, so is removed by the driver during the first
+                        probe.
+- ti,late-attach-dma-pool : Flag to indicate that the pagetable has been allocated
+                            from a DMA pool instead of the usual CMA pool for late
+                            attach case. This property is only relevant for initial
+                            boot, so is removed by the driver during the first
+                            probe.
+- ti,no-reset-on-init : Flag to let the hwmod layer not reset the IOMMU at init
+- ti,no-idle-on-init  : Flag to let the hwmod layer not idle and disable IOMMU
+                        at init
 Example:
        /* OMAP3 ISP MMU */
        mmu_isp: mmu@480bd400 {
diff --git a/Documentation/devicetree/bindings/media/i2c/tvp5158.txt b/Documentation/devicetree/bindings/media/i2c/tvp5158.txt
new file mode 100644
index 000000000000..833dbcda1590
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/i2c/tvp5158.txt
@@ -0,0 +1,34 @@
+* Texas Instruments TVP5158 video decoder
+The TVP5158 device is high quality, single-chip
+digital video decoder that digitizes and decodes all popular baseband analog
+video formats into digital video component. The tvp5158 decoder supports
+decoding of NTSC, PAL and SECAM composite and S-video.
+TVP5158 generates output in BT656 format with embedded sync.
+Required Properties :
+- compatible : Must be "ti,tvp5158"
+Optional Properties :
+  There are no custom optional properties although the driver supports
+  standard endpoint properties as documented in
+  Documentation/devicetree/bindings/media/video-interfaces.txt
+Example:
+        &i2c2 {
+                ...
+                ...
+                tvp5158@5c {
+                        compatible = "ti,tvp5158";
+                        reg = <0x58>;
+                        port {
+                                tvp_decoder: endpoint {
+                                        /* No properties for BT 656 */
+                                };
+                        };
+                };
+                ...
+        };
diff --git a/Documentation/devicetree/bindings/remoteproc/omap-remoteproc.txt b/Documentation/devicetree/bindings/remoteproc/omap-remoteproc.txt
index 62b01944adb2..c33e4c33ce1c 100644
--- a/Documentation/devicetree/bindings/remoteproc/omap-remoteproc.txt
+++ b/Documentation/devicetree/bindings/remoteproc/omap-remoteproc.txt
@@ -120,6 +120,25 @@ The following are the optional properties:
                         remoteprocs, and should contain the address containing
                         the module standby status.
+Required properties when doing "late attach":
+---------------------------------------------
+The following three properties are required to support "late attach" (external
+entity has already booted the remote processor prior to kernel boot) of a
+remote processor. These three properties should also be set on all the IOMMU
+and timer nodes used by the remote processor.
+- ti,late-attach:       Flag to Indicate that the remote processor has already
+                        been configured by boot loader. This property is only
+                        relevant for initial boot, so is removed by the driver
+                        during the first probe.
+- ti,no-reset-on-init:  Flag to let the hwmod layer not reset the remoteproc
+                        device at init.
+- ti,no-idle-on-init:   Flag to let the hwmod layer not idle and disable the
+                        remoteproc device at init
 Example:
 --------
diff --git a/Documentation/devicetree/bindings/sound/codecs.txt b/Documentation/devicetree/bindings/sound/codecs.txt
new file mode 100644
index 000000000000..8e6630d73fee
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/codecs.txt
@@ -0,0 +1,7 @@
+Codecs:
+Generic properties for any audio codec handled directly by ASoC core.
+Optional properties:
+- name-prefix           : Name prefix to avoid kcontrol name collisions
+                          in cards with multiple instances of the same codec
diff --git a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
index 46bc9829c71a..00107789a6dd 100644
--- a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
+++ b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
@@ -39,6 +39,8 @@ Optional properties:
                 please refer to pinctrl-bindings.txt
 - fck_parent : Should contain a valid clock name which will be used as parent
               for the McASP fck
+- shared-dai : CPU DAI is shared (typically shared with DSP). McASP will not be
+               power managed at runtime.
 Example:
diff --git a/Documentation/devicetree/bindings/video/fpd3-serdes.txt b/Documentation/devicetree/bindings/video/fpd3-serdes.txt
new file mode 100644
index 000000000000..afa56806f7a5
--- /dev/null
+++ b/Documentation/devicetree/bindings/video/fpd3-serdes.txt
@@ -0,0 +1,134 @@
+Texas instruments video serializer de serializer
+================================================
+See Documentation/video-serdes.txt for generic information about
+video serializer / de serializers.
+FPDlink3 video serdes devices are I2C slave devices. They are always
+used in pairs where one device is connected to the CPU/SoC which is
+called local device and the other one is called remote device.
+FPDlink3 video serdes devices have some gpios which can be controlled
+over I2C. Also, the FPDlink supports gpio forwarding. Which means that
+the remote device can copy the gpio values from it's remote device.
+Also, each of the remote device is an I2C master itself, so it can
+interface some I2C slaves at remote end. For e.g, a backlight LCD chip
+connected to the de serializer or the camera connected to a serializer.
+So these slaves can be accessed from local devices via I2C aliases.
+A pair of serializer/deserializer can be used for tunneling the i2c
+transactions over LVDS channel. The one of the device is connected to
+the system i2c bus in slave mode and the other one acts as a master
+at the remote end. But, the slave device can register dummy aliases
+remote master and for each of the remote slaves.
+As this is acting like a i2c bridge driver, we need a method for
+configuring the address translations.
+Required Properties:
+  - compatible: should be one of the following.
+    - "ti,ds90ub913aq": For TI FPDlink3 12bit video serializer
+    - "ti,ds90ub914aq": For TI FPDlink3 12bit video de serializer
+    - "ti,ds90uh925q": For TI FPDlink3 24bit video serializer
+    - "ti,ds90uh928q": For TI FPDlink3 24bit video de serializer
+    - "ti,ds90ub924q": For TI FPDlink3 24bit video de serializer
+    - "ti,ds90ub921q": For TI FPDlink3 24bit video serializer
+  - reg: I2C slave address
+        This would be the alias adress for remote device. The CPU side
+        ser/des would address the remote device using this address.
+Optional Properties:
+  - gpio-controller: Marks the device node as a gpio controller.
+  - #gpio-cells: Should be 1. The first cell is the GPIO number.
+  - ranges: This is the address translation table for mapping i2c devices
+        on the remote bus to the i2c address(alias) on parent bus.
+        The first entry in the ranges property has to of the corresponding
+        remote ser/des device.
+        For dynamic address mapping, keep the remote slave address as 0x0
+        The corresponding alias would be used if the remote slave doesn't
+        have an address already mapped.
+  - slave-mode: This property marks the ser/des as remote device.
+        For a device where 'slave-mode' property is absent, it is considered
+        as master device and 'ranges' and 'i2c-bus-num' properties are
+        compulsory.
+Example:
+Following example demonstrates device node structure for a camera connected
+using FPDlink3 ser/des. Here the deserializer and serializer are connected
+only via the LVDS link. The camera is connected on the serializer i2c bus.
+Here, serializer and camera are not connected to the system i2c bus, but it
+can be accessed from the system i2c bus. The deserializer maps each of the
+remote slave onto the system i2c bus and acts as a bridge to transfer any
+messages addressed to the remote devices.
+=======================================
+-------+
+|I2C bus|
+-------+
+  |
+  |0x60<real> +------------+
+  +-----------|Deserializer|0x60
+  |           +------------+
+  |                X
+  |                X
+  |                X <LVDS link>
+  |                X
+  |                X
+  |           +----------+
+  |           |  Remote  |
+  |           |  i2c bus |
+  |           +----------+
+  |              |
+  |0x74<alias>   |      +----------+
+  | <-  -  -  -  +------|Serializer| 0x58
+  |              |      +----------+
+  |              |
+  |0x38<alias>   |      +---------+
+  | <-  -  -  -  +------|OV Camera| 0x30
+  |              |      +---------+
+  |
+  |
+=======================================
+i2cbus {
+        lvds_des: deserializer@60 {
+                compatible = "ti,ds90ub914aq";
+                reg = <0x60>;
+                gpio-controller;
+                #gpio-cells=1;
+                i2c-bus-num = <5>;
+        };
+};
+&lvds_des {
+        ranges = <0x58 0x74>,
+                 <0x38 0x30>;
+        lvds_ser: serializer@58 {
+                compatible = "ti,ds90ub913aq";
+                reg = <0x58>;
+                remote-device = <&lvds_des>;
+                gpio-controller;
+                #gpio-cells=1;
+                slave-mode;
+        };
+        lvds_cam: camera@30 {
+                compatible = "ov10635"
+                reg = <0x30>;
+                gpios = <&lvds_ser 0>;
+                /* power pin controlled by serializer local gpio */
+        };
+};
diff --git a/Documentation/kdump/kdump.txt b/Documentation/kdump/kdump.txt
index bc4bd5a44b88..b6fe6a885bf8 100644
--- a/Documentation/kdump/kdump.txt
+++ b/Documentation/kdump/kdump.txt
@@ -18,7 +18,7 @@ memory image to a dump file on the local disk, or across the network to
 a remote system.
 Kdump and kexec are currently supported on the x86, x86_64, ppc64, ia64,
-s390x and arm architectures.
+s390x, arm and arm64 architectures.
 When the system kernel boots, it reserves a small section of memory for
 the dump-capture kernel. This ensures that ongoing Direct Memory Access
@@ -249,6 +249,13 @@ Dump-capture kernel config options (Arch Dependent, arm)
    AUTO_ZRELADDR=y
+Dump-capture kernel config options (Arch Dependent, arm64)
+----------------------------------------------------------
+- Please note that kvm of the dump-capture kernel will not be enabled
+  on non-VHE systems even if it is configured. This is because the CPU
+  will not be reset to EL2 on panic.
 Extended crashkernel syntax
 ===========================
@@ -312,6 +319,8 @@ Boot into System Kernel
   any space below the alignment point may be overwritten by the dump-capture kernel,
   which means it is possible that the vmcore is not that precise as expected.
+   On arm64, use "crashkernel=Y[@X]".  Note that the start address of
+   the kernel, X if explicitly specified, must be aligned to 2MiB (0x200000).
 Load the Dump-capture Kernel
 ============================
@@ -334,6 +343,8 @@ For s390x:
        - Use image or bzImage
 For arm:
        - Use zImage
+For arm64:
+        - Use vmlinux or Image
 If you are using a uncompressed vmlinux image then use following command
 to load dump-capture kernel.
@@ -377,6 +388,9 @@ For s390x:
 For arm:
        "1 maxcpus=1 reset_devices"
+For arm64:
+        "1 maxcpus=1 reset_devices"
 Notes on loading the dump-capture kernel:
 * By default, the ELF headers are stored in ELF64 format to support
diff --git a/Documentation/video-serdes.txt b/Documentation/video-serdes.txt
new file mode 100644
index 000000000000..d74da285b518
--- /dev/null
+++ b/Documentation/video-serdes.txt
@@ -0,0 +1,42 @@
+Video serializer and de serializer
+==================================
+Video serializers and de serializers are the devices which are used to
+interface parallel port video imaging or display devices using serial
+medium.
+Video serializer are used at the transmit side to convert the parallel data
+and the control signals to serial data and send it at high frequency
+using fewer cables.
+Video de serializer are used at the receive side to convert the serial data
+into parallel port video and recreate the same control signals.
+Typical video serializer/de serializer (serdes) uses data lines as well as
+pixel clock, hsync, vsync, etc.
+The video serdes devices are controlled via I2C interface and they are always
+used in pairs. One end is connected to the video peripheral and other is
+connected to the CPU/ SoC. In this way, only one of the device is actually
+connected to the I2C bus while other device is controllable remotely.
+In case of camera, serializer and camera are remotely connected to the
+system and are controllable via deserializer.
+First, the deserializer needs to be configured before accessing the
+serialzer or the camera.
+In case of display, de serializer and display are remotely connected to the
+system and are controllable via serializer.
+First, the serializer needs to be configured before accessing the
+deserializer of the display.
+When serdes devices are to be controlled remotely, the device which is
+connected to the system registers it's counterpart as an alias.
+So that all the accesses done to the alias are reproduced at the remote end.
+Linux kernel has driver support for following video devices:
+===========================================================
+"drivers/video/serdes/fpd3_serdes.c" supports video (de)serializers.
+See Documentation/devicetree/bindings/video/fpd3-serdes.txt
+for more information on the devices supported and the device tree bindings
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index e0d7386143b9..8c57745523e4 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -494,8 +494,14 @@ dtb-$(CONFIG_SOC_OMAP5) += \
 dtb-$(CONFIG_SOC_DRA7XX) += \
        dra7-evm.dtb \
        dra7-evm-lcd-lg.dtb \
+        dra7-evm-fpd-lg.dtb \
+        dra7-evm-lcd-lg-late-attach.dtb \
+        dra7-evm-lcd-lg-late-attach-no-map.dtb \
        dra7-evm-lcd-osd.dtb \
        dra7-evm-lcd-osd101t2587.dtb \
+        dra7-evm-lcd-osd-late-attach.dtb \
+        dra7-evm-fpd-auo-g101evn01.0.dtb \
+        dra7-evm-vision.dtb \
        am57xx-beagle-x15.dtb \
        am57xx-beagle-x15-revb1.dtb \
        am571x-idk.dtb \
@@ -510,12 +516,15 @@ dtb-$(CONFIG_SOC_DRA7XX) += \
        dra72-evm-lcd-lg.dtb \
        dra72-evm-lcd-osd.dtb \
        dra72-evm-lcd-osd101t2587.dtb \
+        dra72-evm-fpd-lg.dtb \
        dra72-evm-revc.dtb \
        dra72-evm-revc-lcd-osd101t2045.dtb \
        dra72-evm-revc-lcd-osd101t2587.dtb \
+        dra72-evm-vision.dtb \
        dra71-evm.dtb \
        dra71-evm-lcd-auo-g101evn01.0.dtb \
-        dra76-evm.dtb
+        dra76-evm.dtb \
+        dra76-evm-fpd-auo-g101evn01.0.dtb
 dtb-$(CONFIG_ARCH_ORION5X) += \
        orion5x-lacie-d2-network.dtb \
        orion5x-lacie-ethernet-disk-mini-v2.dtb \
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
index da403a8debd4..f010d6ff4e2d 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
@@ -20,9 +20,8 @@
                rtc1 = &tps659038_rtc;
                rtc2 = &rtc;
                display0 = &hdmi0;
                sound0 = &sound0;
-                sound1 = &hdmi;
+                sound1 = &hdmi0;
        };
        memory {
diff --git a/arch/arm/boot/dts/dra7-evm-common.dtsi b/arch/arm/boot/dts/dra7-evm-common.dtsi
index cadf0e6dd430..2bbc04791628 100644
--- a/arch/arm/boot/dts/dra7-evm-common.dtsi
+++ b/arch/arm/boot/dts/dra7-evm-common.dtsi
@@ -46,7 +46,7 @@
                sound0_master: simple-audio-card,cpu {
                        sound-dai = <&mcasp3>;
-                        system-clock-frequency = <5644800>;
+                        system-clock-frequency = <11289600>;
                };
                simple-audio-card,codec {
@@ -266,9 +266,11 @@
                          <&atl_gfclk_mux>,
                          <&dpll_abe_ck>,
                          <&dpll_abe_m2x2_ck>,
+                          <&atl_clkin1_ck>,
                          <&atl_clkin2_ck>;
        assigned-clock-parents = <&sys_clkin2>, <&dpll_abe_m2_ck>;
-        assigned-clock-rates = <0>, <0>, <180633600>, <361267200>, <5644800>;
+        assigned-clock-rates = <0>, <0>, <180633600>, <361267200>,
+                                <11289600>, <11289600>;
        status = "okay";
diff --git a/arch/arm/boot/dts/dra7-evm-fpd-auo-g101evn01.0.dts b/arch/arm/boot/dts/dra7-evm-fpd-auo-g101evn01.0.dts
new file mode 100644
index 000000000000..64e79754bb22
--- /dev/null
+++ b/arch/arm/boot/dts/dra7-evm-fpd-auo-g101evn01.0.dts
@@ -0,0 +1,37 @@
+#include "dra7-evm.dts"
+#include "dra7x-evm-fpd-auo-g101evn01.0.dtsi"
+/ {
+        aliases {
+                display0 = &fpd_disp;
+                display1 = &hdmi0;
+        };
+};
+&dss {
+        ports {
+                status = "ok";
+        };
+};
+&disp_ser {
+        status = "ok";
+        ranges = <0x0 0x2d>;
+};
+/* Tie the end points of DSS and FPDLink together */
+&fpd_in {
+        remote-endpoint = <&dpi_out3>;
+};
+&dpi_out3 {
+        remote-endpoint = <&fpd_in>;
+};
+&lcd_fpd {
+        enable-gpios = <&pcf_gpio_21 0 GPIO_ACTIVE_LOW>;
+        /* P0, SEL_GPMC_AD_VID_S0 */
+        status = "ok";
+};
diff --git a/arch/arm/boot/dts/dra7-evm-fpd-lg.dts b/arch/arm/boot/dts/dra7-evm-fpd-lg.dts
new file mode 100644
index 000000000000..b8df0766ecff
--- /dev/null
+++ b/arch/arm/boot/dts/dra7-evm-fpd-lg.dts
@@ -0,0 +1,38 @@
+#include "dra7-evm.dts"
+#include "dra7x-evm-fpd-lg.dtsi"
+/ {
+        aliases {
+                display0 = &fpd_disp;
+                display1 = &hdmi0;
+        };
+};
+&dss {
+        ports {
+                status = "ok";
+        };
+};
+&disp_ser {
+        status = "ok";
+        ranges = <0x2c 0x2c>,
+                <0x1c 0x1c>;
+};
+/* Tie the end points of DSS and FPDLink together */
+&fpd_in {
+        remote-endpoint = <&dpi_out3>;
+};
+&dpi_out3 {
+        remote-endpoint = <&fpd_in>;
+};
+&lcd_fpd {
+        enable-gpios = <&pcf_gpio_21 0 GPIO_ACTIVE_LOW>;
+        /* P0, SEL_GPMC_AD_VID_S0 */
+        status = "ok";
+};
diff --git a/arch/arm/boot/dts/dra7-evm-lcd-lg-late-attach-no-map.dts b/arch/arm/boot/dts/dra7-evm-lcd-lg-late-attach-no-map.dts
new file mode 100644
index 000000000000..e15f7bdc0eed
--- /dev/null
+++ b/arch/arm/boot/dts/dra7-evm-lcd-lg-late-attach-no-map.dts
@@ -0,0 +1,179 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+#include "dra7-evm-lcd-lg.dts"
+/*
+ * Memory reserved for IOMMU table carveout 0xbfc00000 for length 0x100000
+ * Page Table Address for IPU1   0xbfc00000
+ * Page Table Address for IPU2   0xbfc08000
+ * Page Table Address for DSP1   0xbfc10000
+ * Page Table Address for DSP2   0xbfc18000
+ */
+&reserved_mem {
+        latea_pagetbl: late_pgtbl@bfc00000 {
+                reg = <0x0 0xbfc00000 0x0 0x100000>;
+                no-map;
+                status = "okay";
+        };
+};
+&ipu2_cma_pool {
+        /delete-property/ reusable;
+        no-map;
+};
+&ipu2 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&timer3 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&timer4 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&timer9 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&mmu_ipu2{
+        ti,late-attach;
+        ti,late-attach-dma-pool;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+/* Uncomment below block to enable late attach for IPU1 */
+/*
+&ipu1_cma_pool {
+        /delete-property/ reusable;
+        no-map;
+};
+&ipu1 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&timer11 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&timer7 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&timer8 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&mmu_ipu1{
+        ti,late-attach;
+        ti,late-attach-dma-pool;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+*/
+/* Uncomment below block to enable late attach for DSP1 */
+/*
+&dsp1_cma_pool {
+        /delete-property/ reusable;
+        no-map;
+};
+&dsp1 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&timer5 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&timer10 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&mmu0_dsp1 {
+        ti,late-attach;
+        ti,late-attach-dma-pool;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&mmu1_dsp1 {
+        ti,late-attach;
+        ti,late-attach-dma-pool;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+*/
+/* Uncomment below block to enable late attach for DSP2 */
+/*
+&dsp2_cma_pool {
+        /delete-property/ reusable;
+        no-map;
+};
+&dsp2 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&timer6 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&mmu0_dsp2 {
+        ti,late-attach;
+        ti,late-attach-dma-pool;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&mmu1_dsp2 {
+        ti,late-attach;
+        ti,late-attach-dma-pool;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+*/
diff --git a/arch/arm/boot/dts/dra7-evm-lcd-lg-late-attach.dts b/arch/arm/boot/dts/dra7-evm-lcd-lg-late-attach.dts
new file mode 100644
index 000000000000..939896b6e00b
--- /dev/null
+++ b/arch/arm/boot/dts/dra7-evm-lcd-lg-late-attach.dts
@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+#include "dra7-evm-lcd-lg.dts"
+/*
+ * Memory reserved for IOMMU table carveout 0xbfc00000 for length 0x100000
+ * Page Table Address for IPU1   0xbfc00000
+ * Page Table Address for IPU2   0xbfc08000
+ * Page Table Address for DSP1   0xbfc10000
+ * Page Table Address for DSP2   0xbfc18000
+ */
+&reserved_mem {
+        latea_pagetbl: late_pgtbl@bfc00000 {
+                reg = <0x0 0xbfc00000 0x0 0x100000>;
+                no-map;
+                status = "okay";
+        };
+};
+&ipu2 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&timer3 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&timer4 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&timer9 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&mmu_ipu2{
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+/* Uncomment below block to enable late attach for IPU1 */
+/*
+&ipu1 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&timer11 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&timer7 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&timer8 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&mmu_ipu1{
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+*/
+/* Uncomment below block to enable late attach for DSP1 */
+/*
+&dsp1 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&timer5 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&timer10 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&mmu0_dsp1 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&mmu1_dsp1 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+*/
+/* Uncomment below block to enable late attach for DSP2 */
+/*
+&dsp2 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&timer6 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&mmu0_dsp2 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&mmu1_dsp2 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+*/
diff --git a/arch/arm/boot/dts/dra7-evm-lcd-lg.dts b/arch/arm/boot/dts/dra7-evm-lcd-lg.dts
index d2653938d051..2b09d3a8839f 100644
--- a/arch/arm/boot/dts/dra7-evm-lcd-lg.dts
+++ b/arch/arm/boot/dts/dra7-evm-lcd-lg.dts
@@ -8,3 +8,17 @@
 #include "dra7-evm.dts"
 #include "dra7x-evm-lcd-lg.dtsi"
+&ldc3001 {
+        interrupt-parent = <&gpio1>;
+        interrupts = <2 IRQ_TYPE_LEVEL_HIGH>;
+};
+/* Uncomment the below lines to enable the FPDLink display */
+/*
+&lcd_fpd {
+        status = "okay";
+};
+*/
diff --git a/arch/arm/boot/dts/dra7-evm-lcd-osd-late-attach.dts b/arch/arm/boot/dts/dra7-evm-lcd-osd-late-attach.dts
new file mode 100644
index 000000000000..5416d2645517
--- /dev/null
+++ b/arch/arm/boot/dts/dra7-evm-lcd-osd-late-attach.dts
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+#include "dra7-evm-lcd-osd.dts"
+/*
+ * Memory reserved for IOMMU table carveout 0xbfc00000 for length 0x100000
+ * Page Table Address for IPU1   0xbfc00000
+ * Page Table Address for IPU2   0xbfc08000
+ * Page Table Address for DSP1   0xbfc10000
+ * Page Table Address for DSP2   0xbfc18000
+ */
+&reserved_mem {
+        latea_pagetbl: late_pgtbl@bfc00000 {
+                reg = <0x0 0xbfc00000 0x0 0x100000>;
+                no-map;
+                status = "okay";
+        };
+};
+&ipu2 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&timer3 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&timer4 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&timer9 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&mmu_ipu2{
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+/*Uncomment below block to enable late attach for IPU1*/
+/*
+&ipu1 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&timer11 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&timer7 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&timer8 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&mmu_ipu1{
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+*/
+/*Uncomment below block to enable late attach for DSP1*/
+/*
+&dsp1 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&timer5 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&timer10 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&mmu0_dsp1 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&mmu1_dsp1 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+*/
+/*Uncomment below block to enable late attach for DSP2*/
+/*
+&dsp2 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&timer6 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&mmu0_dsp2 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+&mmu1_dsp2 {
+        ti,late-attach;
+        ti,no-idle-on-init;
+        ti,no-reset-on-init;
+};
+*/
diff --git a/arch/arm/boot/dts/dra7-evm-vision.dts b/arch/arm/boot/dts/dra7-evm-vision.dts
new file mode 100644
index 000000000000..5c00f3b76655
--- /dev/null
+++ b/arch/arm/boot/dts/dra7-evm-vision.dts
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2013 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.
+ */
+#include "dra7-evm.dts"
+i2cexp: &i2c2 {
+};
+#include "dra7xx-vision.dtsi"
+/*
+ * Following is the mapping of the cameras and video ports:
+ *
+ * +--------+---------+---------+---------+---------+
+ * | LVDS   | DES I2C | Remote  | SER I2C | CAM I2C |
+ * | Camera | Addr    | I2C bus | Alias   | Alias   |
+ * +--------+---------+---------+---------+---------+
+ * |  cam1  |   0x60  |   11    |   0x74  |   0x38  |
+ * |  cam2  |   0x64  |   12    |   0x75  |   0x39  |
+ * |  cam3  |   0x68  |   13    |   0x76  |   0x3A  |
+ * |  cam4  |   0x6C  |   14    |   0x77  |   0x3B  |
+ * |  cam5  |   0x69  |   15    |   0x78  |   0x3C  |
+ * |  cam6  |   0x61  |   16    |   0x79  |   0x3D  |
+ * +--------+---------+---------+---------+---------+
+ *
+ * For easier access, all the remote devices can be accessed using the
+ * remote bus as well as the local bus. e.g. remote Serializer can be
+ * accessed as 11-0058 as well as 1-0074
+ */
+&vip1 {
+        status = "okay";
+};
+&vip2 {
+        status = "okay";
+};
+&vip3 {
+        status = "okay";
+};
+&ovcam_fc {
+        /* Select between onboard OV10633 camera and daughter card vin
+         * Also enable power for the OVcamera externally
+         */
+        mux-gpios =
+                <&pcf_hdmi 3    GPIO_ACTIVE_HIGH>,      /* CAM_FPD_MUX_S0 */
+                <&gpio6 17      GPIO_ACTIVE_HIGH>;      /* OV_PWDN */
+};
+&ovcam1 {
+        /* Select between onboard OV10633 camera and daughter card vin */
+        mux-gpios =
+                <&pcf_hdmi 3    GPIO_ACTIVE_HIGH>;      /* CAM_FPD_MUX_S0 */
+};
+&ovcam2 {
+        /* Select between vin2a and ethernet slave0 */
+        mux-gpios =
+                <&pcf_hdmi 2    GPIO_ACTIVE_LOW>;       /* VIN2_S0 */
+};
+&ovcam3 {
+        /* No board muxes */
+};
+&ovcam4 {
+        /* No board muxes */
+};
+&ovcam5 {
+        /* No board muxes */
+};
+/* Main board hogs this GPIO, it should be set by the camera driver */
+/delete-node/ &vin6_brdmux;
+&ovcam6 {
+        mux-gpios =
+                <&pcf_hdmi 1    GPIO_ACTIVE_HIGH>;      /* VIN6_SEL_S0 */
+};
+&vin1a {
+        status = "okay";
+        endpoint@cam1 {
+                slave-mode;
+                remote-endpoint = <&cam1>;
+        };
+        endpoint@ovcam {
+                slave-mode;
+                remote-endpoint = <&ovcam>;
+        };
+};
+&vin2a {
+        status = "okay";
+        endpoint@0 {
+                slave-mode;
+                remote-endpoint = <&cam2>;
+        };
+};
+&vin3a {
+        status = "okay";
+        endpoint@0 {
+                slave-mode;
+                remote-endpoint = <&cam3>;
+        };
+};
+&vin5a {
+        status = "okay";
+        endpoint@0 {
+                slave-mode;
+                remote-endpoint = <&cam4>;
+        };
+};
+&vin6a {
+        status = "okay";
+        endpoint@0 {
+                slave-mode;
+                remote-endpoint = <&cam6>;
+        };
+};
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index e8ddc3b9d047..aee34b6d45c1 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -19,7 +19,7 @@
                reg = <0x0 0x80000000 0x0 0x60000000>; /* 1536 MB */
        };
-        reserved-memory {
+        reserved_mem: reserved-memory {
                #address-cells = <2>;
                #size-cells = <2>;
                ranges;
@@ -53,6 +53,10 @@
                };
        };
+        aliases {
+                i2c7 = &disp_ser;
+        };
        evm_1v8_sw: fixedregulator-evm_1v8 {
                compatible = "regulator-fixed";
                regulator-name = "evm_1v8";
@@ -806,7 +810,7 @@
        };
 };
-&i2c2 {
+i2c_p3_exp: &i2c2 {
        status = "okay";
        clock-frequency = <400000>;
@@ -815,7 +819,7 @@
                reg = <0x26>;
                gpio-controller;
                #gpio-cells = <2>;
-                p1 {
+                vin6_brdmux: p1 {
                        /* vin6_sel_s0: high: VIN6, low: audio */
                        gpio-hog;
                        gpios = <1 GPIO_ACTIVE_HIGH>;
@@ -838,6 +842,15 @@
                        };
                };
        };
+        disp_ser: serializer@1b {
+                compatible = "ti,ds90uh925q";
+                reg = <0x1b>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                status = "disabled";
+        };
 };
 &mmc1 {
@@ -1046,9 +1059,23 @@
 };
 &dss {
-        status = "ok";
+        status = "okay";
        vdda_video-supply = <&ldoln_reg>;
+        ports {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                status = "disabled";
+                port@lcd3 {
+                        reg = <2>;
+                        dpi_out3: endpoint {
+                                data-lines = <24>;
+                        };
+                };
+        };
 };
 &hdmi {
@@ -1060,7 +1087,7 @@
        status = "okay";
 };
-&vin1a {
+video_in: &vin1a {
        status = "okay";
        endpoint@0 {
                slave-mode;
@@ -1072,3 +1099,8 @@
        status = "okay";
 };
+#include "dra7xx-jamr3.dtsi"
+&tvp_5158{
+        mux-gpios = <&pcf_hdmi 3 GPIO_ACTIVE_HIGH>,     /*CAM_FPD_MUX_S0*/
+                    <&pcf_jamr3_21 8 GPIO_ACTIVE_LOW>;  /*SEL_TVP_FPD*/
+};
diff --git a/arch/arm/boot/dts/dra71-evm.dts b/arch/arm/boot/dts/dra71-evm.dts
index 42ca589606a9..1a6cb83fddb8 100644
--- a/arch/arm/boot/dts/dra71-evm.dts
+++ b/arch/arm/boot/dts/dra71-evm.dts
@@ -18,7 +18,7 @@
                reg = <0x0 0x80000000 0x0 0x80000000>; /* 2GB */
        };
-        reserved-memory {
+        reserved_mem: reserved-memory {
                #address-cells = <2>;
                #size-cells = <2>;
                ranges;
@@ -376,7 +376,12 @@
        };
 };
-&i2c5 {
+&i2c3 {
+        status = "okay";
+        clock-frequency = <400000>;
+};
+i2c_p3_exp: &i2c5 {
        status = "okay";
        clock-frequency = <400000>;
@@ -430,7 +435,7 @@
        status = "okay";
 };
-&vin2a {
+video_in: &vin2a {
        status = "okay";
        endpoint@0 {
                slave-mode;
@@ -584,3 +589,10 @@
        status = "okay";
        memory-region = <&dsp1_cma_pool>;
 };
+#include "dra7xx-jamr3.dtsi"
+&tvp_5158{
+        mux-gpios = <&pcf_hdmi 2 GPIO_ACTIVE_LOW>,      /*VIN2_S0*/
+                    <&pcf_jamr3_21 8 GPIO_ACTIVE_LOW>,  /*SEL_TVP_FPD*/
+                    <&pcf_hdmi 6 GPIO_ACTIVE_HIGH>;     /*VIN2_S2*/
+};
diff --git a/arch/arm/boot/dts/dra72-evm-common.dtsi b/arch/arm/boot/dts/dra72-evm-common.dtsi
index f914e6ac0256..1896ef30f673 100644
--- a/arch/arm/boot/dts/dra72-evm-common.dtsi
+++ b/arch/arm/boot/dts/dra72-evm-common.dtsi
@@ -16,9 +16,9 @@
        aliases {
                display0 = &hdmi0;
+                sound0 = &snd0;
-                sound0 = &sound0;
                sound1 = &hdmi;
+                i2c7 = &disp_ser;
        };
        evm_12v0: fixedregulator-evm12v0 {
@@ -137,7 +137,7 @@
                };
        };
-        sound0: sound@0 {
+        snd0: sound@0 {
                compatible = "simple-audio-card";
                simple-audio-card,name = "DRA7xx-EVM";
                simple-audio-card,widgets =
@@ -162,7 +162,7 @@
                sound0_master: simple-audio-card,cpu {
                        sound-dai = <&mcasp3>;
-                        system-clock-frequency = <5644800>;
+                        system-clock-frequency = <11289600>;
                };
                simple-audio-card,codec {
@@ -282,7 +282,7 @@
        };
 };
-&i2c5 {
+i2c_p3_exp: &i2c5 {
        status = "okay";
        clock-frequency = <400000>;
@@ -582,8 +582,34 @@
        };
 };
+&i2c5 {
+        disp_ser: serializer@1b {
+                compatible = "ti,ds90uh925q";
+                reg = <0x1b>;
+                status = "disabled";
+                #address-cells = <1>;
+                #size-cells = <0>;
+        };
+};
 &dss {
        status = "ok";
+        vdda_video-supply = <&ldo5_reg>;
+        ports {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                status = "disabled";
+                port@lcd3 {
+                        reg = <2>;
+                        dpi_out3: endpoint {
+                                data-lines = <24>;
+                        };
+                };
+        };
 };
 &bb2d {
@@ -628,9 +654,11 @@
                          <&atl_gfclk_mux>,
                          <&dpll_abe_ck>,
                          <&dpll_abe_m2x2_ck>,
+                          <&atl_clkin1_ck>,
                          <&atl_clkin2_ck>;
        assigned-clock-parents = <&sys_clkin2>, <&dpll_abe_m2_ck>;
-        assigned-clock-rates = <0>, <0>, <180633600>, <361267200>, <5644800>;
+        assigned-clock-rates = <0>, <0>, <180633600>, <361267200>,
+                               <11289600>, <11289600>;
        status = "okay";
diff --git a/arch/arm/boot/dts/dra72-evm-fpd-lg.dts b/arch/arm/boot/dts/dra72-evm-fpd-lg.dts
new file mode 100644
index 000000000000..9ed0f66fdb76
--- /dev/null
+++ b/arch/arm/boot/dts/dra72-evm-fpd-lg.dts
@@ -0,0 +1,39 @@
+#include "dra72-evm.dts"
+#include "dra7x-evm-fpd-lg.dtsi"
+/* Set display aliases for use by Android */
+/ {
+        aliases {
+                display0 = &fpd_disp;
+                display1 = &hdmi0;
+        };
+};
+&dss {
+        ports {
+                status = "ok";
+        };
+};
+&disp_ser {
+        status = "ok";
+        ranges = <0x2c 0x2c>,
+                <0x1c 0x1c>;
+};
+/* Tie the end points of DSS and FPDLink together */
+&fpd_in {
+        remote-endpoint = <&dpi_out3>;
+};
+&dpi_out3 {
+        remote-endpoint = <&fpd_in>;
+};
+&lcd_fpd {
+        enable-gpios = <&pcf_gpio_21 0 GPIO_ACTIVE_LOW>;
+        /* P0, SEL_GPMC_AD_VID_S0 */
+        status = "ok";
+};
diff --git a/arch/arm/boot/dts/dra72-evm-revc.dts b/arch/arm/boot/dts/dra72-evm-revc.dts
index 5ef7389e979e..517d85f7c294 100644
--- a/arch/arm/boot/dts/dra72-evm-revc.dts
+++ b/arch/arm/boot/dts/dra72-evm-revc.dts
@@ -16,7 +16,7 @@
                reg = <0x0 0x80000000 0x0 0x80000000>; /* 2GB */
        };
-        reserved-memory {
+        reserved_mem: reserved-memory {
                #address-cells = <2>;
                #size-cells = <2>;
                ranges;
@@ -366,3 +366,18 @@
        status = "okay";
        memory-region = <&dsp1_cma_pool>;
 };
+video_in: &vin2a {
+        status = "okay";
+        endpoint@0 {
+                slave-mode;
+                remote-endpoint = <&onboardLI>;
+        };
+};
+#include "dra7xx-jamr3.dtsi"
+&tvp_5158{
+        mux-gpios = <&pcf_hdmi 2 GPIO_ACTIVE_LOW>,      /*VIN2_S0*/
+                    <&pcf_jamr3_21 8 GPIO_ACTIVE_LOW>,  /*SEL_TVP_FPD*/
+                    <&pcf_hdmi 6 GPIO_ACTIVE_HIGH>;     /*VIN2_S2*/
+};
diff --git a/arch/arm/boot/dts/dra72-evm-vision.dts b/arch/arm/boot/dts/dra72-evm-vision.dts
new file mode 100644
index 000000000000..b59d44f20772
--- /dev/null
+++ b/arch/arm/boot/dts/dra72-evm-vision.dts
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2013 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.
+ */
+#include "dra72-evm-revc.dts"
+i2cexp: &i2c5 {
+};
+#include "dra7xx-vision.dtsi"
+/*
+ * Following is the mapping of the cameras and video ports:
+ * This is for the RevC onwards of DRA72 EVMs
+ *
+ * +-------+--------+---------+---------+---------+---------+
+ * | Video | LVDS   | DES I2C | Remote  | SER I2C | CAM I2C |
+ * | Port  | Camera | Addr    | I2C bus | Alias   | Alias   |
+ * +-------+--------+---------+---------+---------+---------+
+ * | vin1a |  cam2  |   0x64  |   12    |   0x75  |   0x39  |
+ * | vin1b |  cam5  |   0x69  |   15    |   0x78  |   0x3C  |
+ * | vin2a |  cam1  |   0x60  |   11    |   0x74  |   0x38  |
+ * | vin2b |  cam4  |   0x6C  |   14    |   0x77  |   0x3B  |
+ * +-------+--------+---------+---------+---------+---------+
+ *
+ * For easier access, all the remote devices can be accessed using the
+ * remote bus as well as the local bus. e.g. remote Serializer can be
+ * accessed as 11-0058 as well as 4-0074
+ */
+&dra72_vip_mux {
+        pinctrl-names = "default";
+        pinctrl-0 = <&vip_mux>;
+        /* Following is the mapping of interfaces
+         * vin1A <= vin3A (remapped)
+         * vin1B <= vin4B (remapped, only available option)
+         * vin2A <= vin2A (default)
+         * vin2B <= vin2B (default)
+         */
+        vip_mux: pinmux_vin5a_pins {
+                pinctrl-single,pins = <
+                        0x0     (VIP_VIN3A | VIP_VIN4B | VIP_VIN2A | VIP_VIN2B)
+                >;
+        };
+};
+&vip1 {
+        status = "okay";
+};
+&ovcam_fc {
+        /* Select between onboard OV10633 camera and daughter card vin
+         * Also enable power for the OVcamera externally
+         */
+        mux-gpios =
+                <&pcf_hdmi 2    GPIO_ACTIVE_LOW>,       /* VIN2_S0 */
+                <&pcf_hdmi 6    GPIO_ACTIVE_HIGH>,      /* VIN2_S2 */
+                <&gpio6 17      GPIO_ACTIVE_HIGH>;      /* OV_PWDN */
+};
+&ovcam1 {
+        /* Select between OV10633 camera, ethernet and external vin2a */
+        mux-gpios =
+                <&pcf_hdmi 2    GPIO_ACTIVE_LOW>,       /* VIN2_S0 */
+                <&pcf_hdmi 6    GPIO_ACTIVE_HIGH>;      /* VIN2_S2 */
+};
+&ovcam2 {
+        /* Select between GPMC, VOUT3 (FPDlink disp) and external vin1a */
+        mux-gpios =
+                <&pcf_gpio_21 0 GPIO_ACTIVE_HIGH>,      /* SEL_GPMC_AD_VID_S0 */
+                <&pcf_gpio_21 7 GPIO_ACTIVE_LOW>;       /* SEL_GPMC_AD_VID_S2 */
+};
+&ovcam3 {
+        status = "disabled";
+};
+&ovcam4 {
+        /* Select  */
+        mux-gpios =
+                <&pcf_hdmi 11   GPIO_ACTIVE_LOW>;       /* MMC3_SEL */
+};
+&ovcam5 {
+        /* No board muxes */
+};
+&ovcam6 {
+        status = "disabled";
+};
+&pcf_gpio_21 {
+        cpsw_sel_s0 {
+                status = "disabled";
+        };
+};
+&vin1a {
+        status = "okay";
+        endpoint@0 {
+                slave-mode;
+                remote-endpoint = <&cam2>;
+        };
+};
+&vin1b {
+        status = "okay";
+        endpoint@0 {
+                slave-mode;
+                remote-endpoint = <&cam5>;
+        };
+};
+&vin2a {
+        status = "okay";
+        endpoint@0 {
+                slave-mode;
+                remote-endpoint = <&cam1>;
+        };
+        endpoint@1 {
+                slave-mode;
+                remote-endpoint = <&ovcam>;
+        };
+};
+&vin2b {
+        status = "okay";
+        endpoint@0 {
+                slave-mode;
+                remote-endpoint = <&cam4>;
+        };
+};
diff --git a/arch/arm/boot/dts/dra72-evm.dts b/arch/arm/boot/dts/dra72-evm.dts
index c2a4bc1ad423..cc108d2f9b09 100644
--- a/arch/arm/boot/dts/dra72-evm.dts
+++ b/arch/arm/boot/dts/dra72-evm.dts
@@ -9,12 +9,18 @@
 / {
        model = "TI DRA722";
+        aliases {
+                display0 = &hdmi0;
+                sound1 = &hdmi;
+                i2c7 = &disp_ser;
+        };
        memory {
                device_type = "memory";
                reg = <0x0 0x80000000 0x0 0x40000000>; /* 1024 MB */
        };
-        reserved-memory {
+        reserved_mem: reserved-memory {
                #address-cells = <2>;
                #size-cells = <2>;
                ranges;
@@ -260,3 +266,18 @@
        status = "okay";
        memory-region = <&dsp1_cma_pool>;
 };
+video_in: &vin2a {
+        status = "okay";
+        endpoint@0 {
+                slave-mode;
+                remote-endpoint = <&onboardLI>;
+        };
+};
+#include "dra7xx-jamr3.dtsi"
+&tvp_5158{
+        mux-gpios = <&pcf_hdmi 2 GPIO_ACTIVE_LOW>,      /*VIN2_S0*/
+                    <&pcf_jamr3_21 8 GPIO_ACTIVE_LOW>,  /*SEL_TVP_FPD*/
+                    <&pcf_hdmi 6 GPIO_ACTIVE_HIGH>;     /*VIN2_S2*/
+};
diff --git a/arch/arm/boot/dts/dra76-evm-fpd-auo-g101evn01.0.dts b/arch/arm/boot/dts/dra76-evm-fpd-auo-g101evn01.0.dts
new file mode 100644
index 000000000000..69983d70d1f4
--- /dev/null
+++ b/arch/arm/boot/dts/dra76-evm-fpd-auo-g101evn01.0.dts
@@ -0,0 +1,67 @@
+#include "dra76-evm.dts"
+#include "dra7x-evm-fpd-auo-g101evn01.0.dtsi"
+/ {
+        aliases {
+                display0 = &fpd_disp;
+                display1 = &hdmi0;
+        };
+};
+&dss {
+        ports {
+                status = "ok";
+        };
+};
+&disp_ser {
+        status = "ok";
+        ranges = <0x0 0x2d>;
+};
+/* Tie the end points of DSS and FPDLink together */
+&fpd_in {
+        remote-endpoint = <&dpi_out3>;
+};
+&dpi_out3 {
+        remote-endpoint = <&fpd_in>;
+};
+&lcd_fpd {
+        status = "ok";
+};
+/* U21 on the EVM */
+/* gpmc_ad_vid_s0: high: GPMC , low: VOUT3 */
+&pcf_gpio_21 {
+        p0 {
+                gpio-hog;
+                gpios = <0 GPIO_ACTIVE_HIGH>;
+                output-low;
+                line-name = "gpmc_ad_vid_s0";
+        };
+};
+/* U110 on the EVM. For Rev A boards */
+/*
+&pcf_hdmi {
+        p11 {
+                gpio-hog;
+                gpios = <11 GPIO_ACTIVE_HIGH>;
+                output-low;
+                line-name = "disp1_vpoc_onn";
+        };
+};
+*/
+/* For supplying power to the display via FPDLink */
+&gpio2 {
+        p2 {
+                gpio-hog;
+                gpios =  <2 GPIO_ACTIVE_HIGH>;
+                output-low;
+                line-name = "disp1_vpoc_onn";
+        };
+};
diff --git a/arch/arm/boot/dts/dra76-evm.dts b/arch/arm/boot/dts/dra76-evm.dts
index db4fc1e99b1d..213f4b53f965 100644
--- a/arch/arm/boot/dts/dra76-evm.dts
+++ b/arch/arm/boot/dts/dra76-evm.dts
@@ -55,6 +55,10 @@
                };
        };
+        aliases {
+                i2c7 = &disp_ser;
+        };
        vsys_12v0: fixedregulator-vsys12v0 {
                /* main supply */
                compatible = "regulator-fixed";
@@ -441,9 +445,35 @@
        phy-supply = <&ldo3_reg>;
 };
+&i2c3 {
+        disp_ser: serializer@0c {
+                compatible = "ti,ds90ub921q";
+                reg = <0x0c>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                status = "disabled";
+        };
+};
 &dss {
        status = "ok";
        vdda_video-supply = <&ldo5_reg>;
+        ports {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                status = "disabled";
+                port@lcd3 {
+                        reg = <2>;
+                        dpi_out3: endpoint {
+                                data-lines = <24>;
+                        };
+                };
+        };
 };
 &hdmi {
diff --git a/arch/arm/boot/dts/dra7x-evm-fpd-auo-g101evn01.0.dtsi b/arch/arm/boot/dts/dra7x-evm-fpd-auo-g101evn01.0.dtsi
new file mode 100644
index 000000000000..c928be92c1ac
--- /dev/null
+++ b/arch/arm/boot/dts/dra7x-evm-fpd-auo-g101evn01.0.dtsi
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+/ {
+        backlight {
+                compatible = "led-backlight";
+                leds = <&backlight_led>;
+                brightness-levels = <0 2 38 74 110 146 182 218 255>;
+                default-brightness-level = <8>;
+                enable-gpios = <&pcf_display_board 0 GPIO_ACTIVE_LOW>;
+        };
+        lcd_fpd: display {
+                compatible = "auo,g101evn01.0", "panel-dpi";
+                label = "lcd_fpd";
+                status = "disabled";
+                panel-timing {
+                        clock-frequency = <68930000>;
+                        hactive = <1280>;
+                        vactive = <800>;
+                        hfront-porch = <48>;
+                        hsync-len = <32>;
+                        hback-porch = <48>;
+                        vfront-porch = <4>;
+                        vsync-len = <4>;
+                        vback-porch = <8>;
+                        hsync-active = <0>;
+                        vsync-active = <0>;
+                        de-active = <1>;
+                        pixelclk-active = <1>;
+                };
+                port {
+                        fpd_in: endpoint {
+                        };
+                };
+        };
+};
+&disp_ser {
+        /*
+        * 0x2c - deserializer
+        * 0x40 - TLC59108
+        * 0x27 - PCF8575
+        * 0x57 - EEPROM
+        * 0x14 - Goodix Touch Controller
+        * 0x28 - RF430CL330H
+        */
+        disp_des: deserializer@2c {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "ti,ds90ub924q";
+                reg = <0x2c>;
+                slave-mode;
+        };
+        /* TLC chip for LCD panel power and backlight */
+        fpd_disp: tlc59108@40 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "ti,tlc59108";
+                reg = <0x40>;
+                backlight_led: bl@2 {
+                        label = "backlight";
+                        reg = <0x2>;
+                };
+        };
+        pcf_display_board: gpio@27 {
+                compatible = "nxp,pcf8575";
+                reg = <0x27>;
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+        touchscreen: goodix-gt9271@14 {
+                status = "okay";
+                compatible = "goodix,gt9271";
+                reg = <0x14>;
+                touchscreen-size-x = <1280>;
+                touchscreen-size-y = <800>;
+                touchscreen-inverted-y;
+                /* Reset gpio line is inverted before going to touch panel */
+                reset-gpios = <&pcf_display_board 5 GPIO_ACTIVE_LOW>;
+                irq-gpios = <&pcf_display_board 6 GPIO_ACTIVE_HIGH>;
+        };
+        /* Below two slaves on the I2C bus are not yet defined */
+        /* ID EEPROM 0x57 */
+        /* RF430CL330H 0x28 */
+};
diff --git a/arch/arm/boot/dts/dra7x-evm-fpd-lg.dtsi b/arch/arm/boot/dts/dra7x-evm-fpd-lg.dtsi
new file mode 100644
index 000000000000..b4760b4efdad
--- /dev/null
+++ b/arch/arm/boot/dts/dra7x-evm-fpd-lg.dtsi
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+#include <dt-bindings/gpio/gpio.h>
+/ {
+        lcd_fpd: display_fpd {
+                /*
+                * This is not really a dpi panel, but panel-dpi driver
+                * works as dummy panel driver.
+                */
+                compatible = "lg,lp101wx2", "panel-dpi";
+                label = "lcd_fpd";
+                status = "disabled";
+                panel-timing {
+                        clock-frequency = <69300404>;
+                        hactive = <1280>;
+                        vactive = <800>;
+                        hfront-porch = <48>;
+                        hback-porch = <44>;
+                        hsync-len = <32>;
+                        vfront-porch = <4>;
+                        vback-porch = <7>;
+                        vsync-len = <12>;
+                        hsync-active = <0>;
+                        vsync-active = <0>;
+                        de-active = <1>;
+                        pixelclk-active = <0>;
+                };
+                port {
+                        fpd_in: endpoint {
+                        };
+                };
+        };
+};
+&disp_ser {
+        disp_des: deserializer@2c {
+                compatible = "ti,ds90uh928q";
+                reg = <0x2c>;
+                slave-mode;
+        };
+        fpd_disp: tlc59108@1c {
+                compatible = "ti,tlc59108";
+                reg = <0x1c>;
+        };
+};
diff --git a/arch/arm/boot/dts/dra7x-evm-lcd-lg.dtsi b/arch/arm/boot/dts/dra7x-evm-lcd-lg.dtsi
index 71bc803c8282..23268b7a474f 100644
--- a/arch/arm/boot/dts/dra7x-evm-lcd-lg.dtsi
+++ b/arch/arm/boot/dts/dra7x-evm-lcd-lg.dtsi
@@ -50,7 +50,7 @@
                        hsync-active = <0>;
                        vsync-active = <0>;
                        de-active = <1>;
-                        pixelclk-active = <1>;
+                        pixelclk-active = <0>;
                };
                port {
@@ -83,6 +83,17 @@
                        line-name = "LVDS_CLKSel";
                };
        };
+        ldc3001:ldc3001@18 {
+                compatible = "lgphilips,ldc3001";
+                status = "okay";
+                reg = <0x18>;
+                interrupt-parent = <&gpio1>;
+                interrupts = <15 IRQ_TYPE_LEVEL_HIGH>;
+                max-touch-points = <10>;
+                res-x = <1280>;
+                res-y = <800>;
+        };
 };
 &dss {
diff --git a/arch/arm/boot/dts/dra7xx-jamr3.dtsi b/arch/arm/boot/dts/dra7xx-jamr3.dtsi
new file mode 100644
index 000000000000..894e97f93775
--- /dev/null
+++ b/arch/arm/boot/dts/dra7xx-jamr3.dtsi
@@ -0,0 +1,213 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+#include <dt-bindings/clk/ti-dra7-atl.h>
+/ {
+        jamr3_sound {
+                compatible = "simple-audio-card";
+                simple-audio-card,name = "DRA7xx-JAMR3";
+                simple-audio-card,widgets =
+                        "Line", "Line Out",
+                        "Line", "Line In";
+                simple-audio-card,routing =
+                        "Line Out",             "J3A LLOUT",
+                        "Line Out",             "J3A RLOUT",
+                        "J3A LINE1L",           "Line In",
+                        "J3A LINE1R",           "Line In";
+                simple-audio-card,format = "dsp_b";
+                simple-audio-card,bitclock-master = <&jamr3_sound_master>;
+                simple-audio-card,frame-master = <&jamr3_sound_master>;
+                simple-audio-card,bitclock-inversion;
+                jamr3_sound_master: simple-audio-card,cpu {
+                        sound-dai = <&mcasp6>;
+                        system-clock-frequency = <11289600>;
+                };
+                simple-audio-card,codec {
+                        sound-dai = <&tlv320aic3106a>;
+                        clocks = <&atl_clkin1_ck>;
+                };
+        };
+        gatemp {
+                compatible = "hwspinlock-user";
+                hwlocks = <&hwspinlock 0>,
+                          <&hwspinlock 1>,
+                          <&hwspinlock 2>,
+                          <&hwspinlock 3>,
+                          <&hwspinlock 4>,
+                          <&hwspinlock 5>,
+                          <&hwspinlock 6>,
+                          <&hwspinlock 7>,
+                          <&hwspinlock 8>,
+                          <&hwspinlock 9>,
+                          <&hwspinlock 10>,
+                          <&hwspinlock 11>,
+                          <&hwspinlock 12>,
+                          <&hwspinlock 13>,
+                          <&hwspinlock 14>,
+                          <&hwspinlock 15>,
+                          <&hwspinlock 16>,
+                          <&hwspinlock 17>,
+                          <&hwspinlock 18>,
+                          <&hwspinlock 19>;
+        };
+        sr0 {
+                compatible = "generic-uio";
+                reg = <0x0 0xbfb00000 0x0 0x100000>;
+        };
+};
+&reserved_mem {
+        /* Required by cmem driver used by radio */
+        cmem_radio: cmem@95400000 {
+                reg = <0x0 0x95400000 0x0 0x400000>;
+                no-map;
+                status = "okay";
+        };
+        dsp1_sr0: dsp1_sr0@bfb00000 {
+                reg = <0x0 0xbfb00000 0x0 0x100000>;
+                no-map;
+                status = "okay";
+        };
+};
+&gpio6 {
+        p20 {
+                /* Radio reset GPIO */
+                gpio-hog;
+                gpios = <1 GPIO_ACTIVE_LOW>;
+                output-low;
+                line-name = "radio_rst";
+        };
+};
+&atl {
+        atl1 {
+                bws = <DRA7_ATL_WS_MCASP2_FSX>;
+                aws = <DRA7_ATL_WS_MCASP6_FSX>;
+        };
+};
+&mcasp2 {
+        assigned-clocks = <&mcasp2_ahclkx_mux>;
+        assigned-clock-parents = <&atl_clkin2_ck>;
+        status = "okay";
+        op-mode = <0>;          /* MCASP_IIS_MODE */
+        tdm-slots = <2>;
+        /* 8 serializers */
+        serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */
+                2 0 0 0 0 0 0 0
+        >;
+        shared-dai;
+};
+&mcasp6 {
+        #sound-dai-cells = <0>;
+        assigned-clocks = <&mcasp6_ahclkx_mux>;
+        assigned-clock-parents = <&atl_clkin1_ck>;
+        status = "okay";
+        op-mode = <0>;          /* MCASP_IIS_MODE */
+        tdm-slots = <2>;
+        /* 4 serializer */
+        serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */
+                1 2 0 0
+        >;
+        tx-num-evt = <32>;
+        rx-num-evt = <32>;
+        shared-dai;
+};
+&i2c4 {
+        status = "okay";
+        clock-frequency = <400000>;
+        pcf_jamr3_21: pcf8575@21 {
+                compatible = "nxp,pcf8575";
+                reg = <0x21>;
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+};
+&i2c_p3_exp {
+        tlv320aic3106a: tlv320aic3106@18 {
+                #sound-dai-cells = <0>;
+                compatible = "ti,tlv320aic3106";
+                reg = <0x18>;
+                adc-settle-ms = <40>;
+                ai3x-micbias-vg = <1>;          /* 2.0V */
+                name-prefix = "J3A";
+                status = "okay";
+                /* Regulators */
+                AVDD-supply = <&evm_3v3_sw>;
+                IOVDD-supply = <&evm_3v3_sw>;
+                DRVDD-supply = <&evm_3v3_sw>;
+                DVDD-supply = <&aic_dvdd>;
+        };
+        tlv320aic3106b: tlv320aic3106@19 {
+                #sound-dai-cells = <0>;
+                compatible = "ti,tlv320aic3106";
+                reg = <0x19>;
+                adc-settle-ms = <40>;
+                ai3x-micbias-vg = <1>;          /* 2.0V */
+                name-prefix = "J3B";
+                status = "okay";
+                /* Regulators */
+                AVDD-supply = <&evm_3v3_sw>;
+                IOVDD-supply = <&evm_3v3_sw>;
+                DRVDD-supply = <&evm_3v3_sw>;
+                DVDD-supply = <&aic_dvdd>;
+        };
+        tlv320aic3106c: tlv320aic3106@1a {
+                #sound-dai-cells = <0>;
+                compatible = "ti,tlv320aic3106";
+                reg = <0x1a>;
+                adc-settle-ms = <40>;
+                ai3x-micbias-vg = <1>;          /* 2.0V */
+                name-prefix = "J3C";
+                status = "okay";
+                /* Regulators */
+                AVDD-supply = <&evm_3v3_sw>;
+                IOVDD-supply = <&evm_3v3_sw>;
+                DRVDD-supply = <&evm_3v3_sw>;
+                DVDD-supply = <&aic_dvdd>;
+        };
+        tvp_5158: tvp5158@58 {
+                compatible= "ti,tvp5158";
+                reg = <0x58>;
+                port {
+                        tvp_decoder: endpoint@0 {
+                                pclk-sample = <0>;
+                                channels = <0 2 4 6>;
+                        };
+                };
+        };
+};
+&video_in {
+        endpoint {
+                slave-mode;
+                remote-endpoint = <&tvp_decoder>;
+        };
+};
diff --git a/arch/arm/boot/dts/dra7xx-vision.dtsi b/arch/arm/boot/dts/dra7xx-vision.dtsi
new file mode 100644
index 000000000000..f593a68c8777
--- /dev/null
+++ b/arch/arm/boot/dts/dra7xx-vision.dtsi
@@ -0,0 +1,306 @@
+/*
+ * Copyright (C) 2013 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.
+ */
+/*
+ * Uncomment this define to enable IMI camera support
+ * #define VISION_IMI2_CAMERA
+ */
+/ {
+        aliases {
+                i2c11 = &lvds_des1;
+                i2c12 = &lvds_des2;
+                i2c13 = &lvds_des3;
+                i2c14 = &lvds_des4;
+                i2c15 = &lvds_des5;
+                i2c16 = &lvds_des6;
+        };
+};
+&i2cexp {
+        ovcam_fc: ov10635@30 {
+                compatible = "ovti,ov10635";
+                reg = <0x30>;
+                port {
+                        ovcam: endpoint {
+                                hsync-active = <1>;
+                                vsync-active = <1>;
+                                pclk-sample = <1>;
+                        };
+                };
+        };
+        /*
+         * These are I/O expanders which drive some signals of the deserializer
+         * Each 16bit I/O expander drives two deserializers
+         * The mapping of I/O expanders and deserializer is as follows:-
+         * I/O Expander | Deserializer
+         * -------------+----------------
+         * mcp_ioexp1(0x27)     | lvds_des1(0x60)
+         * mcp_ioexp1(0x27)     | lvds_des2(0x64)
+         * mcp_ioexp2(0x21)     | lvds_des3(0x68)
+         * mcp_ioexp2(0x21)     | lvds_des4(0x6c)
+         * mcp_ioexp3(0x25)     | lvds_des5(0x61)
+         * mcp_ioexp4(0x25)     | lvds_des6(0x69)
+         */
+        mcp_ioexp1: ioexp@27 {
+                compatible = "microchip,mcp23017";
+                reg=<0x27>;
+                gpio-controller;
+                #gpio-cells = <2>;
+                init-dir = <0x0000>;
+#ifdef VISION_IMI2_CAMERA
+                init-val = <0x6B6B>;
+#else
+                init-val = <0x6363>;
+#endif
+                /* 15:pdb, 14:sel, 13:oen, 12:bisten, 11:gpio0, 10-8:mode
+                 *  7:pdb,  6:sel,  5:oen,  4:bisten,  3:gpio0,  2-0:mode
+                 */
+        };
+        mcp_ioexp2: ioexp@21 {
+                compatible = "microchip,mcp23017";
+                reg=<0x21>;
+                gpio-controller;
+                #gpio-cells = <2>;
+                init-dir = <0x0000>;
+#ifdef VISION_IMI2_CAMERA
+                init-val = <0x6B6B>;
+#else
+                init-val = <0x6363>;
+#endif
+                /* 15:pdb, 14:sel, 13:oen, 12:bisten, 11:gpio0, 10-8:mode
+                 *  7:pdb,  6:sel,  5:oen,  4:bisten,  3:gpio0,  2-0:mode
+                 */
+        };
+        mcp_ioexp3: ioexp@25 {
+                compatible = "microchip,mcp23017";
+                reg=<0x25>;
+                gpio-controller;
+                #gpio-cells = <2>;
+                init-dir = <0x0000>;
+#ifdef VISION_IMI2_CAMERA
+                init-val = <0x6B6B>;
+#else
+                init-val = <0x6363>;
+#endif
+                /* 15:pdb, 14:sel, 13:oen, 12:bisten, 11:gpio0, 10-8:mode
+                 *  7:pdb,  6:sel,  5:oen,  4:bisten,  3:gpio0,  2-0:mode
+                 */
+        };
+        lvds_des1: deserializer@60 {
+                compatible = "ti,ds90ub914aq";
+                reg = <0x60>;
+                gpios = <&mcp_ioexp1 7 0>;      /* pdb */
+                #address-cells = <1>;
+                #size-cells = <0>;
+        };
+        lvds_des2: deserializer@64 {
+                compatible = "ti,ds90ub914aq";
+                reg = <0x64>;
+                gpios = <&mcp_ioexp1 15 0>;     /* pdb */
+                #address-cells = <1>;
+                #size-cells = <0>;
+        };
+        lvds_des3: deserializer@68 {
+                compatible = "ti,ds90ub914aq";
+                reg = <0x68>;
+                gpios = <&mcp_ioexp2 7 0>;      /* pdb */
+                #address-cells = <1>;
+                #size-cells = <0>;
+        };
+        lvds_des4: deserializer@6c {
+                compatible = "ti,ds90ub914aq";
+                reg = <0x6c>;
+                gpios = <&mcp_ioexp2 15 0>;     /* pdb */
+                #address-cells = <1>;
+                #size-cells = <0>;
+        };
+        lvds_des5: deserializer@61 {
+                compatible = "ti,ds90ub914aq";
+                reg = <0x61>;
+                gpios = <&mcp_ioexp3 7 0>;      /* pdb */
+                #address-cells = <1>;
+                #size-cells = <0>;
+        };
+        lvds_des6: deserializer@69 {
+                compatible = "ti,ds90ub914aq";
+                reg = <0x69>;
+                gpios = <&mcp_ioexp3 15 0>;     /* pdb */
+                #address-cells = <1>;
+                #size-cells = <0>;
+        };
+};
+&lvds_des1 {
+        ranges = <0x58 0x74>,
+                 <0x30 0x38>;
+        lvds_ser1: serializer@74 {
+                compatible = "ti,ds90ub913aq";
+                reg = <0x58>;
+                slave-mode;
+        };
+        ovcam1: ov10635@38 {
+                compatible = "ovti,ov10635";
+                reg = <0x30>;
+                port {
+                        cam1: endpoint {
+                                hsync-active = <1>;
+                                vsync-active = <1>;
+                                pclk-sample = <0>;
+                        };
+                };
+        };
+};
+&lvds_des2 {
+        ranges = <0x58 0x75>,
+                 <0x30 0x39>;
+        lvds_ser2: serializer@75 {
+                compatible = "ti,ds90ub913aq";
+                reg = <0x58>;
+                slave-mode;
+        };
+        ovcam2: ov10635@39 {
+                compatible = "ovti,ov10635";
+                reg = <0x30>;
+                port {
+                        cam2: endpoint {
+                                hsync-active = <1>;
+                                vsync-active = <1>;
+                                pclk-sample = <0>;
+                        };
+                };
+        };
+};
+&lvds_des3 {
+        ranges = <0x58 0x76>,
+                 <0x30 0x3a>;
+        lvds_ser3: serializer@76 {
+                compatible = "ti,ds90ub913aq";
+                reg = <0x58>;
+                slave-mode;
+        };
+        ovcam3: ov10635@3a {
+                compatible = "ovti,ov10635";
+                reg = <0x30>;
+                port {
+                        cam3: endpoint {
+                                hsync-active = <1>;
+                                vsync-active = <1>;
+                                pclk-sample = <0>;
+                        };
+                };
+        };
+};
+&lvds_des4 {
+        ranges = <0x58 0x77>,
+                 <0x30 0x3b>;
+        lvds_ser4: serializer@77 {
+                compatible = "ti,ds90ub913aq";
+                reg = <0x58>;
+                slave-mode;
+        };
+        ovcam4: ov10635@3b {
+                compatible = "ovti,ov10635";
+                reg = <0x30>;
+                port {
+                        cam4: endpoint {
+                                hsync-active = <1>;
+                                vsync-active = <1>;
+                                pclk-sample = <0>;
+                        };
+                };
+        };
+};
+&lvds_des5 {
+        ranges = <0x58 0x78>,
+                 <0x30 0x3c>;
+        lvds_ser5: serializer@78 {
+                compatible = "ti,ds90ub913aq";
+                reg = <0x58>;
+                slave-mode;
+        };
+        ovcam5: ov10635@3c {
+                compatible = "ovti,ov10635";
+                reg = <0x30>;
+                port {
+                        cam5: endpoint {
+                                hsync-active = <1>;
+                                vsync-active = <1>;
+                                pclk-sample = <0>;
+                        };
+                };
+        };
+};
+&lvds_des6 {
+        ranges = <0x58 0x79>,
+                 <0x30 0x3d>;
+        lvds_ser6: serializer@79 {
+                compatible = "ti,ds90ub913aq";
+                reg = <0x58>;
+                slave-mode;
+        };
+        ovcam6: ov10635@3d {
+                compatible = "ovti,ov10635";
+                reg = <0x30>;
+                port {
+                        cam6: endpoint {
+                                hsync-active = <1>;
+                                vsync-active = <1>;
+                                pclk-sample = <0>;
+                        };
+                };
+        };
+};
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
index b91a2d17a521..389133ce0139 100644
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
@@ -15,6 +15,7 @@
 #define DMA_ERROR_CODE  (~(dma_addr_t)0x0)
 extern struct dma_map_ops arm_dma_ops;
+extern struct dma_map_ops arm_dma_m_ops;
 extern struct dma_map_ops arm_coherent_dma_ops;
 static inline struct dma_map_ops *__generic_dma_ops(struct device *dev)
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 534a60ae282e..9bfd334f6e9b 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -145,6 +145,26 @@ struct dma_map_ops arm_dma_ops = {
 };
 EXPORT_SYMBOL(arm_dma_ops);
+static void *arm_dma_malloc(struct device *dev, size_t size, dma_addr_t *handle,
+                            gfp_t gfp, struct dma_attrs *attrs);
+struct dma_map_ops arm_dma_m_ops = {
+        .alloc                  = arm_dma_malloc,
+        .free                   = arm_dma_free,
+        .mmap                   = arm_dma_mmap,
+        .get_sgtable            = arm_dma_get_sgtable,
+        .map_page               = arm_dma_map_page,
+        .unmap_page             = arm_dma_unmap_page,
+        .map_sg                 = arm_dma_map_sg,
+        .unmap_sg               = arm_dma_unmap_sg,
+        .sync_single_for_cpu    = arm_dma_sync_single_for_cpu,
+        .sync_single_for_device = arm_dma_sync_single_for_device,
+        .sync_sg_for_cpu        = arm_dma_sync_sg_for_cpu,
+        .sync_sg_for_device     = arm_dma_sync_sg_for_device,
+        .set_dma_mask           = arm_dma_set_mask,
+};
+EXPORT_SYMBOL(arm_dma_m_ops);
 static void *arm_coherent_dma_alloc(struct device *dev, size_t size,
        dma_addr_t *handle, gfp_t gfp, struct dma_attrs *attrs);
 static void arm_coherent_dma_free(struct device *dev, size_t size, void *cpu_addr,
@@ -293,7 +313,8 @@ static void __dma_free_buffer(struct page *page, size_t size)
 static void *__alloc_from_contiguous(struct device *dev, size_t size,
                                     pgprot_t prot, struct page **ret_page,
-                                     const void *caller, bool want_vaddr);
+                                     const void *caller, bool want_vaddr,
+                                     bool zero);
 static void *__alloc_remap_buffer(struct device *dev, size_t size, gfp_t gfp,
                                 pgprot_t prot, struct page **ret_page,
@@ -361,7 +382,8 @@ static int __init atomic_pool_init(void)
        if (dev_get_cma_area(NULL))
                ptr = __alloc_from_contiguous(NULL, atomic_pool_size, prot,
-                                              &page, atomic_pool_init, true);
+                                              &page, atomic_pool_init, true,
+                                              true);
        else
                ptr = __alloc_remap_buffer(NULL, atomic_pool_size, gfp, prot,
                                           &page, atomic_pool_init, true);
@@ -530,7 +552,8 @@ static int __free_from_pool(void *start, size_t size)
 static void *__alloc_from_contiguous(struct device *dev, size_t size,
                                     pgprot_t prot, struct page **ret_page,
-                                     const void *caller, bool want_vaddr)
+                                     const void *caller, bool want_vaddr,
+                                     bool zero)
 {
        unsigned long order = get_order(size);
        size_t count = size >> PAGE_SHIFT;
@@ -541,7 +564,8 @@ static void *__alloc_from_contiguous(struct device *dev, size_t size,
        if (!page)
                return NULL;
-        __dma_clear_buffer(page, size);
+        if (zero)
+                __dma_clear_buffer(page, size);
        if (!want_vaddr)
                goto out;
@@ -614,7 +638,8 @@ static void *__alloc_simple_buffer(struct device *dev, size_t size, gfp_t gfp,
 static void *__dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
                         gfp_t gfp, pgprot_t prot, bool is_coherent,
-                         struct dma_attrs *attrs, const void *caller)
+                         struct dma_attrs *attrs, const void *caller,
+                         bool zero)
 {
        u64 mask = get_coherent_dma_mask(dev);
        struct page *page = NULL;
@@ -653,7 +678,7 @@ static void *__dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
                addr = __alloc_simple_buffer(dev, size, gfp, &page);
        else if (dev_get_cma_area(dev) && (gfp & __GFP_DIRECT_RECLAIM))
                addr = __alloc_from_contiguous(dev, size, prot, &page,
-                                               caller, want_vaddr);
+                                               caller, want_vaddr, zero);
        else if (is_coherent)
                addr = __alloc_simple_buffer(dev, size, gfp, &page);
        else if (!gfpflags_allow_blocking(gfp))
@@ -678,14 +703,30 @@ void *arm_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
        pgprot_t prot = __get_dma_pgprot(attrs, PAGE_KERNEL);
        return __dma_alloc(dev, size, handle, gfp, prot, false,
-                           attrs, __builtin_return_address(0));
+                           attrs, __builtin_return_address(0),
+                           true);
 }
+/*
+ * Same as arm_dma_alloc except don't zero memory on alloc
+ */
+void *arm_dma_malloc(struct device *dev, size_t size, dma_addr_t *handle,
+                    gfp_t gfp, struct dma_attrs *attrs)
+{
+        pgprot_t prot = __get_dma_pgprot(attrs, PAGE_KERNEL);
+        return __dma_alloc(dev, size, handle, gfp, prot, false,
+                           attrs, __builtin_return_address(0),
+                           false);
+}
 static void *arm_coherent_dma_alloc(struct device *dev, size_t size,
        dma_addr_t *handle, gfp_t gfp, struct dma_attrs *attrs)
 {
        return __dma_alloc(dev, size, handle, gfp, PAGE_KERNEL, true,
-                           attrs, __builtin_return_address(0));
+                           attrs, __builtin_return_address(0),
+                           true);
 }
 static int __arm_dma_mmap(struct device *dev, struct vm_area_struct *vma,
diff --git a/arch/arm/mm/proc-syms.c b/arch/arm/mm/proc-syms.c
index 054b491ff764..778e32c97913 100644
--- a/arch/arm/mm/proc-syms.c
+++ b/arch/arm/mm/proc-syms.c
@@ -30,6 +30,7 @@ EXPORT_SYMBOL(__cpuc_flush_user_all);
 EXPORT_SYMBOL(__cpuc_flush_user_range);
 EXPORT_SYMBOL(__cpuc_coherent_kern_range);
 EXPORT_SYMBOL(__cpuc_flush_dcache_area);
+EXPORT_SYMBOL(dmac_flush_range);
 #else
 EXPORT_SYMBOL(cpu_cache);
 #endif
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index 4c48b52c4a7c..0f094594eed4 100644
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -94,6 +94,13 @@ static void omap_dm_timer_write_reg(struct omap_dm_timer *timer, u32 reg,
 static void omap_timer_restore_context(struct omap_dm_timer *timer)
 {
+        /*
+         * Do not restore the context during late attach. Kernel data
+         * structure is not in sync with the register settings of the timer.
+         */
+        if (timer->late_attach)
+                return;
        omap_dm_timer_write_reg(timer, OMAP_TIMER_WAKEUP_EN_REG,
                                timer->context.twer);
        omap_dm_timer_write_reg(timer, OMAP_TIMER_COUNTER_REG,
@@ -167,6 +174,14 @@ static int omap_dm_timer_prepare(struct omap_dm_timer *timer)
        __omap_dm_timer_enable_posted(timer);
        omap_dm_timer_disable(timer);
+        /*
+         * During late attach, do not set the timer source during prepare
+         * as the timer might be clocked from a different source. It will
+         * be set properly from remoteproc.
+         */
+        if (timer->late_attach)
+                return 0;
        return omap_dm_timer_set_source(timer, OMAP_TIMER_SRC_32_KHZ);
 }
@@ -451,6 +466,16 @@ int omap_dm_timer_start(struct omap_dm_timer *timer)
        /* Save the context */
        timer->context.tclr = l;
+        /*
+         * Now that timer has been started, call pm_runtime_put_noidle to
+         * balance the pm_runtime device usage count to the proper value as
+         * the regular case, and reset the late_attach flag.
+         */
+        if (timer->late_attach)
+                pm_runtime_put_noidle(&timer->pdev->dev);
+        timer->late_attach = 0;
        return 0;
 }
 EXPORT_SYMBOL_GPL(omap_dm_timer_start);
@@ -556,10 +581,18 @@ int omap_dm_timer_set_load(struct omap_dm_timer *timer, int autoreload,
                l |= OMAP_TIMER_CTRL_AR;
        else
                l &= ~OMAP_TIMER_CTRL_AR;
-        omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG, l);
-        omap_dm_timer_write_reg(timer, OMAP_TIMER_LOAD_REG, load);
-        omap_dm_timer_write_reg(timer, OMAP_TIMER_TRIGGER_REG, 0);
+        /*
+         * If late attach is enabled, do not modify the dmtimer registers.
+         * The registers would have been configured already.
+         */
+        if (!timer->late_attach) {
+                omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG, l);
+                omap_dm_timer_write_reg(timer, OMAP_TIMER_LOAD_REG, load);
+                omap_dm_timer_write_reg(timer, OMAP_TIMER_TRIGGER_REG, 0);
+        }
        /* Save the context */
        timer->context.tclr = l;
        timer->context.tldr = load;
@@ -582,13 +615,21 @@ int omap_dm_timer_set_load_start(struct omap_dm_timer *timer, int autoreload,
        l = omap_dm_timer_read_reg(timer, OMAP_TIMER_CTRL_REG);
        if (autoreload) {
                l |= OMAP_TIMER_CTRL_AR;
-                omap_dm_timer_write_reg(timer, OMAP_TIMER_LOAD_REG, load);
+                /*
+                 * If late attach is enabled, do not modify the dmtimer
+                 * registers. The registers would have been configured
+                 * already.
+                 */
+                if (!timer->late_attach)
+                        omap_dm_timer_write_reg(timer, OMAP_TIMER_LOAD_REG,
+                                                load);
        } else {
                l &= ~OMAP_TIMER_CTRL_AR;
        }
        l |= OMAP_TIMER_CTRL_ST;
-        __omap_dm_timer_load_start(timer, l, load, timer->posted);
+        if (!timer->late_attach)
+                __omap_dm_timer_load_start(timer, l, load, timer->posted);
        /* Save the context */
        timer->context.tclr = l;
@@ -807,6 +848,7 @@ static int omap_dm_timer_probe(struct platform_device *pdev)
        const struct of_device_id *match;
        const struct dmtimer_platform_data *pdata;
        int ret;
+        struct property *prop;
        match = of_match_device(of_match_ptr(omap_timer_match), dev);
        pdata = match ? match->data : dev->platform_data;
@@ -848,6 +890,17 @@ static int omap_dm_timer_probe(struct platform_device *pdev)
                        timer->capability |= OMAP_TIMER_HAS_PWM;
                if (of_find_property(dev->of_node, "ti,timer-secure", NULL))
                        timer->capability |= OMAP_TIMER_SECURE;
+                prop = of_find_property(dev->of_node, "ti,late-attach", NULL);
+                if (prop) {
+                        timer->late_attach = 1;
+                        /*
+                         * Clear the late attach property in device tree for
+                         * subsequent probes.
+                         */
+                        if (of_remove_property(dev->of_node, prop))
+                                dev_err(dev, "Unable to remove late-attach property\n");
+                }
        } else {
                timer->id = pdev->id;
                timer->capability = pdata->timer_capability;
@@ -875,6 +928,14 @@ static int omap_dm_timer_probe(struct platform_device *pdev)
                        goto err_get_sync;
                }
                __omap_dm_timer_init_regs(timer);
+                /*
+                 * Increase the pm_runtime usage count and prevent kernel power
+                 * management from idling or disabling the timer.
+                 */
+                if (timer->late_attach)
+                        pm_runtime_get_noresume(dev);
                pm_runtime_put(dev);
        }
@@ -912,6 +973,12 @@ static int omap_dm_timer_remove(struct platform_device *pdev)
                if (!strcmp(dev_name(&timer->pdev->dev),
                            dev_name(&pdev->dev))) {
                        list_del(&timer->node);
+                        /*
+                         * Reset device usage counter if late_attach is still
+                         * set
+                         */
+                        if (timer->late_attach)
+                                pm_runtime_put_noidle(&timer->pdev->dev);
                        ret = 0;
                        break;
                }
diff --git a/arch/arm/plat-omap/include/plat/dmtimer.h b/arch/arm/plat-omap/include/plat/dmtimer.h
index dd79f3005cdf..3f2653eca46c 100644
--- a/arch/arm/plat-omap/include/plat/dmtimer.h
+++ b/arch/arm/plat-omap/include/plat/dmtimer.h
@@ -122,6 +122,7 @@ struct omap_dm_timer {
        u32 errata;
        struct platform_device *pdev;
        struct list_head node;
+        u32 late_attach;
 };
 int omap_dm_timer_reserve_systimer(int id);
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 5c74ad90a447..049335584e0c 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -581,6 +581,7 @@ source kernel/Kconfig.preempt
 source kernel/Kconfig.hz
 config ARCH_SUPPORTS_DEBUG_PAGEALLOC
+        depends on !HIBERNATION
        def_bool y
 config ARCH_HAS_HOLES_MEMORYMODEL
@@ -630,6 +631,27 @@ config SECCOMP
          and the task is only allowed to execute a few safe syscalls
          defined by each seccomp mode.
+config KEXEC
+        depends on PM_SLEEP_SMP
+        select KEXEC_CORE
+        bool "kexec system call"
+        ---help---
+          kexec is a system call that implements the ability to shutdown your
+          current kernel, and to start another kernel.  It is like a reboot
+          but it is independent of the system firmware.   And like a reboot
+          you can start any kernel with it, not just Linux.
+config CRASH_DUMP
+        bool "Build kdump crash kernel"
+        help
+          Generate crash dump after being started by kexec. This should
+          be normally only set in special crash dump kernels which are
+          loaded in the main kernel with kexec-tools into a specially
+          reserved region and then later executed after a crash by
+          kdump/kexec.
+          For more details see Documentation/kdump/kdump.txt
 config XEN_DOM0
        def_bool y
        depends on XEN
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 79717faf2161..7dc5e58f7b7a 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -58,6 +58,8 @@ CONFIG_PREEMPT=y
 CONFIG_KSM=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_CMA=y
+CONFIG_KEXEC=y
+CONFIG_CRASH_DUMP=y
 CONFIG_CMDLINE="console=ttyAMA0"
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_COMPAT=y
diff --git a/arch/arm64/include/asm/cacheflush.h b/arch/arm64/include/asm/cacheflush.h
index 22dda613f9c9..22aabdeacc24 100644
--- a/arch/arm64/include/asm/cacheflush.h
+++ b/arch/arm64/include/asm/cacheflush.h
@@ -155,5 +155,6 @@ int set_memory_ro(unsigned long addr, int numpages);
 int set_memory_rw(unsigned long addr, int numpages);
 int set_memory_x(unsigned long addr, int numpages);
 int set_memory_nx(unsigned long addr, int numpages);
+int set_memory_valid(unsigned long addr, unsigned long size, int enable);
 #endif
diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h
index 6818fbec44c6..8e1f826caf99 100644
--- a/arch/arm64/include/asm/cpufeature.h
+++ b/arch/arm64/include/asm/cpufeature.h
@@ -33,6 +33,7 @@
 #define ARM64_HAS_NO_HW_PREFETCH                8
 #define ARM64_HAS_UAO                           9
 #define ARM64_ALT_PAN_NOT_UAO                   10
 #define ARM64_WORKAROUND_CAVIUM_27456           11
 #define ARM64_HAS_VIRT_HOST_EXTN                12
 #define ARM64_NCAPS                             13
diff --git a/arch/arm64/include/asm/hardirq.h b/arch/arm64/include/asm/hardirq.h
index 8740297dac77..1473fc2f7ab7 100644
--- a/arch/arm64/include/asm/hardirq.h
+++ b/arch/arm64/include/asm/hardirq.h
@@ -20,7 +20,7 @@
 #include <linux/threads.h>
 #include <asm/irq.h>
-#define NR_IPI  6
+#define NR_IPI  7
 typedef struct {
        unsigned int __softirq_pending;
diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h
new file mode 100644
index 000000000000..e17f0529a882
--- /dev/null
+++ b/arch/arm64/include/asm/kexec.h
@@ -0,0 +1,98 @@
+/*
+ * kexec for arm64
+ *
+ * Copyright (C) Linaro.
+ * Copyright (C) Huawei Futurewei Technologies.
+ *
+ * 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 _ARM64_KEXEC_H
+#define _ARM64_KEXEC_H
+/* Maximum physical address we can use pages from */
+#define KEXEC_SOURCE_MEMORY_LIMIT (-1UL)
+/* Maximum address we can reach in physical address mode */
+#define KEXEC_DESTINATION_MEMORY_LIMIT (-1UL)
+/* Maximum address we can use for the control code buffer */
+#define KEXEC_CONTROL_MEMORY_LIMIT (-1UL)
+#define KEXEC_CONTROL_PAGE_SIZE 4096
+#define KEXEC_ARCH KEXEC_ARCH_AARCH64
+#ifndef __ASSEMBLY__
+/**
+ * crash_setup_regs() - save registers for the panic kernel
+ *
+ * @newregs: registers are saved here
+ * @oldregs: registers to be saved (may be %NULL)
+ */
+static inline void crash_setup_regs(struct pt_regs *newregs,
+                                    struct pt_regs *oldregs)
+{
+        if (oldregs) {
+                memcpy(newregs, oldregs, sizeof(*newregs));
+        } else {
+                u64 tmp1, tmp2;
+                __asm__ __volatile__ (
+                        "stp     x0,   x1, [%2, #16 *  0]\n"
+                        "stp     x2,   x3, [%2, #16 *  1]\n"
+                        "stp     x4,   x5, [%2, #16 *  2]\n"
+                        "stp     x6,   x7, [%2, #16 *  3]\n"
+                        "stp     x8,   x9, [%2, #16 *  4]\n"
+                        "stp    x10,  x11, [%2, #16 *  5]\n"
+                        "stp    x12,  x13, [%2, #16 *  6]\n"
+                        "stp    x14,  x15, [%2, #16 *  7]\n"
+                        "stp    x16,  x17, [%2, #16 *  8]\n"
+                        "stp    x18,  x19, [%2, #16 *  9]\n"
+                        "stp    x20,  x21, [%2, #16 * 10]\n"
+                        "stp    x22,  x23, [%2, #16 * 11]\n"
+                        "stp    x24,  x25, [%2, #16 * 12]\n"
+                        "stp    x26,  x27, [%2, #16 * 13]\n"
+                        "stp    x28,  x29, [%2, #16 * 14]\n"
+                        "mov     %0,  sp\n"
+                        "stp    x30,  %0,  [%2, #16 * 15]\n"
+                        "/* faked current PSTATE */\n"
+                        "mrs     %0, CurrentEL\n"
+                        "mrs     %1, SPSEL\n"
+                        "orr     %0, %0, %1\n"
+                        "mrs     %1, DAIF\n"
+                        "orr     %0, %0, %1\n"
+                        "mrs     %1, NZCV\n"
+                        "orr     %0, %0, %1\n"
+                        /* pc */
+                        "adr     %1, 1f\n"
+                "1:\n"
+                        "stp     %1, %0,   [%2, #16 * 16]\n"
+                        : "=&r" (tmp1), "=&r" (tmp2)
+                        : "r" (newregs)
+                        : "memory"
+                );
+        }
+}
+#if defined(CONFIG_KEXEC_CORE) && defined(CONFIG_HIBERNATION)
+extern bool crash_is_nosave(unsigned long pfn);
+extern void crash_prepare_suspend(void);
+extern void crash_post_resume(void);
+#else
+static inline bool crash_is_nosave(unsigned long pfn) {return false; }
+static inline void crash_prepare_suspend(void) {}
+static inline void crash_post_resume(void) {}
+#endif
+#endif /* __ASSEMBLY__ */
+#endif
diff --git a/arch/arm64/include/asm/mmu.h b/arch/arm64/include/asm/mmu.h
index 990124a67eeb..5472251c8e6c 100644
--- a/arch/arm64/include/asm/mmu.h
+++ b/arch/arm64/include/asm/mmu.h
@@ -33,7 +33,7 @@ extern void __iomem *early_io_map(phys_addr_t phys, unsigned long virt);
 extern void init_mem_pgprot(void);
 extern void create_pgd_mapping(struct mm_struct *mm, phys_addr_t phys,
                               unsigned long virt, phys_addr_t size,
-                               pgprot_t prot);
+                               pgprot_t prot, bool allow_block_mappings);
 extern void *fixmap_remap_fdt(phys_addr_t dt_phys);
 #endif
diff --git a/arch/arm64/include/asm/smp.h b/arch/arm64/include/asm/smp.h
index 2013a4dc5124..1d3ff7e4a6c2 100644
--- a/arch/arm64/include/asm/smp.h
+++ b/arch/arm64/include/asm/smp.h
@@ -16,6 +16,19 @@
 #ifndef __ASM_SMP_H
 #define __ASM_SMP_H
+/* Values for secondary_data.status */
+#define CPU_MMU_OFF             (-1)
+#define CPU_BOOT_SUCCESS        (0)
+/* The cpu invoked ops->cpu_die, synchronise it with cpu_kill */
+#define CPU_KILL_ME             (1)
+/* The cpu couldn't die gracefully and is looping in the kernel */
+#define CPU_STUCK_IN_KERNEL     (2)
+/* Fatal system error detected by secondary CPU, crash the system */
+#define CPU_PANIC_KERNEL        (3)
+#ifndef __ASSEMBLY__
 #include <linux/threads.h>
 #include <linux/cpumask.h>
 #include <linux/thread_info.h>
@@ -54,11 +67,17 @@ asmlinkage void secondary_start_kernel(void);
 /*
 * Initial data for bringing up a secondary CPU.
+ * @stack  - sp for the secondary CPU
+ * @status - Result passed back from the secondary CPU to
+ *           indicate failure.
 */
 struct secondary_data {
        void *stack;
+        long status;
 };
 extern struct secondary_data secondary_data;
+extern long __early_cpu_boot_status;
 extern void secondary_entry(void);
 extern void arch_send_call_function_single_ipi(int cpu);
@@ -77,5 +96,38 @@ extern int __cpu_disable(void);
 extern void __cpu_die(unsigned int cpu);
 extern void cpu_die(void);
+extern void cpu_die_early(void);
+static inline void cpu_park_loop(void)
+{
+        for (;;) {
+                wfe();
+                wfi();
+        }
+}
+static inline void update_cpu_boot_status(int val)
+{
+        WRITE_ONCE(secondary_data.status, val);
+        /* Ensure the visibility of the status update */
+        dsb(ishst);
+}
+/*
+ * If a secondary CPU enters the kernel but fails to come online,
+ * (e.g. due to mismatched features), and cannot exit the kernel,
+ * we increment cpus_stuck_in_kernel and leave the CPU in a
+ * quiesecent loop within the kernel text. The memory containing
+ * this loop must not be re-used for anything else as the 'stuck'
+ * core is executing it.
+ *
+ * This function is used to inhibit features like kexec and hibernate.
+ */
+bool cpus_are_stuck_in_kernel(void);
+extern void smp_send_crash_stop(void);
+extern bool smp_crash_stop_failed(void);
+#endif /* ifndef __ASSEMBLY__ */
 #endif /* ifndef __ASM_SMP_H */
diff --git a/arch/arm64/include/asm/virt.h b/arch/arm64/include/asm/virt.h
index 06e6a5238c4c..e6c27b8ce311 100644
--- a/arch/arm64/include/asm/virt.h
+++ b/arch/arm64/include/asm/virt.h
@@ -34,6 +34,11 @@
 */
 #define HVC_SET_VECTORS 1
+/*
+ * HVC_SOFT_RESTART - CPU soft reset, used by the cpu_soft_restart routine.
+ */
+#define HVC_SOFT_RESTART 2
 #define BOOT_CPU_MODE_EL1       (0xe11)
 #define BOOT_CPU_MODE_EL2       (0xe12)
diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile
index 4e8a30b7e949..01c0b3881f88 100644
--- a/arch/arm64/kernel/Makefile
+++ b/arch/arm64/kernel/Makefile
@@ -44,7 +44,9 @@ arm64-obj-$(CONFIG_ACPI)		+= acpi.o
 arm64-obj-$(CONFIG_RANDOMIZE_BASE)      += kaslr.o
 arm64-obj-$(CONFIG_HIBERNATION)         += hibernate.o hibernate-asm.o
 arm64-obj-$(CONFIG_ARM64_ACPI_PARKING_PROTOCOL) += acpi_parking_protocol.o
-arm64-obj-$(CONFIG_PARAVIRT)            += paravirt.o
+arm64-obj-$(CONFIG_KEXEC)               += machine_kexec.o relocate_kernel.o    \
+                                           cpu-reset.o
+arm64-obj-$(CONFIG_CRASH_DUMP)          += crash_dump.o
 obj-y                                   += $(arm64-obj-y) vdso/ probes/
 obj-m                                   += $(arm64-obj-m)
diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c
index 350c0e99fc6b..7a3f34b15fb0 100644
--- a/arch/arm64/kernel/asm-offsets.c
+++ b/arch/arm64/kernel/asm-offsets.c
@@ -124,6 +124,8 @@ int main(void)
  DEFINE(TZ_MINWEST,            offsetof(struct timezone, tz_minuteswest));
  DEFINE(TZ_DSTTIME,            offsetof(struct timezone, tz_dsttime));
  BLANK();
+  DEFINE(CPU_BOOT_STACK,        offsetof(struct secondary_data, stack));
+  BLANK();
 #ifdef CONFIG_KVM_ARM_HOST
  DEFINE(VCPU_CONTEXT,          offsetof(struct kvm_vcpu, arch.ctxt));
  DEFINE(CPU_GP_REGS,           offsetof(struct kvm_cpu_context, gp_regs));
diff --git a/arch/arm64/kernel/cpu-reset.S b/arch/arm64/kernel/cpu-reset.S
new file mode 100644
index 000000000000..65f42d257414
--- /dev/null
+++ b/arch/arm64/kernel/cpu-reset.S
@@ -0,0 +1,54 @@
+/*
+ * CPU reset routines
+ *
+ * Copyright (C) 2001 Deep Blue Solutions Ltd.
+ * Copyright (C) 2012 ARM Ltd.
+ * Copyright (C) 2015 Huawei Futurewei Technologies.
+ *
+ * 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.
+ */
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+#include <asm/sysreg.h>
+#include <asm/virt.h>
+.text
+.pushsection    .idmap.text, "ax"
+/*
+ * __cpu_soft_restart(el2_switch, entry, arg0, arg1, arg2) - Helper for
+ * cpu_soft_restart.
+ *
+ * @el2_switch: Flag to indicate a swich to EL2 is needed.
+ * @entry: Location to jump to for soft reset.
+ * arg0: First argument passed to @entry.
+ * arg1: Second argument passed to @entry.
+ * arg2: Third argument passed to @entry.
+ *
+ * Put the CPU into the same state as it would be if it had been reset, and
+ * branch to what would be the reset vector. It must be executed with the
+ * flat identity mapping.
+ */
+ENTRY(__cpu_soft_restart)
+        /* Clear sctlr_el1 flags. */
+        mrs     x12, sctlr_el1
+        ldr     x13, =SCTLR_ELx_FLAGS
+        bic     x12, x12, x13
+        msr     sctlr_el1, x12
+        isb
+        cbz     x0, 1f                          // el2_switch?
+        mov     x0, #HVC_SOFT_RESTART
+        hvc     #0                              // no return
+1:      mov     x18, x1                         // entry
+        mov     x0, x2                          // arg0
+        mov     x1, x3                          // arg1
+        mov     x2, x4                          // arg2
+        br      x18
+ENDPROC(__cpu_soft_restart)
+.popsection
diff --git a/arch/arm64/kernel/cpu-reset.h b/arch/arm64/kernel/cpu-reset.h
new file mode 100644
index 000000000000..d4e9ecb264f0
--- /dev/null
+++ b/arch/arm64/kernel/cpu-reset.h
@@ -0,0 +1,34 @@
+/*
+ * CPU reset routines
+ *
+ * Copyright (C) 2015 Huawei Futurewei Technologies.
+ *
+ * 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 _ARM64_CPU_RESET_H
+#define _ARM64_CPU_RESET_H
+#include <asm/virt.h>
+void __cpu_soft_restart(unsigned long el2_switch, unsigned long entry,
+        unsigned long arg0, unsigned long arg1, unsigned long arg2);
+static inline void __noreturn cpu_soft_restart(unsigned long el2_switch,
+        unsigned long entry, unsigned long arg0, unsigned long arg1,
+        unsigned long arg2)
+{
+        typeof(__cpu_soft_restart) *restart;
+        el2_switch = el2_switch && !is_kernel_in_hyp_mode() &&
+                is_hyp_mode_available();
+        restart = (void *)virt_to_phys(__cpu_soft_restart);
+        cpu_install_idmap();
+        restart(el2_switch, entry, arg0, arg1, arg2);
+        unreachable();
+}
+#endif
diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index cdf1dca64133..53fab76d3c39 100644
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -895,28 +895,6 @@ static u64 __raw_read_system_reg(u32 sys_id)
 }
 /*
- * Park the CPU which doesn't have the capability as advertised
- * by the system.
- */
-static void fail_incapable_cpu(char *cap_type,
-                                 const struct arm64_cpu_capabilities *cap)
-{
-        int cpu = smp_processor_id();
-        pr_crit("CPU%d: missing %s : %s\n", cpu, cap_type, cap->desc);
-        /* Mark this CPU absent */
-        set_cpu_present(cpu, 0);
-        /* Check if we can park ourselves */
-        if (cpu_ops[cpu] && cpu_ops[cpu]->cpu_die)
-                cpu_ops[cpu]->cpu_die(cpu);
-        asm(
-        "1:     wfe\n"
-        "       wfi\n"
-        "       b       1b");
-}
-/*
 * Run through the enabled system capabilities and enable() it on this CPU.
 * The capabilities were decided based on the available CPUs at the boot time.
 * Any new CPU should match the system wide status of the capability. If the
@@ -944,8 +922,11 @@ void verify_local_cpu_capabilities(void)
                 * If the new CPU misses an advertised feature, we cannot proceed
                 * further, park the cpu.
                 */
-                if (!feature_matches(__raw_read_system_reg(caps[i].sys_reg), &caps[i]))
+                if (!feature_matches(__raw_read_system_reg(caps[i].sys_reg), &caps[i])) {
-                        fail_incapable_cpu("arm64_features", &caps[i]);
+                        pr_crit("CPU%d: missing feature: %s\n",
+                                        smp_processor_id(), caps[i].desc);
+                        cpu_die_early();
+                }
                if (caps[i].enable)
                        caps[i].enable(NULL);
        }
@@ -953,8 +934,11 @@ void verify_local_cpu_capabilities(void)
        for (i = 0, caps = arm64_hwcaps; caps[i].matches; i++) {
                if (!cpus_have_hwcap(&caps[i]))
                        continue;
-                if (!feature_matches(__raw_read_system_reg(caps[i].sys_reg), &caps[i]))
+                if (!feature_matches(__raw_read_system_reg(caps[i].sys_reg), &caps[i])) {
-                        fail_incapable_cpu("arm64_hwcaps", &caps[i]);
+                        pr_crit("CPU%d: missing HWCAP: %s\n",
+                                        smp_processor_id(), caps[i].desc);
+                        cpu_die_early();
+                }
        }
 }
diff --git a/arch/arm64/kernel/crash_dump.c b/arch/arm64/kernel/crash_dump.c
new file mode 100644
index 000000000000..f46d57c31443
--- /dev/null
+++ b/arch/arm64/kernel/crash_dump.c
@@ -0,0 +1,71 @@
+/*
+ * Routines for doing kexec-based kdump
+ *
+ * Copyright (C) 2017 Linaro Limited
+ * Author: AKASHI Takahiro <takahiro.akashi@linaro.org>
+ *
+ * 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.
+ */
+#include <linux/crash_dump.h>
+#include <linux/errno.h>
+#include <linux/io.h>
+#include <linux/memblock.h>
+#include <linux/uaccess.h>
+#include <asm/memory.h>
+/**
+ * copy_oldmem_page() - copy one page from old kernel memory
+ * @pfn: page frame number to be copied
+ * @buf: buffer where the copied page is placed
+ * @csize: number of bytes to copy
+ * @offset: offset in bytes into the page
+ * @userbuf: if set, @buf is in a user address space
+ *
+ * This function copies one page from old kernel memory into buffer pointed by
+ * @buf. If @buf is in userspace, set @userbuf to %1. Returns number of bytes
+ * copied or negative error in case of failure.
+ */
+ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
+                         size_t csize, unsigned long offset,
+                         int userbuf)
+{
+        void *vaddr;
+        if (!csize)
+                return 0;
+        vaddr = memremap(__pfn_to_phys(pfn), PAGE_SIZE, MEMREMAP_WB);
+        if (!vaddr)
+                return -ENOMEM;
+        if (userbuf) {
+                if (copy_to_user((char __user *)buf, vaddr + offset, csize)) {
+                        memunmap(vaddr);
+                        return -EFAULT;
+                }
+        } else {
+                memcpy(buf, vaddr + offset, csize);
+        }
+        memunmap(vaddr);
+        return csize;
+}
+/**
+ * elfcorehdr_read - read from ELF core header
+ * @buf: buffer where the data is placed
+ * @csize: number of bytes to read
+ * @ppos: address in the memory
+ *
+ * This function reads @count bytes from elf core header which exists
+ * on crash dump kernel's memory.
+ */
+ssize_t elfcorehdr_read(char *buf, size_t count, u64 *ppos)
+{
+        memcpy(buf, phys_to_virt((phys_addr_t)*ppos), count);
+        return count;
+}
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
index 8cfd5ab37743..9c2e1564e9a7 100644
--- a/arch/arm64/kernel/head.S
+++ b/arch/arm64/kernel/head.S
@@ -36,6 +36,7 @@
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
+#include <asm/smp.h>
 #include <asm/sysreg.h>
 #include <asm/thread_info.h>
 #include <asm/virt.h>
@@ -643,7 +644,8 @@ __secondary_switched:
        msr     vbar_el1, x5
        isb
-        ldr_l   x0, secondary_data              // get secondary_data.stack
+        adr_l   x0, secondary_data
+        ldr     x0, [x0, #CPU_BOOT_STACK]       // get secondary_data.stack
        mov     sp, x0
        and     x0, x0, #~(THREAD_SIZE - 1)
        msr     sp_el0, x0                      // save thread_info
@@ -652,6 +654,29 @@ __secondary_switched:
 ENDPROC(__secondary_switched)
 /*
+ * The booting CPU updates the failed status @__early_cpu_boot_status,
+ * with MMU turned off.
+ *
+ * update_early_cpu_boot_status tmp, status
+ *  - Corrupts tmp1, tmp2
+ *  - Writes 'status' to __early_cpu_boot_status and makes sure
+ *    it is committed to memory.
+ */
+        .macro  update_early_cpu_boot_status status, tmp1, tmp2
+        mov     \tmp2, #\status
+        str_l   \tmp2, __early_cpu_boot_status, \tmp1
+        dmb     sy
+        dc      ivac, \tmp1                     // Invalidate potentially stale cache line
+        .endm
+        .pushsection    .data..cacheline_aligned
+        .align  L1_CACHE_SHIFT
+ENTRY(__early_cpu_boot_status)
+        .long   0
+        .popsection
+/*
 * Enable the MMU.
 *
 *  x0  = SCTLR_EL1 value for turning on the MMU.
@@ -669,6 +694,7 @@ ENTRY(__enable_mmu)
        ubfx    x2, x1, #ID_AA64MMFR0_TGRAN_SHIFT, 4
        cmp     x2, #ID_AA64MMFR0_TGRAN_SUPPORTED
        b.ne    __no_granule_support
+        update_early_cpu_boot_status 0, x1, x2
        msr     ttbr0_el1, x25                  // load TTBR0
        msr     ttbr1_el1, x26                  // load TTBR1
        isb
@@ -708,8 +734,12 @@ ENTRY(__enable_mmu)
 ENDPROC(__enable_mmu)
 __no_granule_support:
+        /* Indicate that this CPU can't boot and is stuck in the kernel */
+        update_early_cpu_boot_status CPU_STUCK_IN_KERNEL, x1, x2
+1:
        wfe
-        b __no_granule_support
+        wfi
+        b 1b
 ENDPROC(__no_granule_support)
 __primary_switch:
diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.c
index 6dd18140ebb8..35a33d705536 100644
--- a/arch/arm64/kernel/hibernate.c
+++ b/arch/arm64/kernel/hibernate.c
@@ -27,6 +27,7 @@
 #include <asm/barrier.h>
 #include <asm/cacheflush.h>
 #include <asm/irqflags.h>
+#include <asm/kexec.h>
 #include <asm/memory.h>
 #include <asm/mmu_context.h>
 #include <asm/pgalloc.h>
@@ -100,7 +101,8 @@ int pfn_is_nosave(unsigned long pfn)
        unsigned long nosave_begin_pfn = virt_to_pfn(&__nosave_begin);
        unsigned long nosave_end_pfn = virt_to_pfn(&__nosave_end - 1);
-        return (pfn >= nosave_begin_pfn) && (pfn <= nosave_end_pfn);
+        return ((pfn >= nosave_begin_pfn) && (pfn <= nosave_end_pfn)) ||
+                crash_is_nosave(pfn);
 }
 void notrace save_processor_state(void)
@@ -250,11 +252,17 @@ int swsusp_arch_suspend(void)
        local_dbg_save(flags);
        if (__cpu_suspend_enter(&state)) {
+                /* make the crash dump kernel image visible/saveable */
+                crash_prepare_suspend();
                ret = swsusp_save();
        } else {
                /* Clean kernel to PoC for secondary core startup */
                __flush_dcache_area(LMADDR(KERNEL_START), KERNEL_END - KERNEL_START);
+                /* make the crash dump kernel image protected again */
+                crash_post_resume();
                /*
                 * Tell the hibernation core that we've just restored
                 * the memory
diff --git a/arch/arm64/kernel/hyp-stub.S b/arch/arm64/kernel/hyp-stub.S
index 8727f4490772..d3b5f75e652e 100644
--- a/arch/arm64/kernel/hyp-stub.S
+++ b/arch/arm64/kernel/hyp-stub.S
@@ -71,8 +71,16 @@ el1_sync:
        msr     vbar_el2, x1
        b       9f
+2:      cmp     x0, #HVC_SOFT_RESTART
+        b.ne    3f
+        mov     x0, x2
+        mov     x2, x4
+        mov     x4, x1
+        mov     x1, x3
+        br      x4                              // no return
        /* Someone called kvm_call_hyp() against the hyp-stub... */
-2:      mov     x0, #ARM_EXCEPTION_HYP_GONE
+3:      mov     x0, #ARM_EXCEPTION_HYP_GONE
 9:      eret
 ENDPROC(el1_sync)
diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c
new file mode 100644
index 000000000000..481f54a866c5
--- /dev/null
+++ b/arch/arm64/kernel/machine_kexec.c
@@ -0,0 +1,364 @@
+/*
+ * kexec for arm64
+ *
+ * Copyright (C) Linaro.
+ * Copyright (C) Huawei Futurewei Technologies.
+ *
+ * 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.
+ */
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/kernel.h>
+#include <linux/kexec.h>
+#include <linux/page-flags.h>
+#include <linux/smp.h>
+#include <asm/cacheflush.h>
+#include <asm/cpu_ops.h>
+#include <asm/memory.h>
+#include <asm/mmu.h>
+#include <asm/mmu_context.h>
+#include <asm/page.h>
+#include "cpu-reset.h"
+/* Global variables for the arm64_relocate_new_kernel routine. */
+extern const unsigned char arm64_relocate_new_kernel[];
+extern const unsigned long arm64_relocate_new_kernel_size;
+/**
+ * kexec_image_info - For debugging output.
+ */
+#define kexec_image_info(_i) _kexec_image_info(__func__, __LINE__, _i)
+static void _kexec_image_info(const char *func, int line,
+        const struct kimage *kimage)
+{
+        unsigned long i;
+        pr_debug("%s:%d:\n", func, line);
+        pr_debug("  kexec kimage info:\n");
+        pr_debug("    type:        %d\n", kimage->type);
+        pr_debug("    start:       %lx\n", kimage->start);
+        pr_debug("    head:        %lx\n", kimage->head);
+        pr_debug("    nr_segments: %lu\n", kimage->nr_segments);
+        for (i = 0; i < kimage->nr_segments; i++) {
+                pr_debug("      segment[%lu]: %016lx - %016lx, 0x%lx bytes, %lu pages\n",
+                        i,
+                        kimage->segment[i].mem,
+                        kimage->segment[i].mem + kimage->segment[i].memsz,
+                        kimage->segment[i].memsz,
+                        kimage->segment[i].memsz /  PAGE_SIZE);
+        }
+}
+void machine_kexec_cleanup(struct kimage *kimage)
+{
+        /* Empty routine needed to avoid build errors. */
+}
+/**
+ * machine_kexec_prepare - Prepare for a kexec reboot.
+ *
+ * Called from the core kexec code when a kernel image is loaded.
+ * Forbid loading a kexec kernel if we have no way of hotplugging cpus or cpus
+ * are stuck in the kernel. This avoids a panic once we hit machine_kexec().
+ */
+int machine_kexec_prepare(struct kimage *kimage)
+{
+        kexec_image_info(kimage);
+        if (kimage->type != KEXEC_TYPE_CRASH && cpus_are_stuck_in_kernel()) {
+                pr_err("Can't kexec: CPUs are stuck in the kernel.\n");
+                return -EBUSY;
+        }
+        return 0;
+}
+/**
+ * kexec_list_flush - Helper to flush the kimage list and source pages to PoC.
+ */
+static void kexec_list_flush(struct kimage *kimage)
+{
+        kimage_entry_t *entry;
+        for (entry = &kimage->head; ; entry++) {
+                unsigned int flag;
+                void *addr;
+                /* flush the list entries. */
+                __flush_dcache_area(entry, sizeof(kimage_entry_t));
+                flag = *entry & IND_FLAGS;
+                if (flag == IND_DONE)
+                        break;
+                addr = phys_to_virt(*entry & PAGE_MASK);
+                switch (flag) {
+                case IND_INDIRECTION:
+                        /* Set entry point just before the new list page. */
+                        entry = (kimage_entry_t *)addr - 1;
+                        break;
+                case IND_SOURCE:
+                        /* flush the source pages. */
+                        __flush_dcache_area(addr, PAGE_SIZE);
+                        break;
+                case IND_DESTINATION:
+                        break;
+                default:
+                        BUG();
+                }
+        }
+}
+/**
+ * kexec_segment_flush - Helper to flush the kimage segments to PoC.
+ */
+static void kexec_segment_flush(const struct kimage *kimage)
+{
+        unsigned long i;
+        pr_debug("%s:\n", __func__);
+        for (i = 0; i < kimage->nr_segments; i++) {
+                pr_debug("  segment[%lu]: %016lx - %016lx, 0x%lx bytes, %lu pages\n",
+                        i,
+                        kimage->segment[i].mem,
+                        kimage->segment[i].mem + kimage->segment[i].memsz,
+                        kimage->segment[i].memsz,
+                        kimage->segment[i].memsz /  PAGE_SIZE);
+                __flush_dcache_area(phys_to_virt(kimage->segment[i].mem),
+                        kimage->segment[i].memsz);
+        }
+}
+/**
+ * machine_kexec - Do the kexec reboot.
+ *
+ * Called from the core kexec code for a sys_reboot with LINUX_REBOOT_CMD_KEXEC.
+ */
+void machine_kexec(struct kimage *kimage)
+{
+        phys_addr_t reboot_code_buffer_phys;
+        void *reboot_code_buffer;
+        bool in_kexec_crash = (kimage == kexec_crash_image);
+        bool stuck_cpus = cpus_are_stuck_in_kernel();
+        /*
+         * New cpus may have become stuck_in_kernel after we loaded the image.
+         */
+        BUG_ON(!in_kexec_crash && (stuck_cpus || (num_online_cpus() > 1)));
+        WARN(in_kexec_crash && (stuck_cpus || smp_crash_stop_failed()),
+                "Some CPUs may be stale, kdump will be unreliable.\n");
+        reboot_code_buffer_phys = page_to_phys(kimage->control_code_page);
+        reboot_code_buffer = phys_to_virt(reboot_code_buffer_phys);
+        kexec_image_info(kimage);
+        pr_debug("%s:%d: control_code_page:        %p\n", __func__, __LINE__,
+                kimage->control_code_page);
+        pr_debug("%s:%d: reboot_code_buffer_phys:  %pa\n", __func__, __LINE__,
+                &reboot_code_buffer_phys);
+        pr_debug("%s:%d: reboot_code_buffer:       %p\n", __func__, __LINE__,
+                reboot_code_buffer);
+        pr_debug("%s:%d: relocate_new_kernel:      %p\n", __func__, __LINE__,
+                arm64_relocate_new_kernel);
+        pr_debug("%s:%d: relocate_new_kernel_size: 0x%lx(%lu) bytes\n",
+                __func__, __LINE__, arm64_relocate_new_kernel_size,
+                arm64_relocate_new_kernel_size);
+        /*
+         * Copy arm64_relocate_new_kernel to the reboot_code_buffer for use
+         * after the kernel is shut down.
+         */
+        memcpy(reboot_code_buffer, arm64_relocate_new_kernel,
+                arm64_relocate_new_kernel_size);
+        /* Flush the reboot_code_buffer in preparation for its execution. */
+        __flush_dcache_area(reboot_code_buffer, arm64_relocate_new_kernel_size);
+        flush_icache_range((uintptr_t)reboot_code_buffer,
+                arm64_relocate_new_kernel_size);
+        /* Flush the kimage list and its buffers. */
+        kexec_list_flush(kimage);
+        /* Flush the new image if already in place. */
+        if ((kimage != kexec_crash_image) && (kimage->head & IND_DONE))
+                kexec_segment_flush(kimage);
+        pr_info("Bye!\n");
+        /* Disable all DAIF exceptions. */
+        asm volatile ("msr daifset, #0xf" : : : "memory");
+        /*
+         * cpu_soft_restart will shutdown the MMU, disable data caches, then
+         * transfer control to the reboot_code_buffer which contains a copy of
+         * the arm64_relocate_new_kernel routine.  arm64_relocate_new_kernel
+         * uses physical addressing to relocate the new image to its final
+         * position and transfers control to the image entry point when the
+         * relocation is complete.
+         */
+        cpu_soft_restart(kimage != kexec_crash_image,
+                reboot_code_buffer_phys, kimage->head, kimage->start, 0);
+        BUG(); /* Should never get here. */
+}
+static void machine_kexec_mask_interrupts(void)
+{
+        unsigned int i;
+        struct irq_desc *desc;
+        for_each_irq_desc(i, desc) {
+                struct irq_chip *chip;
+                int ret;
+                chip = irq_desc_get_chip(desc);
+                if (!chip)
+                        continue;
+                /*
+                 * First try to remove the active state. If this
+                 * fails, try to EOI the interrupt.
+                 */
+                ret = irq_set_irqchip_state(i, IRQCHIP_STATE_ACTIVE, false);
+                if (ret && irqd_irq_inprogress(&desc->irq_data) &&
+                    chip->irq_eoi)
+                        chip->irq_eoi(&desc->irq_data);
+                if (chip->irq_mask)
+                        chip->irq_mask(&desc->irq_data);
+                if (chip->irq_disable && !irqd_irq_disabled(&desc->irq_data))
+                        chip->irq_disable(&desc->irq_data);
+        }
+}
+/**
+ * machine_crash_shutdown - shutdown non-crashing cpus and save registers
+ */
+void machine_crash_shutdown(struct pt_regs *regs)
+{
+        local_irq_disable();
+        /* shutdown non-crashing cpus */
+        smp_send_crash_stop();
+        /* for crashing cpu */
+        crash_save_cpu(regs, smp_processor_id());
+        machine_kexec_mask_interrupts();
+        pr_info("Starting crashdump kernel...\n");
+}
+void arch_kexec_protect_crashkres(void)
+{
+        int i;
+        kexec_segment_flush(kexec_crash_image);
+        for (i = 0; i < kexec_crash_image->nr_segments; i++)
+                set_memory_valid(
+                        __phys_to_virt(kexec_crash_image->segment[i].mem),
+                        kexec_crash_image->segment[i].memsz >> PAGE_SHIFT, 0);
+}
+void arch_kexec_unprotect_crashkres(void)
+{
+        int i;
+        for (i = 0; i < kexec_crash_image->nr_segments; i++)
+                set_memory_valid(
+                        __phys_to_virt(kexec_crash_image->segment[i].mem),
+                        kexec_crash_image->segment[i].memsz >> PAGE_SHIFT, 1);
+}
+#ifdef CONFIG_HIBERNATION
+/*
+ * To preserve the crash dump kernel image, the relevant memory segments
+ * should be mapped again around the hibernation.
+ */
+void crash_prepare_suspend(void)
+{
+        if (kexec_crash_image)
+                arch_kexec_unprotect_crashkres();
+}
+void crash_post_resume(void)
+{
+        if (kexec_crash_image)
+                arch_kexec_protect_crashkres();
+}
+/*
+ * crash_is_nosave
+ *
+ * Return true only if a page is part of reserved memory for crash dump kernel,
+ * but does not hold any data of loaded kernel image.
+ *
+ * Note that all the pages in crash dump kernel memory have been initially
+ * marked as Reserved in kexec_reserve_crashkres_pages().
+ *
+ * In hibernation, the pages which are Reserved and yet "nosave" are excluded
+ * from the hibernation iamge. crash_is_nosave() does thich check for crash
+ * dump kernel and will reduce the total size of hibernation image.
+ */
+bool crash_is_nosave(unsigned long pfn)
+{
+        int i;
+        phys_addr_t addr;
+        if (!crashk_res.end)
+                return false;
+        /* in reserved memory? */
+        addr = __pfn_to_phys(pfn);
+        if ((addr < crashk_res.start) || (crashk_res.end < addr))
+                return false;
+        if (!kexec_crash_image)
+                return true;
+        /* not part of loaded kernel image? */
+        for (i = 0; i < kexec_crash_image->nr_segments; i++)
+                if (addr >= kexec_crash_image->segment[i].mem &&
+                                addr < (kexec_crash_image->segment[i].mem +
+                                        kexec_crash_image->segment[i].memsz))
+                        return false;
+        return true;
+}
+void crash_free_reserved_phys_range(unsigned long begin, unsigned long end)
+{
+        unsigned long addr;
+        struct page *page;
+        for (addr = begin; addr < end; addr += PAGE_SIZE) {
+                page = phys_to_page(addr);
+                ClearPageReserved(page);
+                free_reserved_page(page);
+        }
+}
+#endif /* CONFIG_HIBERNATION */
+void arch_crash_save_vmcoreinfo(void)
+{
+        VMCOREINFO_NUMBER(VA_BITS);
+        /* Please note VMCOREINFO_NUMBER() uses "%d", not "%x" */
+        vmcoreinfo_append_str("NUMBER(kimage_voffset)=0x%llx\n",
+                                                kimage_voffset);
+        vmcoreinfo_append_str("NUMBER(PHYS_OFFSET)=0x%llx\n",
+                                                PHYS_OFFSET);
+}
diff --git a/arch/arm64/kernel/relocate_kernel.S b/arch/arm64/kernel/relocate_kernel.S
new file mode 100644
index 000000000000..51b73cdde287
--- /dev/null
+++ b/arch/arm64/kernel/relocate_kernel.S
@@ -0,0 +1,130 @@
+/*
+ * kexec for arm64
+ *
+ * Copyright (C) Linaro.
+ * Copyright (C) Huawei Futurewei Technologies.
+ *
+ * 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.
+ */
+#include <linux/kexec.h>
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+#include <asm/kexec.h>
+#include <asm/page.h>
+#include <asm/sysreg.h>
+/*
+ * arm64_relocate_new_kernel - Put a 2nd stage image in place and boot it.
+ *
+ * The memory that the old kernel occupies may be overwritten when coping the
+ * new image to its final location.  To assure that the
+ * arm64_relocate_new_kernel routine which does that copy is not overwritten,
+ * all code and data needed by arm64_relocate_new_kernel must be between the
+ * symbols arm64_relocate_new_kernel and arm64_relocate_new_kernel_end.  The
+ * machine_kexec() routine will copy arm64_relocate_new_kernel to the kexec
+ * control_code_page, a special page which has been set up to be preserved
+ * during the copy operation.
+ */
+ENTRY(arm64_relocate_new_kernel)
+        /* Setup the list loop variables. */
+        mov     x17, x1                         /* x17 = kimage_start */
+        mov     x16, x0                         /* x16 = kimage_head */
+        dcache_line_size x15, x0                /* x15 = dcache line size */
+        mov     x14, xzr                        /* x14 = entry ptr */
+        mov     x13, xzr                        /* x13 = copy dest */
+        /* Clear the sctlr_el2 flags. */
+        mrs     x0, CurrentEL
+        cmp     x0, #CurrentEL_EL2
+        b.ne    1f
+        mrs     x0, sctlr_el2
+        ldr     x1, =SCTLR_ELx_FLAGS
+        bic     x0, x0, x1
+        msr     sctlr_el2, x0
+        isb
+1:
+        /* Check if the new image needs relocation. */
+        tbnz    x16, IND_DONE_BIT, .Ldone
+.Lloop:
+        and     x12, x16, PAGE_MASK             /* x12 = addr */
+        /* Test the entry flags. */
+.Ltest_source:
+        tbz     x16, IND_SOURCE_BIT, .Ltest_indirection
+        /* Invalidate dest page to PoC. */
+        mov     x0, x13
+        add     x20, x0, #PAGE_SIZE
+        sub     x1, x15, #1
+        bic     x0, x0, x1
+2:      dc      ivac, x0
+        add     x0, x0, x15
+        cmp     x0, x20
+        b.lo    2b
+        dsb     sy
+        mov x20, x13
+        mov x21, x12
+        copy_page x20, x21, x0, x1, x2, x3, x4, x5, x6, x7
+        /* dest += PAGE_SIZE */
+        add     x13, x13, PAGE_SIZE
+        b       .Lnext
+.Ltest_indirection:
+        tbz     x16, IND_INDIRECTION_BIT, .Ltest_destination
+        /* ptr = addr */
+        mov     x14, x12
+        b       .Lnext
+.Ltest_destination:
+        tbz     x16, IND_DESTINATION_BIT, .Lnext
+        /* dest = addr */
+        mov     x13, x12
+.Lnext:
+        /* entry = *ptr++ */
+        ldr     x16, [x14], #8
+        /* while (!(entry & DONE)) */
+        tbz     x16, IND_DONE_BIT, .Lloop
+.Ldone:
+        /* wait for writes from copy_page to finish */
+        dsb     nsh
+        ic      iallu
+        dsb     nsh
+        isb
+        /* Start new image. */
+        mov     x0, xzr
+        mov     x1, xzr
+        mov     x2, xzr
+        mov     x3, xzr
+        br      x17
+ENDPROC(arm64_relocate_new_kernel)
+.ltorg
+.align 3        /* To keep the 64-bit values below naturally aligned. */
+.Lcopy_end:
+.org    KEXEC_CONTROL_PAGE_SIZE
+/*
+ * arm64_relocate_new_kernel_size - Number of bytes to copy to the
+ * control_code_page.
+ */
+.globl arm64_relocate_new_kernel_size
+arm64_relocate_new_kernel_size:
+        .quad   .Lcopy_end - arm64_relocate_new_kernel
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 0153c0d8ddb1..19749870c757 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -31,7 +31,6 @@
 #include <linux/screen_info.h>
 #include <linux/init.h>
 #include <linux/kexec.h>
-#include <linux/crash_dump.h>
 #include <linux/root_dev.h>
 #include <linux/cpu.h>
 #include <linux/interrupt.h>
@@ -220,6 +219,12 @@ static void __init request_standard_resources(void)
                if (kernel_data.start >= res->start &&
                    kernel_data.end <= res->end)
                        request_resource(res, &kernel_data);
+#ifdef CONFIG_KEXEC_CORE
+                /* Userspace will find "Crash kernel" region in /proc/iomem. */
+                if (crashk_res.end && crashk_res.start >= res->start &&
+                    crashk_res.end <= res->end)
+                        request_resource(res, &crashk_res);
+#endif
        }
 }
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index a84623d91410..a1d06fc42048 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -37,6 +37,7 @@
 #include <linux/completion.h>
 #include <linux/of.h>
 #include <linux/irq_work.h>
+#include <linux/kexec.h>
 #include <asm/alternative.h>
 #include <asm/atomic.h>
@@ -63,16 +64,29 @@
 * where to place its SVC stack
 */
 struct secondary_data secondary_data;
+/* Number of CPUs which aren't online, but looping in kernel text. */
+int cpus_stuck_in_kernel;
 enum ipi_msg_type {
        IPI_RESCHEDULE,
        IPI_CALL_FUNC,
        IPI_CPU_STOP,
+        IPI_CPU_CRASH_STOP,
        IPI_TIMER,
        IPI_IRQ_WORK,
        IPI_WAKEUP
 };
+#ifdef CONFIG_HOTPLUG_CPU
+static int op_cpu_kill(unsigned int cpu);
+#else
+static inline int op_cpu_kill(unsigned int cpu)
+{
+        return -ENOSYS;
+}
+#endif
 /*
 * Boot a secondary CPU, and assign it the specified idle task.
 * This also gives us the initial stack to use for this CPU.
@@ -90,12 +104,14 @@ static DECLARE_COMPLETION(cpu_running);
 int __cpu_up(unsigned int cpu, struct task_struct *idle)
 {
        int ret;
+        long status;
        /*
         * We need to tell the secondary core where to find its stack and the
         * page tables.
         */
        secondary_data.stack = task_stack_page(idle) + THREAD_START_SP;
+        update_cpu_boot_status(CPU_MMU_OFF);
        __flush_dcache_area(&secondary_data, sizeof(secondary_data));
        /*
@@ -119,6 +135,32 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle)
        }
        secondary_data.stack = NULL;
+        status = READ_ONCE(secondary_data.status);
+        if (ret && status) {
+                if (status == CPU_MMU_OFF)
+                        status = READ_ONCE(__early_cpu_boot_status);
+                switch (status) {
+                default:
+                        pr_err("CPU%u: failed in unknown state : 0x%lx\n",
+                                        cpu, status);
+                        break;
+                case CPU_KILL_ME:
+                        if (!op_cpu_kill(cpu)) {
+                                pr_crit("CPU%u: died during early boot\n", cpu);
+                                break;
+                        }
+                        /* Fall through */
+                        pr_crit("CPU%u: may not have shut down cleanly\n", cpu);
+                case CPU_STUCK_IN_KERNEL:
+                        pr_crit("CPU%u: is stuck in kernel\n", cpu);
+                        cpus_stuck_in_kernel++;
+                        break;
+                case CPU_PANIC_KERNEL:
+                        panic("CPU%u detected unsupported configuration\n", cpu);
+                }
+        }
        return ret;
 }
@@ -184,6 +226,9 @@ asmlinkage void secondary_start_kernel(void)
         */
        pr_info("CPU%u: Booted secondary processor [%08x]\n",
                                         cpu, read_cpuid_id());
+        update_cpu_boot_status(CPU_BOOT_SUCCESS);
+        /* Make sure the status update is visible before we complete */
+        smp_wmb();
        set_cpu_online(cpu, true);
        complete(&cpu_running);
@@ -311,6 +356,30 @@ void cpu_die(void)
 }
 #endif
+/*
+ * Kill the calling secondary CPU, early in bringup before it is turned
+ * online.
+ */
+void cpu_die_early(void)
+{
+        int cpu = smp_processor_id();
+        pr_crit("CPU%d: will not boot\n", cpu);
+        /* Mark this CPU absent */
+        set_cpu_present(cpu, 0);
+#ifdef CONFIG_HOTPLUG_CPU
+        update_cpu_boot_status(CPU_KILL_ME);
+        /* Check if we can park ourselves */
+        if (cpu_ops[cpu] && cpu_ops[cpu]->cpu_die)
+                cpu_ops[cpu]->cpu_die(cpu);
+#endif
+        update_cpu_boot_status(CPU_STUCK_IN_KERNEL);
+        cpu_park_loop();
+}
 static void __init hyp_mode_check(void)
 {
        if (is_hyp_mode_available())
@@ -634,6 +703,7 @@ static const char *ipi_types[NR_IPI] __tracepoint_string = {
        S(IPI_RESCHEDULE, "Rescheduling interrupts"),
        S(IPI_CALL_FUNC, "Function call interrupts"),
        S(IPI_CPU_STOP, "CPU stop interrupts"),
+        S(IPI_CPU_CRASH_STOP, "CPU stop (for crash dump) interrupts"),
        S(IPI_TIMER, "Timer broadcast interrupts"),
        S(IPI_IRQ_WORK, "IRQ work interrupts"),
        S(IPI_WAKEUP, "CPU wake-up interrupts"),
@@ -718,6 +788,29 @@ static void ipi_cpu_stop(unsigned int cpu)
                cpu_relax();
 }
+#ifdef CONFIG_KEXEC_CORE
+static atomic_t waiting_for_crash_ipi = ATOMIC_INIT(0);
+#endif
+static void ipi_cpu_crash_stop(unsigned int cpu, struct pt_regs *regs)
+{
+#ifdef CONFIG_KEXEC_CORE
+        crash_save_cpu(regs, cpu);
+        atomic_dec(&waiting_for_crash_ipi);
+        local_irq_disable();
+#ifdef CONFIG_HOTPLUG_CPU
+        if (cpu_ops[cpu]->cpu_die)
+                cpu_ops[cpu]->cpu_die(cpu);
+#endif
+        /* just in case */
+        cpu_park_loop();
+#endif
+}
 /*
 * Main handler for inter-processor interrupts
 */
@@ -748,6 +841,15 @@ void handle_IPI(int ipinr, struct pt_regs *regs)
                irq_exit();
                break;
+        case IPI_CPU_CRASH_STOP:
+                if (IS_ENABLED(CONFIG_KEXEC_CORE)) {
+                        irq_enter();
+                        ipi_cpu_crash_stop(cpu, regs);
+                        unreachable();
+                }
+                break;
 #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
        case IPI_TIMER:
                irq_enter();
@@ -816,6 +918,39 @@ void smp_send_stop(void)
                pr_warning("SMP: failed to stop secondary CPUs\n");
 }
+#ifdef CONFIG_KEXEC_CORE
+void smp_send_crash_stop(void)
+{
+        cpumask_t mask;
+        unsigned long timeout;
+        if (num_online_cpus() == 1)
+                return;
+        cpumask_copy(&mask, cpu_online_mask);
+        cpumask_clear_cpu(smp_processor_id(), &mask);
+        atomic_set(&waiting_for_crash_ipi, num_online_cpus() - 1);
+        pr_crit("SMP: stopping secondary CPUs\n");
+        smp_cross_call(&mask, IPI_CPU_CRASH_STOP);
+        /* Wait up to one second for other CPUs to stop */
+        timeout = USEC_PER_SEC;
+        while ((atomic_read(&waiting_for_crash_ipi) > 0) && timeout--)
+                udelay(1);
+        if (atomic_read(&waiting_for_crash_ipi) > 0)
+                pr_warning("SMP: failed to stop secondary CPUs %*pbl\n",
+                           cpumask_pr_args(&mask));
+}
+bool smp_crash_stop_failed(void)
+{
+        return (atomic_read(&waiting_for_crash_ipi) > 0);
+}
+#endif
 /*
 * not supported here
 */
@@ -823,3 +958,21 @@ int setup_profiling_timer(unsigned int multiplier)
 {
        return -EINVAL;
 }
+static bool have_cpu_die(void)
+{
+#ifdef CONFIG_HOTPLUG_CPU
+        int any_cpu = raw_smp_processor_id();
+        if (cpu_ops[any_cpu]->cpu_die)
+                return true;
+#endif
+        return false;
+}
+bool cpus_are_stuck_in_kernel(void)
+{
+        bool smp_spin_tables = (num_possible_cpus() > 1 && !have_cpu_die());
+        return !!cpus_stuck_in_kernel || smp_spin_tables;
+}
diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile
index 826032bc3945..acde4782621a 100644
--- a/arch/arm64/kvm/hyp/Makefile
+++ b/arch/arm64/kvm/hyp/Makefile
@@ -12,3 +12,7 @@ obj-$(CONFIG_KVM_ARM_HOST) += switch.o
 obj-$(CONFIG_KVM_ARM_HOST) += fpsimd.o
 obj-$(CONFIG_KVM_ARM_HOST) += tlb.o
 obj-$(CONFIG_KVM_ARM_HOST) += hyp-entry.o
+GCOV_PROFILE    := n
+KASAN_SANITIZE  := n
+UBSAN_SANITIZE  := n
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 678878077996..74ac8a90ba3f 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -29,11 +29,14 @@
 #include <linux/gfp.h>
 #include <linux/memblock.h>
 #include <linux/sort.h>
+#include <linux/of.h>
 #include <linux/of_fdt.h>
 #include <linux/dma-mapping.h>
 #include <linux/dma-contiguous.h>
 #include <linux/efi.h>
 #include <linux/swiotlb.h>
+#include <linux/kexec.h>
+#include <linux/crash_dump.h>
 #include <asm/boot.h>
 #include <asm/fixmap.h>
@@ -75,6 +78,142 @@ static int __init early_initrd(char *p)
 early_param("initrd", early_initrd);
 #endif
+#ifdef CONFIG_KEXEC_CORE
+/*
+ * reserve_crashkernel() - reserves memory for crash kernel
+ *
+ * This function reserves memory area given in "crashkernel=" kernel command
+ * line parameter. The memory reserved is used by dump capture kernel when
+ * primary kernel is crashing.
+ */
+static void __init reserve_crashkernel(void)
+{
+        unsigned long long crash_base, crash_size;
+        int ret;
+        ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(),
+                                &crash_size, &crash_base);
+        /* no crashkernel= or invalid value specified */
+        if (ret || !crash_size)
+                return;
+        crash_size = PAGE_ALIGN(crash_size);
+        if (crash_base == 0) {
+                /* Current arm64 boot protocol requires 2MB alignment */
+                crash_base = memblock_find_in_range(0, ARCH_LOW_ADDRESS_LIMIT,
+                                crash_size, SZ_2M);
+                if (crash_base == 0) {
+                        pr_warn("cannot allocate crashkernel (size:0x%llx)\n",
+                                crash_size);
+                        return;
+                }
+        } else {
+                /* User specifies base address explicitly. */
+                if (!memblock_is_region_memory(crash_base, crash_size)) {
+                        pr_warn("cannot reserve crashkernel: region is not memory\n");
+                        return;
+                }
+                if (memblock_is_region_reserved(crash_base, crash_size)) {
+                        pr_warn("cannot reserve crashkernel: region overlaps reserved memory\n");
+                        return;
+                }
+                if (!IS_ALIGNED(crash_base, SZ_2M)) {
+                        pr_warn("cannot reserve crashkernel: base address is not 2MB aligned\n");
+                        return;
+                }
+        }
+        memblock_reserve(crash_base, crash_size);
+        pr_info("crashkernel reserved: 0x%016llx - 0x%016llx (%lld MB)\n",
+                crash_base, crash_base + crash_size, crash_size >> 20);
+        crashk_res.start = crash_base;
+        crashk_res.end = crash_base + crash_size - 1;
+}
+static void __init kexec_reserve_crashkres_pages(void)
+{
+#ifdef CONFIG_HIBERNATION
+        phys_addr_t addr;
+        struct page *page;
+        if (!crashk_res.end)
+                return;
+        /*
+         * To reduce the size of hibernation image, all the pages are
+         * marked as Reserved initially.
+         */
+        for (addr = crashk_res.start; addr < (crashk_res.end + 1);
+                        addr += PAGE_SIZE) {
+                page = phys_to_page(addr);
+                SetPageReserved(page);
+        }
+#endif
+}
+#else
+static void __init reserve_crashkernel(void)
+{
+}
+static void __init kexec_reserve_crashkres_pages(void)
+{
+}
+#endif /* CONFIG_KEXEC_CORE */
+#ifdef CONFIG_CRASH_DUMP
+static int __init early_init_dt_scan_elfcorehdr(unsigned long node,
+                const char *uname, int depth, void *data)
+{
+        const __be32 *reg;
+        int len;
+        if (depth != 1 || strcmp(uname, "chosen") != 0)
+                return 0;
+        reg = of_get_flat_dt_prop(node, "linux,elfcorehdr", &len);
+        if (!reg || (len < (dt_root_addr_cells + dt_root_size_cells)))
+                return 1;
+        elfcorehdr_addr = dt_mem_next_cell(dt_root_addr_cells, &reg);
+        elfcorehdr_size = dt_mem_next_cell(dt_root_size_cells, &reg);
+        return 1;
+}
+/*
+ * reserve_elfcorehdr() - reserves memory for elf core header
+ *
+ * This function reserves the memory occupied by an elf core header
+ * described in the device tree. This region contains all the
+ * information about primary kernel's core image and is used by a dump
+ * capture kernel to access the system memory on primary kernel.
+ */
+static void __init reserve_elfcorehdr(void)
+{
+        of_scan_flat_dt(early_init_dt_scan_elfcorehdr, NULL);
+        if (!elfcorehdr_size)
+                return;
+        if (memblock_is_region_reserved(elfcorehdr_addr, elfcorehdr_size)) {
+                pr_warn("elfcorehdr is overlapped\n");
+                return;
+        }
+        memblock_reserve(elfcorehdr_addr, elfcorehdr_size);
+        pr_info("Reserving %lldKB of memory at 0x%llx for elfcorehdr\n",
+                elfcorehdr_size >> 10, elfcorehdr_addr);
+}
+#else
+static void __init reserve_elfcorehdr(void)
+{
+}
+#endif /* CONFIG_CRASH_DUMP */
 /*
 * Return the maximum physical address for ZONE_DMA (DMA_BIT_MASK(32)). It
 * currently assumes that for memory starting above 4G, 32-bit devices will
@@ -168,10 +307,45 @@ static int __init early_mem(char *p)
 }
 early_param("mem", early_mem);
+static int __init early_init_dt_scan_usablemem(unsigned long node,
+                const char *uname, int depth, void *data)
+{
+        struct memblock_region *usablemem = data;
+        const __be32 *reg;
+        int len;
+        if (depth != 1 || strcmp(uname, "chosen") != 0)
+                return 0;
+        reg = of_get_flat_dt_prop(node, "linux,usable-memory-range", &len);
+        if (!reg || (len < (dt_root_addr_cells + dt_root_size_cells)))
+                return 1;
+        usablemem->base = dt_mem_next_cell(dt_root_addr_cells, &reg);
+        usablemem->size = dt_mem_next_cell(dt_root_size_cells, &reg);
+        return 1;
+}
+static void __init fdt_enforce_memory_region(void)
+{
+        struct memblock_region reg = {
+                .size = 0,
+        };
+        of_scan_flat_dt(early_init_dt_scan_usablemem, &reg);
+        if (reg.size)
+                memblock_cap_memory_range(reg.base, reg.size);
+}
 void __init arm64_memblock_init(void)
 {
        const s64 linear_region_size = -(s64)PAGE_OFFSET;
+        /* Handle linux,usable-memory-range property */
+        fdt_enforce_memory_region();
        /*
         * Ensure that the linear region takes up exactly half of the kernel
         * virtual address space. This way, we can distinguish a linear address
@@ -248,6 +422,11 @@ void __init arm64_memblock_init(void)
                arm64_dma_phys_limit = max_zone_dma_phys();
        else
                arm64_dma_phys_limit = PHYS_MASK + 1;
+        reserve_crashkernel();
+        reserve_elfcorehdr();
        dma_contiguous_reserve(arm64_dma_phys_limit);
        memblock_allow_resize();
@@ -361,6 +540,8 @@ void __init mem_init(void)
        /* this will put all unused low memory onto the freelists */
        free_all_bootmem();
+        kexec_reserve_crashkres_pages();
        mem_init_print_info(NULL);
 #define MLK(b, t) b, t, ((t) - (b)) >> 10
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
index 1cab2703f5a8..aeadc2c0a6c8 100644
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@ -21,6 +21,8 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/kexec.h>
 #include <linux/libfdt.h>
 #include <linux/mman.h>
 #include <linux/nodemask.h>
@@ -156,29 +158,10 @@ static void split_pud(pud_t *old_pud, pmd_t *pmd)
        } while (pmd++, i++, i < PTRS_PER_PMD);
 }
-#ifdef CONFIG_DEBUG_PAGEALLOC
-static bool block_mappings_allowed(phys_addr_t (*pgtable_alloc)(void))
-{
-        /*
-         * If debug_page_alloc is enabled we must map the linear map
-         * using pages. However, other mappings created by
-         * create_mapping_noalloc must use sections in some cases. Allow
-         * sections to be used in those cases, where no pgtable_alloc
-         * function is provided.
-         */
-        return !pgtable_alloc || !debug_pagealloc_enabled();
-}
-#else
-static bool block_mappings_allowed(phys_addr_t (*pgtable_alloc)(void))
-{
-        return true;
-}
-#endif
 static void alloc_init_pmd(pud_t *pud, unsigned long addr, unsigned long end,
                                  phys_addr_t phys, pgprot_t prot,
-                                  phys_addr_t (*pgtable_alloc)(void))
+                                  phys_addr_t (*pgtable_alloc)(void),
+                                  bool allow_block_mappings)
 {
        pmd_t *pmd;
        unsigned long next;
@@ -209,7 +192,7 @@ static void alloc_init_pmd(pud_t *pud, unsigned long addr, unsigned long end,
                next = pmd_addr_end(addr, end);
                /* try section mapping first */
                if (((addr | next | phys) & ~SECTION_MASK) == 0 &&
-                      block_mappings_allowed(pgtable_alloc)) {
+                      (!pgtable_alloc || allow_block_mappings)) {
                        pmd_t old_pmd =*pmd;
                        pmd_set_huge(pmd, phys, prot);
                        /*
@@ -248,7 +231,8 @@ static inline bool use_1G_block(unsigned long addr, unsigned long next,
 static void alloc_init_pud(pgd_t *pgd, unsigned long addr, unsigned long end,
                                  phys_addr_t phys, pgprot_t prot,
-                                  phys_addr_t (*pgtable_alloc)(void))
+                                  phys_addr_t (*pgtable_alloc)(void),
+                                  bool allow_block_mappings)
 {
        pud_t *pud;
        unsigned long next;
@@ -269,7 +253,7 @@ static void alloc_init_pud(pgd_t *pgd, unsigned long addr, unsigned long end,
                 * For 4K granule only, attempt to put down a 1GB block
                 */
                if (use_1G_block(addr, next, phys) &&
-                    block_mappings_allowed(pgtable_alloc)) {
+                      (!pgtable_alloc || allow_block_mappings)) {
                        pud_t old_pud = *pud;
                        pud_set_huge(pud, phys, prot);
@@ -290,7 +274,7 @@ static void alloc_init_pud(pgd_t *pgd, unsigned long addr, unsigned long end,
                        }
                } else {
                        alloc_init_pmd(pud, addr, next, phys, prot,
-                                       pgtable_alloc);
+                                       pgtable_alloc, allow_block_mappings);
                }
                phys += next - addr;
        } while (pud++, addr = next, addr != end);
@@ -304,7 +288,8 @@ static void alloc_init_pud(pgd_t *pgd, unsigned long addr, unsigned long end,
 */
 static void init_pgd(pgd_t *pgd, phys_addr_t phys, unsigned long virt,
                                    phys_addr_t size, pgprot_t prot,
-                                    phys_addr_t (*pgtable_alloc)(void))
+                                    phys_addr_t (*pgtable_alloc)(void),
+                                    bool allow_block_mappings)
 {
        unsigned long addr, length, end, next;
@@ -322,7 +307,8 @@ static void init_pgd(pgd_t *pgd, phys_addr_t phys, unsigned long virt,
        end = addr + length;
        do {
                next = pgd_addr_end(addr, end);
-                alloc_init_pud(pgd, addr, next, phys, prot, pgtable_alloc);
+                alloc_init_pud(pgd, addr, next, phys, prot, pgtable_alloc,
+                              (!pgtable_alloc || allow_block_mappings));
                phys += next - addr;
        } while (pgd++, addr = next, addr != end);
 }
@@ -340,9 +326,11 @@ static phys_addr_t late_pgtable_alloc(void)
 static void __create_pgd_mapping(pgd_t *pgdir, phys_addr_t phys,
                                 unsigned long virt, phys_addr_t size,
                                 pgprot_t prot,
-                                 phys_addr_t (*alloc)(void))
+                                 phys_addr_t (*alloc)(void),
+                                 bool allow_block_mappings)
 {
-        init_pgd(pgd_offset_raw(pgdir, virt), phys, virt, size, prot, alloc);
+        init_pgd(pgd_offset_raw(pgdir, virt), phys, virt, size, prot, alloc,
+                 allow_block_mappings);
 }
 /*
@@ -358,16 +346,15 @@ static void __init create_mapping_noalloc(phys_addr_t phys, unsigned long virt,
                        &phys, virt);
                return;
        }
-        __create_pgd_mapping(init_mm.pgd, phys, virt, size, prot,
+        __create_pgd_mapping(init_mm.pgd, phys, virt, size, prot, NULL, true);
-                             NULL);
 }
 void __init create_pgd_mapping(struct mm_struct *mm, phys_addr_t phys,
                               unsigned long virt, phys_addr_t size,
-                               pgprot_t prot)
+                               pgprot_t prot, bool allow_block_mappings)
 {
        __create_pgd_mapping(mm->pgd, phys, virt, size, prot,
-                             late_pgtable_alloc);
+                             late_pgtable_alloc, allow_block_mappings);
 }
 static void create_mapping_late(phys_addr_t phys, unsigned long virt,
@@ -380,10 +367,18 @@ static void create_mapping_late(phys_addr_t phys, unsigned long virt,
        }
        __create_pgd_mapping(init_mm.pgd, phys, virt, size, prot,
-                             late_pgtable_alloc);
+                             late_pgtable_alloc, !debug_pagealloc_enabled());
+}
+static void __init __map_memblock(pgd_t *pgd, phys_addr_t start,
+                                  phys_addr_t end, pgprot_t prot,
+                                  bool allow_block_mappings)
+{
+        __create_pgd_mapping(pgd, start, __phys_to_virt(start), end - start,
+                             prot, early_pgtable_alloc, allow_block_mappings);
 }
-static void __init __map_memblock(pgd_t *pgd, phys_addr_t start, phys_addr_t end)
+static void __init map_mem(pgd_t *pgd)
 {
        unsigned long kernel_start = __pa(_text);
        unsigned long kernel_end = __pa(__init_begin);
@@ -391,45 +386,15 @@ static void __init __map_memblock(pgd_t *pgd, phys_addr_t start, phys_addr_t end
        /*
         * Take care not to create a writable alias for the
         * read-only text and rodata sections of the kernel image.
+         * So temporarily mark them as NOMAP to skip mappings in
+         * the following for-loop
         */
+        memblock_mark_nomap(kernel_start, kernel_end - kernel_start);
-        /* No overlap with the kernel text/rodata */
+#ifdef CONFIG_KEXEC_CORE
-        if (end < kernel_start || start >= kernel_end) {
+        if (crashk_res.end)
-                __create_pgd_mapping(pgd, start, __phys_to_virt(start),
+                memblock_mark_nomap(crashk_res.start,
-                                     end - start, PAGE_KERNEL,
+                                    resource_size(&crashk_res));
-                                     early_pgtable_alloc);
+#endif
-                return;
-        }
-        /*
-         * This block overlaps the kernel text/rodata mappings.
-         * Map the portion(s) which don't overlap.
-         */
-        if (start < kernel_start)
-                __create_pgd_mapping(pgd, start,
-                                     __phys_to_virt(start),
-                                     kernel_start - start, PAGE_KERNEL,
-                                     early_pgtable_alloc);
-        if (kernel_end < end)
-                __create_pgd_mapping(pgd, kernel_end,
-                                     __phys_to_virt(kernel_end),
-                                     end - kernel_end, PAGE_KERNEL,
-                                     early_pgtable_alloc);
-        /*
-         * Map the linear alias of the [_text, __init_begin) interval as
-         * read-only/non-executable. This makes the contents of the
-         * region accessible to subsystems such as hibernate, but
-         * protects it from inadvertent modification or execution.
-         */
-        __create_pgd_mapping(pgd, kernel_start, __phys_to_virt(kernel_start),
-                             kernel_end - kernel_start, PAGE_KERNEL_RO,
-                             early_pgtable_alloc);
-}
-static void __init map_mem(pgd_t *pgd)
-{
-        struct memblock_region *reg;
        /* map all the memory banks */
        for_each_memblock(memory, reg) {
@@ -441,8 +406,33 @@ static void __init map_mem(pgd_t *pgd)
                if (memblock_is_nomap(reg))
                        continue;
-                __map_memblock(pgd, start, end);
+                __map_memblock(pgd, start, end,
+                               PAGE_KERNEL, !debug_pagealloc_enabled());
        }
+        /*
+         * Map the linear alias of the [_text, __init_begin) interval as
+         * read-only/non-executable. This makes the contents of the
+         * region accessible to subsystems such as hibernate, but
+         * protects it from inadvertent modification or execution.
+         */
+        __map_memblock(pgd, kernel_start, kernel_end,
+                       PAGE_KERNEL_RO, !debug_pagealloc_enabled());
+        memblock_clear_nomap(kernel_start, kernel_end - kernel_start);
+#ifdef CONFIG_KEXEC_CORE
+        /*
+         * Use page-level mappings here so that we can shrink the region
+         * in page granularity and put back unused memory to buddy system
+         * through /sys/kernel/kexec_crash_size interface.
+         */
+        if (crashk_res.end) {
+                __map_memblock(pgd, crashk_res.start, crashk_res.end + 1,
+                               PAGE_KERNEL, false);
+                memblock_clear_nomap(crashk_res.start,
+                                     resource_size(&crashk_res));
+        }
+#endif
 }
 void mark_rodata_ro(void)
@@ -481,7 +471,7 @@ static void __init map_kernel_segment(pgd_t *pgd, void *va_start, void *va_end,
        BUG_ON(!PAGE_ALIGNED(size));
        __create_pgd_mapping(pgd, pa_start, (unsigned long)va_start, size, prot,
-                             early_pgtable_alloc);
+                             early_pgtable_alloc, !debug_pagealloc_enabled());
        vma->addr       = va_start;
        vma->phys_addr  = pa_start;
diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c
index ca6d268e3313..f4e39dbdd36b 100644
--- a/arch/arm64/mm/pageattr.c
+++ b/arch/arm64/mm/pageattr.c
@@ -125,6 +125,19 @@ int set_memory_x(unsigned long addr, int numpages)
 }
 EXPORT_SYMBOL_GPL(set_memory_x);
+int set_memory_valid(unsigned long addr, int numpages, int enable)
+{
+        if (enable)
+                return __change_memory_common(addr, PAGE_SIZE * numpages,
+                                        __pgprot(PTE_VALID),
+                                        __pgprot(0));
+        else
+                return __change_memory_common(addr, PAGE_SIZE * numpages,
+                                        __pgprot(0),
+                                        __pgprot(PTE_VALID));
+}
 #ifdef CONFIG_DEBUG_PAGEALLOC
 void __kernel_map_pages(struct page *page, int numpages, int enable)
 {
diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
index ea6579f48f9d..db71448b9bb9 100644
--- a/arch/powerpc/include/asm/uaccess.h
+++ b/arch/powerpc/include/asm/uaccess.h
@@ -327,7 +327,6 @@ static inline unsigned long copy_from_user(void *to,
                check_object_size(to, n, false);
                return __copy_tofrom_user((__force void __user *)to, from, n);
        }
        memset(to, 0, n);
        return n;
 }
@@ -339,7 +338,6 @@ static inline unsigned long copy_to_user(void __user *to,
                check_object_size(from, n, true);
                return __copy_tofrom_user(to, (__force void __user *)from, n);
        }
        return n;
 }
diff --git a/drivers/base/dma-coherent.c b/drivers/base/dma-coherent.c
index 55b83983a9c0..c76eea0c5d12 100644
--- a/drivers/base/dma-coherent.c
+++ b/drivers/base/dma-coherent.c
@@ -140,11 +140,35 @@ EXPORT_SYMBOL(dma_mark_declared_memory_occupied);
 /**
 * dma_alloc_from_coherent() - try to allocate memory from the per-device coherent area
 *
+ * @dev:        device from which we allocate memory
+ * @size:       size of requested memory area
+ * @dma_handle: This will be filled with the correct dma handle
+ * @ret:        This pointer will be filled with the virtual address
+ *              to allocated area.
+ *
+ * This function should be only called from per-arch dma_alloc_coherent()
+ * to support allocation from per-device coherent memory pools.
+ *
+ * Returns 0 if dma_alloc_coherent should continue with allocating from
+ * generic memory areas, or !0 if dma_alloc_coherent should return @ret.
+ */
+int dma_alloc_from_coherent(struct device *dev, ssize_t size,
+                                        dma_addr_t *dma_handle, void **ret)
+{
+        return dma_malloc_from_coherent(dev, size, dma_handle, ret, true);
+}
+EXPORT_SYMBOL(dma_alloc_from_coherent);
+/**
+ * dma_malloc_from_coherent() - try to allocate memory from the per-device
+ * coherent area with option to zero memory
+ *
 * @dev:        device from which we allocate memory
 * @size:       size of requested memory area
 * @dma_handle: This will be filled with the correct dma handle
 * @ret:        This pointer will be filled with the virtual address
 *              to allocated area.
+ * @zero:       should the memory be zero-ed or not
 *
 * This function should be only called from per-arch dma_alloc_coherent()
 * to support allocation from per-device coherent memory pools.
@@ -152,8 +176,9 @@ EXPORT_SYMBOL(dma_mark_declared_memory_occupied);
 * Returns 0 if dma_alloc_coherent should continue with allocating from
 * generic memory areas, or !0 if dma_alloc_coherent should return @ret.
 */
-int dma_alloc_from_coherent(struct device *dev, ssize_t size,
+int dma_malloc_from_coherent(struct device *dev, ssize_t size,
-                                       dma_addr_t *dma_handle, void **ret)
+                                         dma_addr_t *dma_handle, void **ret,
+                                         bool zero)
 {
        struct dma_coherent_mem *mem;
        int order = get_order(size);
@@ -181,7 +206,8 @@ int dma_alloc_from_coherent(struct device *dev, ssize_t size,
         */
        *dma_handle = mem->device_base + (pageno << PAGE_SHIFT);
        *ret = mem->virt_base + (pageno << PAGE_SHIFT);
-        memset(*ret, 0, size);
+        if (zero)
+                memset(*ret, 0, size);
        spin_unlock_irqrestore(&mem->spinlock, flags);
        return 1;
@@ -195,7 +221,7 @@ err:
         */
        return mem->flags & DMA_MEMORY_EXCLUSIVE;
 }
-EXPORT_SYMBOL(dma_alloc_from_coherent);
+EXPORT_SYMBOL(dma_malloc_from_coherent);
 /**
 * dma_release_from_coherent() - try to free the memory allocated from per-device coherent memory pool
diff --git a/drivers/firmware/efi/libstub/fdt.c b/drivers/firmware/efi/libstub/fdt.c
index b1c22cf18f7d..9ee9973b5c3e 100644
--- a/drivers/firmware/efi/libstub/fdt.c
+++ b/drivers/firmware/efi/libstub/fdt.c
@@ -16,6 +16,22 @@
 #include "efistub.h"
+#define EFI_DT_ADDR_CELLS_DEFAULT 2
+#define EFI_DT_SIZE_CELLS_DEFAULT 2
+static void fdt_update_cell_size(efi_system_table_t *sys_table, void *fdt)
+{
+        int offset;
+        offset = fdt_path_offset(fdt, "/");
+        /* Set the #address-cells and #size-cells values for an empty tree */
+        fdt_setprop_u32(fdt, offset, "#address-cells",
+                        EFI_DT_ADDR_CELLS_DEFAULT);
+        fdt_setprop_u32(fdt, offset, "#size-cells", EFI_DT_SIZE_CELLS_DEFAULT);
+}
 efi_status_t update_fdt(efi_system_table_t *sys_table, void *orig_fdt,
                        unsigned long orig_fdt_size,
                        void *fdt, int new_fdt_size, char *cmdline_ptr,
@@ -45,10 +61,18 @@ efi_status_t update_fdt(efi_system_table_t *sys_table, void *orig_fdt,
                }
        }
-        if (orig_fdt)
+        if (orig_fdt) {
                status = fdt_open_into(orig_fdt, fdt, new_fdt_size);
-        else
+        } else {
                status = fdt_create_empty_tree(fdt, new_fdt_size);
+                if (status == 0) {
+                        /*
+                         * Any failure from the following function is non
+                         * critical
+                         */
+                        fdt_update_cell_size(sys_table, fdt);
+                }
+        }
        if (status != 0)
                goto fdt_set_fail;
diff --git a/drivers/gpio/gpio-mcp23s08.c b/drivers/gpio/gpio-mcp23s08.c
index 4a41694919da..47cc4dcea36e 100644
--- a/drivers/gpio/gpio-mcp23s08.c
+++ b/drivers/gpio/gpio-mcp23s08.c
@@ -584,6 +584,7 @@ static int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev,
                              struct mcp23s08_platform_data *pdata, int cs)
 {
        int status;
+        u32  init_dir = 0, init_val = 0;
        bool mirror = false;
        mutex_init(&mcp->lock);
@@ -682,6 +683,14 @@ static int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev,
        if (status < 0)
                goto fail;
+        if (of_property_read_u32(mcp->chip.of_node,
+                "init-dir", &init_dir) == 0)
+                status = mcp->ops->write(mcp, MCP_IODIR, init_dir);
+        if (of_property_read_u32(mcp->chip.of_node,
+                "init-val", &init_val) == 0)
+                status = mcp->ops->write(mcp, MCP_OLAT, init_val);
        status = mcp->ops->read_regs(mcp, 0, mcp->cache, ARRAY_SIZE(mcp->cache));
        if (status < 0)
                goto fail;
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 5044f2257e89..6fca39e1c419 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3475,11 +3475,6 @@ static inline uint32_t i915_vgacntrl_reg(struct drm_device *dev)
                return VGACNTRL;
 }
-static inline void __user *to_user_ptr(u64 address)
-{
-        return (void __user *)(uintptr_t)address;
-}
 static inline unsigned long msecs_to_jiffies_timeout(const unsigned int m)
 {
        unsigned long j = msecs_to_jiffies(m);
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index f56af0aaafde..659b90657f36 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -324,7 +324,7 @@ i915_gem_phys_pwrite(struct drm_i915_gem_object *obj,
 {
        struct drm_device *dev = obj->base.dev;
        void *vaddr = obj->phys_handle->vaddr + args->offset;
-        char __user *user_data = to_user_ptr(args->data_ptr);
+        char __user *user_data = u64_to_user_ptr(args->data_ptr);
        int ret = 0;
        /* We manually control the domain here and pretend that it
@@ -605,7 +605,7 @@ i915_gem_shmem_pread(struct drm_device *dev,
        int needs_clflush = 0;
        struct sg_page_iter sg_iter;
-        user_data = to_user_ptr(args->data_ptr);
+        user_data = u64_to_user_ptr(args->data_ptr);
        remain = args->size;
        obj_do_bit17_swizzling = i915_gem_object_needs_bit17_swizzle(obj);
@@ -692,7 +692,7 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data,
                return 0;
        if (!access_ok(VERIFY_WRITE,
-                       to_user_ptr(args->data_ptr),
+                       u64_to_user_ptr(args->data_ptr),
                       args->size))
                return -EFAULT;
@@ -783,7 +783,7 @@ i915_gem_gtt_pwrite_fast(struct drm_device *dev,
        if (ret)
                goto out_unpin;
-        user_data = to_user_ptr(args->data_ptr);
+        user_data = u64_to_user_ptr(args->data_ptr);
        remain = args->size;
        offset = i915_gem_obj_ggtt_offset(obj) + args->offset;
@@ -907,7 +907,7 @@ i915_gem_shmem_pwrite(struct drm_device *dev,
        int needs_clflush_before = 0;
        struct sg_page_iter sg_iter;
-        user_data = to_user_ptr(args->data_ptr);
+        user_data = u64_to_user_ptr(args->data_ptr);
        remain = args->size;
        obj_do_bit17_swizzling = i915_gem_object_needs_bit17_swizzle(obj);
@@ -1036,12 +1036,12 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
                return 0;
        if (!access_ok(VERIFY_READ,
-                       to_user_ptr(args->data_ptr),
+                       u64_to_user_ptr(args->data_ptr),
                       args->size))
                return -EFAULT;
        if (likely(!i915.prefault_disable)) {
-                ret = fault_in_multipages_readable(to_user_ptr(args->data_ptr),
+                ret = fault_in_multipages_readable(u64_to_user_ptr(args->data_ptr),
                                                   args->size);
                if (ret)
                        return -EFAULT;
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index 201947b4377c..8800f410b2d2 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -492,7 +492,7 @@ i915_gem_execbuffer_relocate_vma(struct i915_vma *vma,
        struct drm_i915_gem_exec_object2 *entry = vma->exec_entry;
        int remain, ret;
-        user_relocs = to_user_ptr(entry->relocs_ptr);
+        user_relocs = u64_to_user_ptr(entry->relocs_ptr);
        remain = entry->relocation_count;
        while (remain) {
@@ -831,7 +831,7 @@ i915_gem_execbuffer_relocate_slow(struct drm_device *dev,
                u64 invalid_offset = (u64)-1;
                int j;
-                user_relocs = to_user_ptr(exec[i].relocs_ptr);
+                user_relocs = u64_to_user_ptr(exec[i].relocs_ptr);
                if (copy_from_user(reloc+total, user_relocs,
                                   exec[i].relocation_count * sizeof(*reloc))) {
@@ -975,7 +975,7 @@ validate_exec_list(struct drm_device *dev,
                invalid_flags |= EXEC_OBJECT_NEEDS_GTT;
        for (i = 0; i < count; i++) {
-                char __user *ptr = to_user_ptr(exec[i].relocs_ptr);
+                char __user *ptr = u64_to_user_ptr(exec[i].relocs_ptr);
                int length; /* limited by fault_in_pages_readable() */
                if (exec[i].flags & invalid_flags)
@@ -1633,7 +1633,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
                return -ENOMEM;
        }
        ret = copy_from_user(exec_list,
-                             to_user_ptr(args->buffers_ptr),
+                             u64_to_user_ptr(args->buffers_ptr),
                             sizeof(*exec_list) * args->buffer_count);
        if (ret != 0) {
                DRM_DEBUG("copy %d exec entries failed %d\n",
@@ -1669,7 +1669,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
        ret = i915_gem_do_execbuffer(dev, data, file, &exec2, exec2_list);
        if (!ret) {
                struct drm_i915_gem_exec_object __user *user_exec_list =
-                        to_user_ptr(args->buffers_ptr);
+                        u64_to_user_ptr(args->buffers_ptr);
                /* Copy the new buffer offsets back to the user's exec list. */
                for (i = 0; i < args->buffer_count; i++) {
@@ -1721,7 +1721,7 @@ i915_gem_execbuffer2(struct drm_device *dev, void *data,
                return -ENOMEM;
        }
        ret = copy_from_user(exec2_list,
-                             to_user_ptr(args->buffers_ptr),
+                             u64_to_user_ptr(args->buffers_ptr),
                             sizeof(*exec2_list) * args->buffer_count);
        if (ret != 0) {
                DRM_DEBUG("copy %d exec entries failed %d\n",
@@ -1734,7 +1734,7 @@ i915_gem_execbuffer2(struct drm_device *dev, void *data,
        if (!ret) {
                /* Copy the new buffer offsets back to the user's exec list. */
                struct drm_i915_gem_exec_object2 __user *user_exec_list =
-                                   to_user_ptr(args->buffers_ptr);
+                                   u64_to_user_ptr(args->buffers_ptr);
                int i;
                for (i = 0; i < args->buffer_count; i++) {
diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c
index fed44d4e5b72..ed1efae0c3f2 100644
--- a/drivers/gpu/drm/msm/msm_gem_submit.c
+++ b/drivers/gpu/drm/msm/msm_gem_submit.c
@@ -28,11 +28,6 @@
 #define BO_LOCKED   0x4000
 #define BO_PINNED   0x2000
-static inline void __user *to_user_ptr(u64 address)
-{
-        return (void __user *)(uintptr_t)address;
-}
 static struct msm_gem_submit *submit_create(struct drm_device *dev,
                struct msm_gpu *gpu, int nr)
 {
@@ -77,7 +72,7 @@ static int submit_lookup_objects(struct msm_gem_submit *submit,
                struct drm_gem_object *obj;
                struct msm_gem_object *msm_obj;
                void __user *userptr =
-                        to_user_ptr(args->bos + (i * sizeof(submit_bo)));
+                        u64_to_user_ptr(args->bos + (i * sizeof(submit_bo)));
                ret = copy_from_user_inatomic(&submit_bo, userptr, sizeof(submit_bo));
                if (unlikely(ret)) {
@@ -275,7 +270,7 @@ static int submit_reloc(struct msm_gem_submit *submit, struct msm_gem_object *ob
        for (i = 0; i < nr_relocs; i++) {
                struct drm_msm_gem_submit_reloc submit_reloc;
                void __user *userptr =
-                        to_user_ptr(relocs + (i * sizeof(submit_reloc)));
+                        u64_to_user_ptr(relocs + (i * sizeof(submit_reloc)));
                uint32_t iova, off;
                bool valid;
@@ -375,7 +370,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
        for (i = 0; i < args->nr_cmds; i++) {
                struct drm_msm_gem_submit_cmd submit_cmd;
                void __user *userptr =
-                        to_user_ptr(args->cmds + (i * sizeof(submit_cmd)));
+                        u64_to_user_ptr(args->cmds + (i * sizeof(submit_cmd)));
                struct msm_gem_object *msm_obj;
                uint32_t iova;
diff --git a/drivers/gpu/drm/omapdrm/displays/Makefile b/drivers/gpu/drm/omapdrm/displays/Makefile
index 729a00dc3178..d08d40bcfd33 100644
--- a/drivers/gpu/drm/omapdrm/displays/Makefile
+++ b/drivers/gpu/drm/omapdrm/displays/Makefile
@@ -1,3 +1,6 @@
+obj-$(CONFIG_DISPLAY_ENCODER_TC358768) += encoder-tc358768.o
+obj-$(CONFIG_DISPLAY_PANEL_TLC59108) += panel-tlc59108.o
+obj-$(CONFIG_DISPLAY_PANEL_DPI) += panel-dpi.o
 obj-$(CONFIG_DISPLAY_ENCODER_OPA362) += encoder-opa362.o
 obj-$(CONFIG_DISPLAY_ENCODER_TFP410) += encoder-tfp410.o
 obj-$(CONFIG_DISPLAY_ENCODER_TPD12S015) += encoder-tpd12s015.o
@@ -5,11 +8,9 @@ obj-$(CONFIG_DISPLAY_DRA7EVM_ENCODER_TPD12S015) += dra7-evm-encoder-tpd12s015.o
 obj-$(CONFIG_DISPLAY_ENCODER_SII9022) += encoder-sii9022.o
 encoder-sii9022-y += encoder-sii9022-video.o
 encoder-sii9022-$(CONFIG_DISPLAY_ENCODER_SII9022_AUDIO_CODEC) += encoder-sii9022-audio.o
-obj-$(CONFIG_DISPLAY_ENCODER_TC358768) += encoder-tc358768.o
 obj-$(CONFIG_DISPLAY_CONNECTOR_DVI) += connector-dvi.o
 obj-$(CONFIG_DISPLAY_CONNECTOR_HDMI) += connector-hdmi.o
 obj-$(CONFIG_DISPLAY_CONNECTOR_ANALOG_TV) += connector-analog-tv.o
-obj-$(CONFIG_DISPLAY_PANEL_DPI) += panel-dpi.o
 obj-$(CONFIG_DISPLAY_PANEL_DSI_CM) += panel-dsi-cm.o
 obj-$(CONFIG_DISPLAY_PANEL_SONY_ACX565AKM) += panel-sony-acx565akm.o
 obj-$(CONFIG_DISPLAY_PANEL_LGPHILIPS_LB035Q02) += panel-lgphilips-lb035q02.o
diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c
index c30ce05dff3d..d717079a122f 100644
--- a/drivers/gpu/drm/omapdrm/omap_connector.c
+++ b/drivers/gpu/drm/omapdrm/omap_connector.c
@@ -352,6 +352,11 @@ struct drm_connector *omap_connector_init(struct drm_device *dev,
                                connector_type);
        drm_connector_helper_add(connector, &omap_connector_helper_funcs);
+#if 0 /* enable when dss2 supports hotplug */
+        if (dssdev->caps & OMAP_DSS_DISPLAY_CAP_HPD)
+                connector->polled = 0;
+        else
+#endif
        if (dssdev->driver->enable_hpd) {
                int ret = dssdev->driver->enable_hpd(dssdev,
                                                     omap_connector_hpd_cb,
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h b/drivers/gpu/drm/omapdrm/omap_drv.h
index 8dfeebec8c6c..82ba6dc9fc7c 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.h
+++ b/drivers/gpu/drm/omapdrm/omap_drv.h
@@ -233,6 +233,8 @@ void omap_gem_put_paddr(struct drm_gem_object *obj);
 int omap_gem_get_pages(struct drm_gem_object *obj, struct page ***pages,
                bool remap);
 int omap_gem_put_pages(struct drm_gem_object *obj);
+struct sg_table *omap_gem_get_sgt(struct drm_gem_object *obj);
+void omap_gem_put_sgt(struct drm_gem_object *obj, struct sg_table *sg);
 uint32_t omap_gem_flags(struct drm_gem_object *obj);
 int omap_gem_rotated_paddr(struct drm_gem_object *obj, uint32_t orient,
                int x, int y, dma_addr_t *paddr);
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c
index 746803476d6d..6ec7916e3840 100644
--- a/drivers/gpu/drm/omapdrm/omap_gem.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem.c
@@ -666,7 +666,8 @@ int omap_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
        };
        return omap_gem_new_handle(dev, file, gsize,
-                        OMAP_BO_SCANOUT | OMAP_BO_WC, &args->handle);
+                        OMAP_BO_SCANOUT | OMAP_BO_WC | args->flags,
+                        &args->handle);
 }
 /**
@@ -807,6 +808,68 @@ void omap_gem_dma_sync(struct drm_gem_object *obj,
        }
 }
+struct sg_table *omap_gem_get_sgt(struct drm_gem_object *obj)
+{
+        struct omap_gem_object *omap_obj = to_omap_bo(obj);
+        struct sg_table *sg;
+        dma_addr_t paddr;
+        int ret;
+        bool remap;
+        remap = omap_obj->flags & OMAP_BO_SCANOUT;
+        ret = omap_gem_get_paddr(obj, &paddr, remap);
+        if (ret)
+                goto out;
+        sg = kmalloc(sizeof(*sg), GFP_KERNEL);
+        if (!sg)
+                return NULL;
+        if (omap_obj->paddr) {
+                if (sg_alloc_table(sg, 1, GFP_KERNEL))
+                        goto free;
+                sg_init_table(sg->sgl, 1);
+                sg_dma_len(sg->sgl) = obj->size;
+                sg_set_page(sg->sgl, pfn_to_page(PFN_DOWN(omap_obj->paddr)),
+                                obj->size, 0);
+                sg_dma_address(sg->sgl) = omap_obj->paddr;
+        } else if (omap_obj->pages) {
+                struct scatterlist *sgl;
+                unsigned int i = 0;
+                int npages = obj->size >> PAGE_SHIFT;
+                if (sg_alloc_table(sg, npages, GFP_KERNEL))
+                        goto free;
+                for_each_sg(sg->sgl, sgl, npages, i) {
+                        sg_set_page(sgl, omap_obj->pages[i], PAGE_SIZE, 0);
+                        sg_dma_address(sgl) = omap_obj->addrs[i];
+                        sg_dma_len(sgl) = PAGE_SIZE;
+                }
+        } else {
+                /* we should have had paddr or pages here */
+                goto free;
+        }
+        return sg;
+out:
+        return ERR_PTR(ret);
+free:
+        sg_free_table(sg);
+        kfree(sg);
+        return NULL;
+}
+void omap_gem_put_sgt(struct drm_gem_object *obj, struct sg_table *sg)
+{
+        struct omap_gem_object *omap_obj = to_omap_bo(obj);
+        bool remap = omap_obj->flags & OMAP_BO_SCANOUT;
+        if (remap)
+                omap_gem_put_paddr(obj);
+}
 /* Get physical address for DMA.. if 'remap' is true, and the buffer is not
 * already contiguous, remap it to pin in physically contiguous memory.. (ie.
 * map in TILER)
@@ -820,19 +883,22 @@ int omap_gem_get_paddr(struct drm_gem_object *obj,
        mutex_lock(&obj->dev->struct_mutex);
-        if (!is_contiguous(omap_obj) && remap && priv->has_dmm) {
+        if (!is_contiguous(omap_obj)) {
-                if (omap_obj->paddr_cnt == 0) {
+                struct page **pages;
-                        struct page **pages;
+                uint32_t npages = obj->size >> PAGE_SHIFT;
-                        uint32_t npages = obj->size >> PAGE_SHIFT;
+                ret = get_pages(obj, &pages);
+                if (ret)
+                        goto fail;
+                if ((omap_obj->paddr_cnt == 0) &&
+                    ((omap_obj->flags & OMAP_BO_SCANOUT) || remap) &&
+                    priv->has_dmm) {
                        enum tiler_fmt fmt = gem2fmt(omap_obj->flags);
                        struct tiler_block *block;
                        BUG_ON(omap_obj->block);
-                        ret = get_pages(obj, &pages);
-                        if (ret)
-                                goto fail;
                        if (omap_obj->flags & OMAP_BO_TILED) {
                                block = tiler_reserve_2d(fmt,
                                                omap_obj->width,
@@ -861,12 +927,12 @@ int omap_gem_get_paddr(struct drm_gem_object *obj,
                        omap_obj->paddr = tiler_ssptr(block);
                        omap_obj->block = block;
-                        DBG("got paddr: %pad", &omap_obj->paddr);
+                        omap_obj->paddr_cnt++;
+                        *paddr = omap_obj->paddr;
+                } else if (omap_obj->paddr_cnt > 0) {
+                        omap_obj->paddr_cnt++;
+                        *paddr = omap_obj->paddr;
                }
-                omap_obj->paddr_cnt++;
-                *paddr = omap_obj->paddr;
        } else if (is_contiguous(omap_obj)) {
                *paddr = omap_obj->paddr;
        } else {
@@ -883,12 +949,12 @@ fail:
 /* Release physical address, when DMA is no longer being performed.. this
 * could potentially unpin and unmap buffers from TILER
 */
-void omap_gem_put_paddr(struct drm_gem_object *obj)
+static void omap_gem_put_paddr_locked(struct drm_gem_object *obj)
 {
        struct omap_gem_object *omap_obj = to_omap_bo(obj);
        int ret;
-        mutex_lock(&obj->dev->struct_mutex);
        if (omap_obj->paddr_cnt > 0) {
                omap_obj->paddr_cnt--;
                if (omap_obj->paddr_cnt == 0) {
@@ -906,7 +972,12 @@ void omap_gem_put_paddr(struct drm_gem_object *obj)
                        omap_obj->block = NULL;
                }
        }
+}
+void omap_gem_put_paddr(struct drm_gem_object *obj)
+{
+        mutex_lock(&obj->dev->struct_mutex);
+        omap_gem_put_paddr_locked(obj);
        mutex_unlock(&obj->dev->struct_mutex);
 }
@@ -1298,6 +1369,9 @@ void omap_gem_free_object(struct drm_gem_object *obj)
        list_del(&omap_obj->mm_list);
        spin_unlock(&priv->list_lock);
+        if (omap_obj->flags & OMAP_BO_MEM_PIN)
+                omap_gem_put_paddr_locked(obj);
        /* this means the object is still pinned.. which really should
         * not happen.  I think..
         */
@@ -1344,6 +1418,11 @@ struct drm_gem_object *omap_gem_new(struct drm_device *dev,
                        return NULL;
                }
+                if (flags & OMAP_BO_MEM_CONTIG) {
+                        dev_err(dev->dev, "Tiled buffers require TILER memory\n");
+                        return NULL;
+                }
                /*
                 * Tiled buffers are always shmem paged backed. When they are
                 * scanned out, they are remapped into DMM/TILER.
@@ -1357,7 +1436,8 @@ struct drm_gem_object *omap_gem_new(struct drm_device *dev,
                 */
                flags &= ~(OMAP_BO_CACHED|OMAP_BO_WC|OMAP_BO_UNCACHED);
                flags |= tiler_get_cpu_cache_flags();
-        } else if ((flags & OMAP_BO_SCANOUT) && !priv->has_dmm) {
+        } else if ((flags & OMAP_BO_MEM_CONTIG) ||
+                ((flags & OMAP_BO_SCANOUT) && !priv->has_dmm)) {
                /*
                 * OMAP_BO_SCANOUT hints that the buffer doesn't need to be
                 * tiled. However, to lower the pressure on memory allocation,
@@ -1417,12 +1497,24 @@ struct drm_gem_object *omap_gem_new(struct drm_device *dev,
                        goto err_release;
        }
+        if (flags & OMAP_BO_MEM_PIN) {
+                dma_addr_t dummy;
+                ret = omap_gem_get_paddr(obj, &dummy, true);
+                if (ret)
+                        goto err_free_dma;
+        }
        spin_lock(&priv->list_lock);
        list_add(&omap_obj->mm_list, &priv->obj_list);
        spin_unlock(&priv->list_lock);
        return obj;
+err_free_dma:
+        if (flags & OMAP_BO_MEM_DMA_API)
+                dma_free_writecombine(dev->dev, size,
+                                omap_obj->vaddr, omap_obj->paddr);
 err_release:
        drm_gem_object_release(obj);
 err_free:
diff --git a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
index 3da25d54523a..f418a7d07205 100644
--- a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
@@ -31,43 +31,23 @@ static struct sg_table *omap_gem_map_dma_buf(
 {
        struct drm_gem_object *obj = attachment->dmabuf->priv;
        struct sg_table *sg;
-        dma_addr_t paddr;
-        int ret;
-        sg = kzalloc(sizeof(*sg), GFP_KERNEL);
-        if (!sg)
-                return ERR_PTR(-ENOMEM);
-        /* camera, etc, need physically contiguous.. but we need a
-         * better way to know this..
-         */
-        ret = omap_gem_get_paddr(obj, &paddr, true);
-        if (ret)
-                goto out;
-        ret = sg_alloc_table(sg, 1, GFP_KERNEL);
+        sg = omap_gem_get_sgt(obj);
-        if (ret)
+        if (IS_ERR(sg))
-                goto out;
+                return sg;
-        sg_init_table(sg->sgl, 1);
-        sg_dma_len(sg->sgl) = obj->size;
-        sg_set_page(sg->sgl, pfn_to_page(PFN_DOWN(paddr)), obj->size, 0);
-        sg_dma_address(sg->sgl) = paddr;
        /* this should be after _get_paddr() to ensure we have pages attached */
        omap_gem_dma_sync(obj, dir);
        return sg;
-out:
-        kfree(sg);
-        return ERR_PTR(ret);
 }
 static void omap_gem_unmap_dma_buf(struct dma_buf_attachment *attachment,
                struct sg_table *sg, enum dma_data_direction dir)
 {
        struct drm_gem_object *obj = attachment->dmabuf->priv;
-        omap_gem_put_paddr(obj);
+        omap_gem_put_sgt(obj, sg);
        sg_free_table(sg);
        kfree(sg);
 }
diff --git a/drivers/hwspinlock/Kconfig b/drivers/hwspinlock/Kconfig
index 73a401662853..7980d5082197 100644
--- a/drivers/hwspinlock/Kconfig
+++ b/drivers/hwspinlock/Kconfig
@@ -8,6 +8,15 @@ config HWSPINLOCK
 menu "Hardware Spinlock drivers"
+config HWSPINLOCK_USER
+       tristate "Hardware Spinlock User-Space Interface"
+       depends on HWSPINLOCK
+       help
+         Say y here to have an user-space interface for the hardware spinlock
+         functionality.
+         If unsure, say N.
 config HWSPINLOCK_OMAP
        tristate "OMAP Hardware Spinlock device"
        depends on ARCH_OMAP4 || SOC_OMAP5 || SOC_DRA7XX || SOC_AM33XX || SOC_AM43XX
diff --git a/drivers/hwspinlock/Makefile b/drivers/hwspinlock/Makefile
index 6b59cb5a4f3a..1407cbad4df0 100644
--- a/drivers/hwspinlock/Makefile
+++ b/drivers/hwspinlock/Makefile
@@ -3,6 +3,7 @@
 #
 obj-$(CONFIG_HWSPINLOCK)                += hwspinlock_core.o
+obj-$(CONFIG_HWSPINLOCK_USER)           += hwspinlock_user.o
 obj-$(CONFIG_HWSPINLOCK_OMAP)           += omap_hwspinlock.o
 obj-$(CONFIG_HWSPINLOCK_QCOM)           += qcom_hwspinlock.o
 obj-$(CONFIG_HWSPINLOCK_SIRF)           += sirf_hwspinlock.o
diff --git a/drivers/hwspinlock/hwspinlock_core.c b/drivers/hwspinlock/hwspinlock_core.c
index d50c701b19d6..6122b5f1ca60 100644
--- a/drivers/hwspinlock/hwspinlock_core.c
+++ b/drivers/hwspinlock/hwspinlock_core.c
@@ -110,6 +110,8 @@ int __hwspin_trylock(struct hwspinlock *hwlock, int mode, unsigned long *flags)
                ret = spin_trylock_irqsave(&hwlock->lock, *flags);
        else if (mode == HWLOCK_IRQ)
                ret = spin_trylock_irq(&hwlock->lock);
+        else if (mode == HWLOCK_MUTEX)
+                ret = mutex_trylock(&hwlock->mutex);
        else
                ret = spin_trylock(&hwlock->lock);
@@ -126,6 +128,8 @@ int __hwspin_trylock(struct hwspinlock *hwlock, int mode, unsigned long *flags)
                        spin_unlock_irqrestore(&hwlock->lock, *flags);
                else if (mode == HWLOCK_IRQ)
                        spin_unlock_irq(&hwlock->lock);
+                else if (mode == HWLOCK_MUTEX)
+                        mutex_unlock(&hwlock->mutex);
                else
                        spin_unlock(&hwlock->lock);
@@ -253,6 +257,8 @@ void __hwspin_unlock(struct hwspinlock *hwlock, int mode, unsigned long *flags)
                spin_unlock_irqrestore(&hwlock->lock, *flags);
        else if (mode == HWLOCK_IRQ)
                spin_unlock_irq(&hwlock->lock);
+        else if (mode == HWLOCK_MUTEX)
+                mutex_unlock(&hwlock->mutex);
        else
                spin_unlock(&hwlock->lock);
 }
@@ -426,6 +432,7 @@ int hwspin_lock_register(struct hwspinlock_device *bank, struct device *dev,
                hwlock = &bank->lock[i];
                spin_lock_init(&hwlock->lock);
+                mutex_init(&hwlock->mutex);
                hwlock->bank = bank;
                ret = hwspin_lock_register_single(hwlock, base_id + i);
diff --git a/drivers/hwspinlock/hwspinlock_internal.h b/drivers/hwspinlock/hwspinlock_internal.h
index d26f78b8f214..586e64630632 100644
--- a/drivers/hwspinlock/hwspinlock_internal.h
+++ b/drivers/hwspinlock/hwspinlock_internal.h
@@ -48,6 +48,7 @@ struct hwspinlock_ops {
 struct hwspinlock {
        struct hwspinlock_device *bank;
        spinlock_t lock;
+        struct mutex mutex;
        void *priv;
 };
diff --git a/drivers/hwspinlock/hwspinlock_user.c b/drivers/hwspinlock/hwspinlock_user.c
new file mode 100644
index 000000000000..cdd8bbdd3b26
--- /dev/null
+++ b/drivers/hwspinlock/hwspinlock_user.c
@@ -0,0 +1,231 @@
+/*
+ * Userspace interface to hardware spinlocks
+ *
+ * Copyright (C) 2015 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.
+ *
+ * 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.
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/hwspinlock.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/uaccess.h>
+#include <linux/fs.h>
+#include <uapi/linux/hwspinlock_user.h>
+#include <linux/miscdevice.h>
+struct hwlock {
+        struct hwspinlock *hwlock;
+        struct file *owner;
+};
+struct hwspinlock_user {
+        struct device *dev;
+        struct mutex mutex;
+        int num_locks;
+        struct hwlock locks[0];
+};
+struct hwspinlock_user *user;
+static long hwspinlock_user_ioctl(struct file *filp, unsigned int cmd,
+                                  unsigned long arg)
+{
+        struct hwspinlock *hwlock = NULL;
+        union {
+                struct hwspinlock_user_lock lock;
+                struct hwspinlock_user_unlock unlock;
+        } data;
+        int i, id, ret = 0;
+        if (copy_from_user(&data, (void __user *)arg, _IOC_SIZE(cmd)))
+                return -EFAULT;
+        mutex_lock(&user->mutex);
+        switch (cmd) {
+        case HWSPINLOCK_USER_LOCK:
+                for (i = 0; i < user->num_locks; i++) {
+                        id = hwspin_lock_get_id(user->locks[i].hwlock);
+                        if (id == data.lock.id) {
+                                hwlock = user->locks[i].hwlock;
+                                break;
+                        }
+                }
+                if (hwlock) {
+                        ret = hwspin_lock_timeout_can_sleep(hwlock,
+                                                            data.lock.timeout);
+                        if (!ret)
+                                user->locks[i].owner = filp;
+                } else {
+                        dev_err(user->dev, "hwspinlock %d is not reserved\n",
+                                data.lock.id);
+                        ret = -EINVAL;
+                }
+                break;
+        case HWSPINLOCK_USER_UNLOCK:
+                for (i = 0; i < user->num_locks; i++) {
+                        id = hwspin_lock_get_id(user->locks[i].hwlock);
+                        if (id == data.unlock.id) {
+                                hwlock = user->locks[i].hwlock;
+                                break;
+                        }
+                }
+                if (hwlock) {
+                        hwspin_unlock_can_sleep(hwlock);
+                        user->locks[i].owner = NULL;
+                } else {
+                        dev_err(user->dev, "hwspinlock %d is not reserved\n",
+                                data.unlock.id);
+                        ret = -EINVAL;
+                }
+                break;
+        default:
+                ret = -ENOTTY;
+                break;
+        }
+        mutex_unlock(&user->mutex);
+        return ret;
+}
+static int hwspinlock_user_release(struct inode *inode, struct file *filp)
+{
+        int i;
+        mutex_lock(&user->mutex);
+        for (i = 0; i < user->num_locks; i++) {
+                if (user->locks[i].owner == filp) {
+                        dev_warn(user->dev,
+                                 "hwspinlock %d is forcefully unlocked\n",
+                                 hwspin_lock_get_id(user->locks[i].hwlock));
+                        hwspin_unlock_can_sleep(user->locks[i].hwlock);
+                }
+        }
+        mutex_unlock(&user->mutex);
+        return 0;
+}
+static const struct file_operations hwspinlock_user_fops = {
+        .owner          = THIS_MODULE,
+        .unlocked_ioctl = hwspinlock_user_ioctl,
+        .release        = hwspinlock_user_release,
+        .llseek         = noop_llseek,
+};
+static struct miscdevice hwspinlock_user_miscdev = {
+        .minor          = MISC_DYNAMIC_MINOR,
+        .name           = "hwspinlock",
+        .fops           = &hwspinlock_user_fops,
+};
+static int hwspinlock_user_probe(struct platform_device *pdev)
+{
+        struct device_node *node = pdev->dev.of_node;
+        struct hwspinlock *hwlock;
+        int num, id, i;
+        int ret;
+        if (!node)
+                return -ENODEV;
+        num = of_count_phandle_with_args(node, "hwlocks", "#hwlock-cells");
+        user = devm_kzalloc(&pdev->dev, sizeof(struct hwspinlock_user) +
+                              num * sizeof(struct hwlock), GFP_KERNEL);
+        if (!user)
+                return -ENOMEM;
+        user->dev = &pdev->dev;
+        user->num_locks = num;
+        mutex_init(&user->mutex);
+        ret = misc_register(&hwspinlock_user_miscdev);
+        if (ret) {
+                dev_err(user->dev, "failed to register miscdev %d\n", ret);
+                return ret;
+        }
+        for (i = 0; i < user->num_locks; i++) {
+                id = of_hwspin_lock_get_id(node, i);
+                if (id < 0) {
+                        dev_err(user->dev, "failed to get lock id %d\n", id);
+                        ret = -ENODEV;
+                        goto err;
+                }
+                hwlock = hwspin_lock_request_specific(id);
+                if (IS_ERR_OR_NULL(hwlock)) {
+                        dev_err(user->dev, "failed to request lock %d\n", id);
+                        ret = IS_ERR(hwlock) ? PTR_ERR(hwlock) : -EBUSY;
+                        goto err;
+                }
+                user->locks[i].hwlock = hwlock;
+        }
+        dev_info(user->dev, "requested %d hwspinlocks\n", i);
+        platform_set_drvdata(pdev, user);
+        return 0;
+err:
+        misc_deregister(&hwspinlock_user_miscdev);
+        for (i--; i >= 0; i--)
+                hwspin_lock_free(user->locks[i].hwlock);
+        return ret;
+}
+static int hwspinlock_user_remove(struct platform_device *pdev)
+{
+        struct hwspinlock_user *user = platform_get_drvdata(pdev);
+        int i;
+        misc_deregister(&hwspinlock_user_miscdev);
+        for (i = 0; i < user->num_locks; i++)
+                hwspin_lock_free(user->locks[i].hwlock);
+        return 0;
+}
+static const struct of_device_id hwspinlock_user_of_match[] = {
+        { .compatible = "hwspinlock-user", },
+        { /* end */ },
+};
+MODULE_DEVICE_TABLE(of, hwspinlock_user_of_match);
+static struct platform_driver hwspinlock_user_driver = {
+        .probe          = hwspinlock_user_probe,
+        .remove         = hwspinlock_user_remove,
+        .driver         = {
+                .name   = "hwspinlock_user",
+                .owner  = THIS_MODULE,
+                .of_match_table = of_match_ptr(hwspinlock_user_of_match),
+        },
+};
+module_platform_driver(hwspinlock_user_driver);
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 709527cd4c2e..97f1eacdda0e 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -325,6 +325,7 @@ config TOUCHSCREEN_GOODIX
        tristate "Goodix I2C touchscreen"
        depends on I2C
        depends on GPIOLIB
+        select INPUT_POLLDEV
        help
          Say Y here if you have the Goodix touchscreen (such as one
          installed in Onda v975w tablets) connected to your
@@ -1107,4 +1108,16 @@ config TOUCHSCREEN_ROHM_BU21023
          To compile this driver as a module, choose M here: the
          module will be called bu21023_ts.
+config TOUCHSCREEN_LDC3001
+        tristate "LDC3001 ROIC based Touch screen controllers"
+        depends on I2C
+        help
+          Say Y here if you have a LDC3001 plus LGD STM32F103
+          MCU based touchscreen controller.
+          If unsure, say N.
+          To compile this driver as a module, choose M here: the
+          module will be called ldc3001_ts.
 endif
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
index cbaa6abb08da..595176cb07cf 100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -91,3 +91,4 @@ obj-$(CONFIG_TOUCHSCREEN_TPS6507X)	+= tps6507x-ts.o
 obj-$(CONFIG_TOUCHSCREEN_ZFORCE)        += zforce_ts.o
 obj-$(CONFIG_TOUCHSCREEN_COLIBRI_VF50)  += colibri-vf50-ts.o
 obj-$(CONFIG_TOUCHSCREEN_ROHM_BU21023)  += rohm_bu21023.o
+obj-$(CONFIG_TOUCHSCREEN_LDC3001)       += ldc3001_ts.o
diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c
index a27f0d7107af..916c9877261f 100644
--- a/drivers/input/touchscreen/goodix.c
+++ b/drivers/input/touchscreen/goodix.c
@@ -22,6 +22,7 @@
 #include <linux/i2c.h>
 #include <linux/input.h>
 #include <linux/input/mt.h>
+#include <linux/input-polldev.h>
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/irq.h>
@@ -34,6 +35,7 @@
 struct goodix_ts_data {
        struct i2c_client *client;
        struct input_dev *input_dev;
+        struct input_polled_dev *poll_dev;
        int abs_x_max;
        int abs_y_max;
        bool swapped_x_y;
@@ -77,6 +79,8 @@ struct goodix_ts_data {
 #define MAX_CONTACTS_LOC        5
 #define TRIGGER_LOC             6
+#define TSC_DEFAULT_POLL_PERIOD 30 /* ms */
 static const unsigned long goodix_irq_flags[] = {
        IRQ_TYPE_EDGE_RISING,
        IRQ_TYPE_EDGE_FALLING,
@@ -281,6 +285,20 @@ static void goodix_process_events(struct goodix_ts_data *ts)
        input_sync(ts->input_dev);
 }
+static void _goodix_process_events(struct goodix_ts_data *ts)
+{
+        goodix_process_events(ts);
+        if (goodix_i2c_write_u8(ts->client, GOODIX_READ_COOR_ADDR, 0) < 0)
+                dev_err(&ts->client->dev, "I2C write end_cmd error\n");
+}
+static void goodix_poll(struct input_polled_dev *poll_dev)
+{
+        struct goodix_ts_data *ts = poll_dev->private;
+        _goodix_process_events(ts);
+}
 /**
 * goodix_ts_irq_handler - The IRQ handler
 *
@@ -291,10 +309,7 @@ static irqreturn_t goodix_ts_irq_handler(int irq, void *dev_id)
 {
        struct goodix_ts_data *ts = dev_id;
-        goodix_process_events(ts);
+        _goodix_process_events(ts);
-        if (goodix_i2c_write_u8(ts->client, GOODIX_READ_COOR_ADDR, 0) < 0)
-                dev_err(&ts->client->dev, "I2C write end_cmd error\n");
        return IRQ_HANDLED;
 }
@@ -614,6 +629,58 @@ static int goodix_request_input_dev(struct goodix_ts_data *ts)
        return 0;
 }
+static int goodix_request_input_polled_dev(struct goodix_ts_data *ts)
+{
+        int error;
+        struct input_polled_dev *poll_dev;
+        dev_err(&ts->client->dev, "Setting up polling.\n");
+        poll_dev = input_allocate_polled_device();
+        if (!poll_dev) {
+                dev_err(&ts->client->dev, "Failed to allocate polled input device.\n");
+                error = -ENOMEM;
+                return error;
+        }
+        ts->poll_dev = poll_dev;
+        poll_dev->private = ts;
+        poll_dev->poll = goodix_poll;
+        poll_dev->poll_interval = TSC_DEFAULT_POLL_PERIOD;
+        ts->input_dev = poll_dev->input;
+        if (!ts->input_dev) {
+                dev_err(&ts->client->dev, "Failed to allocate input device.");
+                return -ENOMEM;
+        }
+        input_set_abs_params(ts->input_dev, ABS_MT_POSITION_X,
+                             0, ts->abs_x_max, 0, 0);
+        input_set_abs_params(ts->input_dev, ABS_MT_POSITION_Y,
+                             0, ts->abs_y_max, 0, 0);
+        input_set_abs_params(ts->input_dev, ABS_MT_WIDTH_MAJOR, 0, 255, 0, 0);
+        input_set_abs_params(ts->input_dev, ABS_MT_TOUCH_MAJOR, 0, 255, 0, 0);
+        input_mt_init_slots(ts->input_dev, ts->max_touch_num,
+                            INPUT_MT_DIRECT | INPUT_MT_DROP_UNUSED);
+        ts->input_dev->name = "Goodix Capacitive TouchScreen";
+        ts->input_dev->phys = "input/ts";
+        ts->input_dev->id.bustype = BUS_I2C;
+        ts->input_dev->id.vendor = 0x0416;
+        ts->input_dev->id.product = ts->id;
+        ts->input_dev->id.version = ts->version;
+        error = input_register_polled_device(poll_dev);
+        if (error) {
+                dev_err(&ts->client->dev,
+                        "Failed to register input device: %d", error);
+                return error;
+        }
+        return 0;
+}
 /**
 * goodix_configure_dev - Finish device initialization
 *
@@ -637,15 +704,23 @@ static int goodix_configure_dev(struct goodix_ts_data *ts)
        goodix_read_config(ts);
-        error = goodix_request_input_dev(ts);
+        if (ts->client->irq) {
-        if (error)
+                error = goodix_request_input_dev(ts);
-                return error;
+                if (error)
+                        return error;
+                ts->irq_flags = goodix_irq_flags[ts->int_trigger_type] |
+                        IRQF_ONESHOT;
+                error = goodix_request_irq(ts);
+                if (error) {
+                        dev_err(&ts->client->dev, "request IRQ failed: %d\n",
+                                error);
+                        return error;
+                }
+        } else {
+                /* setup polling if IRQ is not defined */
+                error = goodix_request_input_polled_dev(ts);
-        ts->irq_flags = goodix_irq_flags[ts->int_trigger_type] | IRQF_ONESHOT;
-        error = goodix_request_irq(ts);
-        if (error) {
-                dev_err(&ts->client->dev, "request IRQ failed: %d\n", error);
-                return error;
        }
        return 0;
diff --git a/drivers/input/touchscreen/ldc3001_ts.c b/drivers/input/touchscreen/ldc3001_ts.c
new file mode 100644
index 000000000000..6cc0798a7e08
--- /dev/null
+++ b/drivers/input/touchscreen/ldc3001_ts.c
@@ -0,0 +1,526 @@
+/*
+ * LDC3001 Touch Screen driver
+ *
+ * Copyright (C) 2013-2014 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 as
+ * published by the Free Software Foundation version 2.
+ *
+ * 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/module.h>
+#include <linux/init.h>
+#include <linux/kthread.h>
+#include <linux/firmware.h>
+#include <linux/i2c.h>
+#include <linux/input/mt.h>
+#include <linux/interrupt.h>
+#include <linux/slab.h>
+#include <linux/gpio.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
+#include <linux/of_device.h>
+#include <linux/of_irq.h>
+#include <linux/regmap.h>
+#define TSC_READ_LEN            1
+#define DEFAULT_READ_LEN        2 /* corresponds to the ID bit-field */
+#define TP_READ_SIZE            3 /* co-ordinates size in bytes */
+#define MAX_PAYLOAD_SIZE(mt_points)     ((mt_points * TP_READ_SIZE) \
+                                                + DEFAULT_READ_LEN)
+/* MACROS to decode data from the i2c messages */
+#define GET_X_POS(msg)          (((((msg)[0] >> 4) & 0x0f) << 8) \
+                                | ((msg)[1]))
+#define GET_Y_POS(msg)          ((((msg)[0] & 0x0f)) << 8 | ((msg)[2]))
+#define GET_INDICES(msg)        ((((msg)[0] & 0x00ff) \
+                                | (((msg)[1]) & 0x30) << 4))
+/* i2c offsets for the tsc */
+#define TOUCH_DATA_ADDR         0xFA
+#define TOUCH_DATA_COUNT_ADDR   0xF5
+/* defines a touch */
+struct touch_point {
+        u8 touch_id;
+        u8 state;
+        int x_pos;
+        int y_pos;
+};
+/* platform data for the LGPhilips LDC3001 TSC */
+struct ldc3001_platform_data {
+        unsigned int x_size;
+        unsigned int y_size;
+        unsigned int num_mt_slots;
+};
+/* each client has this additional data */
+struct ldc3001_data {
+        struct i2c_client *client;
+        struct input_dev *input_dev;
+        char phys[64];          /* device physical location */
+        const struct ldc3001_platform_data *pdata;
+        unsigned int irq;
+        u8 *message;
+        struct touch_point *tps;
+        u8 cur_index;
+        u16 tp_fields;
+};
+static ssize_t ldc3001_fw_version_show(struct device *dev,
+                                   struct device_attribute *attr, char *buf) {
+        /* FIXME: read TLC to get TS version */
+        return scnprintf(buf, PAGE_SIZE, "1.04\n");
+}
+static DEVICE_ATTR(fw_version, S_IRUGO, ldc3001_fw_version_show, NULL);
+static struct attribute *ldc3001_attrs[] = {
+        &dev_attr_fw_version.attr,
+        NULL
+};
+static const struct attribute_group ldc3001_attr_group = {
+        .attrs = ldc3001_attrs,
+};
+#ifdef CONFIG_PM_SLEEP
+static int ldc3001_i2c_ts_suspend(struct device *dev)
+{
+        dev_dbg(dev, "%s\n", __func__);
+        return 0;
+}
+static int ldc3001_i2c_ts_resume(struct device *dev)
+{
+        dev_dbg(dev, "%s\n", __func__);
+        return 0;
+}
+#endif
+static SIMPLE_DEV_PM_OPS(ldc3001_dev_pm_ops,
+                         ldc3001_i2c_ts_suspend, ldc3001_i2c_ts_resume);
+#ifdef DEBUG
+static void dump_touch_data(u8 *message, int len)
+{
+        print_hex_dump(KERN_ERR, " \t", DUMP_PREFIX_NONE, 16, 1,
+                        message, len, false);
+}
+static u16 get_touch_fields(struct ldc3001_data *data)
+{
+        u8 *message = data->message;
+        pr_info("Bit field is %u\n", GET_INDICES(message));
+        return GET_INDICES(message);
+}
+/*
+ * index        - index to the read message
+ * touch_idx    - touch_idx tracking id
+ */
+static void  get_tpos(struct ldc3001_data *data, u8 index, u8 touch_idx)
+{
+        u16 x, y;
+        u8 *message = &data->message[index*TP_READ_SIZE + DEFAULT_READ_LEN];
+        data->tps[index].x_pos = GET_X_POS(msg);
+        data->tps[index].y_pos = GET_Y_POS(msg);
+        data->tps[index].touch_id = touch_idx;
+        pr_info("x %x\n", data->tps[index].x_pos);
+        pr_info("y %x\n", data->tps[index].y_pos);
+}
+static int ldc3001_write_reg(struct i2c_client *client, u16 reg, u16 len,
+                const void *val)
+{
+        u8 *buf;
+        size_t count;
+        int ret;
+        count = len + 2;
+        buf = kmalloc(count, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+        /* pack the 16 bit reg value to byte data */
+        buf[0] = reg & 0xff;
+        buf[1] = (reg >> 8) & 0xff;
+        memcpy(&buf[2], val, len);
+        ret = i2c_master_send(client, buf, count);
+        if (ret == count) {
+                ret = 0;
+        } else {
+                if (ret >= 0)
+                        ret = -EIO;
+                dev_err(&client->dev, "%s: i2c send failed (%d)\n",
+                        __func__, ret);
+        }
+        kfree(buf);
+        return ret;
+}
+#endif
+static int ldc3001_read_reg(struct i2c_client *client,
+                               u16 reg, u16 len, void *val)
+{
+        struct i2c_msg xfer[2];
+        u8 buf[2];
+        int ret;
+        /* pack the 16 bit reg value to byte data */
+        buf[0] = reg & 0xff;
+        buf[1] = (reg >> 8) & 0xff;
+        /* Write register */
+        xfer[0].addr = client->addr;
+        xfer[0].flags = 0;
+        xfer[0].len = 2;
+        xfer[0].buf = buf;
+        /* Read data */
+        xfer[1].addr = client->addr;
+        xfer[1].flags = I2C_M_RD;
+        xfer[1].len = len;
+        xfer[1].buf = val;
+        ret = i2c_transfer(client->adapter, xfer, 2);
+        if (ret == 2) {
+                ret = 0;
+        } else {
+                if (ret >= 0)
+                        ret = -EIO;
+                dev_err(&client->dev, "%s: i2c transfer failed (%d)\n",
+                        __func__, ret);
+        }
+        return ret;
+}
+static int ldc3001_ts_read_data(struct ldc3001_data *data, int len)
+{
+        int error;
+        struct i2c_client *client = data->client;
+        error = ldc3001_read_reg(client, TOUCH_DATA_ADDR, len, data->message);
+        if (error)
+                dev_err(&client->dev, "i2c_read failed %x\n", error);
+        return error;
+}
+static int ldc3001_ts_read_len(struct ldc3001_data *data)
+{
+        int error;
+        u8 len = 0;
+        struct i2c_client *client = data->client;
+        error = ldc3001_read_reg(client, TOUCH_DATA_COUNT_ADDR, TSC_READ_LEN,
+                &len);
+        if (error)
+                dev_err(&client->dev, "i2c_read len failed %x\n", error);
+        return len;
+}
+static void ldc3001_input_touchevent(struct ldc3001_data *data)
+{
+        u16 touch_index = 0;
+        u8 i, msg_index = 0;
+        int num_mt_slots = data->pdata->num_mt_slots;
+        struct input_dev *input_dev = data->input_dev;
+        u8 *message = data->message;
+        /* get valid touch ids */
+        touch_index = GET_INDICES(message);
+        /* loop through all tps to process changes */
+        for (i = 0; i < num_mt_slots; i++) {
+                /* tracking id has a touch event */
+                if (touch_index & (1 << i)) {
+                        message =
+                &data->message[msg_index * TP_READ_SIZE + DEFAULT_READ_LEN];
+                        /* decode the x and y co-ordinates */
+                        data->tps[i].x_pos = GET_X_POS(message);
+                        data->tps[i].y_pos = GET_Y_POS(message);
+                        /* update state and move to the next message */
+                        data->tps[i].state = 1;
+                        msg_index++;
+                        /* report the touch event */
+                        input_mt_slot(input_dev, i);
+                        input_mt_report_slot_state(input_dev,
+                                        MT_TOOL_FINGER, data->tps[i].state);
+                        input_report_abs(input_dev, ABS_MT_POSITION_X,
+                                        data->tps[i].x_pos);
+                        input_report_abs(input_dev, ABS_MT_POSITION_Y,
+                                        data->tps[i].y_pos);
+                } else if (data->tps[i].state == 1) {
+                        /* this is a pen release event */
+                        data->tps[i].state = 0;
+                        input_mt_slot(input_dev, i);
+                        input_mt_report_slot_state(input_dev, MT_TOOL_FINGER,
+                                                        data->tps[i].state);
+                }
+        }
+        /* send sync event */
+        input_mt_report_pointer_emulation(data->input_dev, false);
+        input_sync(input_dev);
+}
+static irqreturn_t ldc3001_ts_interrupt(int irq, void *dev_id)
+{
+        struct ldc3001_data *data = (struct ldc3001_data *)dev_id;
+        int read_len;
+        /* FIXME: need to figure out why this is required */
+        disable_irq_nosync(irq);
+        read_len = ldc3001_ts_read_len(data);
+        /* reset touchid fields */
+        data->message[0] = 0x0;
+        data->message[1] = 0x0;
+        if (read_len > DEFAULT_READ_LEN)
+                /* fill the message array with data read from tsc */
+                ldc3001_ts_read_data(data, read_len);
+        ldc3001_input_touchevent(data);
+        enable_irq(irq);
+        return IRQ_HANDLED;
+}
+int ldc3001_of_populate(struct i2c_client *client,
+                                        struct ldc3001_platform_data *pdata)
+{
+        struct device_node *node = client->dev.of_node;
+        unsigned int val;
+        int ret = -EINVAL;
+        ret = of_property_read_u32(node, "res-x", &val);
+        if (ret)
+                goto error;
+        pdata->x_size = val;
+        ret = of_property_read_u32(node, "res-y", &val);
+        if (ret)
+                goto error;
+        pdata->y_size = val;
+        ret = of_property_read_u32(node, "max-touch-points", &val);
+        if (ret)
+                goto error;
+        pdata->num_mt_slots = val;
+error:
+        return ret;
+}
+static const struct of_device_id ldc3001_dt_ids[] = {
+        { .compatible = "lgphilips,ldc3001"},
+        { /* sentinel */ }
+};
+static int ldc3001_probe(struct i2c_client *client,
+                                        const struct i2c_device_id *idev_id)
+{
+        struct device_node *node = client->dev.of_node;
+        struct ldc3001_platform_data *pdata;
+        struct ldc3001_data *data;
+        struct input_dev *input_dev;
+        const struct of_device_id *match;
+        int error;
+        match = of_match_device(of_match_ptr(ldc3001_dt_ids), &client->dev);
+        if (match) {
+                pdata = devm_kzalloc(&client->dev,
+                        sizeof(struct ldc3001_platform_data), GFP_KERNEL);
+                if (!pdata)
+                        return -ENOMEM;
+                /* get dt values to populate platform data */
+                error = ldc3001_of_populate(client, pdata);
+                if (error)
+                        return -EINVAL;
+        } else {
+                pdata = client->dev.platform_data;
+                if (!pdata) {
+                        dev_err(&client->dev, "platform data not populated\n");
+                        return -EINVAL;
+                }
+        }
+        data = devm_kzalloc(&client->dev,
+                        sizeof(struct ldc3001_data), GFP_KERNEL);
+        if (!data) {
+                error = -ENOMEM;
+                goto err_exit;
+        }
+        data->tps = devm_kzalloc(&client->dev,
+                sizeof(struct touch_point) * pdata->num_mt_slots, GFP_KERNEL);
+        if (!data->tps) {
+                error = -ENOMEM;
+                goto err_exit;
+        }
+        data->message = devm_kzalloc(&client->dev,
+                (sizeof(u8) * MAX_PAYLOAD_SIZE(pdata->num_mt_slots)),
+                GFP_KERNEL);
+        if (!data->message) {
+                error = -ENOMEM;
+                goto err_exit;
+        }
+        input_dev = devm_input_allocate_device(&client->dev);
+        if (!input_dev) {
+                error = -ENOMEM;
+                goto err_exit;
+        }
+        input_dev->name = "LDC 3001 TouchScreen Controller";
+        snprintf(data->phys, sizeof(data->phys), "i2c-%u-%04x/input0",
+                 client->adapter->nr, client->addr);
+        input_dev->phys = data->phys;
+        input_dev->dev.parent = &client->dev;
+        data->client = client;
+        data->input_dev = input_dev;
+        data->pdata = pdata;
+        input_set_drvdata(input_dev, data);
+        i2c_set_clientdata(client, data);
+        /*TODO: Need to poke the tlc chip to read revision of the TSC chip */
+        __set_bit(EV_ABS, input_dev->evbit);
+        __set_bit(EV_KEY, input_dev->evbit);
+        __set_bit(BTN_TOUCH, input_dev->keybit);
+        /* For single touch */
+        input_set_abs_params(input_dev, ABS_X,
+                        0, pdata->x_size, 0, 0);
+        input_set_abs_params(input_dev, ABS_Y,
+                        0, pdata->y_size, 0, 0);
+        /* For multi touch */
+        error = input_mt_init_slots(input_dev, pdata->num_mt_slots, 0);
+        if (error)
+                goto err_exit;
+        input_set_abs_params(input_dev, ABS_MT_POSITION_X,
+                        0, pdata->x_size, 0, 0);
+        input_set_abs_params(input_dev, ABS_MT_POSITION_Y,
+                        0, pdata->y_size, 0, 0);
+        data->irq = irq_of_parse_and_map(node, 0);
+        if (data->irq) {
+                error = devm_request_threaded_irq(&client->dev, data->irq,
+                                NULL, ldc3001_ts_interrupt,
+                                IRQF_ONESHOT | IRQF_TRIGGER_HIGH,
+                                dev_name(&client->dev), data);
+                if (error) {
+                        dev_err(&client->dev, "failed to register interrupt\n");
+                        goto cleanup_exit;
+                }
+        } else {
+                dev_err(&client->dev,
+                                "failed registering irq = %d\n", data->irq);
+                error = -EINVAL;
+                goto cleanup_exit;
+        }
+        error = input_register_device(input_dev);
+        if (error)
+                input_free_device(input_dev);
+        else {
+                error = sysfs_create_group(&client->dev.kobj,
+                                                        &ldc3001_attr_group);
+                return error;
+        }
+cleanup_exit:
+        input_mt_destroy_slots(input_dev);
+err_exit:
+        return error;
+}
+static int ldc3001_remove(struct i2c_client *client)
+{
+        struct ldc3001_data *data =
+                        (struct ldc3001_data *)i2c_get_clientdata(client);
+        struct input_dev *input_dev = data->input_dev;
+        sysfs_remove_group(&client->dev.kobj, &ldc3001_attr_group);
+        input_unregister_device(input_dev);
+        return 0;
+}
+static const struct i2c_device_id ldc3001_i2c_id[] = {
+        {"ldc3001", 0},
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, ldc3001_i2c_id);
+static struct i2c_driver ldc3001_i2c_driver = {
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "ldc3001",
+                .pm     = &ldc3001_dev_pm_ops,
+                .of_match_table = ldc3001_dt_ids,
+        },
+        .probe          = ldc3001_probe,
+        .remove         = ldc3001_remove,
+        .id_table       = ldc3001_i2c_id,
+};
+module_i2c_driver(ldc3001_i2c_driver);
+MODULE_AUTHOR("Subramaniam Chanderashekarapuram <subramaniam.ca@ti.com>");
+MODULE_DESCRIPTION("LDC3001 I2C Touchscreen driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("i2c:ldc3001");
diff --git a/drivers/iommu/omap-iommu-debug.c b/drivers/iommu/omap-iommu-debug.c
index 505548aafeff..78cec6fd5e00 100644
--- a/drivers/iommu/omap-iommu-debug.c
+++ b/drivers/iommu/omap-iommu-debug.c
@@ -197,7 +197,10 @@ static void dump_ioptable(struct seq_file *s)
                        continue;
                }
-                iopte = iopte_offset(iopgd, 0);
+                if (obj->late_attach)
+                        iopte = iopte_offset_lateattach(obj, iopgd, 0);
+                else
+                        iopte = iopte_offset(iopgd, 0);
                for (j = 0; j < PTRS_PER_IOPTE; j++, iopte++) {
                        if (!*iopte)
                                continue;
diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index 4cb603e5ba70..f6ec55ab0233 100644
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -183,7 +183,7 @@ static int omap2_iommu_enable(struct omap_iommu *obj)
        if (!obj->iopgd || !IS_ALIGNED((u32)obj->iopgd,  SZ_16K))
                return -EINVAL;
-        pa = virt_to_phys(obj->iopgd);
+        pa = obj->iopgd_pa;
        if (!IS_ALIGNED(pa, SZ_16K))
                return -EINVAL;
@@ -218,6 +218,15 @@ static int iommu_enable(struct omap_iommu *obj)
 {
        int ret;
+        /*
+         * now that the threat of idling has passed, decrement the
+         * device usage count to balance the increment done in probe,
+         * the pm runtime device usage count will be managed normally
+         * from here on
+         */
+        if (obj->late_attach)
+                pm_runtime_put_noidle(obj->dev);
        ret = pm_runtime_get_sync(obj->dev);
        if (ret < 0)
                pm_runtime_put_noidle(obj->dev);
@@ -530,7 +539,10 @@ static u32 *iopte_alloc(struct omap_iommu *obj, u32 *iopgd, u32 da)
        }
 pte_ready:
-        iopte = iopte_offset(iopgd, da);
+        if (obj->late_attach)
+                iopte = iopte_offset_lateattach(obj, iopgd, da);
+        else
+                iopte = iopte_offset(iopgd, da);
        dev_vdbg(obj->dev,
                 "%s: da:%08x pgd:%p *pgd:%08x pte:%p *pte:%08x\n",
@@ -682,8 +694,12 @@ iopgtable_lookup_entry(struct omap_iommu *obj, u32 da, u32 **ppgd, u32 **ppte)
        if (!*iopgd)
                goto out;
-        if (iopgd_is_table(*iopgd))
+        if (iopgd_is_table(*iopgd)) {
-                iopte = iopte_offset(iopgd, da);
+                if (obj->late_attach)
+                        iopte = iopte_offset_lateattach(obj, iopgd, da);
+                else
+                        iopte = iopte_offset(iopgd, da);
+        }
 out:
        *ppgd = iopgd;
        *ppte = iopte;
@@ -700,13 +716,23 @@ static size_t iopgtable_clear_entry_core(struct omap_iommu *obj, u32 da)
        if (iopgd_is_table(*iopgd)) {
                int i;
-                u32 *iopte = iopte_offset(iopgd, da);
+                u32 *iopte;
+                if (obj->late_attach)
+                        iopte = iopte_offset_lateattach(obj, iopgd, da);
+                else
+                        iopte = iopte_offset(iopgd, da);
                bytes = IOPTE_SIZE;
                if (*iopte & IOPTE_LARGE) {
                        nent *= 16;
                        /* rewind to the 1st entry */
-                        iopte = iopte_offset(iopgd, (da & IOLARGE_MASK));
+                        if (obj->late_attach)
+                                iopte = iopte_offset_lateattach(obj, iopgd,
+                                                        (da & IOLARGE_MASK));
+                        else
+                                iopte = iopte_offset(iopgd,
+                                                        (da & IOLARGE_MASK));
                }
                bytes *= nent;
                memset(iopte, 0, nent * sizeof(*iopte));
@@ -715,7 +741,11 @@ static size_t iopgtable_clear_entry_core(struct omap_iommu *obj, u32 da)
                /*
                 * do table walk to check if this table is necessary or not
                 */
-                iopte = iopte_offset(iopgd, 0);
+                if (obj->late_attach)
+                        iopte = iopte_offset_lateattach(obj, iopgd, 0);
+                else
+                        iopte = iopte_offset(iopgd, 0);
                for (i = 0; i < PTRS_PER_IOPTE; i++)
                        if (iopte[i])
                                goto out;
@@ -772,8 +802,13 @@ static void iopgtable_clear_entry_all(struct omap_iommu *obj)
                if (!*iopgd)
                        continue;
-                if (iopgd_is_table(*iopgd))
+                if (iopgd_is_table(*iopgd)) {
-                        iopte_free(iopte_offset(iopgd, 0));
+                        if (obj->late_attach)
+                                iopte_free(iopte_offset_lateattach(obj,
+                                                                iopgd, 0));
+                        else
+                                iopte_free(iopte_offset(iopgd, 0));
+                }
                *iopgd = 0;
                flush_iopgd_range(iopgd, iopgd + 1);
@@ -816,7 +851,10 @@ static irqreturn_t iommu_fault_handler(int irq, void *data)
                return IRQ_NONE;
        }
-        iopte = iopte_offset(iopgd, da);
+        if (obj->late_attach)
+                iopte = iopte_offset_lateattach(obj, iopgd, da);
+        else
+                iopte = iopte_offset(iopgd, da);
        dev_err(obj->dev, "%s: errs:0x%08x da:0x%08x pgd:0x%p *pgd:0x%08x pte:0x%p *pte:0x%08x\n",
                obj->name, errs, da, iopgd, *iopgd, iopte, *iopte);
@@ -844,6 +882,7 @@ static struct omap_iommu *omap_iommu_attach(const char *name, u32 *iopgd)
        int err;
        struct device *dev;
        struct omap_iommu *obj;
+        u32 iopgd_pa;
        dev = driver_find_device(&omap_iommu_driver.driver, NULL, (void *)name,
                                 device_match_by_alias);
@@ -852,13 +891,25 @@ static struct omap_iommu *omap_iommu_attach(const char *name, u32 *iopgd)
        obj = to_iommu(dev);
+        if (obj->late_attach) {
+                iopgd_pa = iommu_read_reg(obj, MMU_TTB);
+                iopgd = devm_ioremap(obj->dev, iopgd_pa,
+                                        2 * IOPGD_TABLE_SIZE);
+                if (!iopgd)
+                        return ERR_PTR(-ENOMEM);
+        } else {
+                iopgd_pa = virt_to_phys(iopgd);
+        }
        spin_lock(&obj->iommu_lock);
+        obj->iopgd_pa = iopgd_pa;
        obj->iopgd = iopgd;
        err = iommu_enable(obj);
        if (err)
                goto err_enable;
-        flush_iotlb_all(obj);
+        if (!obj->late_attach)
+                flush_iotlb_all(obj);
        spin_unlock(&obj->iommu_lock);
@@ -879,10 +930,16 @@ static void omap_iommu_detach(struct omap_iommu *obj)
        if (!obj || IS_ERR(obj))
                return;
+        if (obj->late_attach && obj->iopgd)
+                iounmap(obj->iopgd);
        spin_lock(&obj->iommu_lock);
+        obj->iopgd_pa = 0;
        obj->iopgd = NULL;
        iommu_disable(obj);
+        obj->late_attach = 0;
+        obj->late_attach_dma_pool = 0;
        spin_unlock(&obj->iommu_lock);
@@ -1056,7 +1113,10 @@ static int omap_iommu_runtime_resume(struct device *dev)
                }
        }
-        if (pdata && pdata->deassert_reset) {
+        /* do not deassert reset only during initial boot for late attach */
+        if ((!obj->late_attach || obj->domain) &&
+            pdata && pdata->deassert_reset) {
                ret = pdata->deassert_reset(pdev, pdata->reset_name);
                if (ret) {
                        dev_err(dev, "deassert_reset failed: %d\n", ret);
@@ -1140,6 +1200,7 @@ static int omap_iommu_probe(struct platform_device *pdev)
        struct resource *res;
        struct iommu_platform_data *pdata = dev_get_platdata(&pdev->dev);
        struct device_node *of = pdev->dev.of_node;
+        struct property *prop;
        obj = devm_kzalloc(&pdev->dev, sizeof(*obj) + MMU_REG_SIZE, GFP_KERNEL);
        if (!obj)
@@ -1165,6 +1226,35 @@ static int omap_iommu_probe(struct platform_device *pdev)
                        return -EINVAL;
                if (of_find_property(of, "ti,iommu-bus-err-back", NULL))
                        obj->has_bus_err_back = MMU_GP_REG_BUS_ERR_BACK_EN;
+                prop = of_find_property(of, "ti,late-attach", NULL);
+                if (prop) {
+                        obj->late_attach = 1;
+                        /*
+                         * Clear the late attach property in device tree for
+                         * subsequent probes.
+                         */
+                        err = of_remove_property(of, prop);
+                        if (err < 0)
+                                dev_err(&pdev->dev, "Unable to remove late-attach property\n");
+                        /*
+                         * Check to see if using a DMA pool (instead of CMA
+                         * pool)
+                         */
+                        prop = of_find_property(of, "ti,late-attach-dma-pool",
+                                                NULL);
+                        if (prop) {
+                                obj->late_attach_dma_pool = 1;
+                                /*
+                                 * Clear the late attach property in device
+                                 * tree for subsequent probes.
+                                 */
+                                err = of_remove_property(of, prop);
+                                if (err < 0)
+                                        dev_err(&pdev->dev, "Unable to remove late-attach-dma-pool property\n");
+                        }
+                }
        } else {
                obj->nr_tlb_entries = pdata->nr_tlb_entries;
                obj->name = pdata->name;
@@ -1201,6 +1291,15 @@ static int omap_iommu_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, obj);
        pm_runtime_irq_safe(obj->dev);
+        /*
+         * increment the device usage count so that runtime_suspend is not
+         * invoked immediately after the probe (due to the ti,no-idle-on-init)
+         * and before any remoteproc has attached to the iommu
+         */
+        if (obj->late_attach)
+                pm_runtime_get_noresume(obj->dev);
        pm_runtime_enable(obj->dev);
        omap_iommu_debugfs_add(obj);
@@ -1372,6 +1471,11 @@ static int omap_iommu_attach_init(struct device *dev,
        iommu = odomain->iommus;
        for (i = 0; i < odomain->num_iommus; i++, iommu++) {
+                /*
+                 * Not necessary for late attach. The page table would be setup
+                 * by the boot loader. Leaving the below code in place it does
+                 * not have any side effects during late attach.
+                 */
                iommu->pgtable = kzalloc(IOPGD_TABLE_SIZE, GFP_ATOMIC);
                if (!iommu->pgtable)
                        return -ENOMEM;
@@ -1496,7 +1600,8 @@ static void _omap_iommu_detach_dev(struct omap_iommu_domain *omap_domain,
        arch_data += (omap_domain->num_iommus - 1);
        for (i = 0; i < omap_domain->num_iommus; i++, iommu--, arch_data--) {
                oiommu = iommu->iommu_dev;
-                iopgtable_clear_entry_all(oiommu);
+                if (!oiommu->late_attach)
+                        iopgtable_clear_entry_all(oiommu);
                omap_iommu_detach(oiommu);
                iommu->iommu_dev = NULL;
diff --git a/drivers/iommu/omap-iommu.h b/drivers/iommu/omap-iommu.h
index 257aab294218..a0faab6c249c 100644
--- a/drivers/iommu/omap-iommu.h
+++ b/drivers/iommu/omap-iommu.h
@@ -42,6 +42,7 @@ struct omap_iommu {
         * but share it globally for each iommu.
         */
        u32             *iopgd;
+        u32             iopgd_pa;
        spinlock_t      page_table_lock; /* protect iopgd */
        int             nr_tlb_entries;
@@ -55,6 +56,8 @@ struct omap_iommu {
        u32 id;
        u8 pwrst;
+        u32 late_attach;
+        u32 late_attach_dma_pool;
 };
 struct cr_regs {
diff --git a/drivers/iommu/omap-iopgtable.h b/drivers/iommu/omap-iopgtable.h
index 01a315227bf0..9a6a6d228765 100644
--- a/drivers/iommu/omap-iopgtable.h
+++ b/drivers/iommu/omap-iopgtable.h
@@ -99,4 +99,12 @@ static inline phys_addr_t omap_iommu_translate(u32 d, u32 va, u32 mask)
 #define iopte_index(da)         (((da) >> IOPTE_SHIFT) & (PTRS_PER_IOPTE - 1))
 #define iopte_offset(iopgd, da) (iopgd_page_vaddr(iopgd) + iopte_index(da))
+/* For late attach */
+#define iopgd_page_vaddr_lateattach(obj, iopgd) \
+        ((u32 *)((u32 *)obj->iopgd) + \
+        ((u32 *)iopgd_page_paddr(iopgd) - (u32 *)obj->iopgd_pa))
+/* to find an entry in the second-level page table for late attach mode*/
+#define iopte_offset_lateattach(obj, iopgd, da) \
+        (iopgd_page_vaddr_lateattach(obj, iopgd) + iopte_index(da))
 #endif /* _OMAP_IOPGTABLE_H */
diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index 9aa2f6aa79ad..1cb286a0afb0 100644
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -317,6 +317,17 @@ config VIDEO_TVP5150
          To compile this driver as a module, choose M here: the
          module will be called tvp5150.
+config VIDEO_TVP5158
+        tristate "Analog video decoder TVP5158 support NTSC/PAL"
+        depends on I2C && VIDEO_V4L2
+        depends on MEDIA_CAMERA_SUPPORT
+        ---help---
+        This is a Video4Linux2 subdevice driver for the TVP5158
+        NTSC/PAL video decoder.
+        To compile this driver as a module, choose M here: the
+        module will be called tvp5158.
 config VIDEO_TVP7002
        tristate "Texas Instruments TVP7002 video decoder"
        depends on VIDEO_V4L2 && I2C
diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
index 74f4e962bef3..03b25c0d0cbe 100644
--- a/drivers/media/i2c/Makefile
+++ b/drivers/media/i2c/Makefile
@@ -39,6 +39,7 @@ obj-$(CONFIG_VIDEO_THS7303) += ths7303.o
 obj-$(CONFIG_VIDEO_THS8200) += ths8200.o
 obj-$(CONFIG_VIDEO_TVP5150) += tvp5150.o
 obj-$(CONFIG_VIDEO_TVP514X) += tvp514x.o
+obj-$(CONFIG_VIDEO_TVP5158) += tvp5158.o
 obj-$(CONFIG_VIDEO_TVP7002) += tvp7002.o
 obj-$(CONFIG_VIDEO_TW2804) += tw2804.o
 obj-$(CONFIG_VIDEO_TW9903) += tw9903.o
diff --git a/drivers/media/i2c/tvp5158.c b/drivers/media/i2c/tvp5158.c
new file mode 100644
index 000000000000..314062f86199
--- /dev/null
+++ b/drivers/media/i2c/tvp5158.c
@@ -0,0 +1,771 @@
+/*
+ * TI TVP5158 V4L2 subdevice driver
+ *
+ * Copyright (C) 2016 Texas Instruments, Inc.
+ * Sathishkumar S <sathish.omap@gmail.com>
+ * Nikhil Devshatwar, <nikhil.nd@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.
+ *
+ */
+#include <linux/delay.h>
+#include <linux/i2c.h>
+#include <linux/gpio.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/regulator/consumer.h>
+#include <linux/regmap.h>
+#include <linux/slab.h>
+#include <linux/v4l2-mediabus.h>
+#include <linux/videodev2.h>
+#include <media/soc_camera.h>
+#include <media/v4l2-async.h>
+#include <media/v4l2-common.h>
+#include <media/v4l2-ctrls.h>
+#include <linux/pm_runtime.h>
+#include <linux/of_gpio.h>
+#include <linux/of_device.h>
+/* Debug functions */
+static bool debug;
+module_param(debug, bool, 0644);
+MODULE_PARM_DESC(debug, "Debug level (0-2)");
+/* VBUS Register Address (24-bit), VBUS Register value (8-bit) */
+struct vbus_addr_value {
+        unsigned int addr;
+        unsigned char val;
+};
+struct vbus_addr_value vbus_addr_value_set[] = {
+        {0x00403E50, 0x40},
+        {0x00403E51, 0x00},
+        {0x00403E52, 0x40},
+        {0x00403E53, 0x00},
+        {0x00403E54, 0x44},
+        {0x00403E55, 0x23},
+        {0x00403E56, 0x38},
+        {0x00403E57, 0x10},
+        {0x00403E58, 0x53},
+        {0x00403E59, 0x23},
+        {0x00403E5A, 0x02},
+        {0x00403E5B, 0x00},
+        {0x00403E5C, 0x20},
+        {0x00403E5D, 0x00},
+        {0x00403E5E, 0x04},
+        {0x00403E5F, 0x04},
+        {0x00403E60, 0x04},
+        {0x00403E61, 0x04},
+        {0x00403E62, 0x10},
+        {0x00403E63, 0xF8},
+        {0x00403E64, 0x30},
+        {0x00403E65, 0x20},
+        {0x00403E66, 0x30},
+        {0x00403E67, 0x3F},
+        {0x00403E68, 0x3F},
+        {0x00403E69, 0x3F},
+        {0x00403E6A, 0x0C},
+        {0x00403E6B, 0x0C},
+        {0x00403E6C, 0x80},
+        {0x00403E6D, 0x80},
+        {0x00403E6E, 0x08},
+        {0x00403E6F, 0x08},
+        {0x00403E70, 0x08},
+        {0x00403E71, 0x30},
+        {0x00403E72, 0x08},
+        {0x00403E73, 0x04},
+        {0x00403E74, 0x00},
+        {0x00403E75, 0x10},
+        {0x00403E76, 0x00},
+        {0x00403E77, 0x00},
+        {0x00403E78, 0x38},
+        {0x00403E79, 0x00},
+        {0x00403E7A, 0x55},
+        {0x00403E7B, 0x03},
+        {0x00403E7C, 0x03},
+        {0x00403E7D, 0x00},
+        {0x00403E7E, 0x03},
+        {0x00403E7F, 0x00},
+        {0x00403E80, 0x30},
+        {0x00403E81, 0x30},
+        {0x00403E82, 0x18},
+        {0x00403E83, 0x0C},
+        {0x00403E95, 0x00},
+        {0x00403E96, 0x00},
+        {0x00403E9B, 0x3F},
+        {0x00403EA2, 0x0C},
+        {0x00403EA3, 0x10},
+        {0x00403EA6, 0x0C},
+        {0x00403EA7, 0x10},
+        {0x00403EA8, 0x44},
+        {0x00403EA9, 0x00},
+};
+static bool vbus_prog = 1;
+static int
+tvp5158_of_probe(struct i2c_client *client, struct device_node *node);
+static int
+tvp5158_init_gpios(struct i2c_client *client);
+static int
+tvp5158_set_default(struct i2c_client *client, unsigned char core);
+static enum tvp5158_std
+tvp5158_get_video_std(struct i2c_client *client, unsigned char core);
+static void
+tvp5158_start_streaming(struct i2c_client *client, unsigned char core);
+static int
+tvp5158_set_int_regs(struct i2c_client *client, struct vbus_addr_value *reg,
+                        int cnt);
+#define REG_STAUS_1    0x00
+#define REG_STAUS_2    0x01
+#define REG_VID_STAND  0x0C
+#define REG_CHIPID_MSB 0x08
+#define REG_CHIPID_LSB 0x09
+#define REG_AVD_CTRL_1 0xB0
+#define REG_AVD_CTRL_2 0xB1
+#define REG_OFM_CTRL   0xB2
+#define REG_DEC_RD_EN  0xFF
+#define REG_DEC_WR_EN  0xFE
+#define REG_VBUS_1     0xE8
+#define REG_VBUS_2     0xE9
+#define REG_VBUS_3     0xEA
+#define REG_VBUS_DATA  0xE0
+#define TVP_CORE_ALL            0x0F
+#define TVP_DECODER_1           (1<<0)
+/* Non interleaved */
+#define TVP_INTERLEAVE_MODE_NON         (0<<6)
+#define TVP_INTERLEAVE_MODE_PIX         (1<<6)
+#define TVP_INTERLEAVE_MODE_LINE        (2<<6)
+/* Number of time multiplexed channels = 0 */
+#define TVP_CH_MUX_NUMBER       (2<<4)
+/* ITU BT 656 8 bit */
+#define TVP_OUTPUT_TYPE         (0<<3)
+/* Single stage */
+#define TVP_VCS_ID              (0<<2)
+/* D1 */
+#define TVP_VID_RES             (0<<0)
+#define TVP_ENABLE_DITHERING    (1<<4)
+#define TVP_VID_DET_SAVEAV_EN   (1<<0)
+#define TVP_VIDEO_PORT_ENABLE   (1<<0)
+#define TVP_OUT_CLK_P_EN        (1<<2)
+#define TVP_FIELD_RATE          (1<<5)
+#define TVP_SIGNAL_PRESENT      (1<<7)
+#define TVP_VIDEO_STANDARD_MASK (0x07)
+/* Number of pixels and number of lines per frame for different standards */
+#define NTSC_NUM_ACTIVE_PIXELS  (720)
+#define NTSC_NUM_ACTIVE_LINES   (480)
+#define PAL_NUM_ACTIVE_PIXELS  (720)
+#define PAL_NUM_ACTIVE_LINES   (576)
+#define MAX_NUM_GPIOS                   3
+struct tvp5158_color_format {
+        u32 code;
+        enum v4l2_colorspace colorspace;
+};
+static const struct tvp5158_color_format tvp5158_cfmts[] = {
+        {
+                .code           = MEDIA_BUS_FMT_UYVY8_2X8,
+                .colorspace     = V4L2_COLORSPACE_SMPTE170M,
+        },
+};
+/* enum tvp5158_std - enum for supported standards */
+enum tvp5158_std {
+        STD_NTSC_MJ = 0,
+        STD_PAL_BDGHIN,
+        STD_INVALID
+};
+/**
+ * struct tvp5158_std_info - Structure to store standard information
+ * @width: Line width in pixels
+ * @height:Number of active lines
+ * @standard: v4l2 standard structure information
+ */
+struct tvp5158_std_info {
+        unsigned long width;
+        unsigned long height;
+        struct v4l2_standard standard;
+};
+enum tvp5158_signal_present {
+        TVP5158_SIGNAL_DEAD = 0,
+        TVP5158_SIGNAL_PRESENT
+};
+struct tvp5158_priv {
+        struct v4l2_subdev              subdev;
+        struct v4l2_mbus_framefmt       format;
+        enum                            tvp5158_std current_std;
+        struct gpio                     mux_gpios[MAX_NUM_GPIOS];
+        int                             num_gpios;
+};
+static const struct tvp5158_std_info std_list[] = {
+[STD_NTSC_MJ] = {
+        .width = NTSC_NUM_ACTIVE_PIXELS,
+        .height = NTSC_NUM_ACTIVE_LINES,
+        .standard = {
+                .index = 0,
+                .id = V4L2_STD_NTSC,
+                .name = "NTSC",
+                .frameperiod = {1001, 30000},
+                .framelines = 525
+                },
+        },
+[STD_PAL_BDGHIN] = {
+        .width = PAL_NUM_ACTIVE_PIXELS,
+        .height = PAL_NUM_ACTIVE_LINES,
+        .standard = {
+                .index = 1,
+                .id = V4L2_STD_PAL,
+                .name = "PAL",
+                .frameperiod = {1001, 25000},
+                .framelines = 625
+                },
+        },
+};
+static struct tvp5158_priv *to_tvp5158(const struct i2c_client *client)
+{
+        return container_of(i2c_get_clientdata(client), struct tvp5158_priv,
+                        subdev);
+}
+static int tvp5158_read(struct i2c_client *client, unsigned char addr)
+{
+        unsigned char buffer[1];
+        int rc;
+        buffer[0] = addr;
+        rc = i2c_master_send(client, buffer, 1);
+        if (rc < 0) {
+                dev_err(&client->dev, "i2c i/o error: rc == %d (should be 1)\n"
+                , rc);
+                return rc;
+        }
+        rc = i2c_master_recv(client, buffer, 1);
+        if (rc < 0) {
+                dev_err(&client->dev, "i2c i/o error: rc == %d (should be 1)\n"
+                , rc);
+                return rc;
+        }
+        return buffer[0];
+}
+static inline void tvp5158_write(struct i2c_client *client, unsigned char addr,
+                        unsigned char value)
+{
+        unsigned char buffer[2];
+        int rc;
+        buffer[0] = addr;
+        buffer[1] = value;
+        rc = i2c_master_send(client, buffer, 2);
+        if (rc != 2)
+                dev_err(&client->dev, "i2c i/o error: rc == %d (should be 2)\n"
+                , rc);
+}
+/**
+ * tvp5158_s_stream() - V4L2 decoder i/f handler for s_stream
+ * @sd: pointer to standard V4L2 sub-device structure
+ * @enable: streaming enable or disable
+ *
+ * Sets streaming to enable or disable.
+ */
+static int tvp5158_s_stream(struct v4l2_subdev *sd, int enable)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        tvp5158_init_gpios(client);
+        if (enable) {
+                if (vbus_prog == 1)
+                        /* VBUS address value setting */
+                        tvp5158_set_int_regs(client, vbus_addr_value_set,
+                                        ARRAY_SIZE(vbus_addr_value_set));
+                tvp5158_start_streaming(client, TVP_CORE_ALL);
+        } else {
+                tvp5158_write(client, REG_OFM_CTRL, 0x0);
+        }
+        return 0;
+}
+/**
+ * tvp5158_querystd() - V4L2 decoder interface handler for querystd
+ * @sd: pointer to standard V4L2 sub-device structure
+ * @std_id: standard V4L2 std_id ioctl enum
+ *
+ * Returns the current standard detected by TVP5146/47. If no active input is
+ * detected then *std_id is set to 0 and the function returns 0.
+ */
+static int tvp5158_querystd(struct v4l2_subdev *sd, v4l2_std_id *std_id)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct tvp5158_priv *priv = to_tvp5158(client);
+        if (std_id == NULL)
+                return -EINVAL;
+        *std_id = V4L2_STD_UNKNOWN;
+        tvp5158_get_video_std(client, TVP_CORE_ALL);
+        if (priv->current_std == STD_INVALID)
+                return -ENODEV;
+        *std_id = std_list[priv->current_std].standard.id;
+return 0;
+}
+/**
+ * tvp5158_g_parm() - V4L2 decoder interface handler for g_parm
+ * @sd: pointer to standard V4L2 sub-device structure
+ * @a: pointer to standard V4L2 VIDIOC_G_PARM ioctl structure
+ *
+ * Returns the decoder's video CAPTURE parameters.
+ */
+static int tvp5158_g_parm(struct v4l2_subdev *sd, struct v4l2_streamparm *parms)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct tvp5158_priv *priv = to_tvp5158(client);
+        struct v4l2_captureparm *cparm;
+        enum tvp5158_std current_std;
+        if (parms == NULL || parms->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                return -EINVAL;
+        tvp5158_get_video_std(client, TVP_CORE_ALL);
+        if (priv->current_std == STD_INVALID)
+                return -ENODEV;
+        /* get the current standard */
+        current_std = priv->current_std;
+        cparm = &parms->parm.capture;
+        cparm->capability = V4L2_CAP_TIMEPERFRAME;
+        cparm->timeperframe =
+                std_list[current_std].standard.frameperiod;
+        return 0;
+}
+/**
+ * tvp5158_s_parm() - V4L2 decoder interface handler for s_parm
+ * @sd: pointer to standard V4L2 sub-device structure
+ * @a: pointer to standard V4L2 VIDIOC_S_PARM ioctl structure
+ *
+ * Configures the decoder to use the input parameters, if possible. If
+ * not possible, returns the appropriate error code.
+ */
+static int tvp5158_s_parm(struct v4l2_subdev *sd, struct v4l2_streamparm *parms)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct tvp5158_priv *priv = to_tvp5158(client);
+        struct v4l2_fract *timeperframe;
+        enum tvp5158_std current_std;
+        if (parms == NULL || parms->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                return -EINVAL;
+        timeperframe = &parms->parm.capture.timeperframe;
+        /* get the current standard */
+        current_std = priv->current_std;
+        if (current_std == STD_INVALID)
+                return -ENODEV;
+        *timeperframe =
+            std_list[current_std].standard.frameperiod;
+        return 0;
+}
+static int tvp5158_get_fmt(struct v4l2_subdev *sd,
+                                struct v4l2_subdev_pad_config *cfg,
+                                struct v4l2_subdev_format *fmt)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct tvp5158_priv *priv = to_tvp5158(client);
+        struct v4l2_mbus_framefmt *mf;
+        enum tvp5158_std current_std;
+        tvp5158_get_video_std(client, TVP_CORE_ALL);
+        current_std = priv->current_std;
+        if (current_std == STD_INVALID)
+                return -EINVAL;
+        switch (fmt->which) {
+        case V4L2_SUBDEV_FORMAT_TRY:
+                mf = v4l2_subdev_get_try_format(sd, cfg, 0);
+                break;
+        case V4L2_SUBDEV_FORMAT_ACTIVE:
+                mf = &priv->format;
+                break;
+        default:
+                return -EINVAL;
+        }
+        mf->width = std_list[current_std].width;
+        mf->height = std_list[current_std].height / 2;
+        fmt->format = *mf;
+        return 0;
+}
+static int tvp5158_set_fmt(struct v4l2_subdev *sd,
+                                struct v4l2_subdev_pad_config *cfg,
+                                struct v4l2_subdev_format *fmt)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct tvp5158_priv *priv = to_tvp5158(client);
+        int ret;
+        if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
+                ret = tvp5158_get_fmt(sd, cfg, fmt);
+                if (ret)
+                        return ret;
+                priv->format = fmt->format;
+        }
+        return 0;
+}
+static int tvp5158_enum_mbus_code(struct v4l2_subdev *sd,
+                                struct v4l2_subdev_pad_config *cfg,
+                                struct v4l2_subdev_mbus_code_enum *code)
+{
+        if (code->index >= ARRAY_SIZE(tvp5158_cfmts))
+                return -EINVAL;
+        code->code = tvp5158_cfmts[code->index].code;
+        return 0;
+}
+static int tvp5158_enum_frame_size(struct v4l2_subdev *sd,
+                                struct v4l2_subdev_pad_config *cfg,
+                                struct v4l2_subdev_frame_size_enum *fse)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct tvp5158_priv *priv = to_tvp5158(client);
+        enum tvp5158_std std;
+        if (fse->index >= 1)
+                return -EINVAL;
+        if (priv->current_std == STD_INVALID)
+                tvp5158_get_video_std(client, TVP_CORE_ALL);
+        if (priv->current_std == STD_INVALID)
+                return -ENODEV;
+        std = priv->current_std;
+        fse->code = priv->format.code;
+        fse->max_width  = fse->min_width  = std_list[std].width;
+        fse->max_height = fse->min_height = std_list[std].height;
+        return 0;
+}
+static int tvp5158_enum_frame_interval(struct v4l2_subdev *sd,
+                                struct v4l2_subdev_pad_config *cfg,
+                                struct v4l2_subdev_frame_interval_enum *fie)
+{
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
+        struct tvp5158_priv *priv = to_tvp5158(client);
+        enum tvp5158_std current_std;
+        struct v4l2_fract *timeperframe;
+        /* Each standard has one frame interval, so return
+         * EINVAL if more are requested
+         */
+        if (fie->index != 0)
+                return -EINVAL;
+        /* Get the current standard */
+        current_std = priv->current_std;
+        /* Check if current standard is invalid */
+        if (current_std == STD_INVALID)
+                return -EINVAL;
+        timeperframe = &fie->interval;
+        *timeperframe =
+                std_list[current_std].standard.frameperiod;
+        return 0;
+}
+static int tvp5158_of_probe(struct i2c_client *client,
+                        struct device_node *node)
+{
+        struct tvp5158_priv *priv = to_tvp5158(client);
+        struct gpio *gpios = &priv->mux_gpios[0];
+        unsigned int flags;
+        int i, gpio;
+        /* Iterate over all the gpios in the device tree
+         * ENOENT is returned when trying to access last + 1 gpio
+         */
+        for (i = 0; i < MAX_NUM_GPIOS; i++) {
+                gpio = of_get_named_gpio_flags(node, "mux-gpios", i, &flags);
+                if (gpio_is_valid(gpio)) {
+                        gpios[i].gpio   = gpio;
+                        gpios[i].flags  = (flags & OF_GPIO_ACTIVE_LOW) ?
+                                GPIOF_OUT_INIT_LOW : GPIOF_OUT_INIT_HIGH;
+                        gpios[i].label  = client->name;
+                } else if (gpio == -ENOENT) {
+                        break;
+                } else {
+                        return gpio;
+                }
+        }
+        priv->num_gpios = i;
+        return 0;
+}
+static int tvp5158_init_gpios(struct i2c_client *client)
+{
+        struct tvp5158_priv *priv = to_tvp5158(client);
+        int ret = 0;
+        ret = gpio_request_array(priv->mux_gpios, priv->num_gpios);
+        if (ret)
+                goto done;
+        gpio_free_array(priv->mux_gpios, priv->num_gpios);
+done:
+        return ret;
+}
+static struct v4l2_subdev_video_ops tvp5158_video_ops = {
+        .querystd       = tvp5158_querystd,
+        .g_parm         = tvp5158_g_parm,
+        .s_parm         = tvp5158_s_parm,
+        .s_stream       = tvp5158_s_stream,
+};
+static struct v4l2_subdev_pad_ops tvp5158_pad_ops = {
+        .enum_mbus_code         = tvp5158_enum_mbus_code,
+        .enum_frame_size        = tvp5158_enum_frame_size,
+        .enum_frame_interval    = tvp5158_enum_frame_interval,
+        .get_fmt                = tvp5158_get_fmt,
+        .set_fmt                = tvp5158_set_fmt,
+};
+static struct v4l2_subdev_ops tvp5158_subdev_ops = {
+        .video          = &tvp5158_video_ops,
+        .pad            = &tvp5158_pad_ops,
+};
+static const struct i2c_device_id tvp5158_id[] = {
+        { "ti,tvp5158", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, tvp5158_id);
+static const struct of_device_id tvp5158_dt_id[] = {
+        {
+        .compatible   = "ti,tvp5158", .data = "tvp5158"
+        },
+        {
+        }
+};
+static int tvp5158_set_int_regs(struct i2c_client *client,
+                        struct vbus_addr_value *reg, int cnt)
+{
+        int i = 0;
+        /* Core Write enable*/
+        tvp5158_write(client, REG_DEC_WR_EN, TVP_CORE_ALL);
+        for (i = 0; i < cnt; i++) {
+                tvp5158_write(client, REG_VBUS_1, ((reg[i].addr >> 0) & 0xFF));
+                tvp5158_write(client, REG_VBUS_2, ((reg[i].addr >> 8) & 0xFF));
+                tvp5158_write(client, REG_VBUS_3, ((reg[i].addr >> 16) & 0xFF));
+                tvp5158_write(client, REG_VBUS_DATA, reg[i].val);
+        }
+        vbus_prog = 0;
+        return 0;
+}
+static int
+tvp5158_set_default(struct i2c_client *client, unsigned char core)
+{
+        unsigned char tvp_reg_val = 0;
+        /* Core Write enable*/
+        tvp5158_write(client, REG_DEC_WR_EN, core);
+        /* Set Video format */
+        tvp_reg_val = TVP_INTERLEAVE_MODE_LINE | TVP_CH_MUX_NUMBER
+                        | TVP_OUTPUT_TYPE | TVP_VCS_ID | TVP_VID_RES;
+        tvp5158_write(client, REG_AVD_CTRL_1, tvp_reg_val);
+        tvp_reg_val = 0;
+        tvp_reg_val = TVP_ENABLE_DITHERING | TVP_VID_DET_SAVEAV_EN;
+        tvp5158_write(client, REG_AVD_CTRL_2, tvp_reg_val);
+        return 0;
+}
+static enum tvp5158_std
+tvp5158_get_video_std(struct i2c_client *client, unsigned char core)
+{
+        struct tvp5158_priv *priv       = to_tvp5158(client);
+        int i2c_read = 0;
+        /* Core Read Enable */
+        tvp5158_write(client, REG_DEC_RD_EN, core);
+        /* Get Video Status */
+        i2c_read = tvp5158_read(client, REG_STAUS_2);
+        v4l2_dbg(1, debug, &priv->subdev, "%s\n",
+                (i2c_read & TVP_SIGNAL_PRESENT) ?
+                "Signal Present" : "Signal not present");
+        if (!(i2c_read & TVP_SIGNAL_PRESENT)) {
+                priv->current_std = STD_INVALID;
+                goto fail;
+        }
+        i2c_read = tvp5158_read(client, REG_VID_STAND);
+        if ((i2c_read & TVP_VIDEO_STANDARD_MASK) == 0x1) {
+                priv->current_std = STD_NTSC_MJ;
+                v4l2_info(&priv->subdev, "NTSC video detected\n");
+        } else if ((i2c_read & TVP_VIDEO_STANDARD_MASK) == 0x2) {
+                priv->current_std = STD_PAL_BDGHIN;
+                v4l2_info(&priv->subdev, "PAL video detected\n");
+        } else {
+                v4l2_err(&priv->subdev, "No video detected\n");
+                priv->current_std = STD_INVALID;
+        }
+fail:
+        return priv->current_std;
+}
+static void
+tvp5158_start_streaming(struct i2c_client *client, unsigned char core)
+{
+        unsigned char tvp_reg_val = 0;
+        /* Decoder Write Enable */
+        tvp5158_write(client, REG_DEC_WR_EN, core);
+        /* Enable output stream on */
+        tvp_reg_val = TVP_VIDEO_PORT_ENABLE | TVP_OUT_CLK_P_EN;
+        tvp5158_write(client, REG_OFM_CTRL, tvp_reg_val);
+}
+static int tvp5158_probe(struct i2c_client *client,
+                         const struct i2c_device_id *did)
+{
+        struct tvp5158_priv *priv;
+        struct v4l2_subdev *sd;
+        struct device_node *node = client->dev.of_node;
+        int ret = -1;
+        int i2c_read;
+        union {
+                char buff[4];
+                int buffer;
+        } u_i2cbuf;
+        priv = devm_kzalloc(&client->dev, sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+        i2c_set_clientdata(client, priv);
+        sd = &priv->subdev;
+        v4l2_i2c_subdev_init(sd, client, &tvp5158_subdev_ops);
+        ret = tvp5158_of_probe(client, node);
+        if (ret) {
+                dev_err(&client->dev, "Unable to of_probe\n");
+                return ret;
+        }
+        ret = tvp5158_init_gpios(client);
+        if (ret) {
+                dev_err(&client->dev, "failed to init gpios ERR %d\n", ret);
+                return ret;
+        }
+        priv->current_std = STD_INVALID;
+        priv->format.code = tvp5158_cfmts[0].code;
+        priv->format.colorspace = tvp5158_cfmts[0].colorspace;
+        priv->format.field = V4L2_FIELD_ALTERNATE;
+        /* Get Chip ID and register with v4l2*/
+        i2c_read = tvp5158_read(client, REG_CHIPID_MSB);
+        u_i2cbuf.buffer = i2c_read << 8;
+        i2c_read = tvp5158_read(client, REG_CHIPID_LSB);
+        u_i2cbuf.buffer |= i2c_read;
+        if (u_i2cbuf.buffer == 0x5158) {
+                v4l2_dbg(1, debug, sd, "Chip id : %x\n", u_i2cbuf.buffer);
+                tvp5158_write(client, REG_DEC_WR_EN, TVP_CORE_ALL);
+                tvp5158_write(client, REG_OFM_CTRL,
+                (TVP_VIDEO_PORT_ENABLE | TVP_OUT_CLK_P_EN));
+        } else {
+                dev_err(&client->dev, "ERROR: Chip id is not TVP5158");
+                return -ENODEV;
+        }
+        tvp5158_set_default(client, TVP_CORE_ALL);
+        tvp5158_get_video_std(client, TVP_CORE_ALL);
+        /* V4l2 asyn subdev register */
+        sd->dev = &client->dev;
+        ret = v4l2_async_register_subdev(sd);
+        if (!ret)
+                v4l2_info(&priv->subdev, "Camera sensor driver registered\n");
+        else
+                return ret;
+        pm_runtime_enable(&client->dev);
+        return ret;
+}
+static int tvp5158_remove(struct i2c_client *client)
+{
+        struct tvp5158_priv *priv = i2c_get_clientdata(client);
+        v4l2_device_unregister_subdev(&priv->subdev);
+        return 0;
+}
+static struct i2c_driver tvp5158_i2c_driver = {
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "tvp5158",
+                .of_match_table = tvp5158_dt_id,
+        },
+        .probe    = tvp5158_probe,
+        .remove   = tvp5158_remove,
+        .id_table = tvp5158_id,
+};
+module_i2c_driver(tvp5158_i2c_driver);
+MODULE_DESCRIPTION("Video Decoder driver");
+MODULE_AUTHOR("Sathishkumar S");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 033b7dbf3d67..182a9089b996 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -303,6 +303,27 @@ config VIDEO_TI_VPE_DEBUG
 endif # V4L_MEM2MEM_DRIVERS
+config VIDEO_TI_VPDMA_HELPER
+       tristate "TI VPDMA helper module"
+       depends on VIDEO_TI_VIP || VIDEO_TI_VPE
+       default n
+       ---help---
+       Video Port Direct Memory Access
+       Used with VIP and VPE on some TI SoC's (e.g. DRA7xx)
+       it provides a mem2mem, mem2device, device2mem DMA specifically
+       for transferring and manipulating video data.
+config VIDEO_TI_VPDMA_LOAD_FW
+        bool "Load VPDMA F/W from Kernel"
+        depends on VIDEO_TI_VPDMA_HELPER
+        default n
+        ---help---
+        TI SoC's Video Port Direct Memory Access module
+        needs a firmware to be loaded. This can be loaded from
+        user space via udev event or it can be loaded from kernel itself
+        Say 'y' if you want the Video devices to be initialized early
+        in the bootup sequence.
 config VIDEO_TI_VPDMA
        tristate
diff --git a/drivers/media/platform/ti-vpe/vip.c b/drivers/media/platform/ti-vpe/vip.c
index 9070e160d166..50d461f53f79 100644
--- a/drivers/media/platform/ti-vpe/vip.c
+++ b/drivers/media/platform/ti-vpe/vip.c
@@ -1592,6 +1592,15 @@ static int vip_try_fmt_vid_cap(struct file *file, void *priv,
                if (ret)
                        break;
+                /* For interlaced capture, enum_frame size = FRAME size
+                 * while f->fmt.pix = FIELD size
+                 * Correct the subdev returned height params
+                 */
+                if (f->fmt.pix.field == V4L2_FIELD_ALTERNATE) {
+                        fse.min_height /= 2;
+                        fse.max_height /= 2;
+                }
                vip_dbg(3, dev, "try_fmt loop:%d fourcc:%s size: %dx%d\n",
                        fse.index, fourcc_to_str(f->fmt.pix.pixelformat),
                        fse.max_width, fse.max_height);
@@ -2691,9 +2700,11 @@ static int vip_init_port(struct vip_port *port)
        sd_fmt.which = V4L2_SUBDEV_FORMAT_ACTIVE;
        sd_fmt.pad = 0;
        ret = v4l2_subdev_call(port->subdev, pad, get_fmt, NULL, &sd_fmt);
-        if (ret)
+        if (ret) {
                vip_dbg(1, dev, "init_port get_fmt failed in subdev: (%d)\n",
                        ret);
+                return ret;
+        }
        /* try to find one that matches */
        fmt = find_port_format_by_code(port, mbus_fmt->code);
@@ -3085,8 +3096,10 @@ static int vip_open(struct file *file)
        if (!v4l2_fh_is_singular_file(file))
                goto unlock;
-        if (vip_init_stream(stream))
+        if (vip_init_stream(stream)) {
+                v4l2_fh_release(file);
                ret = -ENODEV;
+        }
 unlock:
        mutex_unlock(&dev->mutex);
        return ret;
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 31341290cd91..96d3cb526823 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1739,6 +1739,7 @@ int of_add_property(struct device_node *np, struct property *prop)
        return rc;
 }
+EXPORT_SYMBOL_GPL(of_remove_property);
 int __of_remove_property(struct device_node *np, struct property *prop)
 {
diff --git a/drivers/remoteproc/omap_remoteproc.c b/drivers/remoteproc/omap_remoteproc.c
index 39af14e958a2..5d6f17bdfb2f 100644
--- a/drivers/remoteproc/omap_remoteproc.c
+++ b/drivers/remoteproc/omap_remoteproc.c
@@ -436,6 +436,10 @@ static int omap_rproc_start(struct rproc *rproc)
        int ret;
        struct mbox_client *client = &oproc->client;
+        /*
+         * We set boot address irrespective of the value of the late attach flag
+         * as boot address takes effect only on a deassert of remoteproc reset.
+         */
        if (oproc->boot_data) {
                ret = omap_rproc_write_dsp_boot_addr(rproc);
                if (ret)
@@ -475,10 +479,12 @@ static int omap_rproc_start(struct rproc *rproc)
                goto put_mbox;
        }
-        ret = pdata->device_enable(pdev);
+        if (!rproc->late_attach) {
-        if (ret) {
+                ret = pdata->device_enable(pdev);
-                dev_err(dev, "omap_device_enable failed: %d\n", ret);
+                if (ret) {
-                goto reset_timers;
+                        dev_err(dev, "omap_device_enable failed: %d\n", ret);
+                        goto reset_timers;
+                }
        }
        /*
@@ -534,6 +540,16 @@ static int omap_rproc_stop(struct rproc *rproc)
        if (ret)
                goto enable_device;
+        /*
+         * During late attach, we use non-zeroing dma ops to prevent the kernel
+         * from overwriting already loaded code and data segments. When
+         * shutting down the processor, we restore the normal zeroing dma ops.
+         * This allows the kernel to clear memory when loading a new remoteproc
+         * binary or during error recovery with the current remoteproc binary.
+         */
+        if (rproc->late_attach)
+                set_dma_ops(dev, &arm_dma_ops);
        mbox_free_channel(oproc->mbox);
        /*
@@ -1139,6 +1155,7 @@ static int omap_rproc_probe(struct platform_device *pdev)
        u32 standby_addr = 0;
        int num_timers;
        int ret;
+        struct property *prop;
        if (!np) {
                dev_err(&pdev->dev, "only DT-based devices are supported\n");
@@ -1175,6 +1192,21 @@ static int omap_rproc_probe(struct platform_device *pdev)
        if (!rproc)
                return -ENOMEM;
+        prop = of_find_property(np, "ti,late-attach", NULL);
+        if (prop) {
+                rproc->late_attach = 1;
+                set_dma_ops(&pdev->dev, &arm_dma_m_ops);
+                dev_dbg(&pdev->dev, "device will be late-attached\n");
+                /*
+                 * Clear the late attach property in device tree for
+                 * subsequent probes.
+                 */
+                ret = of_remove_property(np, prop);
+                if (ret)
+                        dev_err(&pdev->dev, "Unable to remove late-attach property\n");
+        }
        oproc = rproc->priv;
        oproc->rproc = rproc;
        /* All existing OMAP IPU and DSP processors have an MMU */
@@ -1282,6 +1314,8 @@ static int omap_rproc_probe(struct platform_device *pdev)
 release_mem:
        of_reserved_mem_device_release(&pdev->dev);
 free_rproc:
+        if (rproc->late_attach)
+                set_dma_ops(&pdev->dev, &arm_dma_ops);
        rproc_put(rproc);
        return ret;
 }
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index a1804e236217..8d33bb5d9c3b 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -223,7 +223,11 @@ int rproc_alloc_vring(struct rproc_vdev *rvdev, int i)
         * Allocate non-cacheable memory for the vring. In the future
         * this call will also configure the IOMMU for us
         */
-        va = dma_alloc_coherent(dev->parent, size, &dma, GFP_KERNEL);
+        if (rproc->late_attach) {
+                va = dma_malloc_coherent(dev->parent, size, &dma, GFP_KERNEL);
+        } else {
+                va = dma_alloc_coherent(dev->parent, size, &dma, GFP_KERNEL);
+        }
        if (!va) {
                dev_err(dev->parent, "dma_alloc_coherent failed\n");
                return -EINVAL;
@@ -670,10 +674,13 @@ static int rproc_handle_devmem(struct rproc *rproc, struct fw_rsc_devmem *rsc,
        if (!mapping)
                return -ENOMEM;
-        ret = iommu_map(rproc->domain, rsc->da, rsc->pa, rsc->len, rsc->flags);
+        if (!rproc->late_attach) {
-        if (ret) {
+                ret = iommu_map(rproc->domain, rsc->da, rsc->pa, rsc->len,
-                dev_err(dev, "failed to map devmem: %d\n", ret);
+                                rsc->flags);
-                goto out;
+                if (ret) {
+                        dev_err(dev, "failed to map devmem: %d\n", ret);
+                        goto out;
+                }
        }
        /*
@@ -688,8 +695,12 @@ static int rproc_handle_devmem(struct rproc *rproc, struct fw_rsc_devmem *rsc,
        mapping->len = rsc->len;
        list_add_tail(&mapping->node, &rproc->mappings);
-        dev_dbg(dev, "mapped devmem pa 0x%x, da 0x%x, len 0x%x\n",
+        if (!rproc->late_attach)
-                rsc->pa, rsc->da, rsc->len);
+                dev_dbg(dev, "mapped devmem pa 0x%x, da 0x%x, len 0x%x\n",
+                        rsc->pa, rsc->da, rsc->len);
+        else
+                dev_dbg(dev, "late-attach: processed devmem pa 0x%x, da 0x%x, len 0x%x\n",
+                        rsc->pa, rsc->da, rsc->len);
        return 0;
@@ -744,7 +755,11 @@ static int rproc_handle_carveout(struct rproc *rproc,
        if (!carveout)
                return -ENOMEM;
-        va = dma_alloc_coherent(dev->parent, rsc->len, &dma, GFP_KERNEL);
+        if (rproc->late_attach) {
+                va = dma_malloc_coherent(dev->parent, rsc->len, &dma, GFP_KERNEL);
+        } else {
+                va = dma_alloc_coherent(dev->parent, rsc->len, &dma, GFP_KERNEL);
+        }
        if (!va) {
                dev_err(dev->parent, "dma_alloc_coherent err: %d\n", rsc->len);
                ret = -ENOMEM;
@@ -779,11 +794,13 @@ static int rproc_handle_carveout(struct rproc *rproc,
                        goto dma_free;
                }
-                ret = iommu_map(rproc->domain, rsc->da, dma, rsc->len,
+                if (!rproc->late_attach) {
-                                rsc->flags);
+                        ret = iommu_map(rproc->domain, rsc->da, dma, rsc->len,
-                if (ret) {
+                                        rsc->flags);
-                        dev_err(dev, "iommu_map failed: %d\n", ret);
+                        if (ret) {
-                        goto free_mapping;
+                                dev_err(dev, "iommu_map failed: %d\n", ret);
+                                goto free_mapping;
+                        }
                }
                /*
@@ -797,8 +814,14 @@ static int rproc_handle_carveout(struct rproc *rproc,
                mapping->len = rsc->len;
                list_add_tail(&mapping->node, &rproc->mappings);
-                dev_dbg(dev, "carveout mapped 0x%x to %pad\n",
+                if (!rproc->late_attach)
-                        rsc->da, &dma);
+                        dev_dbg(dev, "carveout mapped 0x%x to %pad\n",
+                                rsc->da, &dma);
+                else
+                        dev_dbg(dev, "late-attach: carveout processed "
+                                "0x%x to %pad\n",
+                                rsc->da, &dma);
        }
        /*
@@ -1011,11 +1034,14 @@ static void rproc_resource_cleanup(struct rproc *rproc)
        list_for_each_entry_safe(entry, tmp, &rproc->mappings, node) {
                size_t unmapped;
-                unmapped = iommu_unmap(rproc->domain, entry->da, entry->len);
+                if (!rproc->late_attach) {
-                if (unmapped != entry->len) {
+                        unmapped = iommu_unmap(rproc->domain, entry->da,
-                        /* nothing much to do besides complaining */
+                                                entry->len);
-                        dev_err(dev, "failed to unmap %u/%zu\n", entry->len,
+                        if (unmapped != entry->len) {
-                                unmapped);
+                                /* nothing much to do besides complaining */
+                                dev_err(dev, "failed to unmap %u/%zu\n",
+                                        entry->len, unmapped);
+                        }
                }
                list_del(&entry->node);
@@ -1100,7 +1126,7 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
                }
        }
-        if (!rproc->use_userspace_loader) {
+        if ((!rproc->use_userspace_loader) && (!rproc->late_attach)) {
                /* load the ELF segments to memory */
                ret = rproc_load_segments(rproc, fw);
                if (ret) {
@@ -1108,6 +1134,8 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
                                ret);
                        goto clean_up;
                }
+        } else {
+                dev_dbg(dev, "late-attach: skipping segment load\n");
        }
        /*
@@ -1504,6 +1532,7 @@ void rproc_shutdown(struct rproc *rproc)
                complete_all(&rproc->crash_comp);
        rproc->state = RPROC_OFFLINE;
+        rproc->late_attach = 0;
        dev_info(dev, "stopped remote processor %s\n", rproc->name);
diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c
index c9fcbf063794..361a6d8aa297 100644
--- a/drivers/rpmsg/virtio_rpmsg_bus.c
+++ b/drivers/rpmsg/virtio_rpmsg_bus.c
@@ -31,6 +31,7 @@
 #include <linux/jiffies.h>
 #include <linux/sched.h>
 #include <linux/wait.h>
+#include <linux/remoteproc.h>
 #include <linux/rpmsg.h>
 #include <linux/mutex.h>
@@ -408,8 +409,11 @@ static int rpmsg_dev_probe(struct device *dev)
                nsm.flags = RPMSG_NS_CREATE;
                err = rpmsg_sendto(rpdev, &nsm, sizeof(nsm), RPMSG_NS_ADDR);
-                if (err)
+                if (err) {
                        dev_err(dev, "failed to announce service %d\n", err);
+                        rpdrv->remove(rpdev);
+                        rpmsg_destroy_ept(ept);
+                }
        }
 out:
@@ -570,6 +574,13 @@ struct rpmsg_channel *__rpmsg_create_channel(struct virtproc_info *vrp,
                return NULL;
        }
+        if (!rpdev->ept) {
+                dev_err(dev, "failed to create ept\n");
+                device_unregister(&rpdev->dev);
+                put_device(&rpdev->dev);
+                return NULL;
+        }
        return rpdev;
 }
@@ -1060,6 +1071,7 @@ static int rpmsg_probe(struct virtio_device *vdev)
        int err = 0, i;
        size_t total_buf_space;
        bool notify;
+        struct rproc *rproc = rproc_vdev_to_rproc_safe(vdev);
        vrp = kzalloc(sizeof(*vrp), GFP_KERNEL);
        if (!vrp)
@@ -1093,9 +1105,15 @@ static int rpmsg_probe(struct virtio_device *vdev)
        total_buf_space = vrp->num_bufs * RPMSG_BUF_SIZE;
        /* allocate coherent memory for the buffers */
-        bufs_va = dma_alloc_coherent(vdev->dev.parent->parent,
+        if (rproc && rproc->late_attach)
-                                     total_buf_space, &vrp->bufs_dma,
+                bufs_va = dma_malloc_coherent(vdev->dev.parent->parent,
-                                     GFP_KERNEL);
+                                              total_buf_space, &vrp->bufs_dma,
+                                              GFP_KERNEL);
+        else
+                 bufs_va = dma_alloc_coherent(vdev->dev.parent->parent,
+                                              total_buf_space, &vrp->bufs_dma,
+                                              GFP_KERNEL);
        if (!bufs_va) {
                err = -ENOMEM;
                goto vqs_del;
diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c
index ac34acd7bb93..5c60bf4423e6 100644
--- a/drivers/tee/tee_core.c
+++ b/drivers/tee/tee_core.c
@@ -250,8 +250,7 @@ static int tee_ioctl_open_session(struct tee_context *ctx,
            buf.buf_len < sizeof(struct tee_ioctl_open_session_arg))
                return -EINVAL;
-        uarg = (struct tee_ioctl_open_session_arg __user *)(unsigned long)
+        uarg = u64_to_user_ptr(buf.buf_ptr);
-               buf.buf_ptr;
        if (copy_from_user(&arg, uarg, sizeof(arg)))
                return -EFAULT;
@@ -322,8 +321,7 @@ static int tee_ioctl_invoke(struct tee_context *ctx,
            buf.buf_len < sizeof(struct tee_ioctl_invoke_arg))
                return -EINVAL;
-        uarg = (struct tee_ioctl_invoke_arg __user *)(unsigned long)
+        uarg = u64_to_user_ptr(buf.buf_ptr);
-               buf.buf_ptr;
        if (copy_from_user(&arg, uarg, sizeof(arg)))
                return -EFAULT;
@@ -457,8 +455,7 @@ static int tee_ioctl_supp_recv(struct tee_context *ctx,
            buf.buf_len < sizeof(struct tee_iocl_supp_recv_arg))
                return -EINVAL;
-        uarg = (struct tee_iocl_supp_recv_arg __user *)(unsigned long)
+        uarg = u64_to_user_ptr(buf.buf_ptr);
-               buf.buf_ptr;
        if (get_user(num_params, &uarg->num_params))
                return -EFAULT;
@@ -552,8 +549,7 @@ static int tee_ioctl_supp_send(struct tee_context *ctx,
            buf.buf_len < sizeof(struct tee_iocl_supp_send_arg))
                return -EINVAL;
-        uarg = (struct tee_iocl_supp_send_arg __user *)(unsigned long)
+        uarg = u64_to_user_ptr(buf.buf_ptr);
-               buf.buf_ptr;
        if (get_user(ret, &uarg->ret) ||
            get_user(num_params, &uarg->num_params))
                return -EFAULT;
diff --git a/drivers/usb/dwc3/debugfs.c b/drivers/usb/dwc3/debugfs.c
index 9ac37fe1b6a7..b07ab05bc05a 100644
--- a/drivers/usb/dwc3/debugfs.c
+++ b/drivers/usb/dwc3/debugfs.c
@@ -25,6 +25,7 @@
 #include <linux/seq_file.h>
 #include <linux/delay.h>
 #include <linux/uaccess.h>
+#include <linux/extcon.h>
 #include <linux/usb/ch9.h>
@@ -357,6 +358,61 @@ static const struct debugfs_reg32 dwc3_regs[] = {
        dump_register(OSTS),
 };
+/* List of detectable cables */
+enum {
+        EXTCON_CABLE_USB = 0,
+        EXTCON_CABLE_USB_HOST,
+        EXTCON_CABLE_END,
+};
+static void usb_extcon_simulate_cable(struct dwc3 *dwc, enum usb_dr_mode mode)
+{
+        const char *usb_extcon_cable[] = {
+                [EXTCON_CABLE_USB] = "USB",
+                [EXTCON_CABLE_USB_HOST] = "USB-HOST",
+                NULL,
+        };
+        bool id, vbus;
+        if (!dwc->edev)
+                return;
+        /* set ID and VBUS based on usb-mode and update cable state */
+        switch (mode) {
+        case USB_DR_MODE_HOST:
+                id = false;
+                vbus = false;
+                break;
+        case USB_DR_MODE_PERIPHERAL:
+                id = true;
+                vbus = true;
+                break;
+        case USB_DR_MODE_OTG:
+                id = false;
+                vbus = true;
+                break;
+        default:
+                return;
+        }
+        /* at first we clean states which are no longer active */
+        if (id)
+                extcon_set_cable_state(dwc->edev,
+                        usb_extcon_cable[EXTCON_CABLE_USB_HOST], false);
+        if (!vbus)
+                extcon_set_cable_state(dwc->edev,
+                        usb_extcon_cable[EXTCON_CABLE_USB], false);
+        if (!id)
+                extcon_set_cable_state(dwc->edev,
+                        usb_extcon_cable[EXTCON_CABLE_USB_HOST], true);
+        if (vbus)
+                extcon_set_cable_state(dwc->edev,
+                        usb_extcon_cable[EXTCON_CABLE_USB], true);
+}
 static int dwc3_mode_show(struct seq_file *s, void *unused)
 {
        struct dwc3             *dwc = s->private;
@@ -410,11 +466,22 @@ static ssize_t dwc3_mode_write(struct file *file,
        if (!strncmp(buf, "otg", 3))
                mode |= DWC3_GCTL_PRTCAP_OTG;
+        if (dwc->dr_mode == USB_DR_MODE_OTG) {
+                if (mode & DWC3_GCTL_PRTCAP_HOST)
+                        usb_extcon_simulate_cable(dwc, USB_DR_MODE_HOST);
+                else if (mode & DWC3_GCTL_PRTCAP_DEVICE)
+                        usb_extcon_simulate_cable(dwc, USB_DR_MODE_PERIPHERAL);
+                else if (mode & DWC3_GCTL_PRTCAP_OTG)
+                        usb_extcon_simulate_cable(dwc, USB_DR_MODE_OTG);
+                return count;
+        }
        if (mode) {
                spin_lock_irqsave(&dwc->lock, flags);
                dwc3_set_mode(dwc, mode);
                spin_unlock_irqrestore(&dwc->lock, flags);
        }
        return count;
 }
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 35d239ebf912..138b0c33f959 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -31,6 +31,8 @@ endmenu
 source "drivers/video/backlight/Kconfig"
 source "drivers/video/adf/Kconfig"
+source "drivers/video/serdes/Kconfig"
 config VGASTATE
       tristate
       default n
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 1a8c4ced39b2..80b5330c1b75 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -7,6 +7,7 @@ obj-$(CONFIG_LOGO)		  += logo/
 obj-y                             += backlight/
 obj-y                             += fbdev/
+obj-y                             += serdes/
 obj-$(CONFIG_VIDEOMODE_HELPERS) += display_timing.o videomode.o
 ifeq ($(CONFIG_OF),y)
diff --git a/drivers/video/serdes/Kconfig b/drivers/video/serdes/Kconfig
new file mode 100644
index 000000000000..84efb53bdab3
--- /dev/null
+++ b/drivers/video/serdes/Kconfig
@@ -0,0 +1,12 @@
+menu "Video Serializer Deserializer drivers"
+config VIDEO_TI_FPD3_SERDES
+        tristate "Texas Instruments FPD link 3 serializer deserializer"
+        depends on I2C
+        help
+                This driver is used for configuring video serializers and
+                deserializers. When capturing video from a remote camera or
+                displaying to a remote display, the camera or display is
+                connected via FPDlink serializer / deserializer.
+endmenu
diff --git a/drivers/video/serdes/Makefile b/drivers/video/serdes/Makefile
new file mode 100644
index 000000000000..eab69490ed5a
--- /dev/null
+++ b/drivers/video/serdes/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_VIDEO_TI_FPD3_SERDES) += ti-fpd3-serdes.o
+ti-fpd3-serdes-y := fpd3_serdes.o fpd3_i2c_adap.o
diff --git a/drivers/video/serdes/fpd3_i2c_adap.c b/drivers/video/serdes/fpd3_i2c_adap.c
new file mode 100644
index 000000000000..8cc866fc1221
--- /dev/null
+++ b/drivers/video/serdes/fpd3_i2c_adap.c
@@ -0,0 +1,325 @@
+/*
+ * fpd3_i2c_adap.c
+ *
+ * lvds based serial link interface for onboard communication.
+ * Copyright (C) 2014-2015 Texas Instruments Incorporated - http://www.ti.com/
+ * Authors: Nikhil Devshatwar <nikhil.nd@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/>.
+ */
+/*
+ * This file has helper functions to implement an i2c bus adapter driver for
+ * fpd3_serdes devices. Only the master device can communicate with the
+ * serializer and any other slaves connected at the remote end.
+ *
+ * Every i2c slave at the remote bus, can be accessed from linux i2c
+ * using aliases. Master device registers some aliases and maps them to the
+ * actual device addresses at remote bus.
+ *
+ * Any transactions addressed for these alias are detected by the master device
+ * and then recreated at the remote i2c bus with the real slave address.
+ * So in a way, master device acts as an i2c adapter driver for all the
+ * remote clients.
+ *
+ * This file implements an i2c adapter which just reroutes the transactions
+ * on the parent adapter with alias for the slave.
+ */
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include <linux/delay.h>
+#include "fpd3_serdes.h"
+static int fpd3_serdes_setup_aliases(struct i2c_client *client)
+{
+        struct fpd3_serdes_data *data = i2c_get_clientdata(client);
+        const struct fpd3_serdes_platform_data *pdata = data->pdata;
+        int i = 0, ret, count = 0;
+        u8 reg;
+        /*
+         * First entry is for the remote serdes and any further entries
+         * are for the slaves connected at remote bus
+         */
+        for (i = 0; i < data->num_slaves; i++) {
+                if (data->slave_addr[i] == 0)
+                        continue;
+                /* Setup the real slave address */
+                if (i == 0)
+                        reg = pdata->dev_type == FPD3_SER_DEV ?
+                                FPD3_SER_DES_ID : FPD3_DES_SER_ID;
+                else  {
+                        reg = pdata->dev_type == FPD3_SER_DEV ?
+                                FPD3_SER_SLAVE_ID0 : FPD3_DES_SLAVE_ID0;
+                        reg += i - 1;
+                }
+                ret = i2c_write_le8(client, reg, data->slave_addr[i] << 1);
+                if (ret < 0)
+                        goto error_setup;
+                /* Setup the alias for the slave */
+                if (i == 0)
+                        reg = pdata->dev_type == FPD3_SER_DEV ?
+                                FPD3_SER_DES_AL : FPD3_DES_SER_AL;
+                else  {
+                        reg = pdata->dev_type == FPD3_SER_DEV ?
+                                FPD3_SER_SLAVE_AL0 : FPD3_DES_SLAVE_AL0;
+                        reg += + i - 1;
+                }
+                ret = i2c_write_le8(client, reg, data->slave_alias[i] << 1);
+                if (ret < 0)
+                        goto error_setup;
+                dev_dbg(&client->dev, "Registered alias 0x%2x for 0x%02x",
+                        data->slave_alias[i], data->slave_addr[i]);
+        }
+        while (count < FPD3_MAX_POLL_COUNT) {
+                reg = pdata->dev_type == FPD3_SER_DEV ?
+                        FPD3_SER_GN_STS : FPD3_DES_GN_STS;
+                ret = i2c_read_le8(client, reg);
+                if (ret < 0)
+                        return ret;
+                if (ret & SIGNAL_DETECT)
+                        break;
+                udelay(10);
+                count++;
+        }
+        if (count >= FPD3_MAX_POLL_COUNT) {
+                dev_err(&client->dev, "Unable to sync with remote slave");
+                return -EIO;
+        }
+        dev_dbg(&client->dev, "Remote signal detected");
+        return 0;
+error_setup:
+        dev_err(&client->dev, "Failed to setup alias for %2x",
+                                data->slave_addr[i]);
+        return ret;
+}
+static int setup_link(struct i2c_adapter *adap)
+{
+        struct i2c_client *client = i2c_get_adapdata(adap);
+        struct fpd3_serdes_data *data = i2c_get_clientdata(client);
+        int ret;
+        if (data->link_ok)
+                return 0;
+        else if (data->link_ok < 0)
+                return data->link_ok;
+        ret = fpd3_serdes_initialize(client);
+        if (ret == 0)
+                ret = fpd3_serdes_setup_aliases(client);
+        if (ret == 0)
+                data->link_ok = 1;
+        else
+                data->link_ok = -EIO;
+        return ret;
+}
+static u8 fpd3_alloc_addr(struct i2c_adapter *adap, u8 addr)
+{
+        struct i2c_client *client = i2c_get_adapdata(adap);
+        struct fpd3_serdes_data *data = i2c_get_clientdata(client);
+        const struct fpd3_serdes_platform_data *pdata = data->pdata;
+        u8 reg, i;
+        for (i = 0; i < data->num_slaves; i++) {
+                if (data->slave_addr[i] == 0x0)
+                        break;
+        }
+        if (i < data->num_slaves) {
+                /* Program new mapping for remote address and alias */
+                reg = pdata->dev_type == FPD3_SER_DEV ?
+                        FPD3_SER_SLAVE_ID0 : FPD3_DES_SLAVE_ID0;
+                i2c_write_le8(client, reg, addr << 1);
+                reg = pdata->dev_type == FPD3_SER_DEV ?
+                        FPD3_SER_SLAVE_AL0 : FPD3_DES_SLAVE_AL0;
+                i2c_write_le8(client, reg, data->slave_alias[i] << 1);
+                return data->slave_alias[i];
+        } else
+                return 0;
+}
+static u8 __get_alias_addr(struct i2c_adapter *adap, u8 addr)
+{
+        struct i2c_client *client = i2c_get_adapdata(adap);
+        struct fpd3_serdes_data *data = i2c_get_clientdata(client);
+        u8 new_alias;
+        int i;
+        /* master device should have the mapping between the
+         * slave address on remote bus to alias for which master device
+         * is monitoring for transactions */
+        for (i = 0; i < data->num_slaves; i++) {
+                if (data->slave_addr[i] == addr)
+                        break;
+        }
+        if (data->slave_addr[i] == addr)
+                return data->slave_alias[i];
+        new_alias = fpd3_alloc_addr(adap, addr);
+        if (new_alias == 0)
+                dev_err(&adap->dev, "Cannot translate chip addr 0x%02x", addr);
+        return new_alias;
+}
+static struct i2c_adapter *__get_alias_adapter(struct i2c_adapter *adap)
+{
+        struct i2c_client *client = i2c_get_adapdata(adap);
+        /* Same i2c adapter used for the master device should be
+         * used for communicating with the remote device via alias */
+        return client->adapter;
+}
+static int fpd3_master_xfer(struct i2c_adapter *adap,
+                        struct i2c_msg msgs[], int num)
+{
+        struct i2c_adapter *alias_adap;
+        struct i2c_msg *new_msg;
+        u8 alias_addr;
+        int i, ret = 0;
+        if (setup_link(adap))
+                return -EIO;
+        alias_adap = __get_alias_adapter(adap);
+        new_msg = kcalloc(num, sizeof(*new_msg), GFP_KERNEL);
+        for (i = 0; i < num; i++) {
+                alias_addr = __get_alias_addr(adap, msgs[i].addr);
+                if (alias_addr == 0) {
+                        ret = -EINVAL;
+                        goto cleanup;
+                }
+                /* Copy the i2c_msgs into temporary buffer; xlate address */
+                new_msg[i] = msgs[i];
+                new_msg[i].addr = alias_addr;
+        }
+        /* Issue the messages on the alias adapter */
+        ret = i2c_transfer(alias_adap, new_msg, num);
+ cleanup:
+        kfree(new_msg);
+        return ret;
+}
+static int fpd3_smbus_xfer(struct i2c_adapter *adap, u16 addr,
+                unsigned short flags, char read_write,
+                u8 command, int size, union i2c_smbus_data *data)
+{
+        struct i2c_adapter *alias_adap;
+        u8 alias_addr;
+        if (setup_link(adap))
+                return -EIO;
+        alias_adap = __get_alias_adapter(adap);
+        alias_addr = __get_alias_addr(adap, addr);
+        if (alias_addr == 0)
+                return -EINVAL;
+        return i2c_smbus_xfer(alias_adap, alias_addr, flags, read_write,
+                        command, size, data);
+}
+static u32 fpd3_i2c_func(struct i2c_adapter *adap)
+{
+        return I2C_FUNC_I2C | (I2C_FUNC_SMBUS_EMUL & ~I2C_FUNC_SMBUS_QUICK) |
+                I2C_FUNC_PROTOCOL_MANGLING;
+}
+static const struct i2c_algorithm fpd3_i2c_algo = {
+        .master_xfer    = fpd3_master_xfer,
+        .smbus_xfer     = fpd3_smbus_xfer,
+        .functionality  = fpd3_i2c_func,
+};
+static int parse_address_translation(struct i2c_client *client)
+{
+        struct device_node *node = client->dev.of_node;
+        struct fpd3_serdes_data *data = i2c_get_clientdata(client);
+        const struct fpd3_serdes_platform_data *pdata = data->pdata;
+        unsigned int slave_bus_addr, master_bus_addr;
+        int ret, i;
+        for (i = 0; i < pdata->nslaves + 1; i++) {
+                ret = of_property_read_u32_index(node, "ranges", 2 * i,
+                                &slave_bus_addr);
+                if (ret)
+                        break;
+                ret = of_property_read_u32_index(node, "ranges", 2 * i + 1,
+                                &master_bus_addr);
+                if (ret)
+                        break;
+                data->slave_addr[i] = slave_bus_addr;
+                data->slave_alias[i] = master_bus_addr;
+        }
+        data->num_slaves = i;
+        ret = 0;
+        if (i == 0) {
+                dev_err(&client->dev, "Master mode device does not have slave address translation information");
+                return -ENODEV;
+        }
+        return 0;
+}
+int fpd3_register_i2c_adapter(struct i2c_client *client)
+{
+        struct fpd3_serdes_data *data = i2c_get_clientdata(client);
+        struct i2c_adapter *adap;
+        int ret = 0;
+        dev_dbg(&client->dev, "Registering i2c adapter");
+        adap = kzalloc(sizeof(*adap), GFP_KERNEL);
+        if (adap == NULL)
+                return -ENOMEM;
+        data->adap = adap;
+        adap->nr = -1;
+        adap->owner = THIS_MODULE;
+        adap->class = I2C_CLASS_HWMON;
+        adap->algo = &fpd3_i2c_algo;
+        adap->dev.parent = &client->dev;
+        adap->dev.of_node = client->dev.of_node;
+        strlcpy(adap->name, "LVDS I2C adapter", sizeof(adap->name));
+        ret = parse_address_translation(client);
+        if (ret)
+                return ret;
+        i2c_set_adapdata(adap, client);
+        return i2c_add_numbered_adapter(adap);
+}
diff --git a/drivers/video/serdes/fpd3_serdes.c b/drivers/video/serdes/fpd3_serdes.c
new file mode 100644
index 000000000000..3598683a3d31
--- /dev/null
+++ b/drivers/video/serdes/fpd3_serdes.c
@@ -0,0 +1,456 @@
+/*
+ * fpd3_serdes.c
+ *
+ * lvds based serial link interface for onboard communication.
+ * Copyright (C) 2014-2015 Texas Instruments Incorporated - http://www.ti.com/
+ * Authors: Nikhil Devshatwar <nikhil.nd@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/>.
+ */
+/*
+ * Datasheets:-
+ * DS90UB913aq/DS90UB914aq http://www.ti.com/lit/ds/snls443a/snls443a.pdf
+ * DS90UH925Q http://www.ti.com/lit/ds/symlink/ds90uh925q-q1.pdf
+ * DS90UH928Q http://www.ti.com/lit/ds/snls440a/snls440a.pdf
+ * DS90UB924Q http://www.ti.com/lit/ds/snls512/snls512.pdf
+ * DS90UB921Q http://www.ti.com/lit/ds/symlink/ds90ub921-q1.pdf
+ *
+ * Documentation:-
+ * -> Documentation/video-serdes.txt
+ * -> Documentation/devicetree/bindings/video/fpd3-serdes.txt
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+#include <linux/of_gpio.h>
+#include <linux/of_device.h>
+#include "fpd3_serdes.h"
+static const unsigned int fpd3_12bit_ser_init[] = {
+        /* auto volt ctrl en, 3.3V, digital reset0, digital reset1 */
+        FPD3_SER_RESET,         0x33,
+        /* RX CRC check, TX parity en, i2c passthrough, rising edge pclk */
+        FPD3_SER_CONFIG1,       0xc5,
+        /* GPIO0 - o/p LOW, GPIO0 - o/p HIGH */
+        FPD3_SER_GPIO_01,       0x55,
+};
+static const unsigned int fpd3_12bit_des_init[] = {
+        /* back channel en */
+        FPD3_DES_RESET,         0x04,
+        /* RX parity check, TX CRC check, auto volt ctrl en
+         * i2c passthrough, auto ack WR, rising edge pclk */
+        FPD3_DES_CONFIG1,       0xec,
+};
+static const unsigned int fpd3_24bit_ser_init[] = {
+        /* digital reset1 */
+        FPD3_SER_RESET,         0x02,
+        /* back chan en, auto ack WR, i2c passthrough, rising edge pclk */
+        FPD3_SER_CONFIG1,       0xab,
+        /* failsafe low, LFMODE override, high freq*/
+        FPD3_SER_CONFIG2,       0x8a,
+        /* RGB data, 24bit, i2s data forwarding */
+        FPD3_SER_DATA_CTRL,     0x8a,
+};
+static const unsigned int fpd3_24bit_des_init[] = {
+        /* digital reset1 */
+        FPD3_DES_RESET,         0x02,
+        /* back channel en */
+        FPD3_DES_RESET,         0x04,
+        /* auto clk en, LFMODE override, high freq */
+        FPD3_DES_CONFIG0,       0x2a,
+        /* failsafe pull up, i2c passthrough, auto ack */
+        FPD3_DES_CONFIG1,       0x4c,
+};
+static const unsigned int fpd3_921_ser_init[] = {
+        /* Reset entire digital block except registers */
+        FPD3_SER_RESET,         0x01,
+        /* back chan en, auto ack WR, i2c passthrough, rising edge pclk */
+        FPD3_SER_CONFIG1,       0x8b,
+};
+static const unsigned int fpd3_924_des_init[] = {
+        /* digital reset1 */
+        FPD3_DES_RESET,         0x02,
+        /* back channel en */
+        FPD3_DES_RESET,         0x04,
+};
+static struct fpd3_serdes_platform_data fpd3_serdes_pdata[] = {
+        {
+                .name = "fpd3_12b_ser",
+                .dev_type = FPD3_SER_DEV,
+                .ngpio = 4,
+                .nslaves = 1,
+                .device_id = 0xb0,
+                .gpio_2reg = 2 * FPD3_SER_GPIO_01,
+                .init_seq = fpd3_12bit_ser_init,
+                .init_len = ARRAY_SIZE(fpd3_12bit_ser_init),
+        },
+        {
+                .name = "fpd3_12b_des",
+                .dev_type = FPD3_DES_DEV,
+                .ngpio = 4,
+                .nslaves = 8,
+                .device_id = 0xc0,
+                .gpio_2reg = 2 * FPD3_DES_GPIO_01,
+                .init_seq = fpd3_12bit_des_init,
+                .init_len = ARRAY_SIZE(fpd3_12bit_des_init),
+        },
+        {
+                .name = "fpd3_24b_ser",
+                .dev_type = FPD3_SER_DEV,
+                .ngpio = 4,
+                .nslaves = 1,
+                .device_id = 0x36,
+                .gpio_2reg = 2 * FPD3_SER_GPIO_01 + 1,
+                .init_seq = fpd3_24bit_ser_init,
+                .init_len = ARRAY_SIZE(fpd3_24bit_ser_init),
+        },
+        {
+                .name = "fpd3_24b_des",
+                .dev_type = FPD3_DES_DEV,
+                .ngpio = 4,
+                .nslaves = 8,
+                .device_id = 0x58,
+                .gpio_2reg = 2 * FPD3_DES_GPIO_01 + 1,
+                .init_seq = fpd3_24bit_des_init,
+                .init_len = ARRAY_SIZE(fpd3_24bit_des_init),
+        },
+        {
+                .name = "fpd3_924_des",
+                .dev_type = FPD3_DES_DEV,
+                .ngpio = 4,
+                .nslaves = 8,
+                .device_id = 0x58,
+                .gpio_2reg = 2 * FPD3_DES_GPIO_01 + 1,
+                .init_seq = fpd3_924_des_init,
+                .init_len = ARRAY_SIZE(fpd3_924_des_init),
+        },
+        {
+                .name = "fpd3_921_ser",
+                .dev_type = FPD3_SER_DEV,
+                .ngpio = 4,
+                .nslaves = 1,
+                .device_id = 0x18,
+                .gpio_2reg = 2 * FPD3_SER_GPIO_01 + 1,
+                .init_seq = fpd3_921_ser_init,
+                .init_len = ARRAY_SIZE(fpd3_921_ser_init),
+        },
+};
+/* GPIO operations */
+static int __fpd3_serdes_dirval(struct gpio_chip *chip,
+                        unsigned offset, int value, int shift)
+{
+        struct fpd3_serdes_data *data =
+                        container_of(chip, struct fpd3_serdes_data, chip);
+        const struct fpd3_serdes_platform_data *pdata = data->pdata;
+        struct i2c_client *client = data->client;
+        int reg, val = 0x00;
+        reg = (pdata->gpio_2reg + offset) / 2;
+        if ((pdata->gpio_2reg + offset) % 2)
+                shift += 4;
+        val = i2c_read_le8(client, reg);
+        if (value)
+                val |= 1 << shift;
+        else
+                val &= ~(1 << shift);
+        return i2c_write_le8(client, reg, val);
+}
+static int fpd3_serdes_input(struct gpio_chip *chip, unsigned offset)
+{
+        return __fpd3_serdes_dirval(chip, offset,
+                        GPIO_DIR_INPUT, GPIO_SHIFT_DIR);
+}
+static int fpd3_serdes_output(struct gpio_chip *chip,
+                unsigned offset, int value)
+{
+        int ret;
+        ret = __fpd3_serdes_dirval(chip, offset,
+                        GPIO_DIR_OUTPUT, GPIO_SHIFT_DIR);
+        if (ret)
+                ret = __fpd3_serdes_dirval(chip, offset,
+                        value, GPIO_SHIFT_VAL);
+        return ret;
+}
+static void fpd3_serdes_set(struct gpio_chip *chip, unsigned offset, int value)
+{
+        __fpd3_serdes_dirval(chip, offset, value, GPIO_SHIFT_VAL);
+}
+static int fpd3_serdes_get(struct gpio_chip *chip, unsigned offset)
+{
+        struct fpd3_serdes_data *data =
+                        container_of(chip, struct fpd3_serdes_data, chip);
+        const struct fpd3_serdes_platform_data *pdata = data->pdata;
+        struct i2c_client *client = data->client;
+        int reg;
+        int shift = GPIO_SHIFT_VAL;
+        reg = (pdata->gpio_2reg + offset) / 2;
+        if ((pdata->gpio_2reg + offset) % 2)
+                shift += 4;
+        return (i2c_read_le8(client, reg) | 1 << shift) ? 1 : 0;
+}
+static struct gpio_chip fpd3_serdes_gpiochip = {
+        .owner                  = THIS_MODULE,
+        .base                   = -1,
+        .ngpio                  = 4,
+        .can_sleep              = false,
+        .get                    = fpd3_serdes_get,
+        .set                    = fpd3_serdes_set,
+        .direction_input        = fpd3_serdes_input,
+        .direction_output       = fpd3_serdes_output,
+};
+int fpd3_serdes_initialize(struct i2c_client *client)
+{
+        struct fpd3_serdes_data *data = i2c_get_clientdata(client);
+        const struct fpd3_serdes_platform_data *pdata = data->pdata;
+        const unsigned int *seq;
+        int i, len, reg, ret = 0, count = 0;
+        if (data->slave_mode == false) {
+                /* Wait for the device to initialize and show up device ID */
+                reg = pdata->dev_type == FPD3_SER_DEV ?
+                        FPD3_SER_DEV_ID : FPD3_SER_DEV_ID;
+                while (ret != pdata->device_id && count < FPD3_MAX_POLL_COUNT) {
+                        ret = i2c_read_le8(client, reg);
+                        count++;
+                        mdelay(3);
+                }
+                if (count == FPD3_MAX_POLL_COUNT) {
+                        dev_err(&client->dev, "Not a %s chip", pdata->name);
+                        return -ENODEV;
+                }
+        }
+        len = pdata->init_len;
+        seq = pdata->init_seq;
+        for (i = 0; i < len; i += 2) {
+                ret = i2c_write_le8(client, seq[i], seq[i+1]);
+                if (ret)
+                        break;
+                if (seq[i] == 0x01)
+                        udelay(500);
+                else
+                        udelay(10);
+        }
+        return ret;
+}
+EXPORT_SYMBOL(fpd3_serdes_initialize);
+/* On Vision app board (up to Rev B), the deserializer I2C addresses
+ * conflicts with the HDMI receiver chip, making deserializer unaccessible.
+ * The workaround is to change the I2C address of the HDMI receiver at runtime.
+ * Following code removes the conflict between HDMI SIL9127 and deserializers
+ * 0x31 is default I2C address of SIL9127
+ */
+static int fpd3_serdes_remove_conflict(struct i2c_client *client)
+{
+        struct regval {
+                u8      reg;
+        u8      val;
+        } conflict_regval[] = {
+                {       0x14,   0xf4,   },
+                {       0x15,   0xf6,   },
+                {       0x16,   0xf8,   },
+                {       0x17,   0xfa,   },
+                {       0x18,   0xfc,   },
+                {       0x19,   0xfe,   },
+        };
+        union i2c_smbus_data data;
+        int i, ret;
+        u16 addr = 0x31;
+        static bool conflict_exist = true;
+        if (!conflict_exist)
+                return 0;
+        conflict_exist = false;
+        for (i = 0; i < 6; i++) {
+                data.byte = conflict_regval[i].val;
+                ret = i2c_smbus_xfer(client->adapter, addr, client->flags,
+                        I2C_SMBUS_WRITE, conflict_regval[i].reg,
+                        I2C_SMBUS_BYTE_DATA, &data);
+                if (ret)
+                        return ret;
+        }
+        dev_err(&client->dev, "Removed conflict b/w HDMI SIL");
+        return 0;
+}
+static int fpd3_serdes_of_probe(struct i2c_client *client,
+                        struct device_node *node)
+{
+        struct fpd3_serdes_data *data = i2c_get_clientdata(client);
+        int gpio, ret;
+        gpio = of_get_gpio(node, 0);
+        if (gpio_is_valid(gpio)) {
+                /* Toggle the pdb bit from LOW to HIGH */
+                ret = devm_gpio_request_one(&client->dev, gpio,
+                                GPIOF_INIT_HIGH, "des_pdb");
+        } else if (gpio == -ENOENT)
+                /* Entry not present - no need to toggle pdb */
+                ret = 0;
+        else
+                ret = gpio;
+        if (ret)
+                return ret;
+        data->gpio_export = of_find_property(node, "gpio-controller", NULL) ?
+                        true : false;
+        data->slave_mode = of_find_property(node, "slave-mode", NULL) ?
+                        true : false;
+        return 0;
+}
+static const struct i2c_device_id fpd3_serdes_i2c_ids[] = {
+        { "ds90ub913aq", 8 },
+        { "ds90ub914aq", 8 },
+        { "ds90uh925q", 8 },
+        { "ds90uh928q", 8 },
+        { "ds90ub924q", 8 },
+        { "ds90ub921q", 8 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, fpd3_serdes_i2c_ids);
+static const struct of_device_id fpd3_serdes_dt_ids[] = {
+        {.compatible = "ti,ds90ub913aq", &fpd3_serdes_pdata[0], },
+        {.compatible = "ti,ds90ub914aq", &fpd3_serdes_pdata[1], },
+        {.compatible = "ti,ds90uh925q", &fpd3_serdes_pdata[2], },
+        {.compatible = "ti,ds90uh928q", &fpd3_serdes_pdata[3], },
+        {.compatible = "ti,ds90ub924q", &fpd3_serdes_pdata[4], },
+        {.compatible = "ti,ds90ub921q", &fpd3_serdes_pdata[5], },
+        { }
+};
+MODULE_DEVICE_TABLE(of, fpd3_serdes_dt_ids);
+static int fpd3_serdes_probe(struct i2c_client *client,
+                         const struct i2c_device_id *id)
+{
+        const struct of_device_id *of_dev_id;
+        const struct fpd3_serdes_platform_data *pdata;
+        struct fpd3_serdes_data *data;
+        int status;
+        data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
+        if (!data)
+                return -ENOMEM;
+        data->client = client;
+        i2c_set_clientdata(client, data);
+        fpd3_serdes_remove_conflict(client);
+        of_dev_id = of_match_device(fpd3_serdes_dt_ids, &client->dev);
+        if (!of_dev_id) {
+                dev_err(&client->dev, "Unable to match device");
+                return -EINVAL;
+        }
+        pdata = of_dev_id->data;
+        data->pdata = pdata;
+        status = fpd3_serdes_of_probe(client, client->dev.of_node);
+        if (status)
+                goto fail;
+        if (data->slave_mode == false) {
+                status = fpd3_register_i2c_adapter(client);
+                if (status) {
+                        dev_err(&client->dev, "Cannot register i2c adapter");
+                        goto fail;
+                }
+        } else {
+                status = fpd3_serdes_initialize(client);
+                if (status)
+                        goto fail;
+        }
+        if (data->gpio_export == true) {
+                /* Register local gpios as a separate gpiochip */
+                data->chip = fpd3_serdes_gpiochip;
+                data->chip.ngpio = pdata->ngpio;
+                data->chip.dev = &client->dev;
+                data->chip.label = client->name;
+                status = gpiochip_add(&data->chip);
+                if (status)
+                        goto fail;
+        }
+        if (status)
+                goto unreg_gpio;
+        dev_err(&client->dev, "%s %s ready", pdata->dev_type == FPD3_SER_DEV ?
+                "Serializer" : "Deserializer", data->pdata->name);
+        return 0;
+unreg_gpio:
+        if (data->gpio_export == true) {
+                gpiochip_remove(&data->chip);
+                return -1;
+        }
+fail:
+        return status;
+}
+static int fpd3_serdes_remove(struct i2c_client *client)
+{
+        struct fpd3_serdes_data *data = i2c_get_clientdata(client);
+        kfree(data);
+        return 0;
+}
+static struct i2c_driver fpd3_serdes_driver = {
+        .driver = {
+                .name = "fpd3_serdes",
+                .owner = THIS_MODULE,
+                .of_match_table = fpd3_serdes_dt_ids,
+        },
+        .probe = fpd3_serdes_probe,
+        .remove = fpd3_serdes_remove,
+        .id_table = fpd3_serdes_i2c_ids
+};
+module_i2c_driver(fpd3_serdes_driver);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Nikhil Devshatwar");
diff --git a/drivers/video/serdes/fpd3_serdes.h b/drivers/video/serdes/fpd3_serdes.h
new file mode 100644
index 000000000000..45c695ab27da
--- /dev/null
+++ b/drivers/video/serdes/fpd3_serdes.h
@@ -0,0 +1,108 @@
+#include <linux/kernel.h>
+#include <linux/i2c.h>
+#include <linux/gpio.h>
+/*              Deserializer registers          */
+#define FPD3_DES_DEV_ID                 0x00
+#define FPD3_DES_RESET                  0x01
+#define FPD3_DES_CONFIG0                0x02
+#define FPD3_DES_CONFIG1                0x03
+#define FPD3_DES_SER_ID                 0x06
+#define FPD3_DES_SER_AL                 0x07
+#define FPD3_DES_SLAVE_ID0              0x08
+#define FPD3_DES_SLAVE_AL0              0x10
+#define FPD3_DES_GN_STS                 0x1c
+#define FPD3_DES_GPIO_01                0x1d
+#define FPD3_DES_GPIO_23                0x1e
+#define FPD3_DES_I2C_CTRL1              0x21
+#define FPD3_DES_I2C_CTRL2              0x22
+/*              Serializer registers            */
+#define FPD3_SER_DEV_ID                 0x00
+#define FPD3_SER_RESET                  0x01
+#define FPD3_SER_CONFIG0                0x02
+#define FPD3_SER_CONFIG1                0x03
+#define FPD3_SER_CONFIG2                0x04
+#define FPD3_SER_DES_ID                 0x06
+#define FPD3_SER_DES_AL                 0x06
+#define FPD3_SER_SLAVE_ID0              0x07
+#define FPD3_SER_SLAVE_AL0              0x08
+#define FPD3_SER_GN_STS                 0x0c
+#define FPD3_SER_GPIO_01                0x0d
+#define FPD3_SER_GPIO_23                0x0e
+#define FPD3_SER_DATA_CTRL              0x12
+#define FPD3_SER_I2C_CTRL1              0x21
+#define FPD3_SER_I2C_CTRL2              0x22
+/*              Generic macros                  */
+#define GPIO_SHIFT_DIR  3
+#define GPIO_SHIFT_VAL  1
+#define GPIO_DIR_INPUT  1
+#define GPIO_DIR_OUTPUT 0
+#define SIGNAL_DETECT                   (1<<0)
+#define FPD3_MAX_POLL_COUNT             100
+#define FPD3_SERDES_MAX_SLAVES          10
+enum fpd3_device_type {
+        FPD3_SER_DEV,
+        FPD3_DES_DEV,
+};
+struct fpd3_serdes_data {
+        struct i2c_client       *client;
+        bool                    slave_mode;
+        struct gpio_chip        chip;
+        bool                    gpio_export;
+        struct i2c_adapter      *adap;
+        unsigned int            slave_addr[FPD3_SERDES_MAX_SLAVES];
+        unsigned int            slave_alias[FPD3_SERDES_MAX_SLAVES];
+        const char              *slave_name[FPD3_SERDES_MAX_SLAVES];
+        int                     num_slaves;
+        int                     link_ok;
+        const struct fpd3_serdes_platform_data *pdata;
+};
+struct fpd3_serdes_platform_data {
+        char                            *name;
+        enum fpd3_device_type           dev_type;
+        int                             device_id;
+        int                             ngpio;
+        int                             nslaves;
+        int                             gpio_2reg;
+        const unsigned int              *init_seq;
+        int                             init_len;
+};
+static inline int i2c_write_le8(struct i2c_client *client, unsigned addr,
+                        unsigned data)
+{
+        int ret = i2c_smbus_write_byte_data(client, addr, data);
+        if (ret)
+                dev_dbg(&client->dev, "Failed to write 0x%02x to 0x%02x",
+                                        data, addr);
+        return ret;
+}
+static inline int i2c_read_le8(struct i2c_client *client, unsigned addr)
+{
+        int ret = (int)i2c_smbus_read_byte_data(client, addr);
+        if (ret < 0)
+                dev_dbg(&client->dev, "Failed to read 0x%02x, Error = %d",
+                                        addr, ret);
+        return ret;
+}
+int fpd3_register_i2c_adapter(struct i2c_client *client);
+int fpd3_serdes_initialize(struct i2c_client *client);
diff --git a/firmware/Makefile b/firmware/Makefile
index e297e1b52636..d019ab46c2cd 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -96,6 +96,9 @@ fw-shipped-$(CONFIG_SND_WAVEFRONT) += yamaha/yss225_registers.bin
 fw-shipped-$(CONFIG_TEHUTI) += tehuti/bdx.bin
 fw-shipped-$(CONFIG_TIGON3) += tigon/tg3.bin tigon/tg3_tso.bin \
                               tigon/tg3_tso5.bin
+fw-shipped-$(CONFIG_VIDEO_TI_VPDMA_LOAD_FW) += vpdma-1b8.bin
 fw-shipped-$(CONFIG_TYPHOON) += 3com/typhoon.bin
 fw-shipped-$(CONFIG_USB_EMI26) += emi26/loader.fw emi26/firmware.fw \
                                  emi26/bitstream.fw
diff --git a/firmware/vpdma-1b8.bin.ihex b/firmware/vpdma-1b8.bin.ihex
new file mode 100644
index 000000000000..ddf307dd3e29
--- /dev/null
+++ b/firmware/vpdma-1b8.bin.ihex
@@ -0,0 +1,252 @@
+:10000000064B408007680749064A005102441F0812
+:10001000064A003102441E080449418004484080D9
+:100020000680000C01D002C01681010000441C08AB
+:1000300001441D080649E809064818080185064AD2
+:1000400001002181219400441B080044180806483F
+:10005000010000441A080648001C0044190806491B
+:1000600000000144250801442408064818080144FA
+:100070002108004420080648E809068001000144E0
+:100080002308004422080144260806480080004452
+:100090002708064834000044428006480000004417
+:1000A000F880064801000044F980064B1808864B8A
+:1000B000200807BC0FB80004064801000044FF8078
+:1000C0000648FFFF0044F8800648FFFF0044F9801F
+:1000D000064800000044580800445D0800445E08DB
+:1000E00000445F0800445C08004457090044590973
+:1000F00000445A0900445B0900445C0900445D095E
+:1001000000445E0900445F09004460090044660938
+:10011000004465090648D1000044E18006486A02AF
+:100120000044E2800648F9050044E3800648B8012F
+:100130000044FC800044FE800004064800000044A7
+:10014000540900445509004456090448FE8006AA93
+:1001500008000649010001940044FF80864B5909BC
+:10016000C483FE800F480ECC064B01800648080071
+:1001700004A8FE80308307480689F0011685F00147
+:1001800001C881450649FF010144FD800FB90649B8
+:1001900042802183074A26867F00CCCC0448E08039
+:1001A00000E00648FFFF0044F880064B59093483FD
+:1001B000FE80064A00000245044AFE8002446108AF
+:1001C00026A9050001446808064B32081383074836
+:1001D0000044630826A9080001446708064B4080D4
+:1001E000138307680044650807480044660836839F
+:1001F000030007480680F9FF03CC064AD70502E052
+:100200000648000000446408064B300826A9050093
+:100210001383076800445D0800445C080045064BF2
+:1002200033081383074800445F080648510100E083
+:1002300004486708064B43803083074932CC044AA0
+:10024000FE80064B6709238306481F010045864B45
+:100250004280C48367080F4836830800004506487B
+:100260007F008045064B0180348367080648FFFF06
+:1002700000450448540912C806488001044955093C
+:10028000018C0045068C80000044FC80064B34083D
+:1002900026AA05003283064800000045064897015B
+:1002A00000E0044AFE80064B6709238306481801D4
+:1002B0000045044AFE8006490800064B018012AA48
+:1002C0002383064801010045864B0F080F4A0DD8CD
+:1002D000064800010045864B07080F4A06D8064825
+:1002E000FA0100450044FF8025C00448FE8006A8AE
+:1002F0000500064B34080383044964080145064B96
+:100300003108038304495D08014506480080004424
+:10031000FA80064A000002449108044AFE80064B17
+:100320006709238306481801068C008000450648AB
+:100330009A0000E00649005106480001108C004474
+:100340001F08044A660802441D080244D18004497B
+:10035000650801441C080144D08004486308064B2A
+:100360004380348367080749018603D80244620842
+:1003700006C016800000064A00000244620804829B
+:10038000640802446408044A640806A81000004493
+:100390001B08004418080044D280064801000044AD
+:1003A000D380064A000004495C0802442508014441
+:1003B00024080449910807C806490000014491082F
+:1003C00004495C0805C00449920802CC04495D0850
+:1003D0000244210801442008064900000144920813
+:1003E00004495F0802442308014422080244260805
+:1003F0000649008001442708864B18080FBE0448B0
+:100400006208064B4380348367080045864B20080A
+:100410000448D480004465080448D5800044660838
+:100420000FB806483400064B42800449670813831E
+:100430000045044AFE80064B6709238306491801DC
+:10044000168D0040014536830800004536830800BC
+:1004500004485D080045064B43803483670807491C
+:100460000448FE80064B6709038336831800014564
+:1004700004496708064B40801383044865080065FB
+:100480000448660800450448FE8006A80500064B9F
+:1004900034080383044964080145064B310803838B
+:1004A00004495D0801450648970100E006480080C0
+:1004B0000044FA80044AFE80064B670923830648FD
+:1004C0001801068C00C0004506489A0000E0004470
+:1004D000EE8000E4044AFE80064B018026A9080055
+:1004E00001446708064B4080138307680044650891
+:1004F0000768004466080768076800446208074800
+:10050000004460080244610826AA05000244680805
+:10051000064B30082383076800445C0807680044E2
+:100520005D08076800445E08076800445F080748E4
+:1005300000446408004463080448640807CC044885
+:100540005E08004463080648180100E0044B5D089B
+:100550000649F5FF368307000748109406490A004C
+:1005600010840CC80649010010840BC8108403C80D
+:100570000648C40200E006488E0400E00648DC029B
+:1005800000E00648CC0300E036830800044A5D081A
+:10059000024536830800044A640802450448FE8088
+:1005A00006490800864B018010A888830648FB0195
+:1005B000804506489A0000E0044A640806CC0648D4
+:1005C0008A0300E006487C0300E0044A64082680B1
+:1005D000FFFFF8C8044B5D08B68306000F48068885
+:1005E000004000448F080F480688008000445409EA
+:1005F000B68307000F480688FF01044AFE800649BB
+:100600000800864B018012AAA88380450649030092
+:100610009097C68307000F4A05D8B68306000F4A95
+:1006200004D808C006489B0300E09097C6830200E8
+:100630000F49F8D8044AFE80864B0180064908001D
+:1006400012AAA8830649FE0181450144FF8007BD27
+:10065000064903009097C68302000F49168D00805B
+:10066000814536830800044954090DC80649030032
+:100670009097C68307000F491689008004488F08A9
+:10068000108D01448F0806480100044A5609209441
+:10069000044A5509028E02445509044A5F0823851D
+:1006A00004D8044B5C0803445D0804498F0805C85E
+:1006B00007B81689000001448F0807B83683080080
+:1006C00006480100044A56092681010001445609E2
+:1006D000044964081681FEFF0144640823C8044AE3
+:1006E0005F08328505D803445D080648A60200E08D
+:1006F00004485C0800445D0804485D0804495F083C
+:100700000680080000449208108404D806480100BE
+:100710000044910804485E080649FFFF1094004415
+:10072000630834C004485C0800445D0804485E085F
+:10073000004463082BC0B68306000F4801D810C0E0
+:10074000044AFE80864B01800649080012AAA8834D
+:100750000648FE0180450044FF8036831000B0C08B
+:1007600004486808064B34080383044964080145BB
+:10077000064B3108038304495D0801450AC0064859
+:10078000100000448E080648670200E00648180181
+:1007900000E006489A0000E0044A640803CC0648DA
+:1007A000500400E0044B5D08B68306000F4869C89A
+:1007B000064A000004495C08024425080144240854
+:1007C00004495D08024421080144200804495F08E7
+:1007D00002442308014422080244260806490080F6
+:1007E00001442708044AFE8006490800064B0180A0
+:1007F00012AA238306480101064900800045864B62
+:100800000F080F4A59D80648000106490040004524
+:10081000864B07080F4A50D8064901010144FD8064
+:100820000044FF800648FC010045044B5D0807BCFE
+:10083000B68306000F680F49168AFF011689000467
+:1008400003C80680010002C006480100864B4280B2
+:10085000C483670806493E00218181450449640834
+:1008600001850144640806A80800308202445D083E
+:10087000064B2008864B080807B90F490F490F4956
+:100880000AC004485D08068008000449640816810F
+:10089000FFFF06C834C004495F08218526D814C06C
+:1008A0000144640804495E08064AFFFF2196024499
+:1008B00063080648180100E0064800800044FA80FA
+:1008C0000648FF800044F98004486808064B340855
+:1008D0000383044964080145064B31080383044936
+:1008E0005D08014506489A0000E004485C080044A1
+:1008F0005D08044A5E0804496408D2C8E5C0064B96
+:10090000310834836808004500445D0836830300DD
+:100910000145014464080648A60200E0044AFE803E
+:10092000044B5D0836830600074806880F000BC895
+:1009300006490100108421C810842DC810843BC8CA
+:1009400010843FC87BC036830100044AFE800748FC
+:100950000688FF01864B9308C6830100C0830F49B8
+:10096000068C00800044FD8007B8864B4280064814
+:10097000080002AAA88381456FC0044AFE80064988
+:100980000800864BF080A88336830100074806885C
+:10099000FF01804561C0044AFE8006490800864B7D
+:1009A000428012A9C183138307480688FF0126826B
+:1009B0004700824551C03683FAFF07480044FB8058
+:1009C0004BC0044AFE8006490800864B018012AAEB
+:1009D000A8833683010007480688FF01804506ABDF
+:1009E00008003683070007491689008009CC368342
+:1009F000FCFF0749168A008008C8168A004005CC0B
+:100A000004485D080449640832C00648FE01804578
+:100A10000044FF80044B5D083683080076C03683AF
+:100A2000010007480688FF01068C00803683F9FF25
+:100A30000044FD8007B83683080067C01084EFC803
+:100A4000108418C8108422C810843EC8108453C86B
+:100A50001084064AC90502E004485D0806800800C3
+:100A6000044964081681FFFF04865F0863D8064ABC
+:100A7000BE0502E00649FCFF3683010007680688D0
+:100A8000FF010044EE800648850500E0064A0000AC
+:100A900002449108044AFE8006490800864B4080C3
+:100AA00012AAA883064806000387076880650768BE
+:100AB0008065C683010007488045064A000002445D
+:100AC00064080648DC0000E0076907490648FF01A2
+:100AD000108906480000864B7E0880658165806528
+:100AE00080658065806580658065864B7E080FBC6B
+:100AF000368301000AC03683FEFF07480688FF01DF
+:100B00000044FA803683040000C00448640806806C
+:100B1000FFFF15C80044640804495F0803445D08EA
+:100B2000318403D80648A60200E004485C0800446B
+:100B30005D08F8C004485C0800445D081FC0044814
+:100B40005E080044630804495F0803445D0831847B
+:100B500003D80648180100E004485C0800445D081A
+:100B60000648180100E004485C0800445D08044899
+:100B70005E080044630806489A0000E0064B31080E
+:100B800034836808004536830300014506489A000F
+:100B900000E00448FE8006490800864B018010A84A
+:100BA00088830648FD01804506489A0000E0044A13
+:100BB0006708064B4080328307680649FFFF90971D
+:100BC000074A268A010002C8C68F00800F4A06889D
+:100BD000010003C80649F8FF12960448FE80064942
+:100BE0000800864B018010A888838245064A9A0037
+:100BF00002E006489A0000E000000000000000004B
+:100C00000000001C01001000020000000031005133
+:100C100000000000000000000000000000000000D4
+:100C200000000000000000000000000000000000C4
+:100C3000001000104000FF110000001200124000E0
+:100C4000FF130000001400144000FF150000001600
+:100C500000164000FF170000001800184000FF19A0
+:100C60000000001A001A4000FF1B0000001C001CBE
+:100C70004000FF1D0000001E001E4000FF1F00007E
+:100C80000000000000000000000000000000000064
+:100C90000000000000000000000000000000000054
+:100CA0000000000000000000000000000000000044
+:100CB0000000000000000000000000000000000034
+:100CC0000000000000000000000000000000000420
+:100CD0000000000000000000000000000000000014
+:100CE0000000000000000000000000000000000004
+:100CF000000000000000000D0100000002000300E1
+:100D00000400050006000700080009000A000B00A7
+:100D10000C000D000E000F00100011001400130055
+:100D2000150016001700180019001A001B001C00FF
+:100D30001D001F00200021002A002B002C002A008B
+:100D40002B002C0022002200220022002200220080
+:100D50002200220022002200220022002200220083
+:100D6000220022002300230023002300230023006D
+:100D7000230023002300230023002300230023005B
+:100D8000230023003A003A003A003A003A003A00C1
+:100D90003A003A003A003A003A003A003A003A0083
+:100DA0003A003A003B003B003B003B003B003B006D
+:100DB0003B003B003B003B003B003B003B003B005B
+:100DC0003B003B00240025002200230024002200D9
+:100DD00026002600260026002600260026002600E3
+:100DE00026002600260026002600260026002600D3
+:100DF00027002700270027002700270027002700BB
+:100E000027002700270027002700270027002700AA
+:100E10003C003C003C003C003C003C003C003C00F2
+:100E20003C003C003C003C003C003C003C003C00E2
+:100E30003D003D003D003D003D003D003D003D00CA
+:100E40003D003D003D003D003D003D003D003D00BA
+:100E50002800290026002700280026002D00300049
+:100E600031002E002F0032003300350012001E002A
+:100E70003700360039003800000000000000000094
+:100E80000000000000000000000000000000000062
+:100E90000000000000000000000000000000000052
+:100EA0000000000000000000000000000000000042
+:100EB0000000000000000000000000000000000032
+:100EC0000000000000000000000000000000000022
+:100ED0000000000000000000000000000000000012
+:100EE0000000000000000000000000000000000002
+:100EF00000000000000000000000000000000000F2
+:100F000000000000000000000000000000000000E1
+:100F100000000000000000000000000000000000D1
+:100F200000000000000000000000000000000000C1
+:100F300000000000000000000000000000000000B1
+:100F400000000000000000000000000000000000A1
+:100F50000000000000000000000000000000000091
+:100F60000000000000000000000000000000000081
+:100F70000000000000000000000000000000000071
+:100F80000000000000000000000000000000000061
+:100F90000000000000000000000000000000000051
+:020FA00000004F
+:00000001FF
diff --git a/include/asm-generic/dma-coherent.h b/include/asm-generic/dma-coherent.h
index 0297e5875798..70d699e671a4 100644
--- a/include/asm-generic/dma-coherent.h
+++ b/include/asm-generic/dma-coherent.h
@@ -8,6 +8,11 @@
 */
 int dma_alloc_from_coherent(struct device *dev, ssize_t size,
                                       dma_addr_t *dma_handle, void **ret);
+int dma_malloc_from_coherent(struct device *dev, ssize_t size,
+                                        dma_addr_t *dma_handle, void **ret,
+                                        bool zero);
 int dma_release_from_coherent(struct device *dev, int order, void *vaddr);
 int dma_mmap_from_coherent(struct device *dev, struct vm_area_struct *vma,
@@ -25,6 +30,7 @@ void *dma_mark_declared_memory_occupied(struct device *dev,
                                        dma_addr_t device_addr, size_t size);
 #else
 #define dma_alloc_from_coherent(dev, size, handle, ret) (0)
+#define dma_malloc_from_coherent(dev, size, handle, ret, zero) (0)
 #define dma_release_from_coherent(dev, order, vaddr) (0)
 #define dma_mmap_from_coherent(dev, vma, vaddr, order, ret) (0)
 #endif
diff --git a/include/asm-generic/dma-mapping-common.h b/include/asm-generic/dma-mapping-common.h
index b1bc954eccf3..c987c61e2d05 100644
--- a/include/asm-generic/dma-mapping-common.h
+++ b/include/asm-generic/dma-mapping-common.h
@@ -242,16 +242,16 @@ dma_get_sgtable_attrs(struct device *dev, struct sg_table *sgt, void *cpu_addr,
 #define arch_dma_alloc_attrs(dev, flag) (true)
 #endif
-static inline void *dma_alloc_attrs(struct device *dev, size_t size,
+static inline void *dma_malloc_attrs(struct device *dev, size_t size,
                                       dma_addr_t *dma_handle, gfp_t flag,
-                                       struct dma_attrs *attrs)
+                                       struct dma_attrs *attrs, bool zero)
 {
        struct dma_map_ops *ops = get_dma_ops(dev);
        void *cpu_addr;
        BUG_ON(!ops);
-        if (dma_alloc_from_coherent(dev, size, dma_handle, &cpu_addr))
+        if (dma_malloc_from_coherent(dev, size, dma_handle, &cpu_addr, zero))
                return cpu_addr;
        if (!arch_dma_alloc_attrs(&dev, &flag))
@@ -264,6 +264,13 @@ static inline void *dma_alloc_attrs(struct device *dev, size_t size,
        return cpu_addr;
 }
+static inline void *dma_alloc_attrs(struct device *dev, size_t size,
+                                       dma_addr_t *dma_handle, gfp_t flag,
+                                       struct dma_attrs *attrs)
+{
+        return dma_malloc_attrs(dev, size, dma_handle, flag, attrs, true);
+}
 static inline void dma_free_attrs(struct device *dev, size_t size,
                                     void *cpu_addr, dma_addr_t dma_handle,
                                     struct dma_attrs *attrs)
@@ -283,6 +290,12 @@ static inline void dma_free_attrs(struct device *dev, size_t size,
        ops->free(dev, size, cpu_addr, dma_handle, attrs);
 }
+static inline void *dma_malloc_coherent(struct device *dev, size_t size,
+                dma_addr_t *dma_handle, gfp_t flag)
+{
+        return dma_malloc_attrs(dev, size, dma_handle, flag, NULL, false);
+}
 static inline void *dma_alloc_coherent(struct device *dev, size_t size,
                dma_addr_t *dma_handle, gfp_t flag)
 {
diff --git a/include/linux/hwspinlock.h b/include/linux/hwspinlock.h
index 859d673d98c8..b32e4898710f 100644
--- a/include/linux/hwspinlock.h
+++ b/include/linux/hwspinlock.h
@@ -24,6 +24,7 @@
 /* hwspinlock mode argument */
 #define HWLOCK_IRQSTATE 0x01    /* Disable interrupts, save state */
 #define HWLOCK_IRQ      0x02    /* Disable interrupts, don't save state */
+#define HWLOCK_MUTEX    0x03    /* Use a mutex for contexts that sleep */
 struct device;
 struct device_node;
@@ -242,6 +243,12 @@ int hwspin_lock_timeout_irq(struct hwspinlock *hwlock, unsigned int to)
        return __hwspin_lock_timeout(hwlock, to, HWLOCK_IRQ, NULL);
 }
+static inline
+int hwspin_lock_timeout_can_sleep(struct hwspinlock *hwlock, unsigned int to)
+{
+        return __hwspin_lock_timeout(hwlock, to, HWLOCK_MUTEX, NULL);
+}
 /**
 * hwspin_lock_timeout() - lock an hwspinlock with timeout limit
 * @hwlock: the hwspinlock to be locked
@@ -301,6 +308,11 @@ static inline void hwspin_unlock_irq(struct hwspinlock *hwlock)
        __hwspin_unlock(hwlock, HWLOCK_IRQ, NULL);
 }
+static inline void hwspin_unlock_can_sleep(struct hwspinlock *hwlock)
+{
+        __hwspin_unlock(hwlock, HWLOCK_MUTEX, NULL);
+}
 /**
 * hwspin_unlock() - unlock hwspinlock
 * @hwlock: a previously-acquired hwspinlock which we want to unlock
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 50220cab738c..05b63a1e9f84 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -53,6 +53,13 @@
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
+#define u64_to_user_ptr(x) (            \
+{                                       \
+        typecheck(u64, x);              \
+        (void __user *)(uintptr_t)x;    \
+}                                       \
+)
 /*
 * This looks more complex than it should be. But we need to
 * get the type for the ~ right in round_down (it needs to be
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index f88a536f8069..e3d461f19cbc 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -84,6 +84,7 @@ int memblock_mark_hotplug(phys_addr_t base, phys_addr_t size);
 int memblock_clear_hotplug(phys_addr_t base, phys_addr_t size);
 int memblock_mark_mirror(phys_addr_t base, phys_addr_t size);
 int memblock_mark_nomap(phys_addr_t base, phys_addr_t size);
+int memblock_clear_nomap(phys_addr_t base, phys_addr_t size);
 ulong choose_memblock_flags(void);
 /* Low level functions */
@@ -325,10 +326,12 @@ phys_addr_t memblock_mem_size(unsigned long limit_pfn);
 phys_addr_t memblock_start_of_DRAM(void);
 phys_addr_t memblock_end_of_DRAM(void);
 void memblock_enforce_memory_limit(phys_addr_t memory_limit);
-int memblock_is_memory(phys_addr_t addr);
+void memblock_cap_memory_range(phys_addr_t base, phys_addr_t size);
+void memblock_mem_limit_remove_map(phys_addr_t limit);
+bool memblock_is_memory(phys_addr_t addr);
 int memblock_is_map_memory(phys_addr_t addr);
 int memblock_is_region_memory(phys_addr_t base, phys_addr_t size);
-int memblock_is_reserved(phys_addr_t addr);
+bool memblock_is_reserved(phys_addr_t addr);
 bool memblock_is_region_reserved(phys_addr_t base, phys_addr_t size);
 extern void __memblock_dump_all(void);
diff --git a/include/linux/mm.h b/include/linux/mm.h
index e51aafbc4b3a..f29e8aa76e39 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2157,14 +2157,18 @@ kernel_map_pages(struct page *page, int numpages, int enable)
 }
 #ifdef CONFIG_HIBERNATION
 extern bool kernel_page_present(struct page *page);
-#endif /* CONFIG_HIBERNATION */
+#endif  /* CONFIG_HIBERNATION */
-#else
+#else   /* CONFIG_DEBUG_PAGEALLOC */
 static inline void
 kernel_map_pages(struct page *page, int numpages, int enable) {}
 #ifdef CONFIG_HIBERNATION
 static inline bool kernel_page_present(struct page *page) { return true; }
-#endif /* CONFIG_HIBERNATION */
+#endif  /* CONFIG_HIBERNATION */
-#endif
+static inline bool debug_pagealloc_enabled(void)
+{
+        return false;
+}
+#endif  /* CONFIG_DEBUG_PAGEALLOC */
 #ifdef __HAVE_ARCH_GATE_AREA
 extern struct vm_area_struct *get_gate_vma(struct mm_struct *mm);
diff --git a/include/linux/platform_data/davinci_asp.h b/include/linux/platform_data/davinci_asp.h
index 85ad68f9206a..4ed28436d187 100644
--- a/include/linux/platform_data/davinci_asp.h
+++ b/include/linux/platform_data/davinci_asp.h
@@ -86,6 +86,8 @@ struct davinci_mcasp_pdata {
        u8 rxnumevt;
        int tx_dma_channel;
        int rx_dma_channel;
+        bool shared_dai;
 };
 /* TODO: Fix arch/arm/mach-davinci/ users and remove this define */
 #define snd_platform_data davinci_mcasp_pdata
diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h
index 4c82c2d5d5f8..d68441b560fa 100644
--- a/include/linux/remoteproc.h
+++ b/include/linux/remoteproc.h
@@ -450,6 +450,7 @@ enum rproc_crash_type {
 * @fw_version: human readable version information extracted from f/w
 * @has_iommu: flag to indicate if remote processor is behind an MMU
 * @use_userspace_loader: flag to denote if remoteproc is loaded by userspace
+ * @late_attach: flag indicating remote core has been externally pre-loaded
 */
 struct rproc {
        struct list_head node;
@@ -486,6 +487,7 @@ struct rproc {
        char *fw_version;
        bool has_iommu;
        bool use_userspace_loader;
+        u32 late_attach;
 };
 /* we currently support only two vrings per rvdev */
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 4b73fe206f37..43daf00967a6 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1171,7 +1171,7 @@ bool cpus_share_cache(int this_cpu, int that_cpu);
 typedef const struct cpumask *(*sched_domain_mask_f)(int cpu);
 typedef int (*sched_domain_flags_f)(void);
 typedef
-const struct sched_group_energy * const(*sched_domain_energy_f)(int cpu);
+const struct sched_group_energy *(*sched_domain_energy_f)(int cpu);
 #define SDTL_OVERLAP    0x01
diff --git a/include/uapi/drm/omap_drm.h b/include/uapi/drm/omap_drm.h
index 72e461e1e5bc..7e7322498992 100644
--- a/include/uapi/drm/omap_drm.h
+++ b/include/uapi/drm/omap_drm.h
@@ -36,6 +36,9 @@ struct drm_omap_param {
 #define OMAP_BO_SCANOUT         0x00000001      /* scanout capable (phys contiguous) */
 #define OMAP_BO_CACHE_MASK      0x00000006      /* cache type mask, see cache modes */
 #define OMAP_BO_TILED_MASK      0x00000f00      /* tiled mapping mask, see tiled modes */
+#define OMAP_BO_MEM_CONTIG      0x00000008      /* only use contiguous dma mem */
+#define OMAP_BO_MEM_TILER       0x00000010      /* only use TILER mem */
+#define OMAP_BO_MEM_PIN         0x00000020      /* pin the buffer when allocating */
 /* cache modes */
 #define OMAP_BO_CACHED          0x00000000      /* default */
diff --git a/include/uapi/linux/hwspinlock_user.h b/include/uapi/linux/hwspinlock_user.h
new file mode 100644
index 000000000000..68f3dff70c7f
--- /dev/null
+++ b/include/uapi/linux/hwspinlock_user.h
@@ -0,0 +1,63 @@
+/*
+ * Userspace interface to hardware spinlocks
+ *
+ * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com
+ *
+ * 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 Texas Instruments 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 _UAPI_HWSPINLOCK_USER_H
+#define _UAPI_HWSPINLOCK_USER_H
+#include <linux/ioctl.h>
+/**
+ * struct hwspinlock_user_lock - Sent to lock a specific hwspinlock
+ * @id:         hardware spinlock id
+ * @timeout:    timeout value in msecs
+ */
+struct hwspinlock_user_lock {
+        int id;
+        unsigned int timeout;
+};
+/**
+ * struct hwspinlock_user_unlock - Sent to unlock a specific hwspinlock
+ * @id:         hardware spinlock id
+ */
+struct hwspinlock_user_unlock {
+        int id;
+};
+#define HWSPINLOCK_IOC_MAGIC            'h'
+#define HWSPINLOCK_USER_LOCK            _IOW(HWSPINLOCK_IOC_MAGIC, 0,   \
+                                             struct hwspinlock_user_lock)
+#define HWSPINLOCK_USER_UNLOCK          _IOW(HWSPINLOCK_IOC_MAGIC, 1,   \
+                                             struct hwspinlock_user_unlock)
+#endif  /* _UAPI_HWSPINLOCK_USER_H */
diff --git a/include/uapi/linux/kexec.h b/include/uapi/linux/kexec.h
index 99048e501b88..aae5ebf2022b 100644
--- a/include/uapi/linux/kexec.h
+++ b/include/uapi/linux/kexec.h
@@ -39,6 +39,7 @@
 #define KEXEC_ARCH_SH      (42 << 16)
 #define KEXEC_ARCH_MIPS_LE (10 << 16)
 #define KEXEC_ARCH_MIPS    ( 8 << 16)
+#define KEXEC_ARCH_AARCH64 (183 << 16)
 /* The artificial cap on the number of segments passed to kexec_load. */
 #define KEXEC_SEGMENT_MAX 16
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 5f5b66a2f156..f3a097fbf72a 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -228,6 +228,7 @@ config ENABLE_DEFAULT_TRACERS
        bool "Trace process context switches and events"
        depends on !GENERIC_TRACER
        select TRACING
+        select GPU_TRACEPOINTS
        help
          This tracer hooks to various trace points in the kernel,
          allowing the user to pick and choose which trace point they
diff --git a/mm/memblock.c b/mm/memblock.c
index da06771223d8..007b6fc1da9b 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -835,6 +835,18 @@ int __init_memblock memblock_mark_nomap(phys_addr_t base, phys_addr_t size)
 }
 /**
+ * memblock_clear_nomap - Clear flag MEMBLOCK_NOMAP for a specified region.
+ * @base: the base phys addr of the region
+ * @size: the size of the region
+ *
+ * Return 0 on success, -errno on failure.
+ */
+int __init_memblock memblock_clear_nomap(phys_addr_t base, phys_addr_t size)
+{
+        return memblock_setclr_flag(base, size, 0, MEMBLOCK_NOMAP);
+}
+/**
 * __next_reserved_mem_region - next function for for_each_reserved_region()
 * @idx: pointer to u64 loop variable
 * @out_start: ptr to phys_addr_t for start address of the region, can be %NULL
@@ -1486,15 +1498,16 @@ phys_addr_t __init_memblock memblock_end_of_DRAM(void)
        return (memblock.memory.regions[idx].base + memblock.memory.regions[idx].size);
 }
-void __init memblock_enforce_memory_limit(phys_addr_t limit)
+static phys_addr_t __init_memblock __find_max_addr(phys_addr_t limit)
 {
        phys_addr_t max_addr = (phys_addr_t)ULLONG_MAX;
        struct memblock_region *r;
-        if (!limit)
+        /*
-                return;
+         * translate the memory @limit size into the max address within one of
+         * the memory memblock regions, if the @limit exceeds the total size
-        /* find out max address */
+         * of those regions, max_addr will keep original value ULLONG_MAX
+         */
        for_each_memblock(memory, r) {
                if (limit <= r->size) {
                        max_addr = r->base + limit;
@@ -1503,6 +1516,22 @@ void __init memblock_enforce_memory_limit(phys_addr_t limit)
                limit -= r->size;
        }
+        return max_addr;
+}
+void __init memblock_enforce_memory_limit(phys_addr_t limit)
+{
+        phys_addr_t max_addr = (phys_addr_t)ULLONG_MAX;
+        if (!limit)
+                return;
+        max_addr = __find_max_addr(limit);
+        /* @limit exceeds the total size of the memory, do nothing */
+        if (max_addr == (phys_addr_t)ULLONG_MAX)
+                return;
        /* truncate both memory and reserved regions */
        memblock_remove_range(&memblock.memory, max_addr,
                              (phys_addr_t)ULLONG_MAX);
@@ -1510,6 +1539,50 @@ void __init memblock_enforce_memory_limit(phys_addr_t limit)
                              (phys_addr_t)ULLONG_MAX);
 }
+void __init memblock_cap_memory_range(phys_addr_t base, phys_addr_t size)
+{
+        int start_rgn, end_rgn;
+        int i, ret;
+        if (!size)
+                return;
+        ret = memblock_isolate_range(&memblock.memory, base, size,
+                                                &start_rgn, &end_rgn);
+        if (ret)
+                return;
+        /* remove all the MAP regions */
+        for (i = memblock.memory.cnt - 1; i >= end_rgn; i--)
+                if (!memblock_is_nomap(&memblock.memory.regions[i]))
+                        memblock_remove_region(&memblock.memory, i);
+        for (i = start_rgn - 1; i >= 0; i--)
+                if (!memblock_is_nomap(&memblock.memory.regions[i]))
+                        memblock_remove_region(&memblock.memory, i);
+        /* truncate the reserved regions */
+        memblock_remove_range(&memblock.reserved, 0, base);
+        memblock_remove_range(&memblock.reserved,
+                        base + size, (phys_addr_t)ULLONG_MAX);
+}
+void __init memblock_mem_limit_remove_map(phys_addr_t limit)
+{
+        phys_addr_t max_addr;
+        if (!limit)
+                return;
+        max_addr = __find_max_addr(limit);
+        /* @limit exceeds the total size of the memory, do nothing */
+        if (max_addr == (phys_addr_t)ULLONG_MAX)
+                return;
+        memblock_cap_memory_range(0, max_addr);
+}
 static int __init_memblock memblock_search(struct memblock_type *type, phys_addr_t addr)
 {
        unsigned int left = 0, right = type->cnt;
@@ -1528,12 +1601,12 @@ static int __init_memblock memblock_search(struct memblock_type *type, phys_addr
        return -1;
 }
-int __init memblock_is_reserved(phys_addr_t addr)
+bool __init memblock_is_reserved(phys_addr_t addr)
 {
        return memblock_search(&memblock.reserved, addr) != -1;
 }
-int __init_memblock memblock_is_memory(phys_addr_t addr)
+bool __init_memblock memblock_is_memory(phys_addr_t addr)
 {
        return memblock_search(&memblock.memory, addr) != -1;
 }
diff --git a/mm/slab.c b/mm/slab.c
index 24a615d42d74..462938fc7cb9 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -1670,6 +1670,14 @@ static void kmem_rcu_free(struct rcu_head *head)
 }
 #if DEBUG
+static bool is_debug_pagealloc_cache(struct kmem_cache *cachep)
+{
+        if (debug_pagealloc_enabled() && OFF_SLAB(cachep) &&
+                (cachep->size % PAGE_SIZE) == 0)
+                return true;
+        return false;
+}
 #ifdef CONFIG_DEBUG_PAGEALLOC
 static void store_stackinfo(struct kmem_cache *cachep, unsigned long *addr,
@@ -1703,6 +1711,23 @@ static void store_stackinfo(struct kmem_cache *cachep, unsigned long *addr,
        }
        *addr++ = 0x87654321;
 }
+static void slab_kernel_map(struct kmem_cache *cachep, void *objp,
+                                int map, unsigned long caller)
+{
+        if (!is_debug_pagealloc_cache(cachep))
+                return;
+        if (caller)
+                store_stackinfo(cachep, objp, caller);
+        kernel_map_pages(virt_to_page(objp), cachep->size / PAGE_SIZE, map);
+}
+#else
+static inline void slab_kernel_map(struct kmem_cache *cachep, void *objp,
+                                int map, unsigned long caller) {}
 #endif
 static void poison_obj(struct kmem_cache *cachep, void *addr, unsigned char val)
@@ -1781,6 +1806,9 @@ static void check_poison_obj(struct kmem_cache *cachep, void *objp)
        int size, i;
        int lines = 0;
+        if (is_debug_pagealloc_cache(cachep))
+                return;
        realobj = (char *)objp + obj_offset(cachep);
        size = cachep->object_size;
@@ -1846,16 +1874,8 @@ static void slab_destroy_debugcheck(struct kmem_cache *cachep,
                void *objp = index_to_obj(cachep, page, i);
                if (cachep->flags & SLAB_POISON) {
-#ifdef CONFIG_DEBUG_PAGEALLOC
-                        if (cachep->size % PAGE_SIZE == 0 &&
-                                        OFF_SLAB(cachep))
-                                kernel_map_pages(virt_to_page(objp),
-                                        cachep->size / PAGE_SIZE, 1);
-                        else
-                                check_poison_obj(cachep, objp);
-#else
                        check_poison_obj(cachep, objp);
-#endif
+                        slab_kernel_map(cachep, objp, 1, 0);
                }
                if (cachep->flags & SLAB_RED_ZONE) {
                        if (*dbg_redzone1(cachep, objp) != RED_INACTIVE)
@@ -2179,7 +2199,6 @@ __kmem_cache_create (struct kmem_cache *cachep, unsigned long flags)
                else
                        size += BYTES_PER_WORD;
        }
-#if FORCED_DEBUG && defined(CONFIG_DEBUG_PAGEALLOC)
        /*
         * To activate debug pagealloc, off-slab management is necessary
         * requirement. In early phase of initialization, small sized slab
@@ -2187,14 +2206,14 @@ __kmem_cache_create (struct kmem_cache *cachep, unsigned long flags)
         * to check size >= 256. It guarantees that all necessary small
         * sized slab is initialized in current slab initialization sequence.
         */
-        if (!slab_early_init && size >= kmalloc_size(INDEX_NODE) &&
+        if (debug_pagealloc_enabled() && (flags & SLAB_POISON) &&
+                !slab_early_init && size >= kmalloc_size(INDEX_NODE) &&
                size >= 256 && cachep->object_size > cache_line_size() &&
                ALIGN(size, cachep->align) < PAGE_SIZE) {
                cachep->obj_offset += PAGE_SIZE - ALIGN(size, cachep->align);
                size = PAGE_SIZE;
        }
 #endif
-#endif
        /*
         * Determine if the slab management is 'on' or 'off' slab.
@@ -2237,15 +2256,6 @@ __kmem_cache_create (struct kmem_cache *cachep, unsigned long flags)
        if (flags & CFLGS_OFF_SLAB) {
                /* really off slab. No need for manual alignment */
                freelist_size = calculate_freelist_size(cachep->num, 0);
-#ifdef CONFIG_PAGE_POISONING
-                /* If we're going to use the generic kernel_map_pages()
-                 * poisoning, then it's going to smash the contents of
-                 * the redzone and userword anyhow, so switch them off.
-                 */
-                if (size % PAGE_SIZE == 0 && flags & SLAB_POISON)
-                        flags &= ~(SLAB_RED_ZONE | SLAB_STORE_USER);
-#endif
        }
        cachep->colour_off = cache_line_size();
@@ -2261,7 +2271,19 @@ __kmem_cache_create (struct kmem_cache *cachep, unsigned long flags)
        cachep->size = size;
        cachep->reciprocal_buffer_size = reciprocal_value(size);
-        if (flags & CFLGS_OFF_SLAB) {
+#if DEBUG
+        /*
+         * If we're going to use the generic kernel_map_pages()
+         * poisoning, then it's going to smash the contents of
+         * the redzone and userword anyhow, so switch them off.
+         */
+        if (IS_ENABLED(CONFIG_PAGE_POISONING) &&
+                (cachep->flags & SLAB_POISON) &&
+                is_debug_pagealloc_cache(cachep))
+                cachep->flags &= ~(SLAB_RED_ZONE | SLAB_STORE_USER);
+#endif
+        if (OFF_SLAB(cachep)) {
                cachep->freelist_cache = kmalloc_slab(freelist_size, 0u);
                /*
                 * This is a possibility for one of the kmalloc_{dma,}_caches.
@@ -2488,9 +2510,6 @@ static void cache_init_objs(struct kmem_cache *cachep,
        for (i = 0; i < cachep->num; i++) {
                void *objp = index_to_obj(cachep, page, i);
 #if DEBUG
-                /* need to poison the objs? */
-                if (cachep->flags & SLAB_POISON)
-                        poison_obj(cachep, objp, POISON_FREE);
                if (cachep->flags & SLAB_STORE_USER)
                        *dbg_userword(cachep, objp) = NULL;
@@ -2514,10 +2533,11 @@ static void cache_init_objs(struct kmem_cache *cachep,
                                slab_error(cachep, "constructor overwrote the"
                                           " start of an object");
                }
-                if ((cachep->size % PAGE_SIZE) == 0 &&
+                /* need to poison the objs? */
-                            OFF_SLAB(cachep) && cachep->flags & SLAB_POISON)
+                if (cachep->flags & SLAB_POISON) {
-                        kernel_map_pages(virt_to_page(objp),
+                        poison_obj(cachep, objp, POISON_FREE);
-                                         cachep->size / PAGE_SIZE, 0);
+                        slab_kernel_map(cachep, objp, 0, 0);
+                }
 #else
                if (cachep->ctor)
                        cachep->ctor(objp);
@@ -2736,17 +2756,8 @@ static void *cache_free_debugcheck(struct kmem_cache *cachep, void *objp,
        set_obj_status(page, objnr, OBJECT_FREE);
        if (cachep->flags & SLAB_POISON) {
-#ifdef CONFIG_DEBUG_PAGEALLOC
-                if ((cachep->size % PAGE_SIZE)==0 && OFF_SLAB(cachep)) {
-                        store_stackinfo(cachep, objp, caller);
-                        kernel_map_pages(virt_to_page(objp),
-                                         cachep->size / PAGE_SIZE, 0);
-                } else {
-                        poison_obj(cachep, objp, POISON_FREE);
-                }
-#else
                poison_obj(cachep, objp, POISON_FREE);
-#endif
+                slab_kernel_map(cachep, objp, 0, caller);
        }
        return objp;
 }
@@ -2873,15 +2884,8 @@ static void *cache_alloc_debugcheck_after(struct kmem_cache *cachep,
        if (!objp)
                return objp;
        if (cachep->flags & SLAB_POISON) {
-#ifdef CONFIG_DEBUG_PAGEALLOC
-                if ((cachep->size % PAGE_SIZE) == 0 && OFF_SLAB(cachep))
-                        kernel_map_pages(virt_to_page(objp),
-                                         cachep->size / PAGE_SIZE, 1);
-                else
-                        check_poison_obj(cachep, objp);
-#else
                check_poison_obj(cachep, objp);
-#endif
+                slab_kernel_map(cachep, objp, 1, 0);
                poison_obj(cachep, objp, POISON_INUSE);
        }
        if (cachep->flags & SLAB_STORE_USER)
diff --git a/net/rpmsg/rpmsg_proto.c b/net/rpmsg/rpmsg_proto.c
index c84cfc4e03c7..010a9aed6dbf 100644
--- a/net/rpmsg/rpmsg_proto.c
+++ b/net/rpmsg/rpmsg_proto.c
@@ -543,6 +543,11 @@ static void __rpmsg_proto_cb(struct device *dev, int from_vproc_id, void *data,
                         len, true);
 #endif
+        if (!sk) {
+                dev_warn(dev, "callback for deleted socket (from %d)\n", src);
+                return;
+        }
        lock_sock(sk);
        switch (sk->sk_state) {
@@ -618,8 +623,11 @@ static int rpmsg_proto_probe(struct rpmsg_channel *rpdev)
                dev_err(dev, "id %d already associated to different vrp\n",
                        id);
-        if (dst == RPMSG_ADDR_ANY)
+        if (dst == RPMSG_ADDR_ANY) {
+                /* Set announce to false and avoid extra delay when binding. */
+                rpdev->announce = false;
                return 0;
+        }
        /* associate id/vrp for later lookup in rpmsg_sock_bind() */
        if (!vrp) {
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index c159042b1eb6..426dd52f6a05 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -1713,6 +1713,11 @@ static struct davinci_mcasp_pdata *davinci_mcasp_set_pdata_from_of(
        if (ret >= 0)
                pdata->sram_size_capture = val;
+        if (of_find_property(np, "shared-dai", NULL))
+                pdata->shared_dai = 1;
+        else
+                pdata->shared_dai = 0;
        return  pdata;
 nodata:
@@ -1957,6 +1962,15 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
        pm_runtime_enable(&pdev->dev);
+        /*
+         * Forbid runtime PM if the DAI is shared, data transfers will occur
+         * from a different core (typically DSP).
+         */
+        if (pdata->shared_dai) {
+                dev_info(&pdev->dev, "DAI is shared\n");
+                pm_runtime_forbid(&pdev->dev);
+        }
        mcasp->op_mode = pdata->op_mode;
        /* sanity check for tdm slots parameter */
        if (mcasp->op_mode == DAVINCI_MCASP_IIS_MODE) {
@@ -1986,51 +2000,58 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
        mcasp->dev = &pdev->dev;
-        irq = platform_get_irq_byname(pdev, "common");
+        /*
-        if (irq >= 0) {
+         * Do not register IRQ if DAI is shared, as the remote core will
-                irq_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s_common",
+         * be responsible for servicing these interrupts.
-                                          dev_name(&pdev->dev));
+         */
-                ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
+        if (!pdata->shared_dai) {
-                                                davinci_mcasp_common_irq_handler,
+                irq = platform_get_irq_byname(pdev, "common");
-                                                IRQF_ONESHOT | IRQF_SHARED,
+                if (irq >= 0) {
-                                                irq_name, mcasp);
+                        irq_name = devm_kasprintf(&pdev->dev, GFP_KERNEL,
-                if (ret) {
+                                        "%s_common", dev_name(&pdev->dev));
-                        dev_err(&pdev->dev, "common IRQ request failed\n");
+                        ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
-                        goto err;
+                                        davinci_mcasp_common_irq_handler,
-                }
+                                        IRQF_ONESHOT | IRQF_SHARED,
+                                        irq_name, mcasp);
+                        if (ret) {
+                                dev_err(&pdev->dev,
+                                        "common IRQ request failed\n");
+                                goto err;
+                        }
-                mcasp->irq_request[SNDRV_PCM_STREAM_PLAYBACK] = XUNDRN;
+                        mcasp->irq_request[SNDRV_PCM_STREAM_PLAYBACK] = XUNDRN;
-                mcasp->irq_request[SNDRV_PCM_STREAM_CAPTURE] = ROVRN;
+                        mcasp->irq_request[SNDRV_PCM_STREAM_CAPTURE] = ROVRN;
-        }
+                }
-        irq = platform_get_irq_byname(pdev, "rx");
+                irq = platform_get_irq_byname(pdev, "rx");
-        if (irq >= 0) {
+                if (irq >= 0) {
-                irq_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s_rx",
+                        irq_name = devm_kasprintf(&pdev->dev, GFP_KERNEL,
-                                          dev_name(&pdev->dev));
+                                                "%s_rx", dev_name(&pdev->dev));
-                ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
+                        ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
                                                davinci_mcasp_rx_irq_handler,
                                                IRQF_ONESHOT, irq_name, mcasp);
-                if (ret) {
+                        if (ret) {
-                        dev_err(&pdev->dev, "RX IRQ request failed\n");
+                                dev_err(&pdev->dev, "RX IRQ request failed\n");
-                        goto err;
+                                goto err;
-                }
+                        }
-                mcasp->irq_request[SNDRV_PCM_STREAM_CAPTURE] = ROVRN;
+                        mcasp->irq_request[SNDRV_PCM_STREAM_CAPTURE] = ROVRN;
-        }
+                }
-        irq = platform_get_irq_byname(pdev, "tx");
+                irq = platform_get_irq_byname(pdev, "tx");
-        if (irq >= 0) {
+                if (irq >= 0) {
-                irq_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s_tx",
+                        irq_name = devm_kasprintf(&pdev->dev, GFP_KERNEL,
-                                          dev_name(&pdev->dev));
+                                                "%s_tx", dev_name(&pdev->dev));
-                ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
+                        ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
                                                davinci_mcasp_tx_irq_handler,
                                                IRQF_ONESHOT, irq_name, mcasp);
-                if (ret) {
+                        if (ret) {
-                        dev_err(&pdev->dev, "TX IRQ request failed\n");
+                                dev_err(&pdev->dev, "TX IRQ request failed\n");
-                        goto err;
+                                goto err;
-                }
+                        }
-                mcasp->irq_request[SNDRV_PCM_STREAM_PLAYBACK] = XUNDRN;
+                        mcasp->irq_request[SNDRV_PCM_STREAM_PLAYBACK] = XUNDRN;
+                }
        }
        dat = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dat");
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 6d442f114136..0124eedcaaa3 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1082,6 +1082,15 @@ static void soc_set_name_prefix(struct snd_soc_card *card,
                                struct snd_soc_component *component)
 {
        int i;
+        int ret;
+        if (component->dev->of_node) {
+                ret = of_property_read_string(component->dev->of_node,
+                                              "name-prefix",
+                                              &component->name_prefix);
+                if (ret == 0)
+                        return;
+        }
        if (card->codec_conf == NULL)
                return;
diff --git a/ti_config_fragments/android_am57x.cfg b/ti_config_fragments/android_am57x.cfg
new file mode 100644
index 000000000000..10afa4079dce
--- /dev/null
+++ b/ti_config_fragments/android_am57x.cfg
@@ -0,0 +1,12 @@
+###############################################################################
+# TI Android AM57x Config Options
+# Use to set additional android options exclusively for TI AM57x products
+# Note:
+# Use android/configs/android-base.cfg to set google android base options
+# Use android/configs/android-recommended.cfg to set google android
+# recommended options
+# Use ti_config_fragments/android_omap.cfg to set common android options between
+# dra7 and am57 products
+###############################################################################
+CONFIG_CMDLINE="root=/dev/mmcblk0p2 rw init=/init rootfstype=ext4 rootwait drm.rnodes=1 androidboot.selinux=permissive snd.slots_reserved=1,1 snd-soc-core.pmdown_time=-1 uio_pdrv_genirq.of_id=generic-uio"
diff --git a/ti_config_fragments/android_omap.cfg b/ti_config_fragments/android_omap.cfg
index f82289719a1f..55ccf7851202 100644
--- a/ti_config_fragments/android_omap.cfg
+++ b/ti_config_fragments/android_omap.cfg
@@ -8,5 +8,68 @@
 ###############################################################################
 CONFIG_MODULES=y
 # CONFIG_USB_G_NOKIA is not set
-CONFIG_CMDLINE="root=/dev/mmcblk1p2 rw console=ttyO0,119200 androidboot.console=ttyO0 init=/init rootfstype=ext4 rootwait drm.rnodes=1"
+CONFIG_CMDLINE="root=/dev/mmcblk0p2 rw init=/init rootfstype=ext4 rootwait drm.rnodes=1 androidboot.selinux=permissive snd.slots_reserved=1,1 snd-soc-core.pmdown_time=-1 uio_pdrv_genirq.of_id=generic-uio console=ttyS0,115200 androidboot.console=ttyS0 androidboot.hardware=jacinto6evmboard"
 CONFIG_CMDLINE_EXTEND=y
+# Enable SquashFS
+# CONFIG_KERNEL_LZMA is not set
+CONFIG_KERNEL_LZO=y
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
+CONFIG_SQUASHFS_FILE_DIRECT=y
+CONFIG_SQUASHFS_LZ4=y
+# USB DWC3
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_OMAP=y
+# USB Mass Storage
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_USB_STORAGE=y
+# Extcon drivers
+CONFIG_EXTCON=y
+CONFIG_EXTCON_PALMAS=y
+CONFIG_EXTCON_USB_GPIO=y
+# Networking
+CONFIG_IP_NF_NAT=y
+# IPC
+CONFIG_OMAP_REMOTEPROC=y
+CONFIG_RPMSG_RPC=y
+# Firmware loader Helper needed by IPC
+CONFIG_FW_LOADER_USER_HELPER=y
+CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
+# Misc.
+CONFIG_DEVTMPFS=n
+CONFIG_DEVMEM=y
+# SW_SYNC
+CONFIG_SW_SYNC=y
+CONFIG_SW_SYNC_USER=y
+#CAN
+CONFIG_CAN=y
+CONFIG_CAN_C_CAN=y
+CONFIG_CAN_C_CAN_PLATFORM=y
+# Watchdog Device Drivers
+CONFIG_OMAP_WATCHDOG=y
+# Wi-Fi
+CONFIG_MAC80211=y
+CONFIG_CFG80211=y
+CONFIG_WL_TI=y
+CONFIG_WL18XX=y
+CONFIG_WLCORE=y
+CONFIG_WLCORE_SPI=y
+CONFIG_WLCORE_SDIO=y
+# Disable /proc/config.gz
+CONFIG_IKCONFIG_PROC=n
+# Ftrace
+CONFIG_FTRACE=y
diff --git a/ti_config_fragments/audio_display.cfg b/ti_config_fragments/audio_display.cfg
index 3952164356df..8925c31049fe 100644
--- a/ti_config_fragments/audio_display.cfg
+++ b/ti_config_fragments/audio_display.cfg
@@ -54,6 +54,7 @@ CONFIG_DISPLAY_DRA7EVM_ENCODER_TPD12S015=y
 CONFIG_DISPLAY_ENCODER_TPD12S015=y
 CONFIG_DISPLAY_ENCODER_SII9022=y
 CONFIG_DISPLAY_ENCODER_TC358768=y
+CONFIG_VIDEO_TI_FPD3_SERDES=y
 # sound
diff --git a/ti_config_fragments/auto.cfg b/ti_config_fragments/auto.cfg
new file mode 100644
index 000000000000..6bbcc9bec063
--- /dev/null
+++ b/ti_config_fragments/auto.cfg
@@ -0,0 +1,48 @@
+##################################################
+# TI automotive config options
+##################################################
+#
+# Connectivity options
+#
+CONFIG_TOUCHSCREEN_EDT_FT5X06=y
+CONFIG_TOUCHSCREEN_GOODIX=y
+#
+# Audio/Display options
+#
+CONFIG_SND_SIMPLE_CARD=y
+CONFIG_SND_SOC_TLV320AIC3X=y
+CONFIG_SND_SOC_HDMI_CODEC=y
+CONFIG_SND_OMAP_SOC_HDMI_AUDIO=y
+#Hardware spinlock
+CONFIG_HWSPINLOCK_USER=y
+#User-space I/O
+CONFIG_UIO=y
+CONFIG_UIO_PDRV_GENIRQ=y
+#Video subsystem options
+CONFIG_VIDEO_TI_CAL=y
+CONFIG_VIDEO_TI_VIP=y
+CONFIG_VIDEO_TI_VPE=y
+CONFIG_VIDEO_TI_VPDMA_HELPER=y
+CONFIG_VIDEO_TI_VPDMA_LOAD_FW=y
+CONFIG_VIDEO_OV1063X=y
+CONFIG_GPIO_PCA953X=y
+CONFIG_VIDEO_OV490=y
+#JAMR and Vision options
+CONFIG_VIDEO_TVP5158=y
+CONFIG_GPIO_MCP23S08=y
+#Debug related
+CONFIG_DEBUG_LL=y
+CONFIG_DEBUG_OMAP2UART1=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_DEBUG_GPIO=n
+#Turn off un-necessary drivers
+CONFIG_SENSORS_LM90=n
+CONFIG_SENSORS_LM95245=n
+CONFIG_ICS932S401=n
diff --git a/ti_config_fragments/connectivity.cfg b/ti_config_fragments/connectivity.cfg
index e4853308e3d3..d1d7ed1eccc4 100644
--- a/ti_config_fragments/connectivity.cfg
+++ b/ti_config_fragments/connectivity.cfg
@@ -296,10 +296,11 @@ CONFIG_EXTCON_USB_GPIO=m
 #Touchscreen/ADC
 CONFIG_TOUCHSCREEN_EDT_FT5X06=m
-CONFIG_TOUCHSCREEN_PIXCIR=m
+CONFIG_TOUCHSCREEN_PIXCIR=y
 CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
 CONFIG_TOUCHSCREEN_GOODIX=m
 CONFIG_TI_AM335X_ADC=m
+CONFIG_TOUCHSCREEN_LDC3001=y
 #QSPI
 CONFIG_SPI_CADENCE_QUADSPI=m
diff --git a/ti_config_fragments/defconfig_map.txt b/ti_config_fragments/defconfig_map.txt
index 5a0ed65087ec..4f637b8b5a3a 100644
--- a/ti_config_fragments/defconfig_map.txt
+++ b/ti_config_fragments/defconfig_map.txt
@@ -1,7 +1,7 @@
 # Release Defconfigs
 classification: SDK_Release_Defconfigs type: ti_sdk_am3x_release defconfig: multi_v7_defconfig config_file: None extra_configs: multi_v7_prune.cfg baseport.cfg ipc.cfg connectivity.cfg audio_display.cfg wlan.cfg omap_soc.cfg am33xx_only.cfg systemd.cfg
 classification: SDK_Release_Defconfigs type: ti_sdk_am4x_release defconfig: multi_v7_defconfig config_file: None extra_configs: multi_v7_prune.cfg baseport.cfg ipc.cfg connectivity.cfg audio_display.cfg wlan.cfg omap_soc.cfg am43xx_only.cfg systemd.cfg
-classification: SDK_Release_Defconfigs type: ti_sdk_dra7x_release defconfig: multi_v7_defconfig config_file: None extra_configs: multi_v7_prune.cfg baseport.cfg ipc.cfg connectivity.cfg audio_display.cfg wlan.cfg omap_soc.cfg lpae.cfg dra7_only.cfg systemd.cfg
+classification: SDK_Release_Defconfigs type: ti_sdk_dra7x_release defconfig: multi_v7_defconfig config_file: None extra_configs: multi_v7_prune.cfg baseport.cfg ipc.cfg connectivity.cfg audio_display.cfg wlan.cfg omap_soc.cfg lpae.cfg dra7_only.cfg systemd.cfg auto.cfg
 classification: SDK_Release_Defconfigs type: ti_sdk_omap2_release defconfig: multi_v7_defconfig config_file: None extra_configs: multi_v7_prune.cfg baseport.cfg ipc.cfg connectivity.cfg audio_display.cfg wlan.cfg omap_soc.cfg systemd.cfg
 classification: SDK_Release_Defconfigs type: ti_sdk_k2g_release defconfig: multi_v7_defconfig config_file: None extra_configs: multi_v7_prune.cfg baseport.cfg ipc.cfg connectivity.cfg audio_display.cfg keystone.cfg lpae.cfg k2g_only.cfg systemd.cfg
 classification: SDK_Release_Defconfigs type: ti_sdk_keystone_release defconfig: multi_v7_defconfig config_file: None extra_configs: multi_v7_prune.cfg baseport.cfg ipc.cfg connectivity.cfg audio_display.cfg keystone.cfg lpae.cfg systemd.cfg
@@ -27,5 +27,7 @@ classification: SDK_Debug_Defconfigs type: ti_sdk_omap2_rt_debug defconfig: mult
 classification: SDK_Debug_Defconfigs type: ti_sdk_k2g_rt_debug defconfig: multi_v7_defconfig config_file: None extra_configs: multi_v7_prune.cfg baseport.cfg ipc.cfg connectivity.cfg audio_display.cfg keystone.cfg lpae.cfg k2g_only.cfg real_time.cfg systemd.cfg debug_options.cfg
 classification: SDK_Debug_Defconfigs type: ti_sdk_keystone_rt_debug defconfig: multi_v7_defconfig config_file: None extra_configs:  multi_v7_prune.cfg baseport.cfg ipc.cfg connectivity.cfg audio_display.cfg keystone.cfg lpae.cfg real_time.cfg systemd.cfg debug_options.cfg
 # Android Defconfigs
-classification: SDK_Release_Defconfigs type: ti_sdk_dra7x_android_release defconfig: multi_v7_defconfig config_file: None extra_configs: multi_v7_prune.cfg baseport.cfg ipc.cfg connectivity.cfg audio_display.cfg wlan.cfg omap_soc.cfg lpae.cfg dra7_only.cfg systemd.cfg ../android/configs/android-base.cfg ../android/configs/android-recommended.cfg
+classification: SDK_Release_Defconfigs type: ti_sdk_dra7x_android_release defconfig: multi_v7_defconfig config_file: None extra_configs: multi_v7_prune.cfg baseport.cfg ipc.cfg connectivity.cfg audio_display.cfg wlan.cfg omap_soc.cfg lpae.cfg dra7_only.cfg systemd.cfg ../android/configs/android-base.cfg ../android/configs/android-recommended.cfg auto.cfg android_omap.cfg
-classification: SDK_Debug_Defconfigs type: ti_sdk_dra7x_android_debug defconfig: multi_v7_defconfig config_file: None extra_configs: multi_v7_prune.cfg baseport.cfg ipc.cfg connectivity.cfg audio_display.cfg wlan.cfg omap_soc.cfg lpae.cfg dra7_only.cfg systemd.cfg debug_options.cfg ../android/configs/android-base.cfg ../android/configs/android-recommended.cfg
+classification: SDK_Release_Defconfigs type: ti_sdk_am57x_android_release defconfig: multi_v7_defconfig config_file: None extra_configs: multi_v7_prune.cfg baseport.cfg ipc.cfg connectivity.cfg audio_display.cfg wlan.cfg omap_soc.cfg lpae.cfg dra7_only.cfg systemd.cfg ../android/configs/android-base.cfg ../android/configs/android-recommended.cfg auto.cfg android_omap.cfg android_am57x.cfg
+classification: SDK_Debug_Defconfigs type: ti_sdk_dra7x_android_debug defconfig: multi_v7_defconfig config_file: None extra_configs: multi_v7_prune.cfg baseport.cfg ipc.cfg connectivity.cfg audio_display.cfg wlan.cfg omap_soc.cfg lpae.cfg dra7_only.cfg systemd.cfg debug_options.cfg ../android/configs/android-base.cfg ../android/configs/android-recommended.cfg auto.cfg android_omap.cfg
+classification: SDK_Debug_Defconfigs type: ti_sdk_am57x_android_debug defconfig: multi_v7_defconfig config_file: None extra_configs: multi_v7_prune.cfg baseport.cfg ipc.cfg connectivity.cfg audio_display.cfg wlan.cfg omap_soc.cfg lpae.cfg dra7_only.cfg systemd.cfg debug_options.cfg ../android/configs/android-base.cfg ../android/configs/android-recommended.cfg auto.cfg android_omap.cfg android_am57x.cfg