Commit Graph

268387 Commits

Author SHA1 Message Date
gwl
e85be8c2be add rtl8188eu to rkwifi_sys_iface.c 2012-08-20 14:50:02 +08:00
chenxing
ebb93cff36 rk2928:sdk: codec pll for sclk_lcdc only, aclk_vio_pre need yxj fixed, move other clks to general pll 2012-08-20 14:22:55 +08:00
kfx
d0273dd2e7 rk2928: a720: touchscren && camera && sdmmc && usb wifi support 2012-08-20 13:16:32 +08:00
ywj
33144075f1 Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0 2012-08-20 11:46:25 +08:00
ywj
6c1f418129 remove bmp_logo option and del rk29_backlight.c printklog 2012-08-20 11:40:56 +08:00
ywj
b7e358d29e amend DEVICE_ATTR 0660 of rk29_keys and rk29_backlight factorytool 2012-08-20 11:29:51 +08:00
yzq
ecf80461d2 rk2928 hdmi: remove unnecessary files and update low power mode 2012-08-20 10:29:14 +08:00
Zheng Yang
28e07bcda6 rk30 hdmi: Modify Kconfig to support hdcp. 2012-08-20 09:18:06 +08:00
lw
486c766794 sensor:mask some debug information 2012-08-19 19:48:54 +08:00
lw@rock-chips.com
1d47ad320f sensor:add setting gsensor orientation online support 2012-08-19 19:40:03 +08:00
kfx
07a6776286 rk2928: a720: cpufreq(1G) && pmic sleep io && backlight && gsensor 2012-08-19 19:11:31 +08:00
lw
f81e3371f3 rk2928 a720:add mma7660 support 2012-08-19 18:27:06 +08:00
lw
afafab1207 sensor:add gsensor mma7660 support 2012-08-19 18:17:03 +08:00
chenxing
dbe3cb9f74 rk2928:a720: fix vdd_log dvfs error 2012-08-19 15:57:41 +08:00
kfx
ebe214e010 rk2928: a720 init 2012-08-19 15:18:44 +08:00
黄涛
21d650142f Revert "add usb wifi rtl8188eus support."
This reverts commit 1c9e908069.

Conflicts:

	drivers/net/wireless/Kconfig
	drivers/net/wireless/Makefile
	drivers/net/wireless/wifi_sys/rkwifi_sys_iface.c
2012-08-17 22:59:47 +08:00
黄涛
e2c42c5690 rk2928: sdk: defconfig: disable bmp logo 2012-08-17 22:40:12 +08:00
黄涛
2465250f7e rk2928: devices.c: add dummy i2c check idle 2012-08-17 22:37:44 +08:00
黄涛
aea3c212d4 rk30: sdk: board-rk30-sdk.c include board-rk30-sdk-camera.c and board-rk30-sdk-key.c 2012-08-17 22:16:19 +08:00
黄涛
8bee22ca2d rk30: phonepad: fix gcc warning, "CONFIG_RK30_PWM_REGULATOR" is not defined 2012-08-17 22:08:40 +08:00
黄涛
9c60c70b72 rk30: sdk: fix gcc warning, "CONFIG_RK30_PWM_REGULATOR" is not defined 2012-08-17 22:08:24 +08:00
黄涛
6214df8abb rk2928: sdk: fix gcc warning, "CONFIG_RK30_PWM_REGULATOR" is not defined 2012-08-17 22:08:08 +08:00
黄涛
d7fb2169b6 Merge remote-tracking branch 'origin/develop-3.0-rk2928' into develop-3.0
Conflicts:
	arch/arm/mach-rk30/include/mach/rk30_camera.h
	arch/arm/plat-rk/include/plat/rk_camera.h
	drivers/gpio/gpio-tps65910.c
	drivers/media/video/rk30_camera_oneframe.c
	drivers/mmc/host/rk29_sdmmc.c
	drivers/net/wireless/Kconfig
	drivers/net/wireless/Makefile
	drivers/net/wireless/wifi_sys/rkwifi_sys_iface.c
	drivers/regulator/rk30-pwm-regulator.c
	drivers/usb/dwc_otg/dwc_otg_driver.c
	drivers/usb/dwc_otg/dwc_otg_hcd.c
	drivers/usb/dwc_otg/dwc_otg_pcd.c
	sound/soc/codecs/Makefile
	sound/soc/rk29/Kconfig
