Commit Graph

270236 Commits

Author SHA1 Message Date
xkd
7cf7fc9784 reboot system if power off with dc charger pluged in 2013-01-22 17:33:40 +08:00
wuhao
55707d1295 rk3168 ds1006: camera flash sgm3140 2013-01-22 17:32:14 +08:00
luowei
e11798334a SPIM:fix SPI_MODE_2 bug 2013-01-22 17:25:49 +08:00
xxx
bf10222721 gpu clk adn gpu aclk is set at on time for rk3168 and rk3066B 2013-01-22 17:23:22 +08:00
yxj
54ebf17ad7 rk30 lcdc:enable frame start irq 2013-01-22 16:29:00 +08:00
yxj
08f41d9e25 board rk30 sdk:modify fb_io_enable/disable function 2013-01-22 16:17:15 +08:00
yxj
1159a4907f dp501: add config for low power,now the all power of dp501 is 303ma 2013-01-22 15:39:31 +08:00
chenxing
2d5d725f05 rk3168/rk3188: update dvfs table to fit rk3188 2013-01-22 14:37:16 +08:00
chenxing
c705010c4a rk30: fix a dvfs error judgement 2013-01-22 14:11:10 +08:00
xxx
3d9b8ec97e arm gpu ddr rate is limited by cpufreq_frequency_table in board-xxx.c 2013-01-22 12:31:39 +08:00
黄涛
d00b319768 rk_timer: support sched_clock 2013-01-22 11:31:55 +08:00
xxx
d95e7313ca extern rk30_dvfs_init() in /mach-rk3188/clock_data.c 2013-01-22 10:40:13 +08:00
黄涛
f27da4121a rk: sram.h: fix gcc error: unknown type name 'uint' 2013-01-22 10:35:02 +08:00
yxj
1b66f1265a rk3066b lcdc:fix unbalanced lcdc dclk disable warning 2013-01-21 19:45:39 +08:00
黄涛
52db9ae6de rk2928: cpufreq: include ddr.h for fix implicit declaration of function ddr_set_rate error 2013-01-21 18:34:39 +08:00
陈辉
e0cefca516 to fix ds1006h crash bug:
3168 with U2BXX title, fix maskrom bug,
but need higher voltage on ddr
2013-01-21 18:24:52 +08:00
xxx
305cd10e7a mov dvfs global fun to rk plat 2013-01-21 17:55:09 +08:00
yxj
e646300de9 rename screen Kconfig for ds1006h,ds1006h use lvds screen ,not display port screen 2013-01-21 17:34:35 +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
a32b669752 dp501:add suspend resume support 2013-01-21 17:06:43 +08:00
yxj
c8cdb6107e edp transmitter dp501 support 2013-01-21 16:24:39 +08:00
yj
4550380e2f LR097: enable peripheral driver && mod ddr freq ==> 360M and increse logic vol 2013-01-21 15:56:40 +08:00
黄涛
f3b2c39518 rk3188: tb: defconfig add RTC_HYM8563 2013-01-21 15:52:46 +08:00
宋秀杰
24c8d45502 rt3261: fix two little issue. 2013-01-21 15:12:10 +08:00
黄涛
b8fa73ae68 rk3188: support RK_USB_UART config 2013-01-21 14:11:55 +08:00
黄涛
d91c20f244 rk3188: usb_detect: support bvalid irq wake up system 2013-01-21 14:11:55 +08:00
chenxing
a582c42c62 rk3188: rename cpu_div parent name, remove while(1) 2013-01-21 10:35:39 +08:00
黄涛
65dcf72949 rk: cpu.h: fix gcc warning for cpu_is_rk3066b 2013-01-21 10:13:40 +08:00
黄涛
8550ec31cd rk: add ddr_set_rate to ddr.h 2013-01-21 10:06:25 +08:00
黄涛
666f5fc2ef rk3188: use rk30 cpufreq 2013-01-21 10:06:25 +08:00
yxj
65eddedab8 rk lcdc:modify Kconfig 2013-01-19 17:53:54 +08:00
yxj
e929a305d6 rk3188 lcdc:add iomux for lcdc1 2013-01-19 17:21:29 +08:00
张晴
f494d4ebdf rk3168_tb:support rtc_hym8563 2013-01-18 16:09:26 +08:00
kfx
81d1be35b3 rk3188: CIF_XXX --> CIF0_XXX 2013-01-18 11:40:18 +08:00
zyc
8d938f087a camera:support 3188 fpga success. 2013-01-18 10:51:27 +08:00
xbw
087f476431 SDMMC: for RK3188, modify error during calling the nei IOMUX-API 2013-01-18 09:47:33 +08:00
yzq
2f3bfab229 if PWM_EFFECT_VALUE==0,set PWM_GPIO=GPIO_LOW would cause backlight resume flash 2013-01-18 09:25:09 +08:00
Greg Kroah-Hartman
0829a6cc39 Linux 3.0.59 v3.0.59 2013-01-17 08:48:09 -08:00
Ian Abbott
7633459bb3 staging: comedi: Kconfig: COMEDI_NI_AT_A2150 should select COMEDI_FC
commit 34ffb33e09 upstream.

