18 files changed, 161 insertions, 137 deletions

diff --git a/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt b/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt
index 63dd8051521c..18729f6fe1e5 100644
--- a/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt
+++ b/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt
@@ -1,7 +1,8 @@
 * OMAP OCP2SCP - ocp interface to scp interface
 
 properties:
-- compatible : Should be "ti,omap-ocp2scp"
+- compatible : Should be "ti,am437x-ocp2scp" for AM437x processor
+               Should be "ti,omap-ocp2scp" for all others
 - reg : Address and length of the register set for the device
 - #address-cells, #size-cells : Must be present if the device has sub-nodes
 - ranges : the child address space are mapped 1:1 onto the parent address space
diff --git a/MAINTAINERS b/MAINTAINERS
index ddc5a8cf9a8a..085614010f1d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6947,6 +6947,8 @@ Q:	http://patchwork.kernel.org/project/linux-omap/list/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
 S:      Maintained
 F:      arch/arm/*omap*/
+F:      arch/arm/configs/omap1_defconfig
+F:      arch/arm/configs/omap2plus_defconfig
 F:      drivers/i2c/busses/i2c-omap.c
 F:      drivers/irqchip/irq-omap-intc.c
 F:      drivers/mfd/*omap*.c
diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index f8a02a295e08..2f6f0c2040db 100644
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -800,7 +800,7 @@
                 };
 
                 ocp2scp0: ocp2scp@483a8000 {
-                        compatible = "ti,omap-ocp2scp";
+                        compatible = "ti,am437x-ocp2scp", "ti,omap-ocp2scp";
                         #address-cells = <1>;
                         #size-cells = <1>;
                         ranges;
@@ -819,7 +819,7 @@
                 };
 
                 ocp2scp1: ocp2scp@483e8000 {
-                        compatible = "ti,omap-ocp2scp";
+                        compatible = "ti,am437x-ocp2scp", "ti,omap-ocp2scp";
                         #address-cells = <1>;
                         #size-cells = <1>;
                         ranges;
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts
index 03750af3b49a..ae83a812d8a6 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15.dts
+++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
@@ -87,6 +87,7 @@
                 gpios =  <&tps659038_gpio 1 GPIO_ACTIVE_HIGH>;
                 gpio-fan,speed-map = <0     0>,
                                      <13000 1>;
+                #cooling-cells = <2>;
         };
 
         extcon_usb1: extcon_usb1 {
@@ -442,6 +443,7 @@
                 pinctrl-0 = <&tmp102_pins_default>;
                 interrupt-parent = <&gpio7>;
                 interrupts = <16 IRQ_TYPE_LEVEL_LOW>;
+                #thermal-sensor-cells = <1>;
         };
 };
 
@@ -560,3 +562,50 @@
 &usb2 {
         dr_mode = "peripheral";
 };
+
+&cpu_trips {
+        cpu_alert1: cpu_alert1 {
+                temperature = <50000>; /* millicelsius */
+                hysteresis = <2000>; /* millicelsius */
+                type = "active";
+        };
+};
+
+&cpu_cooling_maps {
+        map1 {
+                trip = <&cpu_alert1>;
+                cooling-device = <&gpio_fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+        };
+};
+
+&thermal_zones {
+        board_thermal: board_thermal {
+                polling-delay-passive = <1250>; /* milliseconds */
+                polling-delay = <1500>; /* milliseconds */
+
+                                /* sensor       ID */
+                thermal-sensors = <&tmp102     0>;
+
+                board_trips: trips {
+                        board_alert0: board_alert {
+                                temperature = <40000>; /* millicelsius */
+                                hysteresis = <2000>; /* millicelsius */
+                                type = "active";
+                        };
+
+                        board_crit: board_crit {
+                                temperature = <105000>; /* millicelsius */
+                                hysteresis = <0>; /* millicelsius */
+                                type = "critical";
+                        };
+                };
+
+                board_cooling_maps: cooling-maps {
+                        map0 {
+                                trip = <&board_alert0>;
+                                cooling-device =
+                                  <&gpio_fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+                        };
+                };
+       };
+};
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 8e50ca3fc102..a4dec49d0278 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -261,6 +261,28 @@
                         };
                 };
 
