diff options
Diffstat (limited to 'drivers/misc/ti-st/st_ll.c')
| -rw-r--r-- | drivers/misc/ti-st/st_ll.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/drivers/misc/ti-st/st_ll.c b/drivers/misc/ti-st/st_ll.c index 93b4d67cc4a3..518e1b7f2f95 100644 --- a/drivers/misc/ti-st/st_ll.c +++ b/drivers/misc/ti-st/st_ll.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/ti_wilink_st.h> | 26 | #include <linux/ti_wilink_st.h> |
| 27 | 27 | ||
| 28 | /**********************************************************************/ | 28 | /**********************************************************************/ |
| 29 | |||
| 29 | /* internal functions */ | 30 | /* internal functions */ |
| 30 | static void send_ll_cmd(struct st_data_s *st_data, | 31 | static void send_ll_cmd(struct st_data_s *st_data, |
| 31 | unsigned char cmd) | 32 | unsigned char cmd) |
| @@ -53,7 +54,13 @@ static void ll_device_want_to_sleep(struct st_data_s *st_data) | |||
| 53 | 54 | ||
| 54 | /* communicate to platform about chip asleep */ | 55 | /* communicate to platform about chip asleep */ |
| 55 | kim_data = st_data->kim_data; | 56 | kim_data = st_data->kim_data; |
| 56 | pdata = kim_data->kim_pdev->dev.platform_data; | 57 | if (kim_data->kim_pdev->dev.of_node) { |
| 58 | pr_debug("use device tree data"); | ||
| 59 | pdata = dt_pdata; | ||
| 60 | } else { | ||
| 61 | pdata = kim_data->kim_pdev->dev.platform_data; | ||
| 62 | } | ||
| 63 | |||
| 57 | if (pdata->chip_asleep) | 64 | if (pdata->chip_asleep) |
| 58 | pdata->chip_asleep(NULL); | 65 | pdata->chip_asleep(NULL); |
| 59 | } | 66 | } |
| @@ -86,7 +93,13 @@ static void ll_device_want_to_wakeup(struct st_data_s *st_data) | |||
| 86 | 93 | ||
| 87 | /* communicate to platform about chip wakeup */ | 94 | /* communicate to platform about chip wakeup */ |
| 88 | kim_data = st_data->kim_data; | 95 | kim_data = st_data->kim_data; |
| 89 | pdata = kim_data->kim_pdev->dev.platform_data; | 96 | if (kim_data->kim_pdev->dev.of_node) { |
| 97 | pr_debug("use device tree data"); | ||
| 98 | pdata = dt_pdata; | ||
| 99 | } else { | ||
| 100 | pdata = kim_data->kim_pdev->dev.platform_data; | ||
| 101 | } | ||
| 102 | |||
| 90 | if (pdata->chip_awake) | 103 | if (pdata->chip_awake) |
| 91 | pdata->chip_awake(NULL); | 104 | pdata->chip_awake(NULL); |
| 92 | } | 105 | } |
