Commit Graph

405376 Commits

Author SHA1 Message Date
Zheng Yang
bbccb1ea08 display-sys: delete unused code.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-05-22 18:37:36 +08:00
Shawn Lin
fd75a4d1d5 mmc: rk_sdmmc: fix compile warning
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2015-05-22 18:17:48 +08:00
Shawn Lin
6e719a67ff mmc: core: add wrapper for timeout value
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
cc: Xiao yao <xiaoyao@rock-chips.com>
2015-05-22 17:41:04 +08:00
Shawn Lin
e159933221 mmc: rk_sdmmc: do more timeout recovery operation
We stop slaver and rebank our setting for better
compatibility.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Reviewed-by: Roger Hu <roger.hu@rock-chips.com>
Tested-by:  Allen Lee <allen.lee@rock-chips.com>
cc: Xiao yao <xiaoyao@rock-chips.com>
2015-05-22 16:19:59 +08:00
Shawn Lin
a71c0cc8fb mmc: core: skyrocket timeout for cmd erase_group_xxx
It shocked me that a buggy emmc need quite a long period
of time for setting its erase_group_xxx. Increase timeout
value does not harm to normal case which just under constrain.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Tested-by: Yongzhong Yang <yongzhong.yang@rock-chips.com>
cc: Xiao yao <xiaoyao@rock-chips.com>
2015-05-22 16:19:59 +08:00
Shawn Lin
7fe20f9744 mmc: rk_sdmmc: disable controller int before enter deepsleep
Generally when machine enter deepsleep, with no cirrcumstance,
host can interact with slavery devices. So disbale our int generater
ourself. By occasionly, we find reset controller will trigger an
unexpected SEB int. It exists a race condition for reset and IO timing
before switched to gpio and confuse state machine.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Tested-and-Reviewed-by: Xiao yao <xiaoyao@rock-chips.com>
2015-05-22 16:19:59 +08:00
lintao
4bb5de4aae mmc: rk_sdmmc: add platform hook for special pm ops during deepsleep
We register a platform hook and restore all of our regs if platform does
need to cutoff controller's power-supply during deepsleep in period of time.
Make sure your have added "controller-power-down" property AND comment out
"keep-power-in-suspend" in related dts file.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Xiaoyao <xiaoyao@rock-chips.com>
Reviewed-by: Chenjh <chenjh@rock-chips.com>
Tested-by: Chenjh <chenjh@rock-chips.com>
2015-05-22 16:19:59 +08:00
Xiao Feng
db270573b2 dtsi: ddr_freq: add vop bandwidth freq table
Signed-off-by: Xiao Feng <xf@rock-chips.com>
2015-05-22 16:14:33 +08:00
Zheng Yang
3814ad7ea6 fb: add sysfs node lcdcid.
Now we have many fb devices, each vop layer is mapped to a fb device.
	If there is 2 vop, we can not distinguish the vop between these fb devices.
	Add sysfs node lcdcid to get the lcdc id mapped by fb device.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-05-22 15:30:07 +08:00
hwg
f2c6301f10 rfkill-wlan: skip can't find rockchip,grf property error in none 3368 platform 2015-05-22 09:52:18 +08:00
zhangqing
d9cbf1941d rk3368: pmic: rk818:adjust dcdc voltage step
Signed-off-by: zhangqing <zhangqing@rock-chips.com>
2015-05-21 11:56:16 -07:00
Sugar Zhang
bdc58cc10e ASoC: es8316: use startup/shutdown to manager power consumption.
use startup/shutdown to reduce power consumption, every time codec
standby, we shutdown codec. so, there is no need extra operation in
suspend.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2015-05-21 18:40:44 +08:00
Huang, Tao
cdff984abf arm: rockchip: vcodec_service: allow no rockchip,grf in dts
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-21 18:33:08 +08:00
Huang, Tao
a3933acd35 clk: rockchip: allow no rockchip,grf in dts on arm
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-21 18:33:07 +08:00
Sugar Zhang
a9ff4234b2 ASoC: dmaengine: use dma_request_slave_channel to request dma chan.
if i2s module probe before dma module, dma chan resources are not ready.
use dma_request_slave_channel to reinitialize dma chan if not ready.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2015-05-21 16:18:02 +08:00
Zheng Yang
71e8a27d62 HDMI: support show edid status.
Use /sys/class/display/HDMI/debug node to
	show sink EDID status and raw status.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-05-21 13:45:22 +08:00
