shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 12:57:06 +09:00
Code Issues Packages Projects Releases Wiki Activity
404,108 Commits 55 Branches 2,486 Tags
8dde4c06976b5794ef6e102ff6ed4648ea695f67
Commit Graph

404108 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
hjc
8dde4c0697 rk31xx lvds: ttl mode test ok 
Signed-off-by: hjc<hjc@rock-chips.com>
 2015-02-14 19:40:56 +08:00
hjc
457fac05ff rk3368 lcdc: overlay mode depend on screen color mode 
Signed-off-by: hjc<hjc@rock-chips.com>
 2015-02-14 19:40:56 +08:00
CMY
c85ce1ade5 rk: ion: assign sg's dma_length in ion allocation if CONFIG_NEED_SG_DMA_LENGTH is set 2015-02-14 18:05:01 +08:00
CMY
fca343c4d5 ARM64: dma-mapping: zero the buffer that allocate with __GFP_ZERO flags 2015-02-14 16:03:06 +08:00
zsq
abc2159654 Merge branch 'develop-3.10-next' of 10.10.10.29:rk/kernel into develop-3.10-next 2015-02-13 15:22:34 +08:00
Jianqun Xu
1fff298dee ARM64: dts: act8846: ldo5 output 3.0v 
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
 2015-02-13 15:02:43 +08:00
Huang, Tao
8e854569be Merge branch develop-3.10 
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

Conflicts:
	drivers/video/rockchip/rk_fb.c
 2015-02-13 14:40:39 +08:00
huangzhibao
f44ec323d5 dts: rk3368.dtsi:add remotectl; add rk3368-box.dts 2015-02-13 10:56:26 +08:00
Huang, Tao
05f6553656 power: reset: rockchip-reboot: rk3368 support reboot with argument 
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
 2015-02-12 16:39:01 +08:00
hwg
77dd1c6300 rk3368-tb_8846.dts support wifi 2015-02-12 15:23:03 +08:00
hwg
6589e9111e rfkill-wlan.c: support rk3368 2015-02-12 15:22:38 +08:00
hwg
2ed83e814f update rkwifi bcmdhd to version 1.201.34.1 2015-02-12 15:21:52 +08:00
hwg
c58cad4928 update rtl8188eu wifi driver to RTL8188EUS_linux_v4.3.0.7_12758.20141114 2015-02-12 15:03:22 +08:00
lyz
b10188f8f1 usb: dwc_otg: show warning on actual buffer length larger than 
transfer buffer length

In this case DWC_OTG controller will over-write memory space that
not belongs to this urb, it may cause kernel crash.

Signed-off-by: lyz <lyz@rock-chips.com>
 2015-02-12 10:54:51 +08:00
lyz
f0be625fab usb: ehci: fix test packet mode 
When enter usb test packet mode the device no longer connect
normally, so stop the connect detect timer

Signed-off-by: lyz <lyz@rock-chips.com>
 2015-02-12 10:54:50 +08:00
lyz
3d2090f535 usb: dwc_otg: add condition judgement to filter invalid 
disconnect interrupt

In some case, we disconnect a usb device, then usb controller
will trigger more the one disconnect interrupt, so check port
enable change bit in hprt0 to make sure just one disconnect
interrupt be handled.
here to

Signed-off-by: lyz <lyz@rock-chips.com>
 2015-02-12 10:53:39 +08:00
lyz
1424301f3b usb: ehci-rockchip: fix typo 
'work around' should be 'walk around'

Signed-off-by: lyz <lyz@rock-chips.com>
 2015-02-12 10:50:38 +08:00
lyz
3361a4c555 usb: rk3368: support wake up by usb plug 
Signed-off-by: lyz <lyz@rock-chips.com>
 2015-02-11 19:25:24 +08:00
lyz
663848d830 usb: rk3368: support usb battery charger detect 
Signed-off-by: lyz <lyz@rock-chips.com>
 2015-02-11 19:24:57 +08:00
lyz
e9a733bb1c rockchip_defconfig: add generic EHIC and OHCI platform driver 2015-02-11 19:24:56 +08:00
hjc
01831bac5d rk31xx lvds: update config for VOCM and VDIFF 
Signed-off-by: hjc <hjc@rock-chips.com>
 2015-02-11 17:30:59 +08:00
hjc
fe07ef3880 rk fb: fix screen info error when in no dual mode and pull out hdmi 
Signed-off-by: hjc <hjc@rock-chips.com>
 2015-02-11 16:30:22 +08:00
hjc
927ee7b056 rk31xx lvds: fix lvds grf config error when disable lvds 2015-02-11 16:30:21 +08:00
chenyifu
db15be891c rk3368 mipi: modified the bug of dts file 
The address of rk3368 is 64-bits.
Change the order of "pclk_mipi_dsi" and "pclk_mipi_dsi_host"
in order compatible with earlier code.

Signed-off-by: chenyifu <chenyf@rock-chips.com>
 2015-02-11 16:10:19 +08:00
chenyifu
8b6814ddb8 rk3368 mipi: add mipi driver of rk3368 
Signed-off-by: chenyifu <chenyf@rock-chips.com>
 2015-02-11 16:10:12 +08:00
guoyi
2858c88e51 rk3368: dts: fix rk3368-p9_818 err 2015-02-11 15:28:13 +08:00
guoyi
bc327ae60b Drivers: 
input: add gt9xx/ for goodix touchscreen.
 2015-02-11 14:04:40 +08:00
