Commit Graph

61196 Commits

Author SHA1 Message Date
dalon.zhang
f6cc29031a camera:
oneframe: v0.2.0
pingpong: v0.1.a
2015-02-28 19:13:11 +08:00
hwg
7e92f35bdf support different wifi bt chip auto compatible
like auto recognize rtl8188eu, ap6210, esp8089 in android
2015-02-28 14:05:32 +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
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
0a62774761 rk fb: new display framework for dual display mode
move extend display(HDMI) configuration to hareware composer lib
and support dual different display.
Need update: hareware composer lib.

Signed-off-by: xzj <xzj@rockchips.com>
Signed-off-by: zwl <zwl@rockchips.com>
2015-01-22 14:14:43 +08:00
lintao
491715787b mmc: backport tmo mechanism
Signed-off-by: lintao <lintao@rock-chips.com>
2015-01-14 21:15:23 +08:00
guoyi
5002601be4 sensor: add mpu6880's accel and gyro support. 2015-01-14 14:58:31 +08:00
许盛飞
a8c18a575a rk818-battery: fix Division by zero in kernel, and update regs definition
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
2015-01-12 11:40:45 +08:00
许盛飞
f5458974e1 battery: update rk818-battery driver
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
2015-01-05 15:07:36 +08:00
Mark Yao
2fddf40afc rk_fb: update uboot & kernel logo parse
Sometimes we want to display logo at hdmi screen. but hdmi uboot
resolution maybe different with framebuffer size, so we need read
logo config from regs and decide how to display logo at kernel.

now only support uboot logo size = kernel logo size

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2014-12-29 16:30:03 +08:00
CMY
be6254128b rk: ion: ion's heap id order by heap type
need update android, including:
    hardware/rk29/libgralloc_ump/
    hardware/rk29/camera/
    external/rk-pcba-test/
2014-12-23 18:16:22 +08:00
CMY
2ce890be5d rk: mem: protect memory region that specified by uboot on kernel booting 2014-12-11 12:59:21 +08:00
lyz
23805582e3 phy: backport generic phy framework from kernel-3.18 2014-12-09 20:36:43 +08:00
hjc
b9c889d03e rk fb: update fb config done info.
this commit depend on hwc update,
       including the following directory:

       hardware/rk29/hwcomposer_rga/
       hardware/rk29/libgralloc_ump/
       hardware/libhardware/
2014-12-08 17:06:57 +08:00
Mark Yao
52e5c707fc rk_fb: use front_regs instead of some global variable
front_regs means this config is scaning on the vop devices

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2014-12-03 11:40:54 +08:00
Mark Yao
6ba051470a rk_fb: fix iommu problem when hdmi plug or unplug.
There are two thread will update the win config,
one is update_regs handler, another is hdmi hotplug
thread, win config maybe modify by another thread
unexpectly, then vop scan umap address, cause iommu
crash, so we need use a mutex to protect win config.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2014-12-01 09:02:56 +08:00
dalon.zhang
8a297b0552 camera : cif : v0.1.a Support rk3288 cif driver 2014-11-29 19:38:54 +08:00
许盛飞
6f2cf955a2 rk312x-sleep: arm-off and ddr_selfrefres by soft controled
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
2014-11-28 09:11:21 +08:00
lintao
3aa5e0ae7a Revert "mmc: add rto for infinit sending timeout loop"
This reverts commit 426495888a.
2014-11-27 20:04:34 +08:00
lintao
426495888a mmc: add rto for infinit sending timeout loop
dw_mci write cmd index to CMD register to trigger sending cmd by BIU.
However, if device fall into panic holding cmd/data line to low level cause BIU
cannnot send out cmd forever. So no cmd_done_int will come. AND, cmd response timeout
only valid after cmd been sent. Nothing to break this loop, we need a s/w recovery from
STATE_SENDING_CMD to STATE_IDLE, and the pending one reported as -ETIMEOUT, let caller
decide howto again.