Zheng Yang
57fc92cd71 display-sys: debug node support to show debug information.
Add a callback function getdebug() to show debug information.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-05-21 13:40:15 +08:00
Zheng Yang
48c8c2e11a HDMI: just list common format when edid is not valid.
If EDID is not valid, list following common format:
	1920x1080p-60
	1920x1080p-50
	1280x720p-60
	1280x720p-50
	720px576p-50
	720px480p-60

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-05-21 10:26:34 +08:00
hwg
5dfeb37094 esp8089 wifi: solve warning in 64bit 2015-05-21 09:02:38 +08:00
Huang, Tao
76e35f385c video: rockchip: rga2: fix compilation error on arm
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-20 22:10:23 +08:00
Huang, Tao
375d53a8f0 video: rockchip: fix compilation error on arm
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-20 22:09:59 +08:00
Huang, Tao
e6f34ca54b usb: rockchip: fix compilation error on arm
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-20 22:09:32 +08:00
Huang, Tao
55f34d6794 spi: rockchip: fix compilation error on arm
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-20 22:08:53 +08:00
Huang, Tao
effbff51fa pwm: rockchip: fix compilation error on arm
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-20 22:08:31 +08:00
Huang, Tao
32adcaf1d9 arm: rockchip: select MFD_SYSCON
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-20 22:07:02 +08:00
Huang, Tao
1179059c32 usb: dwc_otg: build driver depends on arm or arm64
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-20 21:30:05 +08:00
Huang, Tao
c215764f3f arm: rockchip: cpu.h: only support on arm
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-20 21:29:02 +08:00
Huang, Tao
a3cebb509a arm: rockchip: efuse: fix compilation error on arm
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-20 20:31:57 +08:00
Huang, Tao
d2cd7b6321 arm: rockchip: use read_cpuid_part instead of read_cpuid_part_number
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-20 16:02:24 +08:00
Huang, Tao
ceaf071f79 rk: gcc-wrapper.py ignore sysctl_net_core.c:24
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-20 15:34:59 +08:00
Huang, Tao
addd2754f3 rkwifi: dhd_config: fix compilation warning
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-20 15:34:03 +08:00
Huang, Tao
250ff749b2 rk1000: fix compilation warning 2015-05-20 15:17:32 +08:00
Huang, Tao
231897adf5 Merge branch develop-3.10-next 2015-05-20 14:49:34 +08:00
Xiao Feng
13cd935ba6 ddrfreq: add vop bandwidth freq table in dts, in order to support more boards
Signed-off-by: Xiao Feng <xf@rock-chips.com>
2015-05-20 14:33:20 +08:00
Xiao Feng
70a937f8a3 ddrfreq: fix new_freq=0 when the current load of ddr is between high_load and low_load
Signed-off-by: Xiao Feng <xf@rock-chips.com>
2015-05-20 14:32:03 +08:00
Alpha Lin
3dac608904 VPU, set the power-on flag after power domain already on.
Previous register operation before power on.
Software reset vpu inside vdpu interrupt handle.

Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>
2015-05-20 13:54:47 +08:00
Sugar Zhang
3fcbca1c7c ASoC: es8316: reduce standby power consumption around ~uA.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2015-05-20 11:10:11 +08:00
hjc
a597d99bfe rk fb:extern rockchip_get_screen_type for mipi dsi
Signed-off-by: hjc <hjc@rock-chips.com>
2015-05-20 11:05:09 +08:00
hjc
7369a1c17b rk fb: fix hdmi/cvbs display error when uboot display logo
Signed-off-by: hjc <hjc@rock-chips.com>
2015-05-20 11:00:21 +08:00
Zheng Yang
33f635665a HDMI: Not filter the input 3dmode with EDID information.
If input 3dmode is not list in EDID, we print a
	warning log and send it to sink, no longer return
	error.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-05-19 18:08:02 +08:00
Zheng Yang
77d30fd62d HDMI: fix edid 3d information offset parse error.
In EDID 3D descriptor, 3d information is after
	4K format. But we did not increase the offset of
	3d content if 4K format is zero, which make 3d
	information error.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-05-19 18:07:45 +08:00
Zheng Yang
c0e8b29213 HDMI: Not filter the input 3dmode with EDID information.
If input 3dmode is not list in EDID, we print a
	warning log and send it to sink, no longer return
	error.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-05-19 17:53:55 +08:00
Zheng Yang
09fe887fd1 HDMI: fix edid 3d information offset parse error.
In EDID 3D descriptor, 3d information is after
	4K format. But we did not increase the offset of
	3d content if 4K format is zero, which make 3d
	information error.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-05-19 17:50:55 +08:00
Mark Yao
ea92877923 rk_fb: compatible for mid hdmi switch screen
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-05-19 11:37:42 +08:00
Mark Yao
63f03d7c12 rockchip: video: fix logo display when switch screen
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-05-19 11:37:35 +08:00
Huang, Tao
50b9a50e3e input: keyboard: rk_keys: add wake lock
New version Android will never call EPOLLWAKEUP or EVIOCSSUSPENDBLOCK.
So we need add wake lock in driver.

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-19 11:09:02 +08:00
Huang, Tao
3d5bfb827c input: keyboard: rk_keys: use jiffies rather than msecs_to_jiffies
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-19 11:09:02 +08:00
Huang, Tao
3b6c8b4b8d input: keyboard: rk_keys: fix CodingStyle issues only
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-19 11:09:01 +08:00
Mark Yao
16deb4e06f rk_fb: compatible for mid hdmi switch screen
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-05-19 10:56:48 +08:00
Xiao Feng
b79a8ca460 rk3368: cpufreq: fix pm_notifier return NOTIFY_BAD
the big cluster mask is random when down cpu1~cpu7, so we get the error policy cpu in pm_notifier.

Signed-off-by: Xiao Feng <xf@rock-chips.com>
2015-05-18 21:23:31 +08:00