The 'ni_at_a2150' module links to `cfc_write_to_buffer` in the
'comedi_fc' module, so selecting 'COMEDI_NI_AT_A2150' in the kernel config
needs to also select 'COMEDI_FC'.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-17 08:44:15 -08:00
Ian Abbott
57a750294d staging: comedi: don't hijack hardware device private data
commit c43435d772 upstream.

comedi_auto_config() associates a Comedi minor device number with an
auto-configured hardware device and comedi_auto_unconfig() disassociates
it.  Currently, these use the hardware device's private data pointer to
point to some allocated storage holding the minor device number.  This
is a bit of a waste of the hardware device's private data pointer,
preventing it from being used for something more useful by the low-level
comedi device drivers.  For example, it would make more sense if
comedi_usb_auto_config() was passed a pointer to the struct
usb_interface instead of the struct usb_device, but this cannot be done
currently because the low-level comedi drivers already use the private
data pointer in the struct usb_interface for something more useful.

This patch stops the comedi core hijacking the hardware device's private
data pointer.  Instead, comedi_auto_config() stores a pointer to the
hardware device's struct device in the struct comedi_device_file_info
associated with the minor device number, and comedi_auto_unconfig()
calls new function comedi_find_board_minor() to recover the minor device
number associated with the hardware device.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-17 08:44:13 -08:00
Daniel Vetter
f387ee89ac Revert "drm/i915: no lvds quirk for Zotac ZDBOX SD ID12/ID13"
commit 48e858340d upstream.

This reverts commit 9756fe38d1.

The bogus lvds output is actually a lvds->hdmi bridge, which we don't
really support. But unconditionally disabling it breaks some existing
setups.

Reported-by: John Tapsell <johnflux@gmail.com>
References: http://permalink.gmane.org/gmane.comp.freedesktop.xorg.drivers.intel/17237
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Luis Henriques <luis.henriques@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-17 08:44:13 -08:00
Alexander Graf
9d2fdadbde KVM: PPC: 44x: fix DCR read/write
commit e43a028752 upstream.

When remembering the direction of a DCR transaction, we should write
to the same variable that we interpret on later when doing vcpu_run
again.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: CAI Qian <caiqian@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-17 08:44:13 -08:00
Woodhouse, David
5b8692bf7c intel-iommu: Free old page tables before creating superpage
commit 6491d4d028 upstream.

The dma_pte_free_pagetable() function will only free a page table page
if it is asked to free the *entire* 2MiB range that it covers. So if a
page table page was used for one or more small mappings, it's likely to
end up still present in the page tables... but with no valid PTEs.

This was fine when we'd only be repopulating it with 4KiB PTEs anyway
but the same virtual address range can end up being reused for a
*large-page* mapping. And in that case were were trying to insert the
large page into the second-level page table, and getting a complaint
from the sanity check in __domain_mapping() because there was already a
corresponding entry. This was *relatively* harmless; it led to a memory
leak of the old page table page, but no other ill-effects.

Fix it by calling dma_pte_clear_range (hopefully redundant) and
dma_pte_free_pagetable() before setting up the new large page.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Tested-by: Ravi Murty <Ravi.Murty@intel.com>
Tested-by: Sudeep Dutt <sudeep.dutt@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: CAI Qian <caiqian@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-17 08:44:12 -08:00
Benjamin Marzinski
d668f92bf3 GFS2: Test bufdata with buffer locked and gfs2_log_lock held
commit 96e5d1d3ad upstream.

