Permalink
Browse files

Merges with s2 kernel

  • Loading branch information...
1 parent 472cf30 commit ab80f66478ce49efa7cea61a5aed8b7edd5be64a @gokhanmoral committed Nov 18, 2012
Showing with 7,381 additions and 553 deletions.
  1. +3,226 −0 arch/arm/configs/siyah_s2_defconfig
  2. +23 −0 arch/arm/mach-exynos/board-gps-gsd4t.c
  3. +1 −1 arch/arm/mach-exynos/busfreq.c
  4. +7 −1 arch/arm/mach-exynos/clock-exynos4210.c
  5. +195 −50 arch/arm/mach-exynos/cpufreq-4210.c
  6. +8 −2 arch/arm/mach-exynos/cpufreq.c
  7. +3 −0 arch/arm/mach-exynos/include/mach/gpio-u1.h
  8. +71 −16 arch/arm/mach-exynos/mach-u1.c
  9. +0 −5 arch/arm/mach-exynos/midas-tsp.c
  10. +220 −2 arch/arm/mach-exynos/stand-hotplug.c
  11. +1 −1 arch/arm/mach-exynos/u1-gpio.c
  12. +115 −0 arch/arm/mach-exynos/u1-panel.c
  13. +116 −18 arch/arm/mach-exynos/u1-panel_a2.c
  14. +115 −8 arch/arm/mach-exynos/u1-panel_m2.c
  15. +1 −0 crypto/testmgr.c
  16. +8 −0 drivers/cpufreq/Kconfig
  17. +1 −0 drivers/cpufreq/Makefile
  18. +6 −6 drivers/cpufreq/cpufreq_conservative.c
  19. +25 −10 drivers/cpufreq/cpufreq_interactive.c
  20. +1,063 −0 drivers/cpufreq/cpufreq_lulzactive.c
  21. +110 −41 drivers/cpufreq/cpufreq_lulzactiveq.c
  22. +4 −0 drivers/input/keyboard/gpio_keys.c
  23. +1 −1 drivers/input/touchscreen/Kconfig
  24. +752 −11 drivers/input/touchscreen/mxt224_u1.c
  25. +1 −0 drivers/media/video/samsung/Makefile
  26. +6 −1 drivers/media/video/samsung/mali/linux/mali_kernel_linux.c
  27. +11 −11 drivers/media/video/samsung/mali/platform/mali_platform.h
  28. +201 −79 drivers/media/video/samsung/mali/platform/orion-m400/mali_platform.c
  29. +513 −105 drivers/media/video/samsung/mali/platform/orion-m400/mali_platform_dvfs.c
  30. +2 −0 drivers/media/video/samsung/mali_r3p0_lsi/common/mali_osk.h
  31. +1 −1 drivers/media/video/samsung/mali_r3p0_lsi/linux/mali_kernel_linux.c
  32. +13 −11 drivers/media/video/samsung/mali_r3p0_lsi/platform/mali_platform.h
  33. +281 −101 drivers/media/video/samsung/mali_r3p0_lsi/platform/orion-m400/mali_platform.c
  34. +1 −1 drivers/media/video/samsung/mali_r3p0_lsi/platform/orion-m400/mali_platform_dvfs.c
  35. +0 −40 drivers/media/video/samsung/mali_r3p0_lsi/platform/pegasus-m400/mali_platform.c
  36. +1 −0 drivers/media/video/samsung/mali_r3p0_lsi/platform/pegasus-m400/mali_platform_dvfs.c
  37. +18 −4 drivers/misc/cpu_undervolting.c
  38. +91 −3 drivers/motor/max8997_vibrator.c
  39. +2 −2 drivers/power/max17042_fuelgauge_u1.c
  40. +11 −11 drivers/power/sec_battery_u1.c
  41. +4 −0 drivers/sensor/cm3663.c
  42. +6 −0 drivers/sensor/k3dh.c
  43. +1 −1 drivers/video/samsung/Kconfig
  44. +116 −0 drivers/video/samsung/ld9042_panel.h
  45. +3 −3 drivers/video/samsung/mdnie_table_u1.h
  46. +6 −0 drivers/video/samsung/mdniemod.c
  47. +5 −0 include/linux/i2c/mxt224_u1.h
  48. +4 −2 kernel/power/wakelock.c
  49. +11 −4 kernel/sysctl.c

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -87,4 +87,27 @@ static int __init gps_gsd4t_init(void)
return 0;
}
+#ifdef CONFIG_CPU_EXYNOS4210
+int u1_gps_ntt_init(void)
+{
+ //int isntt = 1;
+ //if(isntt!=1) return 0;
+ s3c_gpio_cfgpin(GPIO_GPS_PWR_EN, S3C_GPIO_SLP_INPUT);
+ s3c_gpio_setpull(GPIO_GPS_PWR_EN, S3C_GPIO_PULL_DOWN);
+ gpio_unexport(GPIO_GPS_PWR_EN);
+ gpio_free(GPIO_GPS_PWR_EN);
+
+ if (gpio_request(GPIO_GPS_PWR_EN_NTT, "GPS_PWR_EN"))
+ WARN(1, "fail to request gpio (GPS_PWR_EN)\n");
+ s3c_gpio_setpull(GPIO_GPS_PWR_EN_NTT, S3C_GPIO_PULL_NONE);
+ s3c_gpio_cfgpin(GPIO_GPS_PWR_EN_NTT, S3C_GPIO_OUTPUT);
+ gpio_direction_output(GPIO_GPS_PWR_EN_NTT, 0);
+ gpio_export(GPIO_GPS_PWR_EN_NTT, 1);
+ sysfs_remove_link(&gps_dev->kobj,"GPS_PWR_EN");
+ gpio_export_link(gps_dev, "GPS_PWR_EN", GPIO_GPS_PWR_EN_NTT);
+ return 0;
+
+}
+#endif
+
device_initcall(gps_gsd4t_init);
@@ -101,7 +101,7 @@ struct busfreq_table {
unsigned int clk_dmcdiv;
};
-static struct busfreq_table exynos4_busfreq_table[] = {
+struct busfreq_table exynos4_busfreq_table[] = {
{LV_0, 400000, 1100000, 0, 0},
{LV_1, 267000, 1000000, 0, 0},
#ifdef CONFIG_BUSFREQ_L2_160M
@@ -277,9 +277,15 @@ static int exynos4210_epll_set_rate(struct clk *clk, unsigned long rate)
static struct vpll_div_data vpll_div_4210[] = {
{54000000, 3, 53, 3, 1024, 0, 17, 0},
+ {66000000, 3, 63, 3, 1024, 0, 20, 1},
{108000000, 3, 53, 2, 1024, 0, 17, 0},
- {260000000, 3, 63, 1, 1950, 0, 20, 1},
+ {160000000, 2, 53, 2, 1024, 1, 1, 1},
+ {200000000, 2, 63, 2, 1024, 1, 1, 1},
+ {267000000, 3, 63, 1, 1950, 0, 20, 1},
{330000000, 2, 53, 1, 2048, 1, 1, 1},
+ {400000000, 2, 63, 1, 2417, 1, 1, 1},
+ {440000000, 3, 53, 0, 2417, 0, 17, 0},
+ {520000000, 3, 63, 0, 2417, 0, 20, 1},
#ifdef CONFIG_EXYNOS4_MSHC_VPLL_46MHZ
{370882812, 3, 44, 0, 2417, 0, 14, 0},
#endif
Oops, something went wrong.

0 comments on commit ab80f66

Please sign in to comment.