summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishal Mahaveer2016-01-15 16:01:03 -0600
committerVishal Mahaveer2016-01-15 16:01:03 -0600
commit46816fa9485a35e058d815e227fb8b2f2f21878a (patch)
treeb1f80aba07bcb77a4c129a75915acb7f54d8e9d2 /jacinto6
parent4933f785adc522fc17b479ac99b2f62b39748721 (diff)
downloaddevice-ti-proprietary-open-46816fa9485a35e058d815e227fb8b2f2f21878a.tar.gz
device-ti-proprietary-open-46816fa9485a35e058d815e227fb8b2f2f21878a.tar.xz
device-ti-proprietary-open-46816fa9485a35e058d815e227fb8b2f2f21878a.zip
jacinto6: sgx-bin: sgx binaries and KM source update
Updating SGX binaries and kernel module source of the latest DDK. Includes fix for warnings on CONFIG_DEBUG_ATOMIC_SLEEP kernel config. Change-Id: Idae93d5bccccabe087711909f714375624dd6f20 Signed-off-by: Gowtham Tammana <g-tammana@ti.com> Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
Diffstat (limited to 'jacinto6')
-rw-r--r--jacinto6/sgx.tgzbin2786364 -> 2784441 bytes
-rw-r--r--jacinto6/sgx_src/eurasia_km/services4/system/omap/sgxfreq.c18
2 files changed, 13 insertions, 5 deletions
diff --git a/jacinto6/sgx.tgz b/jacinto6/sgx.tgz
index 8574397..e7b60f1 100644
--- a/jacinto6/sgx.tgz
+++ b/jacinto6/sgx.tgz
Binary files differ
diff --git a/jacinto6/sgx_src/eurasia_km/services4/system/omap/sgxfreq.c b/jacinto6/sgx_src/eurasia_km/services4/system/omap/sgxfreq.c
index 8df1505..5159fd4 100644
--- a/jacinto6/sgx_src/eurasia_km/services4/system/omap/sgxfreq.c
+++ b/jacinto6/sgx_src/eurasia_km/services4/system/omap/sgxfreq.c
@@ -441,16 +441,16 @@ int sgxfreq_init(struct device *dev)
441 return -EINVAL; 441 return -EINVAL;
442#endif 442#endif
443 443
444#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0))
444 rcu_read_lock(); 445 rcu_read_lock();
445 446
446#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0))
447 sfd.freq_cnt = sfd.pdata->opp_get_opp_count(dev); 447 sfd.freq_cnt = sfd.pdata->opp_get_opp_count(dev);
448#else 448#else
449 ret = of_init_opp_table(dev); 449 ret = of_init_opp_table(dev);
450 if (ret) { 450 if (ret) {
451 pr_err("sgxfreq: failed to init OPP table: %d\n", ret); 451 pr_err("sgxfreq: failed to init OPP table: %d\n", ret);
452 return -EINVAL; 452 return -EINVAL;
453 } 453 }
454#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0)) 454#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0))
455 sfd.freq_cnt = opp_get_opp_count(dev); 455 sfd.freq_cnt = opp_get_opp_count(dev);
456#else 456#else
@@ -459,7 +459,9 @@ int sgxfreq_init(struct device *dev)
459#endif 459#endif
460 if (sfd.freq_cnt < 1) { 460 if (sfd.freq_cnt < 1) {
461 pr_err("sgxfreq: failed to get operating frequencies\n"); 461 pr_err("sgxfreq: failed to get operating frequencies\n");
462#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0))
462 rcu_read_unlock(); 463 rcu_read_unlock();
464#endif
463 return -ENODEV; 465 return -ENODEV;
464 } 466 }
465 467
@@ -485,7 +487,9 @@ int sgxfreq_init(struct device *dev)
485#endif 487#endif
486 sfd.freq_list = kmalloc(sfd.freq_cnt * sizeof(unsigned long), GFP_ATOMIC); 488 sfd.freq_list = kmalloc(sfd.freq_cnt * sizeof(unsigned long), GFP_ATOMIC);
487 if (!sfd.freq_list) { 489 if (!sfd.freq_list) {
490#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0))
488 rcu_read_unlock(); 491 rcu_read_unlock();
492#endif
489 return -ENOMEM; 493 return -ENOMEM;
490 } 494 }
491 495
@@ -500,14 +504,18 @@ int sgxfreq_init(struct device *dev)
500 opp = dev_pm_opp_find_freq_ceil(dev, &freq); 504 opp = dev_pm_opp_find_freq_ceil(dev, &freq);
501#endif 505#endif
502 if (IS_ERR_OR_NULL(opp)) { 506 if (IS_ERR_OR_NULL(opp)) {
507#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0))
503 rcu_read_unlock(); 508 rcu_read_unlock();
509#endif
504 kfree(sfd.freq_list); 510 kfree(sfd.freq_list);
505 return -ENODEV; 511 return -ENODEV;
506 } 512 }
507 sfd.freq_list[i] = freq; 513 sfd.freq_list[i] = freq;
508 freq++; 514 freq++;
509 } 515 }
516#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0))
510 rcu_read_unlock(); 517 rcu_read_unlock();
518#endif
511 519
512#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) 520#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
513 sfd.core_clk = devm_clk_get(dev, "dpll_core_h14x2_ck"); 521 sfd.core_clk = devm_clk_get(dev, "dpll_core_h14x2_ck");