shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-03 17:51:57 +09:00
Code Issues Packages Projects Releases Wiki Activity
380,586 Commits 55 Branches 2,486 Tags
7302e7a5e48a7a1880f56d705ebf4e0dc7da04d3
Commit Graph

380586 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mauro Ribeiro
7302e7a5e4 aml_logo: small fix on the res name 
Change-Id: I9fc6820d418f8c7afe13916c7306d0a103830d13
 2015-01-09 19:10:58 -02:00
Mauro Ribeiro
a8c8ac110a Merge branch 'c1_working' into odroidc-3.10.y 2015-01-09 16:04:54 -02:00
Mauro Ribeiro
981b06637b Merge branch 'odroidc-3.10.y' into c1_working 2015-01-09 16:02:27 -02:00
Mauro Ribeiro
2961993bfd Merge "restore the kernel version handling back to 3.10 stocks." into odroidc-3.10.y 2015-01-10 02:57:10 +09:00
Mauro Ribeiro
b81388f6f6 restore the kernel version handling back to 3.10 stocks. 
Change-Id: I67b9a8c82220169dc6c6a38c3c6d3f158233ebd9
 2015-01-09 14:48:51 -02:00
Mauro Ribeiro
152ecbe4f4 hdmi: add the following extra resolutions: 
1366x768p60hz
1600x900p60hz
800x600p60hz
1024x600p60hz
1024x768p60hz
1360x768p60hz
1440x900p60hz
1680x1050p60hz

Change-Id: I0ef660f1f603d0dcd731980b2bccce3a54befa3f
 2015-01-09 12:51:13 -02:00
Mauro Ribeiro
3b322d3e7d hdmi_tx: kill pwm touch's here 
Change-Id: Ifde23d99e7713cc16a609dad88ab83d5258ca134
 2015-01-09 10:42:26 -02:00
Mauro Ribeiro
62f4c5c984 defconfig: enable mce usb 
Change-Id: Id6d8758443fd8732c049b3c077934398f53398dd
 2015-01-09 10:41:31 -02:00
Mauro Ribeiro
d7db972644 Merge tag 'v3.10.44' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into c1_working 
This is the 3.10.44 stable release
 2015-01-09 10:36:15 -02:00
Mauro Ribeiro
5864417631 restore the kernel version handling back to 3.10 stocks. 
Change-Id: I67b9a8c82220169dc6c6a38c3c6d3f158233ebd9
 2015-01-08 07:50:39 -02:00
Mauro Ribeiro
419791335d defconfig: enable AMAUDIO 
Change-Id: I246ce8a127abe1041fffc8642e00079847aed57b
 2015-01-05 14:49:16 -02:00
alex.cao
6536f5462e pd #100847:Change mx4.4 vpp_process_speed_check the same as mx4.2 
Change-Id: Ibe3baefb5cd6bb962201765b4e6d48da58550af0
 2015-01-05 14:49:15 -02:00
alex.cao
e0f849209e pd #100665:Make vpp in vskip mode when vide is not full screen && 
osd postblend && video preblend

Change-Id: Id0d3f5c68073f2042d5581a32271e565978f1567
 2015-01-05 14:49:15 -02:00
jintao.xu
df1eb46770 PD #99375(94807): fix ionvideo pts error 
Change-Id: I45af0cfe0d66f90d85eba8c292b1a8f645b2b4a4
 2015-01-05 14:49:14 -02:00
tao.zeng
662fa7b663 PD #99163(97320): Fix bug of can't change frequent after enable 'change-frequent-only' 
Change-Id: I385d7afd2a07d3ddd5a8dc80458e3355e1c43cb8
 2015-01-05 14:49:14 -02:00
hui.zhang
3550463a74 pd#99070(96514), add cropping process for right 
Change-Id: I7d4591e83ed0c357187ce1bf085fbf7f7b9d67a7
 2015-01-05 14:49:14 -02:00
