Permalink
Browse files

all previous changes merged to update7 sources (manually)

plus, some changes in cypress driver: used the old one and added led_disable functionality for cm9/10. also renamed led_timeout to led_timeout_ms
and a workaround in the accelerometer driver to get screen rotation working on 4.0.3 based ROMs and CM9/10...
  • Loading branch information...
gokhanmoral committed Aug 4, 2012
1 parent 7453341 commit b19aea946a101500b33ce27c667d7c3c1d186b21
Showing with 23,350 additions and 2,723 deletions.
  1. +17 −0 .gitignore
  2. +4 −1 Makefile
  3. +27 −1 arch/arm/Kconfig
  4. +5 −0 arch/arm/boot/.gitignore
  5. +9 −0 arch/arm/boot/compressed/.gitignore
  6. +9 −2 arch/arm/boot/compressed/Makefile
  7. +4 −0 arch/arm/boot/compressed/decompress.c
  8. +6 −0 arch/arm/boot/compressed/piggy.xzkern.S
  9. +3,146 −0 arch/arm/configs/siyah_defconfig
  10. +6 −0 arch/arm/include/asm/cputype.h
  11. +138 −0 arch/arm/include/asm/rwsem.h
  12. +66 −0 arch/arm/include/asm/topology.h
  13. +1 −0 arch/arm/kernel/.gitignore
  14. +1 −0 arch/arm/kernel/Makefile
  15. +0 −3 arch/arm/kernel/armksyms.c
  16. +5 −0 arch/arm/kernel/smp.c
  17. +589 −0 arch/arm/kernel/topology.c
  18. +1 −1 arch/arm/lib/Makefile
  19. +0 −211 arch/arm/lib/sha1.S
  20. +4 −0 arch/arm/mach-exynos/Kconfig
  21. +1 −0 arch/arm/mach-exynos/Makefile
  22. +194 −48 arch/arm/mach-exynos/cpufreq-4210.c
  23. +229 −4 arch/arm/mach-exynos/cpufreq.c
  24. +2 −0 arch/arm/mach-exynos/include/mach/cpufreq.h
  25. +480 −0 arch/arm/mach-exynos/legacy-hotplug.c
  26. +10 −10 arch/arm/mach-exynos/mach-u1.c
  27. +3 −0 arch/arm/mach-exynos/sec-reboot.c
  28. +211 −1 arch/arm/mach-exynos/stand-hotplug.c
  29. +115 −0 arch/arm/mach-exynos/u1-panel.c
  30. +116 −10 arch/arm/mach-exynos/u1-panel_a2.c
  31. +115 −0 arch/arm/mach-exynos/u1-panel_m2.c
  32. +25 −0 block/Kconfig.iosched
  33. +2 −0 block/Makefile
  34. +399 −0 block/sio-iosched.c
  35. +453 −0 block/vr-iosched.c
  36. +48 −0 build_kernel.sh
  37. +1 −0 crypto/Kconfig
  38. +1 −2 crypto/Makefile
  39. +3 −91 crypto/crc32c.c
  40. +1 −0 crypto/testmgr.c
  41. +47 −0 drivers/cpufreq/Kconfig
  42. +3 −0 drivers/cpufreq/Makefile
  43. +79 −0 drivers/cpufreq/cpufreq.c
  44. +6 −6 drivers/cpufreq/cpufreq_conservative.c
  45. +754 −0 drivers/cpufreq/cpufreq_hotplug.c
  46. +25 −12 drivers/cpufreq/cpufreq_interactive.c
  47. +1,011 −0 drivers/cpufreq/cpufreq_lulzactive.c
  48. +70 −43 drivers/cpufreq/cpufreq_pegasusq.c
  49. +879 −0 drivers/cpufreq/cpufreq_smartass2.c
  50. +15 −1 drivers/cpufreq/cpufreq_stats.c
  51. +16 −1 drivers/cpufreq/freq_table.c
  52. +6 −0 drivers/input/keyboard/cypress/Kconfig
  53. +1,476 −701 drivers/input/keyboard/cypress/cypress-touchkey.c
  54. +300 −301 drivers/input/keyboard/cypress/issp_driver_routines.c
  55. +1 −2 drivers/input/keyboard/cypress/issp_extern.h
  56. +489 −518 drivers/input/keyboard/cypress/issp_main.c
  57. +28 −0 drivers/input/keyboard/cypress/u1-cypress-gpio.h
  58. +42 −0 drivers/input/keyboard/gpio_keys.c
  59. +102 −12 drivers/input/touchscreen/mxt224_u1.c
  60. +7 −0 drivers/media/video/samsung/mali/Kconfig
  61. +6 −1 drivers/media/video/samsung/mali/Makefile
  62. +147 −0 drivers/media/video/samsung/mali/common/gpu_clock_control.c
  63. +14 −0 drivers/media/video/samsung/mali/common/gpu_clock_control.h
  64. +93 −0 drivers/media/video/samsung/mali/common/gpu_voltage_control.c
  65. +16 −0 drivers/media/video/samsung/mali/common/gpu_voltage_control.h
  66. +0 −1 drivers/media/video/samsung/mali/common/mali_osk.h
  67. +5 −0 drivers/media/video/samsung/mali/linux/mali_kernel_linux.c
  68. +10 −0 drivers/media/video/samsung/mali/linux/mali_kernel_pm.c
  69. +1 −10 drivers/media/video/samsung/mali/linux/mali_osk_notification.c
  70. +1 −1 drivers/media/video/samsung/mali/platform/mali_platform.h
  71. +65 −34 drivers/media/video/samsung/mali/platform/orion-m400/mali_platform_dvfs.c
  72. +3 −0 drivers/mmc/card/block.c
  73. +1 −1 drivers/mmc/host/mshci.c
  74. +4 −1 drivers/motor/max8997_vibrator.c
  75. +47 −0 drivers/motor/tspdrv.c
  76. +3 −24 drivers/net/wireless/bcmdhd/src/dhd/sys/dhd_linux.c
  77. +1 −1 drivers/power/Makefile
  78. +71 −0 drivers/power/charge_current.c
  79. +17 −0 drivers/power/charge_current.h
  80. +3 −3 drivers/power/max17042_fuelgauge_u1.c
  81. +42 −15 drivers/power/sec_battery_u1.c
  82. +35 −36 drivers/power/smb328_charger.c
  83. +7 −0 drivers/samsung/Kconfig
  84. +1 −0 drivers/samsung/Makefile
  85. +31 −0 drivers/samsung/j4fs/Makefile
  86. +2,059 −0 drivers/samsung/j4fs/fsd_common.c
  87. +493 −0 drivers/samsung/j4fs/j4fs.h
  88. +1,525 −0 drivers/samsung/j4fs/j4fs_kernel.c
  89. +240 −0 drivers/samsung/j4fs/llid_kernel.c
  90. +4 −0 drivers/sensor/cm3663.c
  91. +6 −0 drivers/sensor/k3dh.c
  92. +2 −0 drivers/tty/vt/.gitignore
  93. +80 −5 drivers/usb/gadget/android.c
  94. +11 −11 drivers/usb/gadget/f_mtp_samsung.c
  95. +348 −119 drivers/video/samsung/ld9040.c
  96. +116 −0 drivers/video/samsung/ld9042_panel.h
  97. +108 −2 drivers/video/samsung/mdnie.c
  98. +3 −0 drivers/video/samsung/mdnie.h
  99. +12 −1 drivers/video/samsung/mdnie_table_u1.h
  100. +6 −0 include/linux/cpufreq.h
  101. +2 −0 include/linux/crc32.h
  102. +1 −1 include/linux/cryptohash.h
  103. +1 −0 include/linux/init.h
  104. +8 −0 include/linux/kernel.h
  105. +1 −1 include/linux/mm.h
  106. +1 −0 include/linux/sched.h
  107. +8 −2 include/linux/slab.h
  108. +300 −0 include/linux/slqb_def.h
  109. +9 −0 include/linux/wakelock.h
  110. +6 −1 init/Kconfig
  111. +1 −0 init/main.c
  112. +6 −0 kernel/.gitignore
  113. +5 −0 kernel/power/fbearlysuspend.c
  114. +11 −11 kernel/power/main.c
  115. +278 −29 kernel/power/wakelock.c
  116. +16 −8 kernel/sched_fair.c
  117. +1 −1 kernel/sched_features.h
  118. +36 −0 kernel/sysctl.c
  119. +6 −0 lib/.gitignore
  120. +49 −4 lib/Kconfig
  121. +21 −1 lib/Kconfig.debug
  122. +955 −326 lib/crc32.c
  123. +48 −8 lib/crc32defs.h
  124. +61 −20 lib/gen_crc32table.c
  125. +158 −54 lib/sha1.c
  126. +47 −0 mkshbootimg.py
  127. +1 −0 mm/Makefile
  128. +3,816 −0 mm/slqb.c
  129. +1 −1 mm/slub.c
  130. BIN payload.tar
  131. BIN recovery.tar.xz
  132. +11 −0 scripts/.gitignore
  133. +1 −1 scripts/Makefile.lib
  134. +1 −0 scripts/basic/.gitignore
  135. +1 −1 scripts/gen_initramfs_list.sh
  136. +23 −0 scripts/kconfig/.gitignore
  137. +4 −0 scripts/mod/.gitignore
  138. +1 −1 scripts/xz_wrap.sh
  139. +4 −4 sound/soc/codecs/mc1n2/mc1n2.c
  140. +10 −0 usr/.gitignore
