Changeset 44572


Ignore:
Timestamp:
2015-02-28T15:56:53+01:00 (3 years ago)
Author:
rmilecki
Message:

omap: complete 3.18 support

Signed-off-by: Rafał Miłecki <zajec5@…>

Location:
trunk/target/linux/omap
Files:
1 added
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/omap/patches-3.18/900-wlcore-Add-support-for-DT-platform-data.patch

    r44571 r44572  
    8989                                  const struct sdio_device_id *id) 
    9090 { 
    91 @@ -248,12 +304,9 @@ static int wl1271_probe(struct sdio_func 
     91@@ -245,12 +301,9 @@ static int wl1271_probe(struct sdio_func 
    9292        /* Use block mode for transferring over one block size of data */ 
    9393        func->card->quirks |= MMC_QUIRK_BLKSZ_FOR_BYTE_MODE; 
    9494  
    95 -       pdev_data->pdata = wl12xx_get_platform_data(); 
    96 -       if (IS_ERR(pdev_data->pdata)) { 
    97 -               ret = PTR_ERR(pdev_data->pdata); 
     95-       pdev_data.pdata = wl12xx_get_platform_data(); 
     96-       if (IS_ERR(pdev_data.pdata)) { 
     97-               ret = PTR_ERR(pdev_data.pdata); 
    9898-               dev_err(glue->dev, "missing wlan platform data: %d\n", ret); 
    99 +       pdev_data->pdata = get_platform_data(&func->dev); 
    100 +       if (!(pdev_data->pdata)) 
     99+       pdev_data.pdata = get_platform_data(&func->dev); 
     100+       if (!(pdev_data.pdata)) 
    101101                goto out_free_glue; 
    102102-       } 
     
    104104        /* if sdio can keep power while host is suspended, enable wow */ 
    105105        mmcflags = sdio_get_host_pm_caps(func); 
    106 @@ -282,7 +335,7 @@ static int wl1271_probe(struct sdio_func 
     106@@ -279,7 +332,7 @@ static int wl1271_probe(struct sdio_func 
    107107        if (!glue->core) { 
    108108                dev_err(glue->dev, "can't allocate platform_device"); 
     
    113113  
    114114        glue->core->dev.parent = &func->dev; 
    115 @@ -316,6 +369,9 @@ static int wl1271_probe(struct sdio_func 
     115@@ -313,6 +366,9 @@ static int wl1271_probe(struct sdio_func 
    116116 out_dev_put: 
    117117        platform_device_put(glue->core); 
    118118  
    119119+out_free_pdata: 
    120 +       del_platform_data(pdev_data->pdata); 
     120+       del_platform_data(pdev_data.pdata); 
    121121+ 
    122122 out_free_glue: 
    123123        kfree(glue); 
    124124  
    125 @@ -329,11 +385,14 @@ out: 
     125@@ -323,11 +379,14 @@ out: 
    126126 static void wl1271_remove(struct sdio_func *func) 
    127127 { 
    128128        struct wl12xx_sdio_glue *glue = sdio_get_drvdata(func); 
    129129+       struct wlcore_platdev_data *pdev_data = glue->core->dev.platform_data; 
    130 +       struct wl12xx_platform_data *pdata = pdev_data->pdata; 
     130+       struct wl12xx_platform_data *pdata = pdev_data.pdata; 
    131131  
    132132        /* Undo decrement done above in wl1271_probe */ 
     
    140140--- a/include/linux/wl12xx.h 
    141141+++ b/include/linux/wl12xx.h 
    142 @@ -51,11 +51,12 @@ enum { 
    143  struct wl12xx_platform_data { 
    144         void (*set_power)(bool enable); 
     142@@ -51,6 +51,7 @@ enum { 
     143 struct wl1251_platform_data { 
     144        int power_gpio; 
    145145        /* SDIO only: IRQ number if WLAN_IRQ line is used, 0 for SDIO IRQs */ 
    146146+       int gpio; 
    147147        int irq; 
    148148        bool use_eeprom; 
     149 }; 
     150@@ -59,7 +60,7 @@ struct wl12xx_platform_data { 
     151        int irq; 
    149152        int board_ref_clock; 
    150153        int board_tcxo_clock; 
Note: See TracChangeset for help on using the changeset viewer.