diff options
| author | Enric Balletbo i Serra <eballetbo@iseebcn.com> | 2014-07-22 07:08:38 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-23 20:02:49 -0400 |
| commit | 4dcc2ab3f869c5ecdcf4edfe5308767121f8a136 (patch) | |
| tree | 5f4bcbb8895bf3157fb78fdf667e88b4a70ac4ae | |
| parent | f222447ea1b70a651ec280bfb4a2fde4cbeae983 (diff) | |
drivers/misc/ti-st: Load firmware from ti-connectivity directory.
Looks like the default location for TI firmware is inside the ti-connectivity
directory, to be coherent with other firmware request used by TI drivers, load
the TIInit firmware from this directory instead of /lib/firmware directly.
Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/misc/ti-st/st_kim.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/misc/ti-st/st_kim.c b/drivers/misc/ti-st/st_kim.c index 45007be7cfb7..21c2337bad68 100644 --- a/drivers/misc/ti-st/st_kim.c +++ b/drivers/misc/ti-st/st_kim.c | |||
| @@ -244,7 +244,8 @@ static long read_local_version(struct kim_data_s *kim_gdata, char *bts_scr_name) | |||
| 244 | if (version & 0x8000) | 244 | if (version & 0x8000) |
| 245 | maj_ver |= 0x0008; | 245 | maj_ver |= 0x0008; |
| 246 | 246 | ||
| 247 | sprintf(bts_scr_name, "TIInit_%d.%d.%d.bts", chip, maj_ver, min_ver); | 247 | sprintf(bts_scr_name, "ti-connectivity/TIInit_%d.%d.%d.bts", |
| 248 | chip, maj_ver, min_ver); | ||
| 248 | 249 | ||
| 249 | /* to be accessed later via sysfs entry */ | 250 | /* to be accessed later via sysfs entry */ |
| 250 | kim_gdata->version.full = version; | 251 | kim_gdata->version.full = version; |
| @@ -287,7 +288,7 @@ static long download_firmware(struct kim_data_s *kim_gdata) | |||
| 287 | long len = 0; | 288 | long len = 0; |
| 288 | unsigned char *ptr = NULL; | 289 | unsigned char *ptr = NULL; |
| 289 | unsigned char *action_ptr = NULL; | 290 | unsigned char *action_ptr = NULL; |
| 290 | unsigned char bts_scr_name[30] = { 0 }; /* 30 char long bts scr name? */ | 291 | unsigned char bts_scr_name[40] = { 0 }; /* 40 char long bts scr name? */ |
| 291 | int wr_room_space; | 292 | int wr_room_space; |
| 292 | int cmd_size; | 293 | int cmd_size; |
| 293 | unsigned long timeout; | 294 | unsigned long timeout; |