guoyi
67edf30694 rk3368: 
dts: add rk3368-p9_818.dts
 2015-02-11 14:04:40 +08:00
hjc
ae87f9de3a rk fb: enable mmu when uboot-logo is 0 2015-02-11 14:02:37 +08:00
hjc
44c63d9ee6 rk fb: fix fence time out for dual display mode 
Signed-off-by: hjc <hjc@rock-chips.com>
 2015-02-11 11:54:29 +08:00
Huang, Tao
9b00db2327 rk: last_log: version 3.1, support arm64 
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
 2015-02-10 20:18:09 +08:00
Huang, Tao
39f61d49ca arm64: rockchip: rockchip_defconfig enable TEST_POWER 
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
 2015-02-10 19:15:57 +08:00
Huang, Tao
52315d4d54 rk: ion: fix compilation error without CONFIG_COMPAT 
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
 2015-02-10 16:48:02 +08:00
Huang, Tao
220ae60186 Merge branch develop-3.10 into develop-3.10-next 
Conflicts:
	drivers/clk/rockchip/clk-ops.h
	drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi.c
	drivers/video/rockchip/rk_fb.c
 2015-02-10 16:43:50 +08:00
Huang, Tao
089c13477b Merge tag 'lsk-v3.10-android-15.01' 
LSK Android 15.01 v3.10

Conflicts:
	arch/arm/Kconfig.debug
	arch/arm64/mm/init.c
	drivers/Makefile
	drivers/cpufreq/cpufreq_interactive.c
 2015-02-10 16:24:25 +08:00
dkl
e57670a8e1 dts: rk3126\rk3126b: modify VIO clocks to slove VIO idle fail problem 
In rk3126, when aclk_vio0\aclk_vio1\hclk_vio were reparented from the
default parent gpll_div2 to gpll in clk_init, the temporary rates
are too high and may lead to failture in VIO idle_request later.
To slove this problem, VIO clocks are modified to auto select parent
and consider the order of reparent and set_div when set_rate.

Signed-off-by: dkl <dkl@rock-chips.com>
 2015-02-10 11:21:20 +08:00
ywj
cb6303521d add usb charge config 2015-02-10 09:23:33 +08:00
Zheng Yang
b448db9497 rk3288 hdmi: If audio source if spdif, sclk/fs should be 128x. 
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
 2015-02-09 10:42:19 +08:00
Zheng Yang
1f69fb2931 HDMI: fix filter feature SUPPORT_TMDS_600M error: 
If soc is not support feature SUPPORT_TMDS_600M,
	or current EDID information is not support the
	feature, we should not show the corresponding
	option, such as 3840x2160p-60.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
 2015-02-09 10:40:40 +08:00
David Wu
af62aaaac5 i2c: fix retry_count to return error when i2c bus checkidle was low 
Signed-off-by: David Wu <wdc@rock-chips.com>
 2015-02-08 21:38:22 +08:00
Huang, Tao
4b8a18bfbc rk3368: rename pmu_grf or pmu to pmugrf 
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
 2015-02-06 21:43:58 +08:00
Huang, Tao
eccdc32d7c power: reset: rockchip-reboot: add rk3368 reboot driver 
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
 2015-02-06 21:37:06 +08:00
Xiao Feng
c3ecb7d483 rk3368: cpufreq: fix compile warning 
Signed-off-by: Xiao Feng <xf@rock-chips.com>
 2015-02-06 19:36:47 +08:00
hwg
14529fd551 rfkill-wlan.c: solve null point panic when wifi_chip_type is not define in dts 2015-02-05 10:52:39 +08:00
li bing
aea5d474dd wifi->esp8089: 
ESP8089 driver update to V1.9.1(30/01/2015);
       Update the V2.4 esp_prealloc program.
 2015-02-03 15:35:02 +08:00
Zheng Yang
c4f332cc42 hdmi: 
1. fix 3288 hdmi audio source select error.
	2. For mid, it need to call rk_fb_get_display_policy
	   to reset overscan after swichting vop timing.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
 2015-02-03 15:51:18 +08:00
dkl
ea38e66b9d rk3288: modify to ensure pairwise call of clk_enable\disable 
in rk3288_pll_early_suspend_notifier_call

Signed-off-by: dkl <dkl@rock-chips.com>
 2015-02-03 14:26:58 +08:00
Zheng Yang
2fce7ea411 hdmi: depends on DRM_ROCKCHIP and fix document error. 
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
 2015-02-02 15:04:21 +08:00
lintao
9145bcc700 dts: fix compile err 
Signed-off-by: lintao <lintao@rock-chips.com>
 2015-02-02 11:27:20 +08:00
Zheng Yang
fa7ee75d42 hdmi: update driver to v2.0: 
1. Rename rk3036 hdmi to rockchip_hdmiv1, support hdmi v1.4;
	2. Rename rk3288 hdmi to rockchip_hdmiv2, support hdmi v2.0;
	3. Support transmmit 3D picture.
	4. 3288 hdmi support HDCP, CEC and TMDSCLK 600M.
	5. HDMI video source default is LCDC0, it can be modified in dts by
	   follow:
	   	rockchip,hdmi_video_source = <DISPLAY_SOURCE_LCDC1>;
	   HDCP and CEC function default is disabled , it can be enabled in
	   dts file by follow:
	   	rockchip,hdcp_enable = <1>;
	   	rockchip,cec_enable = <1>;
	   More information please see
		Documentation/devicetree/bindings/video/rockchip_hdmi.txt
 2015-02-02 11:06:04 +08:00