1 files changed, 119 insertions, 19 deletions

diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
index 3d5b24dcd9a4..b04c5f0fc278 100644
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -16,12 +16,16 @@
 #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"
 
 struct pdata_init {
         const char *compatible;
@@ -31,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;
@@ -92,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)
@@ -99,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;
 
@@ -108,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;
@@ -115,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();
@@ -160,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;
 
@@ -169,6 +189,59 @@ static void __init am3517_evm_legacy_init(void)
         omap_ctrl_writel(v, AM35XX_CONTROL_IP_SW_RESET);
         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();
+
+        if (omap_type() == OMAP2_DEVICE_TYPE_SEC) {
+                if (IS_ENABLED(CONFIG_ARM_ERRATA_430973)) {
+                        pr_info("RX-51: Enabling ARM errata 430973 workaround\n");
+                        /* set IBE to 1 */
+                        rx51_secure_update_aux_cr(BIT(6), 0);
+                } else {
+                        pr_warning("RX-51: Not enabling ARM errata 430973 workaround\n");
+                        pr_warning("Thumb binaries may crash randomly without this workaround\n");
+                }
+        }
+}
 #endif /* CONFIG_ARCH_OMAP3 */
 
 #ifdef CONFIG_ARCH_OMAP4
@@ -182,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
 
@@ -239,7 +325,10 @@ struct of_dev_auxdata omap_auxdata_lookup[] __initdata = {
 #endif
 #ifdef CONFIG_ARCH_OMAP3
         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",
@@ -249,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 */ },
 };
 
@@ -258,8 +353,10 @@ 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", hsmmc2_internal_input_clk, },
+        { "nokia,omap3-n900", nokia_n900_legacy_init, },
         { "nokia,omap3-n9", hsmmc2_internal_input_clk, },
         { "nokia,omap3-n950", hsmmc2_internal_input_clk, },
         { "isee,omap3-igep0020", omap3_igep0020_legacy_init, },
@@ -271,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