+                bandgap: bandgap@4a0021e0 {
+                        reg = <0x4a0021e0 0xc
+                                0x4a00232c 0xc
+                                0x4a002380 0x2c
+                                0x4a0023C0 0x3c
+                                0x4a002564 0x8
+                                0x4a002574 0x50>;
+                                compatible = "ti,dra752-bandgap";
+                                interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
+                                #thermal-sensor-cells = <1>;
+                };
+
+                dra7_ctrl_core: ctrl_core@4a002000 {
+                        compatible = "syscon";
+                        reg = <0x4a002000 0x6d0>;
+                };
+
+                dra7_ctrl_general: tisyscon@4a002e00 {
+                        compatible = "syscon";
+                        reg = <0x4a002e00 0x7c>;
+                };
+
                 sdma: dma-controller@4a056000 {
                         compatible = "ti,omap4430-sdma";
                         reg = <0x4a056000 0x1000>;
@@ -1446,6 +1468,17 @@
                         status = "disabled";
                 };
         };
+
+        thermal_zones: thermal-zones {
+                #include "omap4-cpu-thermal.dtsi"
+                #include "omap5-gpu-thermal.dtsi"
+                #include "omap5-core-thermal.dtsi"
+        };
+
+};
+
+&cpu_thermal {
+        polling-delay = <500>; /* milliseconds */
 };
 
 /include/ "dra7xx-clocks.dtsi"
diff --git a/arch/arm/boot/dts/dra72x.dtsi b/arch/arm/boot/dts/dra72x.dtsi
index e5a3d23a3df1..6ac8e3601499 100644
--- a/arch/arm/boot/dts/dra72x.dtsi
+++ b/arch/arm/boot/dts/dra72x.dtsi
@@ -20,6 +20,11 @@
                         device_type = "cpu";
                         compatible = "arm,cortex-a15";
                         reg = <0>;
+
+                        /* cooling options */
+                        cooling-min-level = <0>;
+                        cooling-max-level = <2>;
+                        #cooling-cells = <2>; /* min followed by max */
                 };
         };
 
diff --git a/arch/arm/boot/dts/dra74x.dtsi b/arch/arm/boot/dts/dra74x.dtsi
index 10173fab1a15..eef981f4bcd5 100644
--- a/arch/arm/boot/dts/dra74x.dtsi
+++ b/arch/arm/boot/dts/dra74x.dtsi
@@ -31,6 +31,11 @@
                         clock-names = "cpu";
 
                         clock-latency = <300000>; /* From omap-cpufreq driver */
