Commit Graph

405745 Commits

Author SHA1 Message Date
zhangqing
da2e4ebd02 rk3x: pmic: rk818: support low battery detect,and slove otg error.
Add function:
1)battery voltage low then 3.0V not allow to power on.
2)battery voltage low then 3.4V have irq to wakeup from deep sleep.
3)disable otg_en when rk818 shutdown..

Signed-off-by: zhangqing <zhangqing@rock-chips.com>
2015-06-08 10:30:41 -07:00
Zheng Yang
a2cc02921a hdmi: v2: update phy register value to improve output signal.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-06-08 16:40:18 +08:00
Zheng Yang
252d3a9b72 hdmi: edid: distinguish deep color mode between YCbCr444 and YCbCr420.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-06-08 16:36:18 +08:00
CMY
e645634ab9 rk3368 camera: hold vio0 noc clock during the camera work, fixed isp iommu stall failed
<6>[  142.697985] Enable stall request failed, MMU status is 0x00000011
<6>[  142.698006] rk_iommu ff914000.isp_mmu: (isp_mmu), rockchip_iommu_disable failed

Signed-off-by: CMY <cmy@rock-chips.com>
Tested-by:  GY <gy@rock-chips.com>
2015-06-08 16:08:53 +08:00
Jianhong Chen
8e3cca9270 power: rk81x-battery: check sec base by rsoc trend anyway
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
2015-06-08 09:32:09 +08:00
chenjh
d2dc4fb8c3 power: rk81x-battery: update verison to 4.0.0
this verison can support both ARM and SOFIA platform.

Signed-off-by: chenjh <chenjh@rock-chips.com>
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
2015-06-05 18:18:58 +08:00
chenjh
71739822de arm64: dts: rk3368-p9_818:modify battery node
Signed-off-by: chenjh <chenjh@rock-chips.com>
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
2015-06-05 18:18:43 +08:00
hjc
34ba62af49 vop: rk3288: update dither config for 10bit output mode
example for 10bit dual lvds output:
	timing0 {
		screen-type = <SCREEN_DUAL_LVDS>;
		out-face    = <OUT_P101010>;
		color-mode  = <COLOR_RGB>;
		...
	}

Signed-off-by: hjc <hjc@rock-chips.com>
2015-06-05 15:03:47 +08:00
hjc
1a4315c213 rk3368 vop: cabc lut update only when cabc enable
Signed-off-by: hjc <hjc@rock-chips.com>
2015-06-05 14:37:13 +08:00
Zheng Yang
96ce23d239 hdmi:edid: improve edid check redundancy.
If edid first block header check or checksum is error,
	but data[126] value is smaller than 4, we think it is
	accecptable, return suscess.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-06-05 14:20:31 +08:00
Alpha Lin
801b12312d VPU: add cru reset if vpu hardware hang or vpu report
error.

It depend on pmu driver. and require pmu to complete
its idle request function.

