Commit Graph

403486 Commits

Author SHA1 Message Date
Huang, Tao
dcbd24b274 pwm: rockchip: covert dsb() to dsb(sy) 2014-12-10 19:25:48 +08:00
Huang, Tao
82c4a8857a irqchip: gic: covert dsb() to dsb(sy) 2014-12-10 19:24:50 +08:00
Huang, Tao
47b1e48e85 mmc: rockchip: covert dsb() to dsb(sy) 2014-12-10 19:24:11 +08:00
Huang, Tao
5624f0b836 rockchip: clk: covert dsb() to dsb(sy) 2014-12-10 19:23:04 +08:00
Huang, Tao
35140154b1 ethernet: gmac: covert dsb() to dsb(sy) 2014-12-10 19:21:35 +08:00
hjc
96808e0a17 rk3368 dtsi: modify dtsi for display module
Signed-off-by: hjc <hjc@rock-chips.com>
2014-12-09 15:12:21 +08:00
hjc
7d40b12c2c rk3368 lcdc: add lcdc driver
Signed-off-by: hjc <hjc@rock-chips.com>
2014-12-09 15:12:14 +08:00
hjc
4cd85a1ffb rk31xx lvds: add support rk3368 lvds transmitter
Signed-off-by: hjc <hjc@rock-chips.com>
2014-12-09 15:12:08 +08:00
Huang, Tao
040cf4804a Merge branch develop-3.10 into develop-3.10-next 2014-12-09 15:10:34 +08:00
hjc
59a94c106e rk312x lcdc: fix vop csc config error 2014-12-08 18:24:42 +08:00
Mark Yao
872aaef89f rk_fb: logo: support display bmp logo from uboot
get bmp file data from bootargs "kernel_logo=xxxxxx", decoder bmp
file to framebuffer.

now support rle 8bit bmp files and 24bit bmp files.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2014-12-08 17:54:59 +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
typ
c9303ae785 RK3126/3126B DDR:fix ddr DQS1 drv set err 2014-12-08 10:56:00 +08:00
sugar
764e56c849 Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into rk30/box/4.4_r1/develop 2014-12-08 09:44:14 +08:00
sugar
6e500ff492 i2s: compatable with rk3126/rk3126b/rk3128. 2014-12-08 09:40:26 +08:00
sugar
53d3292a72 Revert "rk3126/rk3126b: i2s: use i2s_2ch."
This reverts commit 942d98b30d.
2014-12-08 09:11:51 +08:00
Huang, Tao
d03390bfcd Merge tag 'lsk-v3.10-android-14.11'
LSK Android 14.11 v3.10

Conflicts:
	arch/arm/include/asm/cputype.h
2014-12-05 21:18:34 +08:00
lyz
1bfc7cccc5 usb: cleanup useless struct usb20otg_pdata_id 2014-12-05 19:26:34 +08:00
许盛飞
cd75fbf901 RK3126B: RK3126B delete the EBC
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
2014-12-05 19:05:59 +08:00
li bing
039bc0006d wifi->esp8089: add wifi mac address user-defined function. 2014-12-05 17:41:29 +08:00
sugar
942d98b30d rk3126/rk3126b: i2s: use i2s_2ch. 2014-12-05 14:36:00 +08:00
blb
190da48d20 rk3128 & rk3036 : change the led color when power up and down
Signed-off-by:blb <blb@rockchips.com>
2014-12-05 14:27:30 +08:00
CMY
e46863d23c rk: ion: fix dts parse failure on arm64 2014-12-05 12:04:01 +08:00
li bing
e1985ec3e3 wifi->esp8089:
ESP8089 driver update to V1.9 (11272014).
     Update the V2.3 esp_prealloc program.

     This update is mainly as follows:
        1.To increase the new MAC address and MAC address customized version of the support;
        2.Enhance the robustness of the code;
        3.The increase of pure drive consistency under Linux and android;
        4.Enhance compatibility of non-standard AP;
        5.Improve the stability of the P2P mode.
