Commit Graph

402158 Commits

Author SHA1 Message Date
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
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
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
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
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
Mark Yao
492bb08384 kernel logo: default disable CONFIG_LOGO
because most projects use uboot logo display at kenel, so default
disable kernel logo.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2014-11-27 16:36:54 +08:00
lintao
4ac86774c9 mmc: auto-pin when pm call for udbg
If mux data lines with uart, drivers auto work around
pcl setting for CARD_PRESENT state

Signed-off-by: lintao <lintao@rock-chips.com>
2014-11-27 15:32:13 +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
Simon Xue
630463c333 rockchip: iommu: update iommu driver
1.Audi vpu_combo contain hevc and vpu,it need to switch
  when hevc on or vpu on,but there was a issue could cause
  hevc or vpu failed,so current vpu driver disable/enable
  iommu each frame to avoid failed,for these,a lot of log
  produced,so change dev_info to dev_dbg when iommu attach/deattach

2.AudiB has fixed the vop read problem,we use soc_is_rk3126 or
  soc_is_rk3128 instead of cpu_is_rk312x to identify Audi
2014-11-27 09:47:39 +08:00
Jaegeuk Kim
090748a40e f2fs: support xattr security labels
This patch adds the support of security labels for f2fs, which will be used
by Linus Security Models (LSMs).

Quote from http://en.wikipedia.org/wiki/Linux_Security_Modules:
"Linux Security Modules (LSM) is a framework that allows the Linux kernel to
support a variety of computer security models while avoiding favoritism toward
any single security implementation. The framework is licensed under the terms of
the GNU General Public License and is standard part of the Linux kernel since
Linux 2.6. AppArmor, SELinux, Smack and TOMOYO Linux are the currently accepted
modules in the official kernel.".

Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
(cherry picked from commit 8ae8f1627f)
2014-11-26 18:42:33 +08:00
Jaegeuk Kim
48ec812dcc f2fs: update inode page after creation
I found a bug when testing power-off-recovery as follows.

[Bug Scenario]
1. create a file
2. fsync the file
3. reboot w/o any sync
4. try to recover the file
 - found its fsync mark
 - found its dentry mark
   : try to recover its dentry
    - get its file name
    - get its parent inode number
     : here we got zero value

The reason why we get the wrong parent inode number is that we didn't
synchronize the inode page with its newly created inode information perfectly.

Especially, previous f2fs stores fi->i_pino and writes it to the cached
node page in a wrong order, which incurs the zero-valued i_pino during the
recovery.

So, this patch modifies the creation flow to fix the synchronization order of
inode page with its inode.

Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
(cherry picked from commit 44a83ff6a8)
2014-11-26 18:42:26 +08:00