Commit Graph

269485 Commits

Author SHA1 Message Date
yzq
4c82877891 fb: add sys point for dual display mode 2012-11-07 16:35:47 +08:00
zhengxing
aefb4d5932 M701: add is_reboot_charging function, avoid to charging display error. 2012-11-07 12:16:02 +08:00
ddl
7336bd1117 camera: add support interpolate to 8Mega, version v0.2.0x17 2012-11-07 11:53:31 +08:00
许盛飞
3398342781 adc-battery: add battery-power decision method when reboot the system 2012-11-07 11:46:01 +08:00
wuhao
1343a05e2e Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into v86-develop-1106 2012-11-07 10:25:06 +08:00
宋秀杰
a9aa9474fe phonepad: modify HDMI suspend and resume crash, mute pad sound when insert HDMI. 2012-11-07 09:11:31 +08:00
hwg
b236f11e7b usb wifi: disable wifi power then enable in first open 2012-11-06 20:56:54 +08:00
wuhao
4e42e7b6a7 Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into v86-develop-1106 2012-11-06 20:17:23 +08:00
hwg
2f90c8ef93 Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0 2012-11-06 20:05:46 +08:00
hwg
9b2202fcf7 usb wifi: add rk29sdk_wifi_bt_gpio_control_init 2012-11-06 20:05:25 +08:00
wuhao
1e979fd77e Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into v86-develop-1106 2012-11-06 18:22:46 +08:00
kfx
d4d865e351 rk2928: fixed 'WARNING: modpost: Found 1 section mismatch(es).' 2012-11-06 16:58:07 +08:00
wuhao
053587a979 revert the wifi power control of commit cb6f8a8f31 2012-11-06 16:28:31 +08:00
wuhao
e08667ffe5 add rk2926_v86_defconfig for v86 2012-11-06 15:35:13 +08:00
wuhao
313f8c4781 fix : ddr and logic voltage control opposite for v86 2012-11-06 15:34:19 +08:00
hwg
d04dc0fef4 usb wifi: support gpio power control 2012-11-06 15:24:39 +08:00
zyc
2b8f6ccd17 camera: add svga fps info in rk_camera.c 2012-11-06 11:29:24 +08:00
kfx
8eaff33d66 rk2928 defconfig: v86(v1.1) support 2012-11-06 10:40:53 +08:00
wuhao
d71f24644c add gt811 board config for v86 2012-11-05 19:33:11 +08:00
wuhao
1c29b633d3 add ft5x0x for v86 2012-11-05 19:30:03 +08:00
wuhao
cb6f8a8f31 for rk2928 v86 2012-11-05 18:44:40 +08:00
kfx
74facddded rk2928_defconfig: 'pmic: Initialized first && charge: set default parameter 2012-11-05 18:05:55 +08:00
黄涛
3cc8a4b559 rga: make armv7_va_to_pa static 2012-11-05 17:56:48 +08:00
kfx
6dd5db27b9 r2926_tb_defconfig: rk2928-l support 2012-11-05 17:04:55 +08:00
zyc
489da016d4 camera :invalidate useless series of sp0838 and sp2518 2012-11-05 17:03:56 +08:00
yzq
8caf82d8b3 rk2928 hdmi: fix hdmi switch status 2012-11-05 16:00:09 +08:00
yxj
a7bddc36af rk fb: modify drivers/video/rockchip/Kconfig 2012-11-05 11:54:20 +08:00
kfx
167c08d350 rk2928 defconfig: fix lcd_aclk(15M-->150M) 2012-11-05 10:57:03 +08:00
kfx
107586bcff rk2928 defconfig: set OTG_DRVVBUS mode, if usb_otg_drv=-1 2012-11-05 09:48:31 +08:00
yxj
e568db44bb rk3066b lcdc: fix some warning 2012-11-05 09:30:35 +08:00
yxj
b9b12ad8da rk3066b lcdc: turn on frame start interrupt after all lcdc register resumed 2012-11-05 09:30:35 +08:00
ddl
eb3d196914 camera ov5640: fix sensor_qsxga stream is off after sensor_720p 2012-11-03 16:47:30 +08:00
yzq
88e3b826b3 backlight: add get_backlight_status api for fb backlight ctrl 2012-11-03 16:18:28 +08:00
yxj
4c4098060b rk2928 lcdc: freee gpio before swith to RGB IO 2012-11-03 16:14:34 +08:00
kfx
46a7341368 rk2928: update rk2928_defconfig: camera: support: ov2659, gc0308, hi704 2012-11-03 15:28:56 +08:00
许盛飞
46a12b137e adc_factory: return -EINVAL if fail to register and init 2012-11-03 11:44:19 +08:00
zyc
850d247dc3 camera:add interpolation for gc0308 and hi253. 2012-11-03 10:30:15 +08:00
张晴
94257c7c2c rk:pmu tps65910:set dcdc in pwm mode,and set dcdc in pfm mode when enter sleep 2012-11-03 10:20:12 +08:00
宋秀杰
eb51dfda45 phonepad: update rt3261 to V1.3, you must set some mode in your board. 2012-11-02 13:31:11 +08:00
zyc
1156a7fe0a camera : fix careless erro in rk_camera.c. 2012-11-02 11:44:55 +08:00
黄涛
aa0e8730dc rk: sram: fix gcc warning: extra tokens at end of #else directive and fix for rk3066b 2012-11-01 17:33:13 +08:00
黄涛
903d694ab5 Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
Conflicts:
	Makefile