2014-12-05 10:44:14 +08:00
hjc
2afa1f900e rk fb: mid not support uboot display hdmi, so wo identify box and mid at switch screen 2014-12-05 08:46:11 +08:00
cl
f0c78e5826 rockchip: avoid change ddr freq before lcd driver is inited
Signed-off-by: cl <cl@rock-chips.com>
2014-12-04 10:12:52 +08:00
cl
968c0c2c56 rk3288: arm pvtm add RK3288_PROCESS_V2
Signed-off-by: cl <cl@rock-chips.com>
2014-12-03 19:54:35 +08:00
dkl
8280d038cc rk3368: clk: fix address expression and some errors
Signed-off-by: dkl <dkl@rock-chips.com>
2014-12-03 19:15:17 +08:00
dkl
322cfe7421 rk3368: clk: add clocks-init and clocks-enable in DTS
Signed-off-by: dkl <dkl@rock-chips.com>
2014-12-03 19:15:16 +08:00
dkl
c83fb066be rk3368: clk: add codes to make npll only used by dclk_vop
Signed-off-by: dkl <dkl@rock-chips.com>
2014-12-03 19:15:16 +08:00
dkl
566db1b206 rk3368: clk: add rk3368_apllb_table/rk3368_aplll_table
Signed-off-by: dkl <dkl@rock-chips.com>
2014-12-03 19:15:16 +08:00
Huang, Tao
f0f3909f35 Merge branch develop-3.10 into develop-3.10-next 2014-12-03 19:10:23 +08:00
Mark Yao
b8cffb14fc rk_fb: sysfs: make use vmap/vunmap in pairs.
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2014-12-03 15:10:19 +08:00
Mark Yao
2855e146a1 rk_fb: sysfs: add dump_buffer func to fb sysfs
Due to some time we want to know which buffer vop scaning, use "io"
cammand to dump buffer is too complex, so we add a sys node to help
buffer dump.

how to use it:
- echo bin > /sys/class/graphics/fb0/disp_info
  it will create bin file at /data/xxx.bin
- or echo bmp > /sys/class/graphics/fb0/disp_info
  it will create bmp file at /data/xxx.bmp,
  this file is normal bmp file.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2014-12-03 11:40:55 +08:00
Mark Yao
dec12c59c7 ion: export ion handle get/put
use ion handle get/put, we can easyly protect the buffer when we
use it.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2014-12-03 11:40:54 +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
lyz
aa443016ed usb: dwc_otg: fix incorrect bit operation 2014-12-02 18:55:37 +08:00
typ
b5010bc267 RK3126B DDR:add supporting DDR change freq 2014-12-02 10:25:05 +08:00
ljf
9a0ca83d88 hevc, add scaling list table patch in kernel, fix bug in scaling list enable hevc video playback 2014-12-01 11:35:08 +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
ljf
b72ef799e9 vcodec iommu, fix some vp8 source decode cause
iommu pagefault. omit some iommu table creation.

Signed-off-by: ljf <ljf@rock-chips.com>
2014-11-28 15:13:46 +08:00
CMY
81931b033e rk: ion: change ion's debug node for other r/w 2014-11-28 15:07:49 +08:00
Mark Yao
cd1e68d59e rk_fb: rk3128: fix crash when boot when with hdmi plug
enable iommu when first ion buffer take effect.
2014-11-28 14:40:01 +08:00
Zheng Yang
f23cbf56e9 rk3036/rk3128 hdmi:
According to HDMI CTS 7-19, GCP SB1~SB6 value must be zero
	if color mode is 24bit. So we enable reg04 bit4 which will
	set CD[0:3] of SB1 to zero.
2014-11-28 14:13:16 +08:00
许盛飞
ccc87547dd rk312xdts: reconfiguration the rk3126-sdk.dts
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
2014-11-28 09:51:09 +08:00
smj
c31fb693ea rk3036:SDK enable sdmmc
rk88 disable pwm_regulator

Signed-off-by: smj <smj@rock-chips.com>
2014-11-28 09:17:52 +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
blb
b5b11e0960 rk3128 & rk3036: add the power led support of box-rk88
Signed-off-by: Bai Longbiao <blb@rock-chips.com>
2014-11-27 20:46:18 +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