temporary, it haven't enable yet, because rk3368 pmu
function had not completed.

Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>
2015-06-04 17:36:18 +08:00
Alpha Lin
c118a78b5b VPU: add a hardware error check in interrupt handle.
Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>
2015-06-04 17:31:22 +08:00
Alpha Lin
ee5956e454 VPU: use debugfs_remove_recursive to recursive remove
debugfs node.

Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>
2015-06-04 17:26:41 +08:00
Alpha Lin
87fb0b6b55 VPU: abondon old time consume log print, used new time record
interface to calculate and print time logs.

Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>
2015-06-04 17:02:08 +08:00
Alpha Lin
a79dff85c1 VPU: add debug log classification output method.
Use /sys/module/vcodec_service/parameters/debug to
control log output, each bit represent a type of debug
information.

Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>
2015-06-04 16:52:32 +08:00
Alpha Lin
bd6d1444e8 VPU: support compatible vpu request from userspace.
This revision need rk3368 android library libvpu to
revert it VPUReq_t definition, Revert RK_U64 req;
to RK_U32 *req;

Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>
2015-06-04 16:32:16 +08:00
Zheng Yang
031e71fa64 rk1000: shorter reset delay time.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-06-04 16:10:44 +08:00
Zheng Yang
2d8f7edfaa rk1000: fix create sysfs file permission error.
Wrong permission will case following warning:

	------------[ cut here ]------------
	WARNING: at drivers/base/core.c:576 device_create_file+0x74/0xa4()
	Attribute rkcontrl: write permission without 'store'
	Modules linked in:
	CPU: 0 PID: 1 Comm: swapper/0 Not tainted 3.10.0 #247
	Call trace:
	[<ffffffc000087dc0>] dump_backtrace+0x0/0x10c
	[<ffffffc000087edc>] show_stack+0x10/0x1c
	[<ffffffc00087c0e4>] dump_stack+0x1c/0x28
	[<ffffffc0000a1b08>] warn_slowpath_common+0x74/0x9c
	[<ffffffc0000a1b7c>] warn_slowpath_fmt+0x4c/0x58
	[<ffffffc00036cfec>] device_create_file+0x70/0xa4
	[<ffffffc000399fc4>] rk1000_probe+0x1d0/0x20c
	[<ffffffc00058b190>] i2c_device_probe+0x9c/0xd4
	[<ffffffc000370e70>] driver_probe_device+0xd0/0x210
	[<ffffffc00037105c>] __driver_attach+0x60/0x90
	[<ffffffc00036f394>] bus_for_each_dev+0x60/0x88
	[<ffffffc00037096c>] driver_attach+0x1c/0x28
	[<ffffffc000370540>] bus_add_driver+0xf4/0x210
	[<ffffffc000371698>] driver_register+0xbc/0x138
	[<ffffffc00058b054>] i2c_register_driver+0x48/0xac
	[<ffffffc000bf2934>] rk1000_init+0x14/0x20
	[<ffffffc000081554>] do_one_initcall+0x80/0x120
	[<ffffffc000bdb8f0>] kernel_init_freeable+0x148/0x1e8
	[<ffffffc000876a10>] kernel_init+0x10/0xcc
	---[ end trace 1cc1e45d37744cff ]---

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-06-04 15:35:35 +08:00
Zheng Yang
598440e1c6 rk1000: fix rk1000-core.c code style.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-06-04 15:15:20 +08:00
Huang, Tao
38c5411444 arm64: rockchip: rockchip_defconfig enable PRINTK_PROCESS
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-06-03 17:40:01 +08:00
Huang, Tao
ceaeb4796f add support show process information on printks
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-06-03 17:40:01 +08:00
hjc
36cb2472e4 rk fb: if win close we have to set 4 area state to 0, otherwise will lead to pagefault
Signed-off-by: hjc <hjc@rock-chips.com>
2015-06-03 11:38:39 +08:00
hjc
1061576f98 rk fb: 2 pixel align for interlace and xact offset
Signed-off-by: hjc <hjc@rock-chips.com>
2015-06-03 11:29:37 +08:00
hjc
cc3e63b852 rk3368 lcdc: in interlace mode & resolutation is p to i scale, disable vscale done and enable gt2
Signed-off-by: hjc <hjc@rock-chips.com>
2015-06-03 11:29:37 +08:00
hwg
361c76b08d rfkill-wlan.c: solve mac addr all zero error, cause can't connect ap problem 2015-06-03 09:28:46 +08:00
Huang, Tao
5d2ba06a56 arm64: rockchip: rockchip_defconfig sync with samsung product
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-06-02 18:24:18 +08:00
Huang, Tao
d40a582a8c rk: RK_CONSOLE_THREAD no depends on FIQ_DEBUGGER_CONSOLE
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-06-02 18:24:18 +08:00
zxl
5d82dfee2f RK3368 GPU version: Rogue L 0.17
1. Support gpu disable dvfs case.
2. Add rk_tf_check_version to compatible for rk3328.
3. merge 1.4_ED3573678 DDK code.
   Tip: Need update RK3368 GPU so version to L0.17(@vendor/rockchip/common).
2015-06-02 16:07:27 +08:00
Huang, Tao
46f1476d2d rk: gcc-wrapper.py fix psci ignore
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-06-02 14:26:58 +08:00
Huang, Tao
e82146650e Merge branch android-common-3.10 2015-06-02 11:25:51 +08:00
Huang, Tao
3ca9efa2f8 Merge tag 'lsk-v3.10-15.05-android' into develop-3.10 2015-06-02 11:25:34 +08:00
Huang, Tao
668e3ed51f Revert "zram: don't grab mutex in zram_slot_free_noity"
This reverts commit 66db73c14b.
2015-06-02 11:25:10 +08:00
Huang, Tao
d365bf6679 arm64: rockchip: efuse: support set system serial
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-06-02 11:04:51 +08:00
hwg
a9f10c0192 bcmdhd wifi: update to 1.201.59.4 2015-06-01 15:54:19 +08:00
hwg
94dfc90f19 rfkill-wlan, solve rockchip_wifi_mac_addr error 2015-06-01 15:41:27 +08:00
Zheng Yang
d6f81d1133 HDMI: add mutex lock to edid modelist operation.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-05-29 10:08:34 +08:00
Riley Andrews
67680c1419 android: drivers: workaround debugfs race in binder
If a /d/binder/proc/[pid] entry is kept open after linux has
torn down the associated process, binder_proc_show can deference
an invalid binder_proc that has been stashed in the debugfs
inode.  Validate that the binder_proc ptr passed into binder_proc_show
has not been freed by looking for it within the global process list
whilst the global lock is held. If the ptr is not valid, print nothing.

