Commit Graph

402196 Commits

Author SHA1 Message Date
Mark Yao
bef88e87a3 rk_fb: bmp_helper: copy bmp data with memcpy
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2014-12-29 15:03:49 +08:00
zsq
963a9aa886 close rga debug log 2014-12-29 11:53:34 +08:00
Alpha Lin
c1b99a7acb rk3288, rk3036, rk312x, vpu: new vpu driver.
Define the vpu and hevc as the sub-devices of the vpu_combo on
rk3036 and rk312x, combine the work queue of two device, avoid two
device running in the same time, (cause bus error on platform rk3036
and rk312x).
2014-12-29 10:10:01 +08:00
smj
4df3c8bb27 rk312x codec : fix the bug of codec capture gain 2014-12-26 21:07:26 +08:00
Huang, Tao
564a66a1cb arm/configs: add CONFIG_SECCOMP to rockchip_defconfig
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2014-12-26 13:56:29 +08:00
CMY
74ebc4ab43 rk: ion: fix dts parse failure on arm64 2014-12-26 13:04:08 +08:00
CMY
ee0b7b6a50 rk: ion: fix compilation error on arm64
Conflicts:

	drivers/staging/android/ion/rockchip/rockchip_ion.c
	include/linux/rockchip_ion.h
2014-12-26 13:00:41 +08:00
dkl
72dca47db4 clk: rockchip: set aclk_core_div to 4 for all rates in rk3036_apll_table
Set aclk_core_div to 4 for all rates, which makes rk3126\rk3128\rk3126b apll
frequency change stably.

Signed-off-by: dkl <dkl@rock-chips.com>
2014-12-26 10:11:39 +08:00
Wu Liang feng
28e9901cf0 USB: DWC_OTG: Support otg suspend and resume pm
Signed-off-by: Wu Liang feng <wulf@rock-chips.com>
2014-12-25 14:57:26 +08:00
Mark Yao
78648b80d8 rk312x: lcdc: fix shutdown power and clock deinit
immediately power down lcdc and clock, maybe
regs_update_handler still work, some status would
became wrong.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2014-12-25 10:06:38 +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
lyz
8689409d5b usb: rk312x: rk3126/3128 usb phy tuning set OTG port disconnect
trigger point to 600mv, default is 650mv
2014-12-22 15:48:16 +08:00
chenzhen
1ae1ba872d mali_760_driver, rk_ext :
Add log of ver_info and built_time of mali_ko.
2014-12-17 15:19:49 +08:00
chenzhen
4b2e73b447 mali_760_driver : rk_ext on arm_release_ver, from r5p0-02dev0. 2014-12-17 15:19:48 +08:00
chenzhen
4599043e5e mali_760_driver : arm_release_ver r5p0-02dev0. 2014-12-17 15:19:48 +08:00
li bing
032b70b4cd rk312x: close the bluetooth in the file rk3128-box-rk88.dts. 2014-12-17 13:58:18 +08:00
Huang, Tao
adf525716c ARM: rk: kernel.img depends on logo_kernel.bmp
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2014-12-17 13:41:37 +08:00
ljf
0b6f34f8ac iep driver:
get rid of kfree buffer which allocated using devm_kzalloc.

Signed-off-by: ljf <ljf@rock-chips.com>
2014-12-16 19:56:18 +08:00
zsq
bc190eca53 remove rga driver mmu buf malloc to prevent crash 2014-12-15 17:24:31 +08:00
dalon.zhang
86a0db3527 camera: UVC: fix UVC interrupt and other issues 2014-12-15 16:25:18 +08:00
cl
2adaeb93a1 rk312x: miss the new file rk3126.dtsi&&3128.dtsi for the commit c59e8d086aaf89d0f48351ff7287708b57e5aba1(rk312x: adjust dts relation)
Signed-off-by: cl <cl@rock-chips.com>
2014-12-15 09:09:09 +08:00
chenzhen
ecc6527784 rk, gpu :
source code for device/rockchip/common/gpu/libMali-T760/mali_kbase.ko,
	in branch rk/rk32/mid/5.0/develop,
	commit 1b187041f11b7ca1d6c1490b934f09648f334a19.