2012-08-17 21:48:20 +08:00
黄涛
3be93856a1 gitignore: ignore scripts/bmptologo 2012-08-17 19:20:47 +08:00
黄涛
f962867a8f bmptologo: fix gcc warning 2012-08-17 19:17:19 +08:00
ywj
f22b396074 gsensor code result in system reboot,gsensor code by lw update 2012-08-17 18:20:55 +08:00
zyc
67d9247a13 camera : support arm and rga to do digital zoom. 2012-08-17 18:01:02 +08:00
ywj
fe5f1eac21 Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0 2012-08-17 17:58:04 +08:00
ywj
8476fc265f add bmp photo for factory and del fb test log 2012-08-17 17:57:15 +08:00
yangkai
92fcf2abad merge rk2928 usb 2012-08-17 16:20:17 +08:00
gwl
1ef6037854 Merge branch 'develop-3.0-rk2928' of ssh://10.10.10.29/rk/kernel into develop-3.0-rk2928 2012-08-17 15:10:51 +08:00
gwl
1c9e908069 add usb wifi rtl8188eus support. 2012-08-17 15:10:37 +08:00
Zheng Yang
c4915c3f0f rk2929 acodec: for internal audio codec, mclk = 64*bclk = 256*lrclk. 2012-08-17 14:33:23 +08:00
张晴
3fd8816a56 rk30:sdk:support wm8326 early suspend and modify dcdc or ldo mode when in early suspend 2012-08-17 14:30:45 +08:00
ddl
852aaf411c camera rk29: add support zoom by arm, version update to v0.x.11 2012-08-17 12:24:47 +08:00
ywj
22858bea3b Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0 2012-08-17 11:33:49 +08:00
ywj
3161f4afe4 amend DEVICE_ATTR of rk30_factory_adc_battery for cts 2012-08-17 11:32:40 +08:00
xbw
66add55467 Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0 2012-08-17 10:49:46 +08:00
xbw
4dd108cba4 sdmmc: prepare for RK2918 and RK31 2012-08-17 10:49:17 +08:00
zyc
6ef0af5a9b camera : fix conflict when merge to rk30 2012-08-17 10:31:42 +08:00
root
e392c72196 camera rk30 : fix conflict when merge 2928 2012-08-17 10:25:57 +08:00
ywj
bfeaf0792a Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0 2012-08-17 10:03:12 +08:00
Mike Lockwood
16f1d42482 USB: gadget: f_audio_source: Fix compilation error
Change-Id: I1b785c47bda03208d396473a9d1c94631f5624d9
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-08-16 13:15:09 -07:00
Mike Lockwood
54c7c33ce2 USB: gadget: f_audio_source: Fix use after free in audio_unbind
When USB was disconnected, we were freeing our audio_dev struct in audio_unbind
before the audio system had cleaned up, resulting in a hang in audio_pcm_close.
We now statically allocate the audio_dev struct to avoid this problem.

Change-Id: I58ad21eaa20dcf4aa74ee614ef3b6ed2c91d52a1
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-08-16 12:52:33 -07:00
Vinicius Costa Gomes
d4bad8b2ea HID: uhid: Fix sending events with invalid data
This was detected because events with invalid types were arriving
to userspace.

The code before this patch would only work for the first event in the
queue (when uhid->tail is 0).

Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
Reviewed-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2012-08-16 12:44:30 -07:00
Jiri Kosina
db5889812a HID: uhid: silence gcc warning
gcc is giving me:

drivers/hid/uhid.c: In function ‘uhid_hid_get_raw’:
drivers/hid/uhid.c:157: warning: ‘len’ may be used uninitialized in this function

which is clearly bogus, as

- when used as memcpy() argument, it's initialized properly
- the code is structured in a way that either 'ret' or 'len'
  is always initialized, so the return statement always has
  an initialized value.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2012-08-16 12:44:30 -07:00
David Herrmann
d33f92d28b MAINTAINERS: add UHID entry
Add an UHID entry to the MAINTAINERS file.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2012-08-16 12:44:30 -07:00
David Herrmann
9634f8109f HID: uhid: add example program
This adds an example user-space program that emulates a 3 button mouse
with wheel. It detects keyboard presses and moves the mouse accordingly.

It register a fake HID device to feed the raw HID reports into the kernel.
In this example, you could use uinput to get the same result, but this
shows how to get the same behavior with uhid so you don't need HID parsers
in user-space.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2012-08-16 12:44:29 -07:00
David Herrmann
bd76675614 HID: uhid: add documentation
This describes the protocol used by uhid for user-space applications. It
describes the details like non-blocking I/O and readv/writev for multiple
events per syscall.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2012-08-16 12:44:29 -07:00
David Herrmann
c12e46fb71 HID: uhid: implement feature requests
HID standard allows sending a feature request to the device which is
answered by an HID report. uhid implements this by sending a UHID_FEATURE
event to user-space which then must answer with UHID_FEATURE_ANSWER. If it
doesn't do this in a timely manner, the request is discarded silently.

We serialize the feature requests, that is, there is always only a single
active feature-request sent to user-space, other requests have to wait.
HIDP and USB-HID do it the same way.

Because we discard feature-requests silently, we must make sure to match
a response to the corresponding request. We use sequence-IDs for this so
user-space must copy the ID from the request into the answer.
Feature-answers are ignored if they do not contain the same ID as the
currently pending feature request.

Internally, we must make sure that feature-requests are synchronized with
UHID_DESTROY and close() events. We must not dead-lock when closing the
HID device, either, so we have to use separate locks.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2012-08-16 12:44:29 -07:00