View
@@ -23,6 +23,7 @@
*.symtypes
*.order
modules.builtin
+!drivers/mfd/cg2900/modules.order
*.elf
*.bin
*.gz
@@ -44,6 +45,7 @@ modules.builtin
/System.map
/Module.markers
/Module.symvers
+/zImage
#
# git files that we don't want to ignore even it they are dot-files
@@ -58,6 +60,16 @@ include/config
include/linux/version.h
include/generated
arch/*/include/generated
+zImage
+include/asm
+include/asm-arm
+include/config
+include/linux/autoconf.h
+include/linux/compile.h
+include/linux/version.h
+include/linux/utsrelease.h
+include/linux/bounds.h
+include/generated
# stgit generated dirs
patches-*
@@ -79,3 +91,8 @@ GTAGS
*.orig
*~
\#*#
+_t32
+_tool
+
+Module.symvers
+
View
@@ -368,7 +368,10 @@ KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
-fno-strict-aliasing -fno-common \
-Werror-implicit-function-declaration \
-Wno-format-security \
- -fno-delete-null-pointer-checks
+ -fno-delete-null-pointer-checks \
+ -marm -march=armv7-a -mtune=cortex-a9 \
+ -funswitch-loops -fpredictive-commoning \
+ -fmodulo-sched -fmodulo-sched-allow-regmoves
KBUILD_AFLAGS_KERNEL :=
KBUILD_CFLAGS_KERNEL :=
KBUILD_AFLAGS := -D__ASSEMBLY__
View
@@ -20,6 +20,7 @@ config ARM
select HAVE_KERNEL_GZIP
select HAVE_KERNEL_LZO
select HAVE_KERNEL_LZMA
+ select HAVE_KERNEL_XZ
select HAVE_IRQ_WORK
select HAVE_PERF_EVENTS
select PERF_USE_VMALLOC
@@ -135,10 +136,10 @@ config GENERIC_LOCKBREAK
config RWSEM_GENERIC_SPINLOCK
bool
- default y
config RWSEM_XCHGADD_ALGORITHM
bool
+ def_bool y
config ARCH_HAS_ILOG2_U32
bool
@@ -1413,6 +1414,31 @@ config SMP_ON_UP
If you don't know what to do here, say Y.
+config ARM_CPU_TOPOLOGY
+ bool "Support cpu topology definition"
+ depends on SMP && CPU_V7
+ default y
+ help
+ Support ARM cpu topology definition. The MPIDR register defines
+ affinity between processors which is then used to describe the cpu
+ topology of an ARM System.
+
+config SCHED_MC
+ bool "Multi-core scheduler support"
+ depends on ARM_CPU_TOPOLOGY
+ help
+ Multi-core scheduler support improves the CPU scheduler's decision
+ making when dealing with multi-core CPU chips at a cost of slightly
+ increased overhead in some places. If unsure say N here.
+
+config SCHED_SMT
+ bool "SMT scheduler support"
+ depends on ARM_CPU_TOPOLOGY
+ help
+ Improves the CPU scheduler's decision making when dealing with
+ MultiThreading at a cost of slightly increased overhead in some
+ places. If unsure say N here.
+
config HAVE_ARM_SCU
bool
depends on SMP
View
@@ -0,0 +1,5 @@
+Image
+zImage
+xipImage
+bootpImage
+uImage
@@ -0,0 +1,9 @@
+font.c
+lib1funcs.S
+piggy.gzip
+piggy.lzo
+piggy.lzma
+vmlinux
+vmlinux.lds
+piggy.xzkern
+ashldi3.S
@@ -87,13 +87,14 @@ SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/
suffix_$(CONFIG_KERNEL_GZIP) = gzip
suffix_$(CONFIG_KERNEL_LZO) = lzo
suffix_$(CONFIG_KERNEL_LZMA) = lzma
+suffix_$(CONFIG_KERNEL_XZ) = xzkern
targets := vmlinux vmlinux.lds \
piggy.$(suffix_y) piggy.$(suffix_y).o \
font.o font.c head.o misc.o $(OBJS)
# Make sure files are removed during clean
-extra-y += piggy.gzip piggy.lzo piggy.lzma lib1funcs.S
+extra-y += piggy.gzip piggy.lzo piggy.lzma piggy.xzkern lib1funcs.S ashldi3.S
ifeq ($(CONFIG_FUNCTION_TRACER),y)
ORIG_CFLAGS := $(KBUILD_CFLAGS)
@@ -125,6 +126,12 @@ lib1funcs = $(obj)/lib1funcs.o
$(obj)/lib1funcs.S: $(srctree)/arch/$(SRCARCH)/lib/lib1funcs.S FORCE
$(call cmd,shipped)
+# For __aeabi_llsl
+ashldi3 = $(obj)/ashldi3.o
+
+$(obj)/ashldi3.S: $(srctree)/arch/$(SRCARCH)/lib/ashldi3.S FORCE
+ $(call cmd,shipped)
+
# We need to prevent any GOTOFF relocs being used with references
# to symbols in the .bss section since we cannot relocate them
# independently from the rest at run time. This can be achieved by
@@ -139,7 +146,7 @@ bad_syms=$$($(CROSS_COMPILE)nm $@ | sed -n 's/^.\{8\} [bc] \(.*\)/\1/p') && \
echo "$$bad_syms" >&2; rm -f $@; false )
$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.$(suffix_y).o \
- $(addprefix $(obj)/, $(OBJS)) $(lib1funcs) FORCE
+ $(addprefix $(obj)/, $(OBJS)) $(lib1funcs) $(ashldi3) FORCE
$(call if_changed,ld)
@$(check_for_bad_syms)
@@ -44,6 +44,10 @@ extern void error(char *);
#include "../../../../lib/decompress_unlzma.c"
#endif
+#ifdef CONFIG_KERNEL_XZ
+#include "../../../../lib/decompress_unxz.c"
+#endif
+
int do_decompress(u8 *input, int len, u8 *output, void (*error)(char *x))
{
return decompress(input, len, NULL, NULL, output, NULL, error);
@@ -0,0 +1,6 @@
+ .section .piggydata,#alloc
+ .globl input_data
+input_data:
+ .incbin "arch/arm/boot/compressed/piggy.xzkern"
+ .globl input_data_end
+input_data_end:
Oops, something went wrong.

0 comments on commit b19aea9

Please sign in to comment.