2014-12-12 18:08:54 +08:00
cl
c59e8d086a rk312x: adjust dts relation
Signed-off-by: cl <cl@rock-chips.com>
2014-12-12 17:59:56 +08:00
Huang, Tao
037ab54084 ARM: rk: build resource.img with logo_kernel.bmp
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2014-12-12 12:14:01 +08:00
hjc
c768774b04 rk fb: delete unused message
Signed-off-by: hjc <hjc@rock-chips.com>
2014-12-12 11:58:18 +08:00
zyc
3e986e49cf cif: set CONFIG_RK30_CAMERA_ONEFRAME default as yes in rockchip_defconfig 2014-12-12 11:40:23 +08:00
dkl
94cc30128d clk: rockchip: fix some code style problems in clk-pll.c
Signed-off-by: dkl <dkl@rock-chips.com>
2014-12-12 10:41:50 +08:00
dkl
d52ba29d14 clk: rockchip: fix pll_clk_get_best_set() for rk3188plus type pll
When selecting a best setting for rk3188plus type pll, consider a
larger NO first(means larger VCO freq), and a smaller NR later.

Signed-off-by: dkl <dkl@rock-chips.com>
2014-12-12 10:41:50 +08:00
lyz
d072c6fad2 rk32: disabled ohci in dt 2014-12-12 10:33:02 +08:00
lyz
d63fd641d1 ARM: rockchip: rockchip_defconfig add USB_OHCI_HCD 2014-12-12 10:33:02 +08:00
lyz
e84dbc3a64 rk312x: add support for ehci to all rk312x series 2014-12-12 10:33:02 +08:00
lyz
746e038458 rk32: ehci: work-around for abnormal ohci 2014-12-12 10:33:01 +08:00
lyz
29badc3cbd Revert "USB: Fix EHCI bug if connect with FS or LS device."
This reverts commit f65cb6fc5a.
2014-12-12 10:33:01 +08:00
hjc
4ccf4784af rk fb: box is use NO_DUAL mode,so fb have to disable dsp_black
Signed-off-by: hjc <hjc@rock-chips.com>
2014-12-11 17:04:48 +08:00
Mark Yao
aca8091786 rk_fb: logo: get kernel logo addr from protect memory region
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2014-12-11 14:09:30 +08:00
CMY
2ce890be5d rk: mem: protect memory region that specified by uboot on kernel booting 2014-12-11 12:59:21 +08:00
CMY
6c7783c2bf rk: ion: cma reserve 640MB at anywhere by default on rk32xx 2014-12-11 12:59:20 +08:00
lintao
eff12e6b2a Revert "mmc: auto-pin when pm call for udbg"
This reverts commit 4ac86774c9.
2014-12-10 17:16:28 +08:00
hjc
38d79c299e rk3288 hdmi: add config for hdmi
Signed-off-by: hjc <hjc@rock-chips.com>
2014-12-10 17:16:07 +08:00
hjc
2cf99697de rk312x lcdc: fix no used function call.
Signed-off-by: hjc <hjc@rock-chips.com>
2014-12-10 16:44:16 +08:00
Luowei
6060b193b9 rk3128-box:update dts according to pm.c 2014-12-10 14:20:28 +08:00
Mark Yao
1fd8baf8c7 rk_fb: rk312x: direct power on lcdc when do fb_unblank
when do fb blank, we diretcly off the lcdc, so I think
we should power on lcdc in pairs.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2014-12-10 09:44:36 +08:00
Luowei
ee58e93212 rk3288:umask dma support for spi 2014-12-10 08:21:14 +08:00
lyz
a9c8b6d090 rk312x: usb: cleanup ohci-rockchip.c and make it support rk312x 2014-12-09 22:25:41 +08:00
lyz
6e9e103d18 rk312x: usb: Skip DWC HOST for rk3126/3128 and usb phy tuning
1.Use EHCI/OHCI for all rk312x series
2.Set Host disconnect trigger point to 600mv, default is 650mv
2014-12-09 22:23:10 +08:00
lyz
23805582e3 phy: backport generic phy framework from kernel-3.18 2014-12-09 20:36:43 +08:00
Luowei
dd1d4beb15 rk3036:add CONFIG_SWITCH again 2014-12-09 18:01:39 +08:00
sugar
ea0122bffa i2s: compatible with rk3126/rk3126b/rk3128.
because i2s controller is different between rk3126 and rk3126b,
but require the same dtb, so add runtime compatible.
2014-12-09 16:29:02 +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