Commit Graph

405795 Commits

Author SHA1 Message Date
ShenZhengyi
f29270bbfe tve:rk1000:modify suspend and resume condition
Signed-off-by: ShenZhengyi <szy@rock-chips.com>
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-06-18 17:36:40 +08:00
ShenZhengyi
955e0696de tve:rk1000: Fix code style
Signed-off-by: ShenZhengyi <szy@rock-chips.com>
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-06-18 17:36:31 +08:00
hwg
60a93a12d8 bcmdhd wifi: add auto recognize different chips 2015-06-18 17:30:53 +08:00
xubilv
794be81939 rk3368: TP: Forget to remove source drivers/input/touchscreen/gt9xx/Kconfig.
Signed-off-by: xubilv <xbl@rock-chips.com>
2015-06-18 17:11:53 +08:00
hcy
e3e402066c dts: add rk3368-tb_mipi.dts to support new SDK top board
Signed-off-by: hecanyang <hcy@rock-chips.com>
2015-06-18 16:08:26 +08:00
Xiao Feng
d2c7fdf68a dvfs: rockchip: if can not get regulator, set regulator=NULL
Signed-off-by: Xiao Feng <xf@rock-chips.com>
2015-06-18 15:42:21 +08:00
Huang, Tao
1831cf8089 clocksource: rockchip_timer: set clockevent irq flags include IRQF_PERCPU
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-06-18 15:22:21 +08:00
xubilv
9c46bb6969 RK3368: TP: use dts to control the difference between GT9XX.
Signed-off-by: xubilv <xbl@rock-chips.com>
2015-06-18 11:38:19 +08:00
Jianhong Chen
4b1628fc24 rk3368-tb_8846: dts: modify battery node
1) add dc det pinctrl
	2) disable usb adapter
	3) set input charge current 3000mA

Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
2015-06-17 14:57:51 +08:00
Jianhong Chen
67fcb6b630 power: rk81x-battery: fix dwc_otg_check_dpdm declare error
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
2015-06-17 14:57:50 +08:00
Andy Yan
2546580dcb power: rk81x battery: fix charger online init
if the system boot with charger online, use it
as init state for power_supply_register

Signed-off-by: Andy Yan <yxj@rock-chips.com>
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
2015-06-17 14:57:50 +08:00
Andy Yan
70b21d62d2 power: rk81x battery: fix charge/discharge check in reboot mode
judge charge/discharge mode by current direction

Signed-off-by: Andy Yan <yxj@rock-chips.com>
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
2015-06-17 14:57:50 +08:00
Andy Yan
a42a087a7e power: rk81x battery: skip invalid voltage
rk81x battery may get invalid value when resume from suspend,
if the voltage get from adc is lower than INVALID_VOL_THRESD,
we consider it as invalid and filter it

Signed-off-by: Andy Yan <yxj@rock-chips.com>
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
2015-06-17 14:57:49 +08:00
Jianhong Chen
d4f8267697 power: rk81x-battery: disable charge over time funtion
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
2015-06-17 14:57:49 +08:00
Jianhong Chen
868ead9f12 power: rk81x-battery: count all avaraible rsoc into calc
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
2015-06-17 14:57:49 +08:00
Jianhong Chen
77ea8491fc power: rk81x-battery: get charge flag by command line
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
2015-06-17 14:57:49 +08:00
Andy Yan
357f3733c3 power: rk81x battery: add virtual power support
if some board don't use a real fuel gauge, set virtual_power
in dts, the battery driver will report virtural soc to user space

Signed-off-by: Andy Yan <yxj@rock-chips.com>
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
2015-06-17 14:57:48 +08:00
Jianhong Chen
e6653b5325 rk3368-p9_818: dts: rename dc det pinctrl name and add virtual_power
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
2015-06-17 14:57:48 +08:00
Eryu Guan
bcb0c86853 ext4: check for zero length extent explicitly
The following commit introduced a bug when checking for zero length extent

5946d08 ext4: check for overlapping extents in ext4_valid_extent_entries()

Zero length extent could pass the check if lblock is zero.

Adding the explicit check for zero length back.

Signed-off-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@vger.kernel.org
2015-06-17 11:48:50 +08:00
Sugar Zhang
2b92186106 ASoC: rockchip: coding style.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2015-06-16 19:11:06 +08:00
hjc
125ecc7284 rk fb: vsync thread distinction two vop
Signed-off-by: hjc <hjc@rock-chips.com>
2015-06-16 18:03:02 +08:00
Xiao Feng
ba2e134ba3 arm64: rockchip: rk3368-tb: dts: update dvfs table
Signed-off-by: Xiao Feng <xf@rock-chips.com>
2015-06-16 16:40:15 +08:00
ShenZhengyi
987c4de1c0 tve:rk1000: When set mode , judge whether delay
If the set mode is the same of current mode , it does not delay.

Signed-off-by: ShenZhengyi <szy@rock-chips.com>
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-06-16 16:10:10 +08:00
David Wu
7646793a44 rk3368: pinctrl: fix bank:3 gpio irq wakeup not worked
Signed-off-by: David Wu <wdc@rock-chips.com>
2015-06-16 15:55:00 +08:00
Sugar Zhang
96dca4bffe dts: rockchip: rename property 'i2s-controller' to 'audio-controller'
because we have i2s controller, spdif controller, so we use audio-controller
to include both.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2015-06-16 14:19:18 +08:00
Sugar Zhang
56490c7b7e ASoC: rockchip: rename property 'i2s-controller' to 'audio-controller'
because we have i2s controller, spdif controller, so we use audio-controller
to include both.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2015-06-16 14:15:24 +08:00
Sugar Zhang
09db66c5b4 ASoC: rockchip: spdif: drop owner assignment from platform_drivers
A platform_driver does not need to set an owner, it will be populated by the
driver core.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2015-06-16 14:14:35 +08:00
hwg
c983156c64 bcmdhd wifi: after android stop; start, wpa_supplicant start fail because of Failed to create a P2P Device interface p2p-dev-wlan0 2015-06-16 11:02:56 +08:00
hwg
2b23c1bbde bcmdhd: solve ap6212 sdio transmit abnormal 2015-06-16 09:40:05 +08:00
Alpha Lin
dc434cc6a0 VPU: enable auto-freq flag.
bug in previous commit, auto-freq flag disable in all the
platform.

raise freq to 600MHz when 4k avc video decode, could not
get the 500 MHz frequency from current clock pll.

Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>
2015-06-15 17:12:42 +08:00
Aiyoujun
8aa42326f9 dts: rk3368-p9_818: modify DVFS table for gpu, cpu and logic.
Signed-off-by: Aiyoujun <ayj@rock-chips.com>
2015-06-15 16:27:19 +08:00
Aiyoujun
ab291bc02c dts: rk3368-box: modify DVFS table for little cpu.
Signed-off-by: Aiyoujun <ayj@rock-chips.com>
2015-06-15 16:26:57 +08:00
Jony.Qiu
f4a9049a56 optee : optee linux build to .ko depend on function(sched_setaffinity)
Signed-off-by: Jony.Qiu <jony.qiu@rock-chips.com>
2015-06-15 16:04:58 +08:00
lyz
3e8ae7c50f usb: bc: fix crush caused by usb bc detect
Fix a bug that mutex used before init.

Signed-off-by: lyz <lyz@rock-chips.com>
2015-06-12 20:51:13 +08:00
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