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

404085 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
lintao
8f2d8b3794 dts: rk312x: default enable emmc 
Signed-off-by: lintao <lintao@rock-chips.com>
 2015-02-02 10:21:25 +08:00
lintao
c95f566ab0 mmc: add more waiting for erase and status op 2015-02-02 10:13:21 +08:00
Zheng Yang
1dd40af1d4 rk3288 hdmi: add cec clk and pinctrl. 
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
 2015-02-01 16:28:03 +08:00
Zheng Yang
a339b2f509 rk3288 hdmi: 
To improve stability of reading EDID, we need to
	disable HDMI ddc GPIO internal pull up.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
 2015-02-01 16:24:58 +08:00
zyc
6d345e3fc7 camera: oneframe v0.1.e 2015-01-30 09:42:23 +08:00
hwg
b9fddf335a solve rfkill-wlan driver kernel panic when rfkill-bt driver probe fail 2015-01-29 17:29:18 +08:00
li bing
2644e8a0c9 Wifi->rtl8812au: add chip name /sys/class/rkwifi/chip for RTL8812BU 2015-01-29 15:01:37 +08:00
li bing
99d9e3f5ff Wifi->rtl8723au: update dirver to version 4.00(4.1.11_12622.20141215). 2015-01-29 14:09:41 +08:00
smj
f62690fe3b rk312x codec: fix rk312x codec switch state error 
Signed-off-by: lxt <lxt@rock-chips.com>
 2015-01-29 08:51:26 +08:00
Zheng Yang
c164cdc151 modify display-sys.c and display-sys.h code style. 
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
 2015-01-28 18:13:37 +08:00
zwl
a4eb41a668 rk3128: hdmi: add disable clock when system shutdown 
disable clock will call disable power domain.
hdmi and lcdc share the power domain, so they must disable
the power domain when system shutdown.

Signed-off-by: zwl <zwl@rockchips.com>
 2015-01-28 15:53:58 +08:00
Simon
62a4401c59 rockchip: iommu: skip rk312x vop mmu stall operation,mask rk312x vop mmu interrupt 
Video stress test failed, may have something relationship to vop mmu stall operation
skip it as a workaround

Reboot stress test failed, error showed a large number of vop/vop mmu interrupt,mask
vop mmu interrupt to avoid reboot stress test failed in rk312x

Signed-off-by: Simon <xxm@rock-chips.com>
 2015-01-28 15:30:26 +08:00
zyc
7b2df0e3e5 camera: camsys_drv:v0.0x1b.0 oneframe:v0.1.0xd 2015-01-28 11:24:21 +08:00
dalon.zhang
79028a4b3b rk312x: fix usb otg camera issues 2015-01-28 10:12:32 +08:00
chenzhen
3634c70666 mali_400_driver : 
use mod_timer in mali_control_timer_callback_chain.
	upgrade rk_ko_ver to 3.
 2015-01-26 16:16:30 +08:00
chenzhen
2881b75ec3 rk312x, mali_400_driver : ammend rk_ko_ver.txt. 2015-01-26 16:27:30 +08:00
hcy
53920469cc Support 1.5GB and 3GB with 2CS on the DDR1 channel 2015-01-26 09:13:52 +08:00
Mark Brown
429421a879 Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2015-01-24 11:54:15 +00:00
Mark Brown
15f82fce54 Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk 
Conflicts:
	arch/arm64/include/asm/proc-fns.h
	arch/arm64/kernel/debug-monitors.c
	arch/arm64/kernel/psci.c
 2015-01-23 20:36:05 +00:00
Laura Abbott
9698ac7c35 arm64: add atomic pool for non-coherent and CMA allocations 
Neither CMA nor noncoherent allocations support atomic allocations.
Add a dedicated atomic pool to support this.

Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: David Riley <davidriley@chromium.org>
Cc: Olof Johansson <olof@lixom.net>
Cc: Ritesh Harjain <ritesh.harjani@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit d4932f9e81)
Signed-off-by: Mark Brown <broonie@kernel.org>
 2015-01-23 20:28:53 +00:00
Mark Brown
4b647eeef8 Merge remote-tracking branch 'lsk/v3.10/topic/dma-mapping' into lsk-v3.10-arm64-misc 2015-01-23 20:27:25 +00:00
Mark Brown
b749ecc6da Revert "arm64: vdso: move to _install_special_mapping and remove arch_vma_name" 
This reverts commit 95c91bdd8e.

Signed-off-by: Mark Brown <broonie@kernel.org>
 2015-01-23 20:15:32 +00:00