In gfs2_trans_add_bh(), gfs2 was testing if a there was a bd attached to the
buffer without having the gfs2_log_lock held. It was then assuming it would
stay attached for the rest of the function. However, without either the log
lock being held of the buffer locked, __gfs2_ail_flush() could detach bd at any
time.  This patch moves the locking before the test.  If there isn't a bd
already attached, gfs2 can safely allocate one and attach it before locking.
There is no way that the newly allocated bd could be on the ail list,
and thus no way for __gfs2_ail_flush() to detach it.

Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
2013-01-17 08:44:12 -08:00
Sarah Sharp
961161c905 xhci: Handle HS bulk/ctrl endpoints that don't NAK.
commit 55c1945eda upstream.

A high speed control or bulk endpoint may have bInterval set to zero,
which means it does not NAK.  If bInterval is non-zero, it means the
endpoint NAKs at a rate of 2^(bInterval - 1).

The xHCI code to compute the NAK interval does not handle the special
case of zero properly.  The current code unconditionally subtracts one
from bInterval and uses it as an exponent.  This causes a very large
bInterval to be used, and warning messages like these will be printed:

usb 1-1: ep 0x1 - rounding interval to 32768 microframes, ep desc says 0 microframes

This may cause the xHCI host hardware to reject the Configure Endpoint
command, which means the HS device will be unusable under xHCI ports.

This patch should be backported to kernels as old as 2.6.31, that contain
commit dfa49c4ad1 "USB: xhci - fix math in
xhci_get_endpoint_interval()".

Reported-by: Vincent Pelletier <plr.vincent@gmail.com>
Suggested-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-17 08:44:12 -08:00
Oliver Neukum
b30765e891 USB: hub: handle claim of enabled remote wakeup after reset
commit 07e72b95f5 upstream.

Some touchscreens have buggy firmware which claims
remote wakeup to be enabled after a reset. They nevertheless
crash if the feature is cleared by the host.
Add a check for reset resume before checking for
an enabled remote wakeup feature. On compliant
devices the feature must be cleared after a reset anyway.

Signed-off-by: Oliver Neukum <oneukum@suse.de>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-17 08:44:12 -08:00
Sarah Sharp
e16e202710 USB: Increase reset timeout.
commit 77c7f072c8 upstream.

John's NEC 0.96 xHCI host controller needs a longer timeout for a warm
reset to complete.  The logs show it takes 650ms to complete the warm
reset, so extend the hub reset timeout to 800ms to be on the safe side.

This commit should be backported to kernels as old as 3.2, that contain
the commit 75d7cf72ab "usbcore: refine
warm reset logic".

Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Reported-by: John Covici <covici@ccs.covici.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-17 08:44:12 -08:00
Sebastian Andrzej Siewior
fca884e203 usb: gadget: dummy: fix enumeration with g_multi
commit 1d16638e3b upstream.

If we do have endpoints named like "ep-a" then bEndpointAddress is
counted internally by the gadget framework.

If we do have endpoints named like "ep-1" then bEndpointAddress is
assigned from the digit after "ep-".

If we do have both, then it is likely that after we used up the
"generic" endpoints we will use the digits and thus assign one
bEndpointAddress to multiple endpoints.

This theory can be proofed by using the completely enabled g_multi.
Without this patch, the mass storage won't enumerate and times out
because it shares endpoints with RNDIS.

This patch also adds fills up the endpoints list so we have in total
endpoints 1 to 15 in + out available while some of them are restricted
to certain types like BULK or ISO. Without this change the nokia gadget
won't load because the system does not provide enough (BULK) endpoints
but it did before ep-a - ep-f were removed.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-17 08:44:12 -08:00
Denis N Ladin
6d9a5f52d4 USB: cdc-acm: Add support for "PSC Scanning, Magellan 800i"
commit 036915a7a4 upstream.

Adding support "PSC Scanning, Magellan 800i" in cdc-acm

Very simple, but very necessary.
Suitable for all versions of the kernel > 2.6

Signed-off-by: Denis N Ladin <denladin@gmail.com>
Acked-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-17 08:44:12 -08:00
Tomasz Mloduchowski
edce154f05 usb: ftdi_sio: Crucible Technologies COMET Caller ID - pid added
commit 8cf65dc386 upstream.

Simple fix to add support for Crucible Technologies COMET Caller ID
USB decoder - a device containing FTDI USB/Serial converter chip,
handling 1200bps CallerID messages decoded from the phone line -
adding correct USB PID is sufficient.

Tested to apply cleanly and work flawlessly against 3.6.9, 3.7.0-rc8
and 3.8.0-rc3 on both amd64 and x86 arches.

Signed-off-by: Tomasz Mloduchowski <q@qdot.me>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-17 08:44:12 -08:00