2012-11-01 17:13:08 +08:00
yzq
0b5bd7d634 Revert "gpio debug"
This reverts commit 861ef61d90.
2012-11-01 14:18:06 +08:00
yzq
6d58f4de36 rk3066b m701: change stb timing to fix flash screen when resume 2012-11-01 12:20:59 +08:00
yzq
861ef61d90 gpio debug 2012-11-01 10:01:09 +08:00
Greg Kroah-Hartman
27d0858dbc Linux 3.0.50 v3.0.50 2012-10-31 09:51:59 -07:00
Sjoerd Simons
ba90d99d56 drm/i915: no lvds quirk for Zotac ZDBOX SD ID12/ID13
commit 9756fe38d1 upstream.

This box claims to have an LVDS interface but doesn't
actually have one.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-31 09:51:48 -07:00
Ian Abbott
5a30fddcc9 staging: comedi: amplc_pc236: fix invalid register access during detach
commit aaeb61a97b upstream.

`pc236_detach()` is called by the comedi core if it attempted to attach
a device and failed.  `pc236_detach()` calls `pc236_intr_disable()` if
the comedi device private data pointer (`devpriv`) is non-null.  This
test is insufficient as `pc236_intr_disable()` accesses hardware
registers and the attach routine may have failed before it has saved
their I/O base addresses.

Fix it by checking `dev->iobase` is non-zero before calling
`pc236_intr_disable()` as that means the I/O base addresses have been
saved and the hardware registers can be accessed.  It also implies the
comedi device private data pointer is valid, so there is no need to
check it.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-31 09:51:42 -07:00
Yinghai Lu
0ac1713dae x86, mm: Undo incorrect revert in arch/x86/mm/init.c
commit f82f64dd9f upstream.

Commit

    844ab6f9 x86, mm: Find_early_table_space based on ranges that are actually being mapped

added back some lines back wrongly that has been removed in commit

    7b16bbf97 Revert "x86/mm: Fix the size calculation of mapping tables"

remove them again.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/CAE9FiQW_vuaYQbmagVnxT2DGsYc=9tNeAbdBq53sYkitPOwxSQ@mail.gmail.com
Acked-by: Jacob Shin <jacob.shin@amd.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-31 09:51:37 -07:00
Jacob Shin
0582e57500 x86, mm: Find_early_table_space based on ranges that are actually being mapped
commit 844ab6f993 upstream.

Current logic finds enough space for direct mapping page tables from 0
to end. Instead, we only need to find enough space to cover mr[0].start
to mr[nr_range].end -- the range that is actually being mapped by
init_memory_mapping()

This is needed after 1bbbbe779a, to address
the panic reported here:

  https://lkml.org/lkml/2012/10/20/160
  https://lkml.org/lkml/2012/10/21/157

Signed-off-by: Jacob Shin <jacob.shin@amd.com>
Link: http://lkml.kernel.org/r/20121024195311.GB11779@jshin-Toonie
Tested-by: Tom Rini <trini@ti.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-31 09:51:37 -07:00