Commit Graph

405761 Commits

Author SHA1 Message Date
Sugar Zhang
ef5d7fa848 ASoC: rockchip: spdif: caculate sclk according BMC(bitphase mark coding).
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2015-06-12 18:26:40 +08:00
Sugar Zhang
797954d65b ASoC: hdmi_spdif: add 192k samplerate support.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2015-06-12 18:26:36 +08:00
Sugar Zhang
e9c7ade7d9 ASoC: rockchip: spdif: add 192k samplerate support.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2015-06-12 18:26:33 +08:00
Sugar Zhang
7e73c35079 ASoC: rockchip: spdif: refactor driver code.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2015-06-12 18:26:30 +08:00
Xiao Feng
2e335a3872 pm_tests: rockchip: fix compilation warning
Signed-off-by: Xiao Feng <xf@rock-chips.com>
2015-06-12 14:36:46 +08:00
lyz
fded7e003a usb: otg: notify to pmu the otg vbus change
Signed-off-by: lyz <lyz@rock-chips.com>
2015-06-11 14:02:58 +08:00
lyz
ab1ac5a5b9 usb: bc: fix usb charger type detect error in rapidly hotplug
case for inno phy

In device mode, when doing usb plug and unplug rapidly, there
might be some problem with usb battery charger type detect,
caused by line bounces and other connect problems, at this case,
usb battery charger detect module prefer to report a battery
cherger type that draw less current to make it saver for PMIC and
downstream port safer.

Signed-off-by: lyz <lyz@rock-chips.com>
2015-06-11 14:02:58 +08:00
huang zhibao
112cd27141 dts: box fixed ddr freq to 800M 2015-06-11 11:05:38 +08:00
Tang Yun ping
d6f6086059 RK3368 Mailbox: add mailbox version information
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2015-06-10 19:19:37 +08:00
Shengqin.Zhang
c584d65041 rga2 compile error on 64 bit platform
Signed-off-by: Shengqin.Zhang <zsq@rock-chips.com>
2015-06-10 17:28:17 +08:00
Shengqin.Zhang
001f25ec76 fix rga2 compile error
Signed-off-by: Shengqin.Zhang <zsq@rock-chips.com>
2015-06-10 16:38:03 +08:00
Jianhong Chen
de8039fcce arm64: dts: rk3368-tb_8846.dts: modify rk818 battery node
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
2015-06-09 21:30:16 +08:00
zhangqing
a3ba3d67ea rk3x: rmic: rk818: fix the code build warning in rk3288.
Signed-off-by: chenjianhong <cjh@rock-chips.com>
2015-06-09 07:31:06 -07:00
Alpha Lin
095cb8d965 VPU: fix the code cannot be built in 32bits environment.
compat_uptr_t isn't define under 32bits environment, using
this definition under the CONFIG_COMPAT macro.

Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>
2015-06-09 13:44:33 +08:00
Wenlong Zhuang
448baf8f14 video: rockchip: rk312x lcdc: fix set standby err if not support uboot display
Signed-off-by: Wenlong Zhuang <daisen.zhuang@rock-chips.com>
2015-06-09 09:43:59 +08:00
Wu Liang feng
f66e5a7f70 usb: ehci: rename hsic and HSIC to ehci1 and EHCI1
Signed-off-by: Wu Liang feng <wulf@rock-chips.com>
2015-06-08 22:23:26 +08:00
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