Reported-by: roger.hu <hwg@rock-chips.com>
Signed-off-by: lintao <lintao@rock-chips.com>
Reviewed-and-tested-by: roger.hu <hwg@rock-chips.com>
2014-11-27 15:25:47 +08:00
Huang, Tao
08b84034cc ARM: rockchip: rk3126b: add initial support 2014-11-21 14:01:21 +08:00
lintao
92469f0f90 mmc: capture dpm notify and avoid conflict scan flow
Signed-off-by: lintao <lintao@rock-chips.com>
2014-11-17 11:36:45 +08:00
zyc
5c2e792bff camsys_drv: v0.0x18.0 camsys_head: v0.0xa.0 2014-11-10 11:45:56 +08:00
Zheng Yang
218be25fc5 hdmi & fb:
For box, we need to set hdmi switch state when insert/remove,
        regardless of whether the device supports audio. So add function
        rk_fb_get_display_policy() to get display policy.
2014-11-07 18:01:48 +08:00
zwl
44716efd92 rk fb:
* add support the regulator type of power control for lcd
	Signed-off-by: zwl <zwl@rock-chips.com>
2014-11-05 20:24:09 +08:00
cl
82b4c9d85b dvfs: add leakage adjust volt support
Signed-off-by: cl <cl@rock-chips.com>
2014-11-05 17:08:12 +08:00
sugar
e5f7f9c1e0 Audio: add 192k samplerate support. 2014-11-05 13:25:47 +08:00
cl
2bee4db6a5 dvfs: add pvtm support
Signed-off-by: cl <cl@rock-chips.com>
2014-11-05 10:00:28 +08:00
许盛飞
7dd68f0d2b adc-battery: add the function of auto-calibration the reference-voltage
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
2014-11-03 10:05:29 +08:00
hjc
45166c7028 rk312x lcdc: kernel bcsh selete depend on uboot config 2014-10-31 16:49:19 +08:00
lintao
218243389f mmc: Hynix 4.41 iNAND no trim quirk patch from mediatek 2014-10-22 14:59:32 +08:00
Zheng Yang
f92fcd1ceb fb:
Define dts node disp-policy vale:
		DISPLAY_POLICY_SDK
		DISPLAY_POLICY_BOX
2014-10-21 17:31:57 +08:00
Zheng Yang
08afd8301c fb:
Add disp-policy in dts and disp_policy in struct rk_fb
        to distinguish box and sdk display policy.
2014-10-21 14:37:09 +08:00
Cai Zhiyong
d4900b6d2b 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
2014-10-16 12:41:23 +08:00
zwl
81f254ee04 rk fb: add rk_fb_par data struct to store more fb info 2014-10-16 10:02:57 +08:00
CMY
f0ab5f44c0 rk: ion: add drm heap for secure buffer allocation 2014-10-15 15:31:17 +08:00
lintao
47f217c4ea 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>
2014-10-10 09:56:24 +08:00
hjc
a5c44520bb rk fb: fix change ddr freq lead to system panic when uboot display logo 2014-10-09 17:03:58 +08:00
张晴
5dc17820ab rk312x:pmic:rt5036:updata drivers to 1.0.9;support hdmi connect to VMID 2014-10-09 14:42:36 +08:00
huang zhibao
bc0654474f kernel:input:ir, fix start kernel oops and move spaces 2014-10-09 10:29:12 +08:00
huang zhibao
552ead47b6 Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10 2014-10-08 17:38:14 +08:00
huang zhibao
035efe383e kernel:input: remotectl remove ir key struct to dts and handle ir irq not on cpu0 2014-10-08 17:37:41 +08:00
zwl
32827dae2b rk312x lcdc: scaler function for one lcdc dual display is ok 2014-10-08 16:56:06 +08:00
wdc
180b9112e8 rk3036: votalge adjust changed to pwm regelator when suspend 2014-09-25 13:35:53 +08:00
hjc
d1c8b6180a rk hdmi: add node to get TV audio&video info 2014-09-22 11:13:42 +08:00
lintao
1c912e0e91 mmc: add atomic operation for register 2014-09-22 10:17:20 +08:00
lintao
d9a820a163 mmc: schedule out rescan flow for confilicting with ehci reset
Signed-off-by: lintao <lintao@rock-chips.com>
2014-09-20 16:59:44 +08:00
zwl
d2a3adf0f9 rk fb: fix primary screen display flicker at the moment of hdmi insert 2014-09-18 19:52:13 +08:00
陈亮
eb7e8235cf rk312x: correct clk_ddr rate
Signed-off-by: 陈亮 <cl@rock-chips.com>
2014-09-18 02:33:31 -07:00
ddl
51b573ba61 camsys_drv: v0.0x15.0 camsys_head: v0.9.0 2014-09-18 09:57:37 +08:00