Merge tag 'dt-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC device tree changes from Arnd Bergmann:
 "A large part of the arm-soc patches are nowadays DT changes, adding
  support for new SoCs, boards and devices without changing kernel
  source.  The plan is still to move the devicetree files out of the
  kernel tree and reduce the amount of churn going on here, but we keep
  finding reasons to delay doing that.

  Changes are really all over the place, with little sticking out
  particularly.  We have contributions from a total of 116 people in
  this branch.

  Unfortunately, the size of this branch also causes a significant
  number of conflicts at the moment, typically when subsystem
  maintainers merge patches that change the driver at the same time as
  the dts files.  In most cases this could be avoided because the dts
  changes are supposed to be compatible in both ways, and we are asking
  everyone to send ARM dts changes through our tree only"

* tag 'dt-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (541 commits)
  dts: stmmac: Document the clocks property in the stmmac base document
  dts: socfpga: Add DTS entry for adding the stmmac glue layer for stmmac.
  ARM: STi: stih41x: Add support for the FSM Serial Flash Controller
  ARM: STi: stih416: Add support for the FSM Serial Flash Controller
  ARM: tegra: fix Dalmore pinctrl configuration
  ARM: dts: keystone: use common "ti,keystone" compatible instead of -evm
  ARM: dts: k2hk-evm: set ubifs partition size for 512M NAND
  ARM: dts: Build all keystone dt blobs
  ARM: dts: keystone: Fix control register range for clktsip
  ARM: dts: keystone: Fix domain register range for clkfftc1
  ARM: dts: bcm28155-ap: leave camldo1 on to fix reboot
  ARM: dts: add bcm590xx pmu support and enable for bcm28155-ap
  ARM: dts: bcm21664: Add device tree files.
  ARM: DT: bcm21664: Device tree bindings
  ARM: efm32: properly namespace i2c location property
  ARM: efm32: fix unit address part in USART2 device nodes' names
  ARM: mvebu: Enable NAND controller in Armada 385-DB
  ARM: mvebu: Add support for NAND controller in Armada 38x SoC
  ARM: mvebu: Add the Core Divider clock to Armada 38x SoCs
  ARM: mvebu: Add a 2 GHz fixed-clock on Armada 38x SoCs
  ...

6 files changed, 210 insertions, 38 deletions

