Commit Graph

45519 Commits

Author SHA1 Message Date
ddl
78b85738fe camera: update mt9p111 and add hm5065 2013-04-02 18:47:50 +08:00
luowei
44f4717e0d sensors:add sensor debug support 2013-04-01 16:15:12 +08:00
张晴
5838137546 rk808:support pmu rk808 sleep mode 2013-03-25 17:44:44 +08:00
张晴
b2a79c3e11 rk808:support pmu rk808 2013-03-25 11:00:14 +08:00
xuhuicong
08d8a6c0b5 add l3g20d Gyroscope support 2013-03-21 23:17:34 +08:00
yxj
5a6fbdee60 rk fb: fix bmp logo support 2013-03-20 16:43:14 +08:00
yxj
5b18ea09e6 fix compile err when no select CONFIG_DISPLAY_SUPPORT 2013-03-18 17:22:00 +08:00
许盛飞
b56696dfbf show the lowerpower picture , battery lower-power when start up 2013-03-11 16:50:02 +08:00
luowei
3aae7adc71 sensors:add akm8963 support,need update HAL 2013-03-09 15:57:37 +08:00
蓝斌元
2fd93fbff1 rk3066 add phone pad modem support 2013-03-06 18:13:33 +08:00
yxj
c4e4261143 rk fb:add get_format_string to convert format to string for debug 2013-03-05 11:19:14 +08:00
xuhuicong
7e82f4b0c4 add cw2015 battery gauge driver 2013-03-01 14:25:43 +08:00
luowei
61e52f56cb add temperature and pressure sensor driver support 2013-02-27 10:33:18 +08:00
yxj
217b72e6fd rk fb:add ioctl RK_FBIOPUT_COLOR_KEY_CFG for color key config 2013-02-26 17:12:45 +08:00
yxj
8d11c67753 rk fb: move ioctl RK_FBIOSET_CONFIG_DONE to rk fb 2013-02-23 17:00:24 +08:00
yxj
ecb79598d3 rk fb: add some key parameter for layer_par,wirite config done when show logo 2013-02-23 17:00:23 +08:00
黄涛
03c2032989 Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
Merge v3.0.66
Conflicts:
	Makefile
2013-02-23 16:41:10 +08:00
Jonathan Hamilton
3ea639184b base: sync: Include seq_file.h in sync.h
sync.h uses struct seq_file in some function table prototypes. This
causes compile failures when including the header in files that do not
otherwise include seq_file.h

Signed-off-by: Jonathan Hamilton <jonathan.hamilton@imgtec.com>
2013-02-22 17:47:22 +08:00
Erik Gilling
ae739c14a7 sync: add tracepoint support
Change-Id: I181326db4247009161557e45444c9b3548b83d25
Signed-off-by: Erik Gilling <konkers@android.com>
2013-02-22 17:47:18 +08:00
Erik Gilling
2c7ee2190a sync: refactor sync debug printing
Move driver callbacks to fill strings instead of using seq_files.  This
will allow those values to be used in a future tracepoint patch.

Change-Id: I9b706343e35b11124141fe520e520514a32003d2
Signed-off-by: Erik Gilling <konkers@android.com>
2013-02-22 17:47:17 +08:00
Erik Gilling
c9ac59a938 sync: change wait timeout to mirror poll semantics
Change-Id: Ib38e6d339d41885a33027752690d65a52b6897f6
Signed-off-by: Erik Gilling <konkers@android.com>
2013-02-22 17:47:04 +08:00
Erik Gilling
b84b847376 sync: add reference counting to timelines
If a timeline is destroyed while fences still hold pts on it, the reworked
fence release handler can cause the timeline to be freed before all it's points
are freed.

Change-Id: I1cd8ddb638eded7db9db446ff6b37f3dd165d6c4
Signed-off-by: Erik Gilling <konkers@android.com>
2013-02-22 17:47:01 +08:00
Erik Gilling
3162da1d18 sync: add internal refcounting to fences
If a fence is released while a timeline that one of it's pts is on is being
signaled, it is possible for that fence to be deleted before it is signaled.
This patch adds a refcount for internal references such as signaled pt
processing.

