lintao [Sat, 7 Mar 2015 07:14:10 +0000 (15:14 +0800)]
dtsi: sdmmc: add card_detect for udbg
Signed-off-by: lintao <lintao@rock-chips.com>
hwg [Tue, 17 Mar 2015 03:43:32 +0000 (11:43 +0800)]
wifi: use buildin instand of ko for compatibility
huang zhibao [Tue, 17 Mar 2015 01:29:06 +0000 (09:29 +0800)]
dts: add work and power led in rk3128-box.dts
huang zhibao [Tue, 17 Mar 2015 01:18:32 +0000 (09:18 +0800)]
Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
huang zhibao [Mon, 16 Mar 2015 09:39:19 +0000 (17:39 +0800)]
Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
lyz [Mon, 16 Mar 2015 09:11:48 +0000 (17:11 +0800)]
usb: dwc_otg: fix bug in device_init routine
1.wait epenable bit timeout decrease from 10s to 1s
2.fix bug, without 'j++' this loop never break if there is some
problem with ep state
lyz [Wed, 11 Mar 2015 09:33:17 +0000 (17:33 +0800)]
usb: ehci: fix suspend bug
lyz [Wed, 11 Mar 2015 09:44:14 +0000 (17:44 +0800)]
usb: dwc_otg: change method of checking urb dequeue status
According to commit
e9df41c5c, change dwc_otg driver to call
usb_hcd_link_urb_to_ep() and usb_hcd_unlink_urb_from_ep() routine
for checking urb dequeue status instead check for null pointer
by hcd driver to test address.
TEST:
1.rk3126 run host/device change script for 10000 times
许盛飞 [Mon, 16 Mar 2015 01:20:41 +0000 (09:20 +0800)]
rk818-battery: add calibration of charge and discharge
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
许盛飞 [Mon, 16 Mar 2015 01:19:02 +0000 (09:19 +0800)]
rk818-battery: enable parse battery params
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
许盛飞 [Mon, 16 Mar 2015 01:16:57 +0000 (09:16 +0800)]
rk818-battery: reconstruct the voltage discharge algorithm
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
hjc [Fri, 13 Mar 2015 11:37:26 +0000 (19:37 +0800)]
rk32xx lvds: add support lvds 10bit mode
Signed-off-by: hjc <hjc@rock-chips.com>
huang zhibao [Fri, 13 Mar 2015 06:58:46 +0000 (14:58 +0800)]
Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
hwg [Fri, 13 Mar 2015 02:32:05 +0000 (10:32 +0800)]
after support different wifi bt chip auto compatible commit for android 5.0, compatible with android 4.4
lyz [Thu, 12 Mar 2015 14:15:33 +0000 (22:15 +0800)]
usb: fix compliation warning without CONFIG_RK_DEBUG_UART
zhangqing [Thu, 12 Mar 2015 16:32:00 +0000 (09:32 -0700)]
rk3288:tsadc:enable tsadc chn3
hjc [Thu, 12 Mar 2015 08:16:56 +0000 (16:16 +0800)]
rk312x lcdc: add to get hwc layer status
Signed-off-by: hjc <hjc@rock-chips.com>
许盛飞 [Thu, 12 Mar 2015 04:21:54 +0000 (12:21 +0800)]
battery: enable dc charge
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
hwg [Wed, 11 Mar 2015 06:00:13 +0000 (14:00 +0800)]
update rtl8188eu wifi driver to v4.3.0.8_13522.20150213_beta
solve android 5.0 ctsverify wifi direct test fail problem
Mark Yao [Tue, 10 Mar 2015 11:22:43 +0000 (19:22 +0800)]
bmp_helper: fix bmp rle8 display abnormal
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
xxh [Tue, 10 Mar 2015 11:17:29 +0000 (19:17 +0800)]
ESP8089 sdio premalloc default config
hwg [Tue, 10 Mar 2015 08:23:07 +0000 (16:23 +0800)]
wifi: support ap6212 ap6354
xxh [Tue, 10 Mar 2015 04:35:45 +0000 (12:35 +0800)]
Update RTL8723BS wifi driver
1.Refine IQK handle
2.Fix RX error handle to avoid system hang problem
3.Fix IQK restore fail issue
4.Fix running out of RX resource in some case
5.Fix HiddenAP still in driver scan queue after disconnect
xxh [Tue, 10 Mar 2015 01:44:22 +0000 (09:44 +0800)]
Espressi esp8089 WIFI
1.modify copyright info for ESP8089 WIFI driver
2.update esp_premalloc driver to V2.5
hwg [Mon, 9 Mar 2015 09:17:20 +0000 (17:17 +0800)]
update wifi bcmdhd driver:
solve kernel panic when use gmac and hotspots at same time
hjc [Mon, 9 Mar 2015 07:44:14 +0000 (15:44 +0800)]
rk fb: add fbdc data format: HAL_PIXEL_FORMAT_FBDC_RGBA888
hjc [Fri, 26 Dec 2014 10:57:32 +0000 (18:57 +0800)]
rk fb: define data format for fbdc
Signed-off-by: hjc <hjc@rock-chips.com>
Conflicts:
drivers/video/rockchip/lcdc/rk3368_lcdc.c
drivers/video/rockchip/rkfb_sysfs.c
include/linux/rk_fb.h
hjc [Mon, 9 Mar 2015 04:10:48 +0000 (12:10 +0800)]
rk fb: add memsize check
Signed-off-by: hjc <hjc@rock-chips.com>
hjc [Mon, 9 Mar 2015 03:34:40 +0000 (11:34 +0800)]
rk lcdc: if win not support scale, make sure dsp size equal to act size
Signed-off-by: hjc <hjc@rock-chips.com>
hjc [Mon, 9 Mar 2015 03:14:14 +0000 (11:14 +0800)]
rk fb: add support yuv420sp nv21 data format
Signed-off-by: hjc <hjc@rock-chips.com>
hjc [Mon, 9 Mar 2015 02:38:07 +0000 (10:38 +0800)]
rk fb: make sure win close state take effect when update regs
Signed-off-by: hjc <hjc@rock-chips.com>
Zheng Yang [Mon, 9 Mar 2015 03:11:52 +0000 (11:11 +0800)]
HDMI: Modify color output policy.
Introduce feature SUPPORT_YCBCR_INPUT. If VOP can
output YCbCr, VOP output color mode is equal to HDMI
output color mode. Otherwise, VOP just output RGB,
HDMI will conver color space.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Zheng Yang [Mon, 9 Mar 2015 03:07:28 +0000 (11:07 +0800)]
HDMI: add mutex lock when hdmi is set to auto mode, to avoid
system crash by NULL pointer.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
hwg [Sat, 7 Mar 2015 08:11:29 +0000 (16:11 +0800)]
solve bluetooth hid problem:
when bluetooth hid device connected, the key is delayed to be reponse about 5 second
lyz [Mon, 2 Mar 2015 03:23:43 +0000 (11:23 +0800)]
usb: can be wakeup by linestate change interrupt from GRF
Sugar Zhang [Fri, 6 Mar 2015 03:16:01 +0000 (11:16 +0800)]
rockchip: i2s: fix i2s mclk set fail when using multi i2s.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
hwg [Fri, 6 Mar 2015 02:45:03 +0000 (10:45 +0800)]
rtl8723bu wifi: solve need long time to resume
hwg [Thu, 5 Mar 2015 00:46:05 +0000 (08:46 +0800)]
wifi: update broadcom wifi driver bcmdhd to 1.201.34.2
huang zhibao [Wed, 4 Mar 2015 03:04:47 +0000 (11:04 +0800)]
Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
huang zhibao [Wed, 4 Mar 2015 02:52:18 +0000 (10:52 +0800)]
add support rk1000 codec and tvencoder
CMY [Wed, 4 Mar 2015 01:27:51 +0000 (09:27 +0800)]
rk: ion: fix compilation warning without CONFIG_COMPAT
Signed-off-by: CMY <cmy@rock-chips.com>
Huang, Tao [Tue, 10 Feb 2015 08:48:02 +0000 (16:48 +0800)]
rk: ion: fix compilation error without CONFIG_COMPAT
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
(cherry picked from commit
52315d4d540dd3ef6db618b6856ceee0b5af8d98)
Signed-off-by: CMY <cmy@rock-chips.com>
CMY [Tue, 3 Mar 2015 05:56:52 +0000 (13:56 +0800)]
rk: ion: fix compile warnning
Signed-off-by: CMY <cmy@rock-chips.com>
(cherry picked from commit
ee9707a058c52a0d0c27f5804db9e9e96075d363)
Signed-off-by: CMY <cmy@rock-chips.com>
CMY [Mon, 2 Mar 2015 07:42:55 +0000 (15:42 +0800)]
rk: uboot_mem_reserve: lost a '=' in 'if' statement
(cherry picked from commit
b9721d0365d9e88d0c16c3f0c2aff4b2c09c9dec)
Signed-off-by: CMY <cmy@rock-chips.com>
CMY [Mon, 2 Mar 2015 03:33:35 +0000 (11:33 +0800)]
rk: uboot_mem_reserve: fix print format
Signed-off-by: CMY <cmy@rock-chips.com>
(cherry picked from commit
c9bbb3032c50e9b9ecaca58a4aa06ef4192bdbba)
Signed-off-by: CMY <cmy@rock-chips.com>
CMY [Fri, 27 Feb 2015 09:59:00 +0000 (17:59 +0800)]
rk: ion: allow the cacheable buffer to map iommu
Signed-off-by: CMY <cmy@rock-chips.com>
(cherry picked from commit
db95a55ffa214b0bab8643454875a42d655a8ad7)
Signed-off-by: CMY <cmy@rock-chips.com>
CMY [Sat, 14 Feb 2015 10:05:01 +0000 (18:05 +0800)]
rk: ion: assign sg's dma_length in ion allocation if CONFIG_NEED_SG_DMA_LENGTH is set
(cherry picked from commit
c85ce1ade533fe0d02b7539dbe85d55b69386125)
Signed-off-by: CMY <cmy@rock-chips.com>
CMY [Wed, 7 Jan 2015 07:42:54 +0000 (15:42 +0800)]
ARM64: ion: ION_IOC_GET_PHYS compat 32bit userspace app.
Signed-off-by: CMY <cmy@rock-chips.com>
(cherry picked from commit
92ad540611e8599b7fb386a28793c77b410c81c6)
Signed-off-by: CMY <cmy@rock-chips.com>
CMY [Thu, 25 Dec 2014 03:39:38 +0000 (11:39 +0800)]
ion: export ion_device for some kernel modules
(cherry picked from commit
c32433f1e0847cffdee4e0c04c6d8ee7d64392bc)
Signed-off-by: CMY <cmy@rock-chips.com>
hwg [Wed, 4 Mar 2015 02:37:27 +0000 (10:37 +0800)]
solve make clean error causeed by wifi driver
lintao [Tue, 3 Mar 2015 13:31:10 +0000 (21:31 +0800)]
mmc: rk_sdmmc: edmac limit FIFOTH when mburst exceed limitation
Signed-off-by: lintao <lintao@rock-chips.com>
hwg [Tue, 3 Mar 2015 09:56:58 +0000 (17:56 +0800)]
rfkill-wlan.c use CONFIG_MFD_SYSCON to compatible rk3368 and rk3288
hwg [Thu, 12 Feb 2015 07:22:38 +0000 (15:22 +0800)]
rfkill-wlan.c: support rk3368
Conflicts:
net/rfkill/rfkill-wlan.c
hwg [Thu, 12 Feb 2015 07:21:52 +0000 (15:21 +0800)]
update rkwifi bcmdhd to version 1.201.34.1
Conflicts:
drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile
lintao [Mon, 2 Mar 2015 01:25:57 +0000 (09:25 +0800)]
mmc: replace tSD enumaration machanism
Remove dt property "support-tSD" and combine "support-emmc" with
"support-sd" in together for tSD/emmc distinguish by mmc core. More details
please refer to arch/arm/boot/dts/rk3288-tb.dts
Signed-off-by: lintao <lintao@rock-chips.com>
Sugar Zhang [Mon, 2 Mar 2015 00:50:41 +0000 (08:50 +0800)]
rockchip: i2s: use subysys_initcall_sync for probe.
because some codecs initialization depends on i2s mclk.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
dalon.zhang [Sat, 28 Feb 2015 11:16:21 +0000 (19:16 +0800)]
camsys_drv: v0.0x1c.0
dalon.zhang [Sat, 28 Feb 2015 11:09:34 +0000 (19:09 +0800)]
camera:
oneframe: v0.2.0
pingpong: v0.1.a
hwg [Sat, 28 Feb 2015 09:06:56 +0000 (17:06 +0800)]
remove unused wifi driver: rda5990, mt5931, mt7601, mt6620
hwg [Sat, 28 Feb 2015 06:05:32 +0000 (14:05 +0800)]
support different wifi bt chip auto compatible
like auto recognize rtl8188eu, ap6210, esp8089 in android
hwg [Sat, 28 Feb 2015 06:03:13 +0000 (14:03 +0800)]
support different wifi bt chip auto compatible
modify arch/arm/boot/dts/rk3128-86v.dts
hwg [Sat, 28 Feb 2015 06:02:56 +0000 (14:02 +0800)]
support different wifi bt chip auto compatible
modify arch/arm/boot/dts/rk3126-86v.dts
hwg [Sat, 28 Feb 2015 05:59:24 +0000 (13:59 +0800)]
support different wifi bt chip auto compatible
Attention: this is only for android 5.0, not compatible for android 4.4, meaning can't compatible for 4.4 after this commit
modify arch/arm/boot/dts/rk3288-tb_8846.dts
dkl [Thu, 26 Feb 2015 01:44:34 +0000 (09:44 +0800)]
rk312x/rk3036: not change aclk_core_div for stability
In rk312x/rk3036, do not change aclk_core_div for stability.
Also remove some unusued macros and codes.
Signed-off-by: dkl <dkl@rock-chips.com>
dalon.zhang [Sat, 14 Feb 2015 10:18:09 +0000 (18:18 +0800)]
camera: oneframe v0.1.f
Zheng Yang [Sat, 14 Feb 2015 08:22:35 +0000 (16:22 +0800)]
HDMI:
1. In DVI mode, input color and output color should be RGB[0-255];
In HDMI mode, input color should be YCbCr;
2. For MID, HDMI is default disabled.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Zheng Yang [Sat, 14 Feb 2015 01:14:18 +0000 (09:14 +0800)]
hdmi: hdmiv1:
For nlpcm bitstream mode, we need to set audio
channel status nlpcm bit to 1.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Zheng Yang [Sat, 14 Feb 2015 00:51:54 +0000 (08:51 +0800)]
hdmi: fix set hdmi switch state error when remove hdmi.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
hwg [Fri, 13 Feb 2015 07:02:37 +0000 (15:02 +0800)]
update rtl8189es wifi driver to rtl8189ES_linux_v4.3.10.1_13373.
20150129
hwg [Thu, 12 Feb 2015 07:02:51 +0000 (15:02 +0800)]
update rtl8188eu wifi driver to RTL8188EUS_linux_v4.3.0.7_12758.
20141114
lyz [Thu, 12 Feb 2015 02:16:32 +0000 (10:16 +0800)]
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>
lyz [Wed, 11 Feb 2015 02:59:23 +0000 (10:59 +0800)]
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>
lyz [Tue, 27 Jan 2015 07:53:53 +0000 (15:53 +0800)]
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>
lyz [Tue, 27 Jan 2015 03:46:38 +0000 (11:46 +0800)]
usb: ehci-rockchip: fix typo
'work around' should be 'walk around'
Signed-off-by: lyz <lyz@rock-chips.com>
huang zhibao [Wed, 11 Feb 2015 08:48:04 +0000 (16:48 +0800)]
312x
hjc [Wed, 11 Feb 2015 03:54:29 +0000 (11:54 +0800)]
rk fb: fix fence time out for dual display mode
Signed-off-by: hjc <hjc@rock-chips.com>
dkl [Tue, 10 Feb 2015 03:01:25 +0000 (11:01 +0800)]
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>
ywj [Tue, 10 Feb 2015 01:23:33 +0000 (09:23 +0800)]
add usb charge config
Zheng Yang [Mon, 9 Feb 2015 02:42:19 +0000 (10:42 +0800)]
rk3288 hdmi: If audio source if spdif, sclk/fs should be 128x.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Zheng Yang [Mon, 9 Feb 2015 02:40:40 +0000 (10:40 +0800)]
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>
David Wu [Sun, 8 Feb 2015 13:38:22 +0000 (21:38 +0800)]
i2c: fix retry_count to return error when i2c bus checkidle was low
Signed-off-by: David Wu <wdc@rock-chips.com>
hwg [Thu, 5 Feb 2015 02:51:07 +0000 (10:51 +0800)]
rfkill-wlan.c: solve null point panic when wifi_chip_type is not define in dts
li bing [Tue, 3 Feb 2015 07:31:46 +0000 (15:31 +0800)]
wifi->esp8089:
ESP8089 driver update to V1.9.1(30/01/2015);
Update the V2.4 esp_prealloc program.
Zheng Yang [Tue, 3 Feb 2015 07:51:18 +0000 (15:51 +0800)]
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>
dkl [Tue, 3 Feb 2015 06:15:27 +0000 (14:15 +0800)]
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>
Zheng Yang [Mon, 2 Feb 2015 07:04:21 +0000 (15:04 +0800)]
hdmi: depends on DRM_ROCKCHIP and fix document error.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
lintao [Mon, 2 Feb 2015 03:26:48 +0000 (11:26 +0800)]
dts: fix compile err
Signed-off-by: lintao <lintao@rock-chips.com>
Zheng Yang [Mon, 2 Feb 2015 03:06:04 +0000 (11:06 +0800)]
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
lintao [Mon, 2 Feb 2015 02:21:25 +0000 (10:21 +0800)]
dts: rk312x: default enable emmc
Signed-off-by: lintao <lintao@rock-chips.com>
lintao [Mon, 26 Jan 2015 01:57:11 +0000 (09:57 +0800)]
mmc: add more waiting for erase and status op
Zheng Yang [Sun, 1 Feb 2015 08:28:03 +0000 (16:28 +0800)]
rk3288 hdmi: add cec clk and pinctrl.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Zheng Yang [Sun, 1 Feb 2015 08:24:58 +0000 (16:24 +0800)]
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>
zyc [Fri, 30 Jan 2015 01:42:23 +0000 (09:42 +0800)]
camera: oneframe v0.1.e
hwg [Thu, 29 Jan 2015 09:29:03 +0000 (17:29 +0800)]
solve rfkill-wlan driver kernel panic when rfkill-bt driver probe fail
li bing [Thu, 29 Jan 2015 07:01:37 +0000 (15:01 +0800)]
Wifi->rtl8812au: add chip name /sys/class/rkwifi/chip for RTL8812BU
li bing [Thu, 29 Jan 2015 06:09:41 +0000 (14:09 +0800)]
Wifi->rtl8723au: update dirver to version 4.00(4.1.11_12622.
20141215).
smj [Thu, 29 Jan 2015 00:51:26 +0000 (08:51 +0800)]
rk312x codec: fix rk312x codec switch state error
Signed-off-by: lxt <lxt@rock-chips.com>
Zheng Yang [Wed, 28 Jan 2015 10:13:37 +0000 (18:13 +0800)]
modify display-sys.c and display-sys.h code style.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
zwl [Wed, 28 Jan 2015 07:50:05 +0000 (15:50 +0800)]
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>
Simon [Wed, 28 Jan 2015 07:30:26 +0000 (15:30 +0800)]
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>