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

[karo-tx-linux.git] / arch / arm / mach-omap2 / pdata-quirks.c

diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
index 58144779dec4c118aac35f60cab6f0c33a68929a..e781e4fae13a92fd68aa04ac891b9731bc8fa60e 100644 (file)
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -150,6 +150,21 @@ static struct platform_device wl18xx_device = {
        }
 };
 
+static struct ti_st_plat_data wilink7_pdata = {
+       .nshutdown_gpio = 162,
+       .dev_name = "/dev/ttyO1",
+       .flow_cntrl = 1,
+       .baud_rate = 300000,
+};
+
+static struct platform_device wl128x_device = {
+       .name   = "kim",
+       .id     = -1,
+       .dev    = {
+               .platform_data = &wilink7_pdata,
+       }
+};
+
 static struct platform_device btwilink_device = {
        .name   = "btwilink",
        .id     = -1,
@@ -265,7 +280,7 @@ static void __init nokia_n900_legacy_init(void)
                        pr_warn("Thumb binaries may crash randomly without this workaround\n");
                }
 
-               pr_info("RX-51: Registring OMAP3 HWRNG device\n");
+               pr_info("RX-51: Registering OMAP3 HWRNG device\n");
                platform_device_register(&omap3_rom_rng_device);
 
        }
@@ -276,6 +291,13 @@ static void __init omap3_tao3530_legacy_init(void)
        hsmmc2_internal_input_clk();
 }
 
+static void __init omap3_logicpd_torpedo_init(void)
+{
+       omap3_gpio126_127_129();
+       platform_device_register(&wl128x_device);
+       platform_device_register(&btwilink_device);
+}
+
 /* omap3pandora legacy devices */
 #define PANDORA_WIFI_IRQ_GPIO          21
 #define PANDORA_WIFI_NRESET_GPIO       23
@@ -503,7 +525,7 @@ static struct pdata_init pdata_quirks[] __initdata = {
        { "nokia,omap3-n950", hsmmc2_internal_input_clk, },
        { "isee,omap3-igep0020-rev-f", omap3_igep0020_rev_f_legacy_init, },
        { "isee,omap3-igep0030-rev-g", omap3_igep0030_rev_g_legacy_init, },
-       { "logicpd,dm3730-torpedo-devkit", omap3_gpio126_127_129, },
+       { "logicpd,dm3730-torpedo-devkit", omap3_logicpd_torpedo_init, },
        { "ti,omap3-evm-37xx", omap3_evm_legacy_init, },
        { "ti,am3517-evm", am3517_evm_legacy_init, },
        { "technexion,omap3-tao3530", omap3_tao3530_legacy_init, },