hui.zhang
104b780846 pd#99113(98057),not to do hevc recover when vbuf level is very low. it probably reached end of stream 
Change-Id: I660dcd2c73670e4c47754bb6715519aeaa204577
 2015-01-05 14:49:13 -02:00
tao.dong
6d0015cfed PD#99059: default use bicubic osd scale filter parameter 
Change-Id: Ieb2c5441a155909f734cc4ed2252fce8c1713209

Conflicts:

	drivers/amlogic/display/osd/osd_hw.c

Change-Id: Ieb2c5441a155909f734cc4ed2252fce8c1713209
 2015-01-05 14:48:55 -02:00
ke.gong
4fe74a14ab PD #99138(97419): Add video aspect ratio match function. 
Squashed commit of the following:

commit f875db38ab7b0e9f8283130896db3bc3a4c5a0de
Author: ke.gong <ke.gong@amlogic.com>
Date:   Tue Sep 16 15:12:34 2014 +0800

    PD #97419: Remove match_method interface and add match modes to screen_mode.

commit 3206b3fed3ed9c5797f07376ba6633722aeacc5f
Author: ke.gong <ke.gong@amlogic.com>
Date:   Tue Sep 16 11:34:23 2014 +0800

    PD #97419: Add video aspect ratio match function.

    Add /sys/class/video/match_method interface.
    0:VIDEO_MATCH_NONE
    1:VIDEO_MATCH_IGNORE
    2:VIDEO_MATCH_LETTER_BOX
    3:VIDEO_MATCH_PAN_SCAN
    4:VIDEO_MATCH_COMBINED

Change-Id: I1a43b4c9b09a34be12f68f06a7a8a3760de37dd4
 2015-01-05 12:04:00 -02:00
Mauro Ribeiro
49183c0aee PD #98820(95658): hdmitx: reset ENC & VPU to prevent Async 
There is a small async FIFO between VENC and HDMI TX module.
We need to make sure hdmi clk stable, then enable FIFO.
Otherwise, there maybe exist RD/WR asynchronous issue and
cause display abnormally.

Conflicts:

arch/arm/mach-meson8/hdmi_tx_hw/hdmi_tx_hw.c

Change-Id: I7ac80fd582a3ef80fd3bdf4830f5d08cd2d15e70
 2015-01-05 12:03:27 -02:00
tao.zeng
e93d34d925 PD #98831(97021): fit cpu frequent out of avaliable table to proper cooling state 
When you set a value scaling_max_freq of cpu frequent which is not in
scaling_avaliable_table, thermal governor will got a wrong cooling_state
when doing step_wise and force update state of each trip point.This will
cause scaling_max_freq loop between each trip point limitation.

Change-Id: I8d04761474b02868db824157e0d549ed76341c80
 2015-01-05 11:55:50 -02:00
wenbiao.zhang
c7456bb262 PD#98722(98613 and 98479): don't call osd_ioctl to avoid scale set fail 
Change-Id: I0a69a3ce06d237937d06b90be266fc757ef6256e
 2015-01-05 11:52:21 -02:00
tao.zeng
bc4d6b2f94 PD #98603(98115): Increase delay to 500us after reset PLL for lock error under high temperature 
Change-Id: If553552029e9ec7e6ec5a743a6076f692e2a9e0d
 2015-01-05 11:52:09 -02:00
gangfeng.xu
f641f64c51 PD#98604(98390)fix audio memleak for monkeytest from Xujian 
Change-Id: I96c7752521f921f0aa519901842863a430efb2f1
 2015-01-05 11:51:00 -02:00
le.yang
35470d617e PD#98650(97418)::DVB:To switch the pcrmaster to vmaster in the wrong pcr. 
change bug ID

Squashed commit of the following:

commit 663cace350341f87e749391de00ac7569999cbe8
Author: le.yang <le.yang@amlogic.com>
Date:   Mon Oct 27 16:09:18 2014 +0800

    PD #97418:
    (1)Resolve the pcr can't referrence case.
    (2)Optimize the start playing speed.

    Change-Id: I046ca9c1a8af070fb118c452b74e68c8c446e1e5