+
+                        /* cooling options */
+                        cooling-min-level = <0>;
+                        cooling-max-level = <2>;
+                        #cooling-cells = <2>; /* min followed by max */
                 };
                 cpu@1 {
                         device_type = "cpu";
diff --git a/arch/arm/boot/dts/omap4-cpu-thermal.dtsi b/arch/arm/boot/dts/omap4-cpu-thermal.dtsi
index cb9458feb2e3..ab7f87ae96f0 100644
--- a/arch/arm/boot/dts/omap4-cpu-thermal.dtsi
+++ b/arch/arm/boot/dts/omap4-cpu-thermal.dtsi
@@ -18,7 +18,7 @@ cpu_thermal: cpu_thermal {
                         /* sensor       ID */
         thermal-sensors = <&bandgap     0>;
 
-        trips {
+        cpu_trips: trips {
                 cpu_alert0: cpu_alert {
                         temperature = <100000>; /* millicelsius */
                         hysteresis = <2000>; /* millicelsius */
@@ -31,7 +31,7 @@ cpu_thermal: cpu_thermal {
                 };
         };
 
-        cooling-maps {
+        cpu_cooling_maps: cooling-maps {
                 map0 {
                         trip = <&cpu_alert0>;
                         cooling-device =
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index 34b4c0044961..dd94567c3628 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -71,13 +71,7 @@ static unsigned int mpui7xx_sleep_save[MPUI7XX_SLEEP_SAVE_SIZE];
 static unsigned int mpui1510_sleep_save[MPUI1510_SLEEP_SAVE_SIZE];
 static unsigned int mpui1610_sleep_save[MPUI1610_SLEEP_SAVE_SIZE];
 
-#ifndef CONFIG_OMAP_32K_TIMER
-
-static unsigned short enable_dyn_sleep = 0;
-
-#else
-
-static unsigned short enable_dyn_sleep = 1;
+static unsigned short enable_dyn_sleep;
 
 static ssize_t idle_show(struct kobject *kobj, struct kobj_attribute *attr,
                          char *buf)
@@ -90,8 +84,9 @@ static ssize_t idle_store(struct kobject *kobj, struct kobj_attribute *attr,
 {
         unsigned short value;
         if (sscanf(buf, "%hu", &value) != 1 ||
-            (value != 0 && value != 1)) {
-                printk(KERN_ERR "idle_sleep_store: Invalid value\n");
+            (value != 0 && value != 1) ||
+            (value != 0 && !IS_ENABLED(CONFIG_OMAP_32K_TIMER))) {
+                pr_err("idle_sleep_store: Invalid value\n");
                 return -EINVAL;
         }
         enable_dyn_sleep = value;
@@ -101,7 +96,6 @@ static ssize_t idle_store(struct kobject *kobj, struct kobj_attribute *attr,
 static struct kobj_attribute sleep_while_idle_attr =
         __ATTR(sleep_while_idle, 0644, idle_show, idle_store);
 
-#endif
 
 static void (*omap_sram_suspend)(unsigned long r0, unsigned long r1) = NULL;
 
@@ -115,16 +109,11 @@ void omap1_pm_idle(void)
 {
         extern __u32 arm_idlect1_mask;
         __u32 use_idlect1 = arm_idlect1_mask;
-        int do_sleep = 0;
 
         local_fiq_disable();
 
 #if defined(CONFIG_OMAP_MPU_TIMER) && !defined(CONFIG_OMAP_DM_TIMER)
-#warning Enable 32kHz OS timer in order to allow sleep states in idle
         use_idlect1 = use_idlect1 & ~(1 << 9);
-#else
-        if (enable_dyn_sleep)
-                do_sleep = 1;
 #endif
 
 #ifdef CONFIG_OMAP_DM_TIMER
@@ -134,10 +123,12 @@ void omap1_pm_idle(void)
         if (omap_dma_running())
                 use_idlect1 &= ~(1 << 6);
 
-        /* We should be able to remove the do_sleep variable and multiple
+        /*
+         * We should be able to remove the do_sleep variable and multiple
          * tests above as soon as drivers, timer and DMA code have been fixed.
-         * Even the sleep block count should become obsolete. */
-        if ((use_idlect1 != ~0) || !do_sleep) {
+         * Even the sleep block count should become obsolete.
+         */
+        if ((use_idlect1 != ~0) || !enable_dyn_sleep) {
 
                 __u32 saved_idlect1 = omap_readl(ARM_IDLECT1);
                 if (cpu_is_omap15xx())
@@ -635,15 +626,25 @@ static const struct platform_suspend_ops omap_pm_ops = {
 
 static int __init omap_pm_init(void)
 {
-
-#ifdef CONFIG_OMAP_32K_TIMER
-        int error;
-#endif
+        int error = 0;
 
         if (!cpu_class_is_omap1())
                 return -ENODEV;
 
-        printk("Power Management for TI OMAP.\n");
+        pr_info("Power Management for TI OMAP.\n");
+
+        if (!IS_ENABLED(CONFIG_OMAP_32K_TIMER))
+                pr_info("OMAP1 PM: sleep states in idle disabled due to no 32KiHz timer\n");
+
+        if (!IS_ENABLED(CONFIG_OMAP_DM_TIMER))
+                pr_info("OMAP1 PM: sleep states in idle disabled due to no DMTIMER support\n");
+
+        if (IS_ENABLED(CONFIG_OMAP_32K_TIMER) &&
+            IS_ENABLED(CONFIG_OMAP_DM_TIMER)) {
+                /* OMAP16xx only */
+                pr_info("OMAP1 PM: sleep states in idle enabled\n");
+                enable_dyn_sleep = 1;
+        }
 
         /*
          * We copy the assembler sleep/wakeup routines to SRAM.
@@ -693,17 +694,15 @@ static int __init omap_pm_init(void)
         omap_pm_init_debugfs();
 #endif
 
-#ifdef CONFIG_OMAP_32K_TIMER
         error = sysfs_create_file(power_kobj, &sleep_while_idle_attr.attr);
         if (error)
                 printk(KERN_ERR "sysfs_create_file failed: %d\n", error);
-#endif
 
         if (cpu_is_omap16xx()) {
                 /* configure LOW_PWR pin */
                 omap_cfg_reg(T20_1610_LOW_PWR);
         }
 
-        return 0;
+        return error;
 }
 __initcall(omap_pm_init);
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 2b8e47788062..1041b19485ab 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -69,6 +69,7 @@ config SOC_DRA7XX
         select ARM_GIC
         select HAVE_ARM_ARCH_TIMER
         select IRQ_CROSSBAR
+        select ARM_ERRATA_798181 if SMP
 
 config ARCH_OMAP2PLUS
         bool
@@ -278,27 +279,6 @@ config OMAP3_SDRC_AC_TIMING
           wish to say no.  Selecting yes without understanding what is
           going on could result in system crashes;
 
-config OMAP4_ERRATA_I688
-        bool "OMAP4 errata: Async Bridge Corruption"
-        depends on (ARCH_OMAP4 || SOC_OMAP5) && !ARCH_MULTIPLATFORM
-        select ARCH_HAS_BARRIERS
-        help
-          If a data is stalled inside asynchronous bridge because of back
-          pressure, it may be accepted multiple times, creating pointer
-          misalignment that will corrupt next transfers on that data path
-          until next reset of the system (No recovery procedure once the
-          issue is hit, the path remains consistently broken). Async bridge
-          can be found on path between MPU to EMIF and MPU to L3 interconnect.
-          This situation can happen only when the idle is initiated by a
-          Master Request Disconnection (which is trigged by software when
-          executing WFI on CPU).
-          The work-around for this errata needs all the initiators connected
-          through async bridge must ensure that data path is properly drained
-          before issuing WFI. This condition will be met if one Strongly ordered
-          access is performed to the target right before executing the WFI.
-          In MPU case, L3 T2ASYNC FIFO and DDR T2ASYNC FIFO needs to be drained.
-          IO barrier ensure that there is no synchronisation loss on initiators
-          operating on both interconnect port simultaneously.
 endmenu
 
 endif
diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c
index 484cdadfb187..eae6a0e87c90 100644
--- a/arch/arm/mach-omap2/common.c
+++ b/arch/arm/mach-omap2/common.c
@@ -30,5 +30,4 @@ int __weak omap_secure_ram_reserve_memblock(void)
 void __init omap_reserve(void)
 {
         omap_secure_ram_reserve_memblock();
-        omap_barrier_reserve_memblock();
 }
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
index 46e24581d624..cf3cf22ecd42 100644
--- a/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@ -200,9 +200,6 @@ void __init omap4_map_io(void);
 void __init omap5_map_io(void);
 void __init ti81xx_map_io(void);
 
-/* omap_barriers_init() is OMAP4 only */
-void omap_barriers_init(void);
-
 /**
  * omap_test_timeout - busy-loop, testing a condition
  * @cond: condition to test until it evaluates to true
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 7743e3672f98..820dde8b5b04 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -306,7 +306,6 @@ void __init am33xx_map_io(void)
 void __init omap4_map_io(void)
 {
         iotable_init(omap44xx_io_desc, ARRAY_SIZE(omap44xx_io_desc));
-        omap_barriers_init();
 }
 #endif
 
@@ -314,7 +313,6 @@ void __init omap4_map_io(void)
 void __init omap5_map_io(void)
 {
         iotable_init(omap54xx_io_desc, ARRAY_SIZE(omap54xx_io_desc));
-        omap_barriers_init();
 }
 #endif
 /*
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index 78064b0d4db5..176eef6ef338 100644
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -1053,7 +1053,7 @@ static void __init omap_mux_init_list(struct omap_mux_partition *partition,
                 struct omap_mux *entry;
 
 #ifdef CONFIG_OMAP_MUX
-                if (!superset->muxnames || !superset->muxnames[0]) {
+                if (!superset->muxnames[0]) {
                         superset++;
                         continue;
                 }
diff --git a/arch/arm/mach-omap2/omap-secure.h b/arch/arm/mach-omap2/omap-secure.h
index dec2b05d184b..af2851fbcdf0 100644
--- a/arch/arm/mach-omap2/omap-secure.h
+++ b/arch/arm/mach-omap2/omap-secure.h
@@ -70,13 +70,6 @@ extern u32 rx51_secure_dispatcher(u32 idx, u32 process, u32 flag, u32 nargs,
 extern u32 rx51_secure_update_aux_cr(u32 set_bits, u32 clear_bits);
 extern u32 rx51_secure_rng_call(u32 ptr, u32 count, u32 flag);
 
-#ifdef CONFIG_OMAP4_ERRATA_I688
-extern int omap_barrier_reserve_memblock(void);
-#else
-static inline void omap_barrier_reserve_memblock(void)
-{ }
-#endif
-
 #ifdef CONFIG_SOC_HAS_REALTIME_COUNTER
 void set_cntfreq(void);
 #else
diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c
index cee0fe1ee6ff..afaac9e25764 100644
--- a/arch/arm/mach-omap2/omap4-common.c
+++ b/arch/arm/mach-omap2/omap4-common.c
@@ -52,75 +52,6 @@ static void __iomem *twd_base;
 
 #define IRQ_LOCALTIMER          29
 
-#ifdef CONFIG_OMAP4_ERRATA_I688
-/* Used to implement memory barrier on DRAM path */
-#define OMAP4_DRAM_BARRIER_VA                   0xfe600000
-
-void __iomem *dram_sync, *sram_sync;
-
-static phys_addr_t paddr;
-static u32 size;
-
-void omap_bus_sync(void)
-{
-        if (dram_sync && sram_sync) {
-                writel_relaxed(readl_relaxed(dram_sync), dram_sync);
-                writel_relaxed(readl_relaxed(sram_sync), sram_sync);
-                isb();
-        }
-}
-EXPORT_SYMBOL(omap_bus_sync);
-
-static int __init omap4_sram_init(void)
-{
-        struct device_node *np;
-        struct gen_pool *sram_pool;
-
-        np = of_find_compatible_node(NULL, NULL, "ti,omap4-mpu");
-        if (!np)
-                pr_warn("%s:Unable to allocate sram needed to handle errata I688\n",
-                        __func__);
-        sram_pool = of_get_named_gen_pool(np, "sram", 0);
-        if (!sram_pool)
-                pr_warn("%s:Unable to get sram pool needed to handle errata I688\n",
-                        __func__);
-        else
-                sram_sync = (void *)gen_pool_alloc(sram_pool, PAGE_SIZE);
-
-        return 0;
-}
-omap_arch_initcall(omap4_sram_init);
-
-/* Steal one page physical memory for barrier implementation */
-int __init omap_barrier_reserve_memblock(void)
-{
-
-        size = ALIGN(PAGE_SIZE, SZ_1M);
-        paddr = arm_memblock_steal(size, SZ_1M);
-
-        return 0;
-}
-
-void __init omap_barriers_init(void)
-{
-        struct map_desc dram_io_desc[1];
-
-        dram_io_desc[0].virtual = OMAP4_DRAM_BARRIER_VA;
-        dram_io_desc[0].pfn = __phys_to_pfn(paddr);
-        dram_io_desc[0].length = size;
-        dram_io_desc[0].type = MT_MEMORY_RW_SO;
-        iotable_init(dram_io_desc, ARRAY_SIZE(dram_io_desc));
-        dram_sync = (void __iomem *) dram_io_desc[0].virtual;
-
-        pr_info("OMAP4: Map 0x%08llx to 0x%08lx for dram barrier\n",
-                (long long) paddr, dram_io_desc[0].virtual);
-
-}
-#else
-void __init omap_barriers_init(void)
-{}
-#endif
-
 void gic_dist_disable(void)
 {
         if (gic_dist_base_addr)
diff --git a/arch/arm/mach-omap2/sleep44xx.S b/arch/arm/mach-omap2/sleep44xx.S
index b84a0122d823..ad1bb9431e94 100644
--- a/arch/arm/mach-omap2/sleep44xx.S
+++ b/arch/arm/mach-omap2/sleep44xx.S
@@ -333,11 +333,9 @@ ENDPROC(omap4_cpu_resume)
 
 #endif  /* defined(CONFIG_SMP) && defined(CONFIG_PM) */
 
-#ifndef CONFIG_OMAP4_ERRATA_I688
 ENTRY(omap_bus_sync)
         ret     lr
 ENDPROC(omap_bus_sync)
-#endif
 
 ENTRY(omap_do_wfi)
         stmfd   sp!, {lr}
diff --git a/drivers/bus/omap-ocp2scp.c b/drivers/bus/omap-ocp2scp.c
index 723ec06ad2c8..9f1856948758 100644
--- a/drivers/bus/omap-ocp2scp.c
+++ b/drivers/bus/omap-ocp2scp.c
@@ -16,6 +16,7 @@
  *
  */
 
+#include <linux/io.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/err.h>
@@ -23,6 +24,9 @@
 #include <linux/of.h>
 #include <linux/of_platform.h>
 
+#define OCP2SCP_TIMING 0x18
+#define SYNC2_MASK 0xf
+
 static int ocp2scp_remove_devices(struct device *dev, void *c)
 {
         struct platform_device *pdev = to_platform_device(dev);
@@ -35,6 +39,9 @@ static int ocp2scp_remove_devices(struct device *dev, void *c)
 static int omap_ocp2scp_probe(struct platform_device *pdev)
 {
         int ret;
+        u32 reg;
+        void __iomem *regs;
+        struct resource *res;
         struct device_node *np = pdev->dev.of_node;
 
         if (np) {
@@ -47,6 +54,32 @@ static int omap_ocp2scp_probe(struct platform_device *pdev)
         }
 
         pm_runtime_enable(&pdev->dev);
+        /*
+         * As per AM572x TRM: http://www.ti.com/lit/ug/spruhz6/spruhz6.pdf
+         * under section 26.3.2.2, table 26-26 OCP2SCP TIMING Caution;
+         * As per OMAP4430 TRM: http://www.ti.com/lit/ug/swpu231ap/swpu231ap.pdf
+         * under section 23.12.6.2.2 , Table 23-1213 OCP2SCP TIMING Caution;
+         * As per OMAP4460 TRM: http://www.ti.com/lit/ug/swpu235ab/swpu235ab.pdf
+         * under section 23.12.6.2.2, Table 23-1213 OCP2SCP TIMING Caution;
+         * As per OMAP543x TRM http://www.ti.com/lit/pdf/swpu249
+         * under section 27.3.2.2, Table 27-27 OCP2SCP TIMING Caution;
+         *
+         * Read path of OCP2SCP is not working properly due to low reset value
+         * of SYNC2 parameter in OCP2SCP. Suggested reset value is 0x6 or more.
+         */
+        if (!of_device_is_compatible(np, "ti,am437x-ocp2scp")) {
+                res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+                regs = devm_ioremap_resource(&pdev->dev, res);
+                if (IS_ERR(regs))
+                        goto err0;
+
+                pm_runtime_get_sync(&pdev->dev);
+                reg = readl_relaxed(regs + OCP2SCP_TIMING);
+                reg &= ~(SYNC2_MASK);
+                reg |= 0x6;
+                writel_relaxed(reg, regs + OCP2SCP_TIMING);
+                pm_runtime_put_sync(&pdev->dev);
+        }
 
         return 0;
 
@@ -67,6 +100,7 @@ static int omap_ocp2scp_remove(struct platform_device *pdev)
 #ifdef CONFIG_OF
 static const struct of_device_id omap_ocp2scp_id_table[] = {
         { .compatible = "ti,omap-ocp2scp" },
+        { .compatible = "ti,am437x-ocp2scp" },
         {}
 };
 MODULE_DEVICE_TABLE(of, omap_ocp2scp_id_table);