Change-Id: Ie8605e6fd2ac026c207220a03d84e1c1078ec719
Signed-off-by: Erik Gilling <konkers@android.com>
2013-02-22 17:46:59 +08:00
Erik Gilling
064f4dd519 sync: allow async waits to be canceled
In order to allow drivers to cleanly handled teardown we need to allow them
to cancel pending async waits.  To do this cleanly, we move allocation of
sync_fence_waiter to the driver calling sync_async_wait().

Change-Id: Ifcd95648be6ec07026d67f810070a4310f099989
Signed-off-by: Erik Gilling <konkers@android.com>
2013-02-22 17:46:54 +08:00
Paul Gortmaker
7b59177a62 module.h: split out the EXPORT_SYMBOL into export.h
A lot of files pull in module.h when all they are really
looking for is the basic EXPORT_SYMBOL functionality. The
recent data from Ingo[1] shows that this is one of several
instances that has a significant impact on compile times,
and it should be targeted for factoring out (as done here).

Note that several commonly used header files in include/*
directly include <linux/module.h> themselves (some 34 of them!)
The most commonly used ones of these will have to be made
independent of module.h before the full benefit of this change
can be realized.

We also transition THIS_MODULE from module.h to export.h,
since there are lots of files with subsystem structs that
in turn will have a struct module *owner and only be doing:

	.owner = THIS_MODULE;

and absolutely nothing else modular. So, we also want to have
the THIS_MODULE definition present in the lightweight header.

[1] https://lkml.org/lkml/2011/5/23/76

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2013-02-22 17:46:53 +08:00
黄涛
37cafcd206 rk: power_supply: add rk_get_system_battery_capacity and rk_get_system_battery_status api 2013-02-22 15:10:57 +08:00
Alexandre SIMON
f372083018 printk: fix buffer overflow when calling log_prefix function from call_console_drivers
This patch corrects a buffer overflow in kernels from 3.0 to 3.4 when calling
log_prefix() function from call_console_drivers().

This bug existed in previous releases but has been revealed with commit
162a7e7500 (2.6.39 => 3.0) that made changes
about how to allocate memory for early printk buffer (use of memblock_alloc).
It disappears with commit 7ff9554bb5 (3.4 => 3.5)
that does a refactoring of printk buffer management.

In log_prefix(), the access to "p[0]", "p[1]", "p[2]" or
"simple_strtoul(&p[1], &endp, 10)" may cause a buffer overflow as this
function is called from call_console_drivers by passing "&LOG_BUF(cur_index)"
where the index must be masked to do not exceed the buffer's boundary.

The trick is to prepare in call_console_drivers() a buffer with the necessary
data (PRI field of syslog message) to be safely evaluated in log_prefix().

This patch can be applied to stable kernel branches 3.0.y, 3.2.y and 3.4.y.

Without this patch, one can freeze a server running this loop from shell :
  $ export DUMMY=`cat /dev/urandom | tr -dc '12345AZERTYUIOPQSDFGHJKLMWXCVBNazertyuiopqsdfghjklmwxcvbn' | head -c255`
  $ while true do ; echo $DUMMY > /dev/kmsg ; done

The "server freeze" depends on where memblock_alloc does allocate printk buffer :
if the buffer overflow is inside another kernel allocation the problem may not
be revealed, else the server may hangs up.

Signed-off-by: Alexandre SIMON <Alexandre.Simon@univ-lorraine.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-02-21 10:02:28 -08:00
luowei
7782f5cb2b add light sensor cm3232 support 2013-02-18 16:24:05 +08:00
黄涛
14d96d73a2 Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
Merge v3.0.65
Conflicts:
	Makefile
	drivers/net/wireless/ath/ath9k/beacon.c
	drivers/net/wireless/ath/ath9k/htc_hst.c
2013-02-18 12:31:44 +08:00
wuhao
ee68d84251 rk3188 ds1006h: add light photoresistor 2013-02-02 20:05:07 +08:00
yxj
0cea0fa854 rk3188 lcdc:support_wait_frame_start_in_config_done 2013-02-02 17:33:49 +08:00
yxj
57ea50d72c rk fb: report vysnc in rk_fb 2013-01-30 20:34:23 +08:00
yxj
14c56b9767 rk fb:rename rk fb specified ioctl 2013-01-30 16:18:49 +08:00
yxj
364caeaaad Revert "rk_fb.h:add ioctl RK_FBIOSET_W0W1_ZORDER_SWAP"
This reverts commit 96ea1afcf8.
2013-01-30 14:10:17 +08:00
yxj
96ea1afcf8 rk_fb.h:add ioctl RK_FBIOSET_W0W1_ZORDER_SWAP 2013-01-30 12:39:07 +08:00
cdy
6fe30df1fe rk3188 ds1006h: add akm8963 2013-01-29 15:26:26 +08:00
yxj
9cbd68512a rk_screen.h:modify rk_disp_prop 2013-01-29 00:10:41 +08:00
yxj
52af41525a rk fb,rk3188 lcdc:overlay support and modify some macro for RGB order 2013-01-28 17:25:26 +08:00
Alan Cox
d87f5a89f5 ahci: Add identifiers for ASM106x devices
commit 7b4f6ecacb upstream.

They don't always appear as AHCI class devices but instead as IDE class.

Based on an initial patch by Hiroaki Nito

Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=42804
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: Abdallah Chatila <abdallah.chatila@ericsson.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-27 20:46:29 -08:00
xbw
ea053c81da SDMMC:
1。adjust the IO voltage of ap0 and vccio
2. add the drive strength control
3.Temporary realize even divide of sdmmc-frq.
2013-01-27 19:36:08 +08:00
wuhao
a74d8a7895 rk3188 ds1006h: add kernel logo 2013-01-26 10:23:17 +08:00
yxj
82a57c6ea1 rk fb:distinguish ARGB888 and XRGB888 2013-01-25 11:04:32 +08:00
yxj
2ed910d1ed rk_fb.h:add struct rk_fb_vysnc 2013-01-24 15:47:52 +08:00
yxj
4018fa788c rk fb: add ioctl RK_FBIOSET_CONFIG_DONE,RK_FBIOSET_VSYNC_ENABLE 2013-01-24 15:47:52 +08:00
yxj
3e7acefa94 rk2928 lvds,rk610 lvds:move lvds connect MACRO to rk_screen.h 2013-01-23 23:17:13 +08:00
yxj
4673caa440 rk screen:add interface to calculator fb size by screen resolution 2013-01-23 11:39:30 +08:00
yxj
90051d6c76 rkfb:add interface __rk_platform_add_display_devices 2013-01-22 20:51:23 +08:00
黄涛
67450b3bb6 Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
Merge v3.0.59
Conflicts:
	Makefile
	drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
	drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
	drivers/usb/serial/option.c
2013-01-21 17:21:19 +08:00
yxj
c8cdb6107e edp transmitter dp501 support 2013-01-21 16:24:39 +08:00
Greg Rose
a0d3aa1f04 rtnetlink: Fix problem with buffer allocation
commit 115c9b8192 upstream.

Implement a new netlink attribute type IFLA_EXT_MASK.  The mask
is a 32 bit value that can be used to indicate to the kernel that
certain extended ifinfo values are requested by the user application.
At this time the only mask value defined is RTEXT_FILTER_VF to
indicate that the user wants the ifinfo dump to send information
about the VFs belonging to the interface.

This patch fixes a bug in which certain applications do not have
large enough buffers to accommodate the extra information returned
by the kernel with large numbers of SR-IOV virtual functions.
Those applications will not send the new netlink attribute with
the interface info dump request netlink messages so they will
not get unexpectedly large request buffers returned by the kernel.

Modifies the rtnl_calcit function to traverse the list of net
devices and compute the minimum buffer size that can hold the
info dumps of all matching devices based upon the filter passed
in via the new netlink attribute filter mask.  If no filter
mask is sent then the buffer allocation defaults to NLMSG_GOODSIZE.

With this change it is possible to add yet to be defined netlink
attributes to the dump request which should make it fairly extensible
in the future.

Signed-off-by: Greg Rose <gregory.v.rose@intel.com>
Acked-by: Greg Rose <gregory.v.rose@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: Backported to 3.0:
 - Adjust context
 - Drop the change in do_setlink() that reverts commit f18da14565
   ('net: RTNETLINK adjusting values of min_ifinfo_dump_size'), which
   was never applied here]
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-17 08:43:58 -08:00