commit 209846c4423af6119e9e06f2524aa1f8d0eb80ce
Author: le.yang <le.yang@amlogic.com>
Date:   Fri Oct 24 15:52:44 2014 +0800

    PD #97418:To switch the pcrmaster to vmaster in the wrong pcr.

    Change-Id: I89ee41b46faa8018b7882974f706326f6485e216

Change-Id: I641c771e3a8d4bd6bd7555ad8c195366c2b6daf7
 2015-01-05 11:50:38 -02:00
le.yang
f4ee3bf45d PD #98650(97418):merge pcr master . 
http://10.8.9.5/kernel/common/commit/?h=amlogic-pd-93123-01&id=eb9f5e55d99857452bdfbf805d43e46098629d89
http://10.8.9.5/kernel/common/commit/?h=amlogic-pd-97418&id=67606625f74d81ca18430a05e96fded80a5cbfe3
http://10.8.9.5/kernel/common/commit/?h=amlogic-pd-97418-1&id=dec32e9944bc547974f1e7d40f1414664052587e

Change-Id: I0788b74d16a9d78575c03703af1683d02d89190c

PD #98650(97418):the compile problem in M6

Change-Id: Ia69ba55f5c2feb1a495136a993103e9f3fe33463
 2015-01-05 11:49:43 -02:00
alex.cao
5df72f4e83 PD#99098(98799):Fix sys pll mode for m8baby project 
commit cb0f984b6a81a5ebffa13b812b6b41148f8d54db
Author: tao.zeng <tao.zeng@amlogic.com>
Date:   Wed Oct 29 14:56:01 2014 +0800

    PD #98799: Enable Fix sys pll mode for ALL m8baby project

    Change-Id: I55058f0e54d8d49afe6463c5a649afab67c5efb8

commit de9c47904f3d717d1b8034ea06bc3784141e9482
Author: tao.zeng <tao.zeng@amlogic.com>
Date:   Tue Oct 28 10:49:42 2014 +0800

    PD #98799: Import fix syspll mode for cpu frequent scaling

    If we FIX syspll to a certain frequent and only change OD or external
    divider to get different frequent, this mechanism is more stable when
    chip temperature is over than 80 Celsius.

    Note: this feature can only be opened based on M8bay right now

Change-Id: Ieebe2e645ffc594f5229ade97c2b3420b29b7ffb
 2015-01-05 11:05:24 -02:00
Mauro Ribeiro
537312b443 hid: revert everything back to 3.10 original so the led's can work: 
Change-Id: I35138370f4e9e606efced4584ba4811702e6ada0
 2015-01-05 07:27:19 -02:00
Mauro Ribeiro
91dc53ed72 defconfig: enabling PS3 Eye camera 
Change-Id: I5dae9e596d347a96f2fabd3d3c1c5b31126c7ce0
 2015-01-03 19:41:26 -02:00
Mauro Ribeiro
98b2d8a3cd defconfig: enable hiddev and hidraw 
Change-Id: I17220e3aff1265913b820bf89fe0f9f92ce878b2
 2015-01-03 19:38:41 -02:00
Mauro Ribeiro
f7bf383da6 defconfig: enabling more congestion control algorithms 
Change-Id: Ifdffb8ca135b0f25a351ed587d8b58ac494f91f7
 2015-01-02 21:50:22 -02:00
Mauro Ribeiro
17eb14460e defconfig: enable rndis support 
Change-Id: Ic824814e58af8a6b99ce7e9dba9e8dd6baeb96a4
 2015-01-02 21:48:17 -02:00
Mauro Ribeiro
9a62d32412 defconfig: enable support for 3g/lte dongles 
Change-Id: If538a406ef894283dff9856dad3c85e187507f33
 2015-01-02 19:35:44 -02:00
