Zheng Yang [Tue, 21 Oct 2014 06:37:09 +0000 (14:37 +0800)]
fb:
Add disp-policy in dts and disp_policy in struct rk_fb
to distinguish box and sdk display policy.
lintao [Tue, 21 Oct 2014 05:01:55 +0000 (13:01 +0800)]
mmc: lookup mszs for edmac, diff M base from idmac
li bing [Tue, 21 Oct 2014 02:27:37 +0000 (10:27 +0800)]
Wifi: close the rtl8189es's debug log.
cz [Mon, 20 Oct 2014 08:13:18 +0000 (16:13 +0800)]
ethernet:vmac: enable vmac in rockchip_defconfig for rk3036
Zheng Yang [Mon, 20 Oct 2014 06:22:09 +0000 (14:22 +0800)]
rk3036 hdmi:
Add 20ms delay between irq and work thread to make
sure hdmi connection status stable.
li bing [Mon, 20 Oct 2014 03:41:19 +0000 (11:41 +0800)]
rk3036:
1.add uart0 & bluetooth.
2.add 'wifi_chip_type' note.
rk3128:
2.add 'wifi_chip_type' note.
li bing [Mon, 20 Oct 2014 02:18:31 +0000 (10:18 +0800)]
wifi->esp8089: update driver ver 1.8:
1.Repair the coexistence of bluetooth module (unused coexistence agreement possible WIFI does not work).
2.increasing the compatibility of kernel3.10.
3.strengthen SoftAP and P2P GO the performance of the model.
zwl [Mon, 20 Oct 2014 02:53:03 +0000 (10:53 +0800)]
rk fb: fix get fb info addr error if at fb0-win1 map when close fb
Zheng Yang [Mon, 20 Oct 2014 02:31:18 +0000 (10:31 +0800)]
rockchip_defconfig: support rk3036 lcdc.
smj [Mon, 20 Oct 2014 02:27:58 +0000 (10:27 +0800)]
rk3036 : add the rk3036 sound config to rochchip_defconfig
zsq [Mon, 20 Oct 2014 00:26:32 +0000 (08:26 +0800)]
fix rga2 dst yuv offset addr generate error
zwl [Fri, 17 Oct 2014 08:40:03 +0000 (16:40 +0800)]
rk312x:lcdc: the temporary solution for fix charge display flash
smj [Fri, 17 Oct 2014 07:59:04 +0000 (15:59 +0800)]
rk312x box: enable gpio_poweroff driver
Luowei [Fri, 17 Oct 2014 03:26:01 +0000 (11:26 +0800)]
spi:improve spi dma burst
zwl [Fri, 17 Oct 2014 03:04:11 +0000 (11:04 +0800)]
rk fb:
* fix get share dma buf fd failed when stop and start system
Signed-off-by: zwl <zwl@rock-chips.com>
许盛飞 [Fri, 17 Oct 2014 02:36:52 +0000 (10:36 +0800)]
chargedisplay: add for adc-battery-driver
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
hhb [Fri, 17 Oct 2014 01:17:41 +0000 (09:17 +0800)]
DMA:pl330: add burst length config
Zheng Yang [Fri, 17 Oct 2014 00:52:40 +0000 (08:52 +0800)]
rk3036/rk3128 tve: fix compile error.
Zheng Yang [Thu, 16 Oct 2014 09:42:33 +0000 (17:42 +0800)]
rk312x_lcdc.c
1. Fix code style.
2. We need to stanby vop when reconfigure vop output timing.
3. Disabling win0 instead of stanby vop when enable iommu at
uboot logo mode.
Zheng Yang [Thu, 16 Oct 2014 09:42:09 +0000 (17:42 +0800)]
rk3036/rk312x hdmi:
We need to check hdmi connect status in probe hdmi. If hdmi is
enable in uboot, and is removed before kernel, we will power
down hdmi, and set it as disconnected.
Zheng Yang [Thu, 16 Oct 2014 09:36:03 +0000 (17:36 +0800)]
rk3036/rk3128 tve: support uboot logo display.
smj [Thu, 16 Oct 2014 09:23:24 +0000 (17:23 +0800)]
rk3036 :
- Audio : spdif: add spdif card or not according dts define.
- Other : enable gpio_poweroff driver.
cl [Thu, 16 Oct 2014 08:49:47 +0000 (16:49 +0800)]
rk3126-86v: disable usb uart bypass function
Signed-off-by: cl <cl@rock-chips.com>
Cai Zhiyong [Wed, 11 Sep 2013 21:20:09 +0000 (14:20 -0700)]
block: support embedded device command line partition
Read block device partition table from command line. The partition used
for fixed block device (eMMC) embedded device. It is no MBR, save
storage space. Bootloader can be easily accessed by absolute address of
data on the block device. Users can easily change the partition.
This code reference MTD partition, source "drivers/mtd/cmdlinepart.c"
About the partition verbose reference
"Documentation/block/cmdline-partition.txt"
[akpm@linux-foundation.org: fix printk text]
[yongjun_wei@trendmicro.com.cn: fix error return code in parse_parts()]
Signed-off-by: Cai Zhiyong <caizhiyong@huawei.com>
Cc: Karel Zak <kzak@redhat.com>
Cc: "Wanglin (Albert)" <albert.wanglin@huawei.com>
Cc: Marius Groeger <mag@sysgo.de>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Brian Norris <computersforpeace@gmail.com>
Cc: Artem Bityutskiy <dedekind@infradead.org>
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Conflicts:
block/partitions/Kconfig
block/partitions/Makefile
block/partitions/check.c
cl [Thu, 16 Oct 2014 03:13:05 +0000 (11:13 +0800)]
cpufreq: set suspend volt to 1.1V for 40nm process, fix reboot err when vdd_arm regulator is not registered
Signed-off-by: cl <cl@rock-chips.com>
cl [Thu, 16 Oct 2014 02:47:26 +0000 (10:47 +0800)]
rockchip: add gpio_poweroff driver
Signed-off-by: cl <cl@rock-chips.com>
Sun Mingjun [Thu, 16 Oct 2014 02:01:24 +0000 (10:01 +0800)]
rk3036:enable uboot display
zwl [Thu, 16 Oct 2014 02:02:46 +0000 (10:02 +0800)]
rk fb: add rk_fb_par data struct to store more fb info
Sun Mingjun [Thu, 16 Oct 2014 00:39:31 +0000 (08:39 +0800)]
rk312x : audio : fix the box audio crash bug when recording
CMY [Tue, 14 Oct 2014 10:32:42 +0000 (18:32 +0800)]
rk: ion: add drm heap for secure buffer allocation
Zheng Yang [Wed, 15 Oct 2014 06:31:21 +0000 (14:31 +0800)]
rk3036 lcdc: fix uboot display logo kernel open iommu splash
lyz [Wed, 15 Oct 2014 06:04:48 +0000 (14:04 +0800)]
rk312x: remove unused usb charger detect log info
zhangqing [Wed, 15 Oct 2014 01:54:00 +0000 (09:54 +0800)]
rk312x:pmic:rk818:slove irq handle failed
wdc [Tue, 14 Oct 2014 11:13:29 +0000 (19:13 +0800)]
fiq-debugger: enable uart clk by serial-id
huang zhibao [Mon, 13 Oct 2014 09:59:27 +0000 (17:59 +0800)]
input:ir, resume -> resume_early for wakeup one time
gwl [Mon, 13 Oct 2014 03:38:26 +0000 (11:38 +0800)]
Wifi: update rtl8189es/etv to version 4.00(V4.3.10_12447.
20141008).
hjc [Sat, 11 Oct 2014 03:48:22 +0000 (11:48 +0800)]
rk fb: fix uboot display logo kernel open iommu splash
hjc [Sat, 11 Oct 2014 07:50:43 +0000 (15:50 +0800)]
rk312x lcdc: this vop bg layer not support yuv domain overlay,so bg val
have to set 0x800a80 equeal to 0x000000 at rgb domian,after
open win0/win1 alpha we recover to 0x00000.
hjc [Fri, 10 Oct 2014 07:11:31 +0000 (15:11 +0800)]
rk hdmi: update hdmi connect status
lyz [Fri, 10 Oct 2014 05:42:32 +0000 (13:42 +0800)]
usb: support different type of usb charger
Luowei [Sat, 11 Oct 2014 01:18:08 +0000 (09:18 +0800)]
box:enable uboot logo and sdmmc card
Luowei [Sat, 11 Oct 2014 00:32:25 +0000 (08:32 +0800)]
unmask spi dma code for rk312x
张晴 [Fri, 10 Oct 2014 07:18:47 +0000 (15:18 +0800)]
rk312x:clk:modify apll_clk 600M when init
CMY [Fri, 10 Oct 2014 07:07:17 +0000 (15:07 +0800)]
rk: ion: finished ION memory reserve more gracefully
hjc [Fri, 10 Oct 2014 03:30:53 +0000 (11:30 +0800)]
rk312x lcdc: update bcsh path select
lintao [Fri, 10 Oct 2014 01:44:02 +0000 (09:44 +0800)]
mmc: Support sdmmc/uart_dbg auto switch
Add pinctrl-names "udbg" in sdmmc blob, and drivers auto
switch io useage by card-detect tasklet routine. Only audi series need
it indeed now and ever.
Signed-off-by: lintao <lintao@rock-chips.com>
Acked-by: lw <lw@rock-chips.com>
Cc: phc <phc@rock-chips.com>
zwl [Thu, 9 Oct 2014 11:05:40 +0000 (19:05 +0800)]
rk312x:lvds: display no noise for lvds screen
cz [Thu, 9 Oct 2014 10:19:31 +0000 (18:19 +0800)]
ethernet:gmac: fix the bug that rtl8201F attach failed when clock input from rk SoC
hjc [Thu, 9 Oct 2014 08:42:36 +0000 (16:42 +0800)]
rk hdmi: update screen info for display uboot logo
hjc [Thu, 9 Oct 2014 08:28:31 +0000 (16:28 +0800)]
rk fb: fix change ddr freq lead to system panic when uboot display logo
lintao [Thu, 9 Oct 2014 08:56:35 +0000 (16:56 +0800)]
mmc: only ctrl_all_reset if slot state really changed
cz [Thu, 9 Oct 2014 06:44:19 +0000 (14:44 +0800)]
ethernet:gmac support phy irq for rtl8211e (disabled as default)
张晴 [Thu, 9 Oct 2014 06:42:36 +0000 (14:42 +0800)]
rk312x:pmic:rt5036:updata drivers to 1.0.9;support hdmi connect to VMID
huang zhibao [Thu, 9 Oct 2014 03:04:26 +0000 (11:04 +0800)]
input: box, ir add input.h in dts
huang zhibao [Thu, 9 Oct 2014 02:29:12 +0000 (10:29 +0800)]
kernel:input:ir, fix start kernel oops and move spaces
Simon [Thu, 9 Oct 2014 01:58:14 +0000 (09:58 +0800)]
rockchip: gpu: add /sys/rk_gpu/error_count
Note: these add node "error_count" for rk3036/rk312x/rk3288
gpu error auto detect,if cat /sys/rk_gpu/error_count return
> 1,means gpu work unnormal currently
huang zhibao [Wed, 8 Oct 2014 09:38:14 +0000 (17:38 +0800)]
Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
huang zhibao [Wed, 8 Oct 2014 09:37:41 +0000 (17:37 +0800)]
kernel:input: remotectl remove ir key struct to dts and handle ir irq not on cpu0
lintao [Wed, 8 Oct 2014 09:31:55 +0000 (17:31 +0800)]
mmc: merge dpm patch from my-mmc-next
hjc [Wed, 8 Oct 2014 09:01:33 +0000 (17:01 +0800)]
rk hdmi: identify diff SOC HDMI support video mode
zwl [Wed, 8 Oct 2014 08:55:00 +0000 (16:55 +0800)]
rk312x lcdc: scaler function for one lcdc dual display is ok
hjc [Wed, 8 Oct 2014 06:20:35 +0000 (14:20 +0800)]
rk3036 hdmi: fix edid read faile lead to error
lintao [Wed, 8 Oct 2014 00:20:33 +0000 (08:20 +0800)]
fix pio complie warning
zwl [Tue, 7 Oct 2014 11:54:02 +0000 (19:54 +0800)]
rk fb: fix get ion handle fail for mmap when stop and start system
hjc [Tue, 7 Oct 2014 10:09:12 +0000 (18:09 +0800)]
rk hdmi: parse hdmi edid when uboot show logo
yxj [Tue, 7 Oct 2014 09:37:15 +0000 (17:37 +0800)]
rk312x:lcdc:fix winx_set_addr register config err
cz [Tue, 7 Oct 2014 09:04:18 +0000 (17:04 +0800)]
Revert "ethernet:gmac: enable PHY vendors's driver"
This reverts commit
269d928b5cf9e89809be2627a1bcb63bb0e89283.
CMY [Tue, 7 Oct 2014 03:49:02 +0000 (11:49 +0800)]
rk: ion: add event tracer
Zheng Yang [Tue, 7 Oct 2014 01:24:58 +0000 (09:24 +0800)]
rk3128-box-rk88.dts: set fb map to FB0_WIN0_FB1_WIN1_FB2_WIN2.
lintao [Tue, 30 Sep 2014 09:45:24 +0000 (17:45 +0800)]
mmc: fixup edma stop when data err occur, cause edma halt
Fast insert and remove sd card make edma equeue, dequeue
frequently. And with unstable fifo data err, if we stop edma, it
terminate all data will been sent later and flush that desc. However,
MHSC hardware fifo byte counter in fault state because avaliable data
isn't enough, and remain data been teminated by stop edma. So edma req
signal in fault state event we restart edma. We just let edma sent remain
data, and reset fifo to drop these unused data.
<6>[ 1137.707403] mmc0: new SD card at address 1234
<6>[ 1137.708095] mmcblk0: mmc0:1234 SA02G 1.83 GiB
<3>[ 1141.654157] dwmmc_rockchip
10214000.rksdmmc: data_over interrupt timeout!
Signed-off-by: lintao <lintao@rock-chips.com>
yxj [Tue, 30 Sep 2014 06:21:59 +0000 (14:21 +0800)]
rk312x:lcdc: add interface to set buffer addre directly for win1&win0
yxj [Tue, 30 Sep 2014 06:13:13 +0000 (14:13 +0800)]
rk:fb: support all win for copy logo from loader
we default use win0 for ui,but some application
want use win1,such as tv box
ljf [Tue, 30 Sep 2014 07:36:42 +0000 (15:36 +0800)]
iep, disable iommu unmap for efficiency considering
ljf [Tue, 30 Sep 2014 07:32:15 +0000 (15:32 +0800)]
rk312x, rk3036: add mutex when detach iommu device. rk32 and later, clean vpu cache when decoding and encoding proceed. is not video output data will be invalid
Zheng Yang [Mon, 29 Sep 2014 10:47:14 +0000 (18:47 +0800)]
hdmi: remove read edid when hpd is actived.
黄涛 [Mon, 29 Sep 2014 10:43:45 +0000 (18:43 +0800)]
rk_serial: fix compilation warning
Zheng Yang [Mon, 29 Sep 2014 10:36:06 +0000 (18:36 +0800)]
rk312x lcdc: fix compile error.
Zheng Yang [Mon, 29 Sep 2014 10:24:08 +0000 (18:24 +0800)]
rk3128-box.dts: set fb map to FB0_WIN0_FB1_WIN1_FB2_WIN2.
Zheng Yang [Mon, 29 Sep 2014 10:23:24 +0000 (18:23 +0800)]
rk312x lcdc: when remap lcdc win id, need to swap some information.
lintao [Mon, 29 Sep 2014 09:48:42 +0000 (17:48 +0800)]
mmc: no need re-setup bus when dto
wlf [Mon, 29 Sep 2014 09:03:50 +0000 (17:03 +0800)]
USB: fix handle NAK for IN/OUT SSPLIT/CSPLIT transfers.
IN SSPLIT/CSPLIT transfers, NAK packet will cause DWC_OTG
ctrl to generate lots of SSPLIT/CSPLIT transfer interrupts,
and seriously affect the performance of the system. So need
to stop queue transactions after receive SSPLIT/CSPLIT NAK.
lintao [Mon, 29 Sep 2014 06:39:55 +0000 (14:39 +0800)]
wifi: tmp workaround 8089 pm for sdk release, will be reverted later
gwl [Mon, 29 Sep 2014 06:38:37 +0000 (14:38 +0800)]
Wifi: update wifi mac address user-defined function. for UpgradeDllTool_v1.31.
Sun Mingjun [Mon, 29 Sep 2014 06:34:53 +0000 (14:34 +0800)]
rk312x : add resource to BOX rk88.
zyc [Mon, 29 Sep 2014 06:12:33 +0000 (14:12 +0800)]
rk312x : cif : cif driver v0.0x1.8
Simon [Mon, 29 Sep 2014 01:45:16 +0000 (09:45 +0800)]
rk312x: gpu: disable the highest freq except benchmark,version to 0x03
Sun Mingjun [Sun, 28 Sep 2014 12:10:40 +0000 (20:10 +0800)]
rk3128 codec : fixed the codec output bug for box
zwl [Sun, 28 Sep 2014 14:12:50 +0000 (22:12 +0800)]
rk312x:lcdc: fix the calc of the scaler parameter is error for dual screen display
sugar [Sun, 28 Sep 2014 13:48:20 +0000 (21:48 +0800)]
Audio: spdif: add spdif card or not according dts define.
hwg [Sun, 28 Sep 2014 06:33:27 +0000 (14:33 +0800)]
wifi: update rtl8723bs driver
rk version 4.00.WFD, rtk version v4.3.5_11545.20140603_BTCOEX20140507-4E40
wlf [Sun, 28 Sep 2014 02:22:40 +0000 (10:22 +0800)]
USB: fix usb host connect detect timer.
Luowei [Sun, 28 Sep 2014 01:42:41 +0000 (09:42 +0800)]
1.print spi debug infomation to /proc/kmsg;
2.open tx and rx interrupt later;
3.improve software proccess for spi dma;
li bing [Sun, 28 Sep 2014 01:35:49 +0000 (09:35 +0800)]
Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into my_wifi
li bing [Sun, 28 Sep 2014 01:33:45 +0000 (09:33 +0800)]
BT: add rtl 8761aua's bluetooth.
lxt [Sun, 28 Sep 2014 00:15:28 +0000 (08:15 +0800)]
rk312x codec : add the ALC & AGC funtion of codec
hjc [Fri, 26 Sep 2014 08:01:07 +0000 (16:01 +0800)]
rk3036 hdmi: support uboot display logo
Zheng Yang [Fri, 26 Sep 2014 10:51:41 +0000 (18:51 +0800)]
rk3036/rk312x tve: add test mode for cvbs electrical capacity test.
zwl [Fri, 26 Sep 2014 09:22:38 +0000 (17:22 +0800)]
rk fb:sys: add other condition judge to avoid other error when write node
chenyifu [Fri, 26 Sep 2014 08:56:05 +0000 (16:56 +0800)]
rk312x mipi:improve CodingStype of mipi driver code
huang zhibao [Fri, 26 Sep 2014 07:14:37 +0000 (15:14 +0800)]
input:ir: add new remote control support