diff --git a/arch/arm/mach-omap2/clockdomains3xxx_data.c b/arch/arm/mach-omap2/clockdomains3xxx_data.c
index e6b91e552d3d..f03dc97921ad 100644
--- a/arch/arm/mach-omap2/clockdomains3xxx_data.c
+++ b/arch/arm/mach-omap2/clockdomains3xxx_data.c
@@ -247,7 +247,7 @@ static struct clockdomain neon_clkdm = {
 static struct clockdomain iva2_clkdm = {
         .name           = "iva2_clkdm",
         .pwrdm          = { .name = "iva2_pwrdm" },
-        .flags          = CLKDM_CAN_HWSUP_SWSUP,
+        .flags          = CLKDM_CAN_SWSUP,
         .dep_bit        = OMAP3430_PM_WKDEP_MPU_EN_IVA2_SHIFT,
         .wkdep_srcs     = iva2_wkdeps,
         .clktrctrl_mask = OMAP3430_CLKTRCTRL_IVA2_MASK,
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 0dd6398bade4..e58609b312c7 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -229,6 +229,9 @@ static struct omap_iommu_arch_data omap3_isp_iommu = {
 
 int omap3_init_camera(struct isp_platform_data *pdata)
 {
+        if (of_have_populated_dt())
+                omap3_isp_iommu.name = "480bd400.mmu";
+
         omap3isp_device.dev.platform_data = pdata;
         omap3isp_device.dev.archdata.iommu = &omap3_isp_iommu;
 
diff --git a/arch/arm/mach-omap2/gpmc-nand.c b/arch/arm/mach-omap2/gpmc-nand.c
index 174caecc3186..4349e82debfe 100644
--- a/arch/arm/mach-omap2/gpmc-nand.c
+++ b/arch/arm/mach-omap2/gpmc-nand.c
@@ -45,24 +45,31 @@ static struct platform_device gpmc_nand_device = {
 
 static bool gpmc_hwecc_bch_capable(enum omap_ecc ecc_opt)
 {
-        /* support only OMAP3 class */
-        if (!cpu_is_omap34xx() && !soc_is_am33xx()) {
-                pr_err("BCH ecc is not supported on this CPU\n");
+        /* platforms which support all ECC schemes */
+        if (soc_is_am33xx() || cpu_is_omap44xx() ||
+                 soc_is_omap54xx() || soc_is_dra7xx())
+                return 1;
+
+        /* OMAP3xxx do not have ELM engine, so cannot support ECC schemes
+         * which require H/W based ECC error detection */
+        if ((cpu_is_omap34xx() || cpu_is_omap3630()) &&
+            ((ecc_opt == OMAP_ECC_BCH4_CODE_HW) ||
+                 (ecc_opt == OMAP_ECC_BCH8_CODE_HW)))
                 return 0;
-        }
 
         /*
          * For now, assume 4-bit mode is only supported on OMAP3630 ES1.x, x>=1
          * and AM33xx derivates. Other chips may be added if confirmed to work.
          */
-        if ((ecc_opt == OMAP_ECC_BCH4_CODE_HW) &&
-            (!cpu_is_omap3630() || (GET_OMAP_REVISION() == 0)) &&
-            (!soc_is_am33xx())) {
-                pr_err("BCH 4-bit mode is not supported on this CPU\n");
+        if ((ecc_opt == OMAP_ECC_BCH4_CODE_HW_DETECTION_SW) &&
+            (!cpu_is_omap3630() || (GET_OMAP_REVISION() == 0)))
                 return 0;
-        }
 
-        return 1;
+        /* legacy platforms support only HAM1 (1-bit Hamming) ECC scheme */
+        if (ecc_opt == OMAP_ECC_HAM1_CODE_HW)
+                return 1;
+        else
+                return 0;
 }
 
 /* This function will go away once the device-tree convertion is complete */
@@ -133,8 +140,10 @@ int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data,
 
         gpmc_update_nand_reg(&gpmc_nand_data->reg, gpmc_nand_data->cs);
 
-        if (!gpmc_hwecc_bch_capable(gpmc_nand_data->ecc_opt))
+        if (!gpmc_hwecc_bch_capable(gpmc_nand_data->ecc_opt)) {
+                dev_err(dev, "Unsupported NAND ECC scheme selected\n");
                 return -EINVAL;
+        }
 
         err = platform_device_register(&gpmc_nand_device);
         if (err < 0) {
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 4c3b1e6df508..9c7e23aa0e7f 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -3029,8 +3029,6 @@ static struct omap_hwmod omap3xxx_mmu_isp_hwmod = {
         .flags          = HWMOD_NO_IDLEST,
 };
 
-#ifdef CONFIG_OMAP_IOMMU_IVA2
-
 /* mmu iva */
 
 static struct omap_mmu_dev_attr mmu_iva_dev_attr = {
@@ -3070,20 +3068,22 @@ static struct omap_hwmod omap3xxx_mmu_iva_hwmod = {
         .name           = "mmu_iva",
         .class          = &omap3xxx_mmu_hwmod_class,
         .mpu_irqs       = omap3xxx_mmu_iva_irqs,
+        .clkdm_name     = "iva2_clkdm",
         .rst_lines      = omap3xxx_mmu_iva_resets,
         .rst_lines_cnt  = ARRAY_SIZE(omap3xxx_mmu_iva_resets),
         .main_clk       = "iva2_ck",
         .prcm = {
                 .omap2 = {
                         .module_offs = OMAP3430_IVA2_MOD,
+                        .module_bit = OMAP3430_CM_FCLKEN_IVA2_EN_IVA2_SHIFT,
+                        .idlest_reg_id = 1,
+                        .idlest_idle_bit = OMAP3430_ST_IVA2_SHIFT,
                 },
         },
         .dev_attr       = &mmu_iva_dev_attr,
         .flags          = HWMOD_NO_IDLEST,
 };
 
-#endif
-
 /* l4_per -> gpio4 */
 static struct omap_hwmod_addr_space omap3xxx_gpio4_addrs[] = {
         {
@@ -3855,9 +3855,7 @@ static struct omap_hwmod_ocp_if *omap34xx_hwmod_ocp_ifs[] __initdata = {
         &omap3xxx_l4_core__hdq1w,
         &omap3xxx_sad2d__l3,
         &omap3xxx_l4_core__mmu_isp,
-#ifdef CONFIG_OMAP_IOMMU_IVA2
         &omap3xxx_l3_main__mmu_iva,
-#endif
         &omap34xx_l4_core__ssi,
         NULL
 };
@@ -3881,9 +3879,7 @@ static struct omap_hwmod_ocp_if *omap36xx_hwmod_ocp_ifs[] __initdata = {
         &omap3xxx_l4_core__hdq1w,
         &omap3xxx_sad2d__l3,
         &omap3xxx_l4_core__mmu_isp,
-#ifdef CONFIG_OMAP_IOMMU_IVA2
         &omap3xxx_l3_main__mmu_iva,
-#endif
         NULL
 };
 
diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
index e297d6231c3a..892317294fdc 100644
--- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
@@ -1122,6 +1122,71 @@ static struct omap_hwmod omap54xx_mmc5_hwmod = {
 };
 
 /*
+ * 'mmu' class
+ * The memory management unit performs virtual to physical address translation
+ * for its requestors.
+ */
+
+static struct omap_hwmod_class_sysconfig omap54xx_mmu_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0010,
+        .syss_offs      = 0x0014,
+        .sysc_flags     = (SYSC_HAS_AUTOIDLE | SYSC_HAS_CLOCKACTIVITY |
+                           SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |
+                           SYSS_HAS_RESET_STATUS),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
+        .sysc_fields    = &omap_hwmod_sysc_type1,
+};
+
+static struct omap_hwmod_class omap54xx_mmu_hwmod_class = {
+        .name = "mmu",
+        .sysc = &omap54xx_mmu_sysc,
+};
+
+static struct omap_hwmod_rst_info omap54xx_mmu_dsp_resets[] = {
+        { .name = "mmu_cache", .rst_shift = 1 },
+};
+
+static struct omap_hwmod omap54xx_mmu_dsp_hwmod = {
+        .name           = "mmu_dsp",
+        .class          = &omap54xx_mmu_hwmod_class,
+        .clkdm_name     = "dsp_clkdm",
+        .rst_lines      = omap54xx_mmu_dsp_resets,
+        .rst_lines_cnt  = ARRAY_SIZE(omap54xx_mmu_dsp_resets),
+        .main_clk       = "dpll_iva_h11x2_ck",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = OMAP54XX_CM_DSP_DSP_CLKCTRL_OFFSET,
+                        .rstctrl_offs = OMAP54XX_RM_DSP_RSTCTRL_OFFSET,
+                        .context_offs = OMAP54XX_RM_DSP_DSP_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_HWCTRL,
+                },
+        },
+};
+
+/* mmu ipu */
+static struct omap_hwmod_rst_info omap54xx_mmu_ipu_resets[] = {
+        { .name = "mmu_cache", .rst_shift = 2 },
+};
+
+static struct omap_hwmod omap54xx_mmu_ipu_hwmod = {
+        .name           = "mmu_ipu",
+        .class          = &omap54xx_mmu_hwmod_class,
+        .clkdm_name     = "ipu_clkdm",
+        .rst_lines      = omap54xx_mmu_ipu_resets,
+        .rst_lines_cnt  = ARRAY_SIZE(omap54xx_mmu_ipu_resets),
+        .main_clk       = "dpll_core_h22x2_ck",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = OMAP54XX_CM_IPU_IPU_CLKCTRL_OFFSET,
+                        .rstctrl_offs = OMAP54XX_RM_IPU_RSTCTRL_OFFSET,
+                        .context_offs = OMAP54XX_RM_IPU_IPU_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_HWCTRL,
+                },
+        },
+};
+
+/*
  * 'mpu' class
  * mpu sub-system
  */
@@ -1763,6 +1828,14 @@ static struct omap_hwmod_ocp_if omap54xx_l4_cfg__l3_main_1 = {
         .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
+/* l4_cfg -> mmu_dsp */
+static struct omap_hwmod_ocp_if omap54xx_l4_cfg__mmu_dsp = {
+        .master         = &omap54xx_l4_cfg_hwmod,
+        .slave          = &omap54xx_mmu_dsp_hwmod,
+        .clk            = "l4_root_clk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
 /* mpu -> l3_main_1 */
 static struct omap_hwmod_ocp_if omap54xx_mpu__l3_main_1 = {
         .master         = &omap54xx_mpu_hwmod,
@@ -1787,6 +1860,14 @@ static struct omap_hwmod_ocp_if omap54xx_l4_cfg__l3_main_2 = {
         .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
+/* l3_main_2 -> mmu_ipu */
+static struct omap_hwmod_ocp_if omap54xx_l3_main_2__mmu_ipu = {
+        .master         = &omap54xx_l3_main_2_hwmod,
+        .slave          = &omap54xx_mmu_ipu_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
 /* l3_main_1 -> l3_main_3 */
 static struct omap_hwmod_ocp_if omap54xx_l3_main_1__l3_main_3 = {
         .master         = &omap54xx_l3_main_1_hwmod,
@@ -2345,6 +2426,7 @@ static struct omap_hwmod_ocp_if *omap54xx_hwmod_ocp_ifs[] __initdata = {
         &omap54xx_l4_wkup__counter_32k,
         &omap54xx_l4_cfg__dma_system,
         &omap54xx_l4_abe__dmic,
+        &omap54xx_l4_cfg__mmu_dsp,
         &omap54xx_mpu__emif1,
         &omap54xx_mpu__emif2,
         &omap54xx_l4_wkup__gpio1,
@@ -2360,6 +2442,7 @@ static struct omap_hwmod_ocp_if *omap54xx_hwmod_ocp_ifs[] __initdata = {
         &omap54xx_l4_per__i2c3,
         &omap54xx_l4_per__i2c4,
         &omap54xx_l4_per__i2c5,
+        &omap54xx_l3_main_2__mmu_ipu,
         &omap54xx_l4_wkup__kbd,
         &omap54xx_l4_cfg__mailbox,
         &omap54xx_l4_abe__mcbsp1,
diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
index c33e07e2f0d4..b04c5f0fc278 100644
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -16,12 +16,14 @@
 #include <linux/wl12xx.h>
 
 #include <linux/platform_data/pinctrl-single.h>
+#include <linux/platform_data/iommu-omap.h>
 
 #include "am35xx.h"
 #include "common.h"
 #include "common-board-devices.h"
 #include "dss-common.h"
 #include "control.h"
+#include "omap_device.h"
 #include "omap-secure.h"
 #include "soc.h"
 
@@ -33,20 +35,6 @@ struct pdata_init {
 struct of_dev_auxdata omap_auxdata_lookup[];
 static struct twl4030_gpio_platform_data twl_gpio_auxdata;
 
-/*
- * Create alias for USB host PHY clock.
- * Remove this when clock phandle can be provided via DT
- */
-static void __init __used legacy_init_ehci_clk(char *clkname)
-{
-        int ret;
-
-        ret = clk_add_alias("main_clk", NULL, clkname, NULL);
-        if (ret)
-                pr_err("%s:Failed to add main_clk alias to %s :%d\n",
-                       __func__, clkname, ret);
-}
-
 #if IS_ENABLED(CONFIG_WL12XX)
 
 static struct wl12xx_platform_data wl12xx __initdata;
@@ -94,6 +82,12 @@ static void __init hsmmc2_internal_input_clk(void)
         omap_ctrl_writel(reg, OMAP343X_CONTROL_DEVCONF1);
 }
 
+static struct iommu_platform_data omap3_iommu_pdata = {
+        .reset_name = "mmu",
+        .assert_reset = omap_device_assert_hardreset,
+        .deassert_reset = omap_device_deassert_hardreset,
+};
+
 static int omap3_sbc_t3730_twl_callback(struct device *dev,
                                            unsigned gpio,
                                            unsigned ngpio)
@@ -101,7 +95,7 @@ static int omap3_sbc_t3730_twl_callback(struct device *dev,
         int res;
 
         res = gpio_request_one(gpio + 2, GPIOF_OUT_INIT_HIGH,
-                               "wlan rst");
+                               "wlan pwr");
         if (res)
                 return res;
 
@@ -110,6 +104,23 @@ static int omap3_sbc_t3730_twl_callback(struct device *dev,
         return 0;
 }
 
+static void __init omap3_sbc_t3x_usb_hub_init(int gpio, char *hub_name)
+{
+        int err = gpio_request_one(gpio, GPIOF_OUT_INIT_LOW, hub_name);
+
+        if (err) {
+                pr_err("SBC-T3x: %s reset gpio request failed: %d\n",
+                        hub_name, err);
+                return;
+        }
+
+        gpio_export(gpio, 0);
+
+        udelay(10);
+        gpio_set_value(gpio, 1);
+        msleep(1);
+}
+
 static void __init omap3_sbc_t3730_twl_init(void)
 {
         twl_gpio_auxdata.setup = omap3_sbc_t3730_twl_callback;
@@ -117,10 +128,17 @@ static void __init omap3_sbc_t3730_twl_init(void)
 
 static void __init omap3_sbc_t3730_legacy_init(void)
 {
+        omap3_sbc_t3x_usb_hub_init(167, "sb-t35 usb hub");
         legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 136);
         omap_ads7846_init(1, 57, 0, NULL);
 }
 
+static void __init omap3_sbc_t3530_legacy_init(void)
+{
+        omap3_sbc_t3x_usb_hub_init(167, "sb-t35 usb hub");
+        omap_ads7846_init(1, 57, 0, NULL);
+}
+
 static void __init omap3_igep0020_legacy_init(void)
 {
         omap3_igep2_display_init_of();
@@ -162,7 +180,7 @@ static struct emac_platform_data am35xx_emac_pdata = {
         .interrupt_disable      = am35xx_disable_emac_int,
 };
 
-static void __init am3517_evm_legacy_init(void)
+static void __init am35xx_emac_reset(void)
 {
         u32 v;
 
@@ -172,6 +190,43 @@ static void __init am3517_evm_legacy_init(void)
         omap_ctrl_readl(AM35XX_CONTROL_IP_SW_RESET); /* OCP barrier */
 }
 
+static struct gpio cm_t3517_wlan_gpios[] __initdata = {
+        { 56,   GPIOF_OUT_INIT_HIGH,    "wlan pwr" },
+        { 4,    GPIOF_OUT_INIT_HIGH,    "xcvr noe" },
+};
+
+static void __init omap3_sbc_t3517_wifi_init(void)
+{
+        int err = gpio_request_array(cm_t3517_wlan_gpios,
+                                ARRAY_SIZE(cm_t3517_wlan_gpios));
+        if (err) {
+                pr_err("SBC-T3517: wl12xx gpios request failed: %d\n", err);
+                return;
+        }
+
+        gpio_export(cm_t3517_wlan_gpios[0].gpio, 0);
+        gpio_export(cm_t3517_wlan_gpios[1].gpio, 0);
+
+        msleep(100);
+        gpio_set_value(cm_t3517_wlan_gpios[1].gpio, 0);
+}
+
+static void __init omap3_sbc_t3517_legacy_init(void)
+{
+        omap3_sbc_t3x_usb_hub_init(152, "cm-t3517 usb hub");
+        omap3_sbc_t3x_usb_hub_init(98, "sb-t35 usb hub");
+        am35xx_emac_reset();
+        hsmmc2_internal_input_clk();
+        omap3_sbc_t3517_wifi_init();
+        legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 145);
+        omap_ads7846_init(1, 57, 0, NULL);
+}
+
+static void __init am3517_evm_legacy_init(void)
+{
+        am35xx_emac_reset();
+}
+
 static void __init nokia_n900_legacy_init(void)
 {
         hsmmc2_internal_input_clk();
@@ -200,15 +255,28 @@ static void __init omap4_sdp_legacy_init(void)
 static void __init omap4_panda_legacy_init(void)
 {
         omap4_panda_display_init_of();
-        legacy_init_ehci_clk("auxclk3_ck");
         legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 53);
 }
 #endif
 
+#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5)
+static struct iommu_platform_data omap4_iommu_pdata = {
+        .reset_name = "mmu_cache",
+        .assert_reset = omap_device_assert_hardreset,
+        .deassert_reset = omap_device_deassert_hardreset,
+};
+#endif
+
+#ifdef CONFIG_SOC_AM33XX
+static void __init am335x_evmsk_legacy_init(void)
+{
+        legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 31);
+}
+#endif
+
 #ifdef CONFIG_SOC_OMAP5
 static void __init omap5_uevm_legacy_init(void)
 {
-        legacy_init_ehci_clk("auxclk1_ck");
 }
 #endif
 
@@ -259,6 +327,8 @@ struct of_dev_auxdata omap_auxdata_lookup[] __initdata = {
         OF_DEV_AUXDATA("ti,omap3-padconf", 0x48002030, "48002030.pinmux", &pcs_pdata),
         OF_DEV_AUXDATA("ti,omap3-padconf", 0x480025a0, "480025a0.pinmux", &pcs_pdata),
         OF_DEV_AUXDATA("ti,omap3-padconf", 0x48002a00, "48002a00.pinmux", &pcs_pdata),
+        OF_DEV_AUXDATA("ti,omap2-iommu", 0x5d000000, "5d000000.mmu",
+                       &omap3_iommu_pdata),
         /* Only on am3517 */
         OF_DEV_AUXDATA("ti,davinci_mdio", 0x5c030000, "davinci_mdio.0", NULL),
         OF_DEV_AUXDATA("ti,am3517-emac", 0x5c000000, "davinci_emac.0",
@@ -268,6 +338,12 @@ struct of_dev_auxdata omap_auxdata_lookup[] __initdata = {
         OF_DEV_AUXDATA("ti,omap4-padconf", 0x4a100040, "4a100040.pinmux", &pcs_pdata),
         OF_DEV_AUXDATA("ti,omap4-padconf", 0x4a31e040, "4a31e040.pinmux", &pcs_pdata),
 #endif
+#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5)
+        OF_DEV_AUXDATA("ti,omap4-iommu", 0x4a066000, "4a066000.mmu",
+                       &omap4_iommu_pdata),
+        OF_DEV_AUXDATA("ti,omap4-iommu", 0x55082000, "55082000.mmu",
+                       &omap4_iommu_pdata),
+#endif
         { /* sentinel */ },
 };
 
@@ -277,6 +353,8 @@ struct of_dev_auxdata omap_auxdata_lookup[] __initdata = {
  */
 static struct pdata_init pdata_quirks[] __initdata = {
 #ifdef CONFIG_ARCH_OMAP3
+        { "compulab,omap3-sbc-t3517", omap3_sbc_t3517_legacy_init, },
+        { "compulab,omap3-sbc-t3530", omap3_sbc_t3530_legacy_init, },
         { "compulab,omap3-sbc-t3730", omap3_sbc_t3730_legacy_init, },
         { "nokia,omap3-n900", nokia_n900_legacy_init, },
         { "nokia,omap3-n9", hsmmc2_internal_input_clk, },
@@ -290,6 +368,9 @@ static struct pdata_init pdata_quirks[] __initdata = {
         { "ti,omap4-sdp", omap4_sdp_legacy_init, },
         { "ti,omap4-panda", omap4_panda_legacy_init, },
 #endif
+#ifdef CONFIG_SOC_AM33XX
+        { "ti,am335x-evmsk", am335x_evmsk_legacy_init, },
+#endif
 #ifdef CONFIG_SOC_OMAP5
         { "ti,omap5-uevm", omap5_uevm_legacy_init, },
 #endif