Mauro Ribeiro
4a0a08b4d9 Merge branch 'odroidc-3.10.y' into odroidc-3.10.y 2015-01-02 18:34:47 -02:00
Mauro Ribeiro
c3447c6805 Merge branch 'odroidc-3.10.y' into odroidc-3.10.y 2015-01-02 18:34:10 -02:00
Mauro Ribeiro
4b2eeac221 Merge "usb: attempt to revert AMLogic USB Autosuspend" into odroidc-3.10.y 2015-01-03 05:28:52 +09:00
Dongjin Kim
e498a5444b ODROIDC:sd: Fix "Uart in" error if UHS is disabled 
This patch is to fix loosing UART if UHS-I support is disabled, and C1 does
not need to support UART on MicroSD port.

Change-Id: I0bbf99bc40b5d39f08caf3fde21240d9159862f8
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
 2015-01-03 04:27:15 +09:00
Mauro Ribeiro
5f297fc73f Merge branch 'odroidc-3.10.y' into odroidc-3.10.y 2015-01-02 05:30:40 -02:00
Mauro Ribeiro
1339ef7feb Merge branch 'odroidc-3.10.y' of odroidc-3.10.y 
Conflicts:
	drivers/amlogic/hdmi/hdmi_tx/hdmi_tx.c
	drivers/amlogic/hdmi/hdmi_tx/hdmi_tx_video.c

Change-Id: I62a8d0cf58fffda940ce14e999e1a0d6e9c3e84f
 2015-01-02 05:29:13 -02:00
Mauro Ribeiro
4a3f102932 hdmi_tx: handle between hdmi and dvi modes using vout= parameter 
Change-Id: I3a8901b15f20505390fbb83f119ea63908a05ad3
 2015-01-02 05:24:17 -02:00
Mauro Ribeiro
5cf197f4fd usb: attempt to revert AMLogic USB Autosuspend 
Change-Id: I4592256a2c511d3afd6cfcec1e5f647f131da887
 2015-01-02 02:30:33 -02:00
Mauro Ribeiro
94c61f7794 Merge branch 'odroidc-3.10.y' into odroidc-3.10.y 2015-01-02 01:52:07 -02:00
Mauro Ribeiro
4baf91a8bc Merge branch 'odroidc-3.10.y' into odroidc-3.10.y 2015-01-02 01:12:12 -02:00
Mauro Ribeiro
ae27bd8a86 hdmi_tx: handle between hdmi and dvi modes using vout= parameter 
Change-Id: Ib76b0fb325c132a2e436c315dda6e3b41d54d8f2
 2015-01-02 01:07:29 -02:00
Dongjin Kim
590d258e0a ODROIDC:sd: Add to disable UHS-I support on kernel parameter 
This patch is the workaround to add a kernel parameter "disableuhs" which can
disable to switch MicroSD mode to UHS-I on SDHC controller, since particular
MicroSD does not work properly on warm boot on ODROID-C1 board.

Change-Id: I28af391d914e4e7dad2364f3783b1bb331d7d1ff
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
 2015-01-01 07:27:08 +09:00
Mauro Ribeiro
64baccb001 Merge "defconfig: enabling usbmon and kinetic support" into odroidc-3.10.y 2014-12-31 11:55:52 +09:00
ckkim
22d7f4eb0e ODROIDC: Support hardware PWM(GPIOX_11, GPIOX_10) 
Change-Id: Ie258b5c5da3999af743e7e8fdbe22d5d9ed562af
 2014-12-30 17:30:36 +09:00
Mauro Ribeiro
2a139a3e9d defconfig: enabling usbmon and kinetic support 
Change-Id: Ic365d7a21fd8284eee0f05cdb137118778ba8d0f
 2014-12-29 23:29:08 -02:00
Mauro Ribeiro
35ff6937e3 Merge tag 'v3.10.43' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidc-3.10.y 
This is the 3.10.43 stable release

Conflicts:
	drivers/usb/serial/option.c

Change-Id: Ifbbb486cc556a9bd7a266fedb76ff23be4ab9a7d
 2014-12-24 17:08:04 -02:00
Mauro Ribeiro
889f621717 deconfig: enable btusb 
Change-Id: I94550d07ae344341e7893e12c875cc18d3b7b912
 2014-12-24 17:06:53 -02:00