Bug 19587483
Change-Id: Ice878c171db51ef9a4879c2f9299a2deb873d255
Signed-off-by: Riley Andrews <riandrews@android.com>
2015-05-28 14:32:35 -07:00
hwg
1fb8cff52e esp8089 wifi: solve warning in 64bit, new method 2015-05-28 14:35:42 +08:00
CMY
47b2346ab1 rk: iommu: support iommu region guard
Add an guard area after each iommu region, it is used to detect cross-border access

Signed-off-by: CMY <cmy@rock-chips.com>
Signed-off-by: XXM <xxm@rock-chips.com>
2015-05-28 11:54:57 +08:00
hjc
3a354c544c rk fb: act_height should be 2 pix align for interlace output
Signed-off-by: hjc <hjc@rock-chips.com>
2015-05-28 10:13:44 +08:00
Erik Kline
e4a6d6ba5a neigh: Better handling of transition to NUD_PROBE state
[1] When entering NUD_PROBE state via neigh_update(), perhaps received
    from userspace, correctly (re)initialize the probes count to zero.

    This is useful for forcing revalidation of a neighbor (for example
    if the host is attempting to do DNA [IPv4 4436, IPv6 6059]).

[2] Notify listeners when a neighbor goes into NUD_PROBE state.

    By sending notifications on entry to NUD_PROBE state listeners get
    more timely warnings of imminent connectivity issues.

    The current notifications on entry to NUD_STALE have somewhat
    limited usefulness: NUD_STALE is a perfectly normal state, as is
    NUD_DELAY, whereas notifications on entry to NUD_FAILURE come after
    a neighbor reachability problem has been confirmed (typically after
    three probes).

Change-Id: I1d01d40ef3bc4753b0eaa79da2b27235425b1934
Signed-off-by: Erik Kline <ek@google.com>
Acked-By: Lorenzo Colitti <lorenzo@google.com>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-05-28 05:59:03 +09:00
Mark Salyzyn
9de69da198 New Build Breakage in branch: kernel-m-dev-tegra-flounder-3.10 @ 1960706
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Change-Id: I5682198bce94e66ff3de52989c7e361ffc25ba51
2015-05-27 11:13:39 -07:00
Mark Salyzyn
7449299aa1 net/unix: sk_socket can disappear when state is unlocked
got a rare NULL pointer dereference in clear_bit

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 21252747
Change-Id: I27e70f2543034097c8a590a212c2c6fa846fe695
2015-05-27 08:53:07 -07:00
Huang, Tao
a8f65c2c61 rm64: rockchip: rockchip_defconfig disable EARLY_PRINTK
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-27 16:51:40 +08:00
Huang, Tao
f75022e471 arm64: rockchip: check tf version later
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-27 16:49:32 +08:00
Herman Chen
663f6441d7 vcodec: add soft reset after reading dec registers
Sometimes decoder got a timeout error and can not recover from error status.
We need to add soft reset after reading dec registers.

Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
2015-05-27 10:53:37 +08:00
Herman Chen
41dad664eb vcodec: fix enable race condition when power on/off
When multi-instances power on at same time the condition enabled maybe
set mutli-times. Use atomic function to replace orginal
read/compare/change operation to avoid multi-instances.
Also add power on/off count to debugfs for checking

Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
2015-05-27 10:52:05 +08:00
xxx
8967167af2 add func: check tf ver 2015-05-27 09:04:58 +08:00
hjc
5a5e21e9b1 rk3368 lcdc: update hdmi overscan config path
Signed-off-by: hjc <hjc@rock-chips.com>
2015-05-26 17:12:04 +08:00
hjc
4f8e3e9837 rk fb: fix in interlace mode switch between ntsc and pal lead to pagefault
Signed-off-by: hjc <hjc@rock-chips.com>
2015-05-26 17:12:04 +08:00