hhb
3fbf432a9f
rk_serial:1.fix bug dma buffer free error
2013-04-16 17:10:09 +08:00
hhb
04f174f092
rk_serial: set DBG_PORT to CONFIG_RK_DEBUG_UART and close DEBUG
2013-03-08 16:11:45 +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
Jiri Slaby
c9d332c77f
serial: 8250, increase PASS_LIMIT
...
commit e7328ae184 upstream.
With virtual machines like qemu, it's pretty common to see "too much
work for irq4" messages nowadays. This happens when a bunch of output
is printed on the emulated serial console. This is caused by too low
PASS_LIMIT. When ISR loops more than the limit, it spits the message.
I've been using a kernel with doubled the limit and I couldn't see no
problems. Maybe it's time to get rid of the message now?
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Cc: Alan Cox <alan@linux.intel.com >
Cc: Ram Gupta <ram.gupta5@gmail.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2013-01-27 20:46:29 -08:00
黄涛
f34f67b545
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
...
Merge v3.0.60
Conflicts:
Makefile
2013-01-23 09:49:26 +08:00
chao bi
904e718cc7
serial:ifx6x60:Delete SPI timer when shut down port
...
commit 014b9b4ce8 upstream.
When shut down SPI port, it's possible that MRDY has been asserted and a SPI
timer was activated waiting for SRDY assert, in the case, it needs to delete
this timer.
Signed-off-by: Chen Jun <jun.d.chen@intel.com >
Signed-off-by: channing <chao.bi@intel.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2013-01-21 11:45:00 -08:00
hhb
1322b7dcdc
UART: fix bug about BOTH_EMPTY V1.3
2012-12-18 10:35:05 +08:00
黄涛
21158e22d9
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
...
Conflicts:
Makefile
drivers/mmc/core/sd.c
drivers/net/usb/asix.c
drivers/net/wireless/ath/ath9k/recv.c
drivers/net/wireless/b43legacy/main.c
drivers/net/wireless/p54/p54usb.c
drivers/net/wireless/rt2x00/rt2400pci.c
drivers/net/wireless/rt2x00/rt2400pci.h
drivers/net/wireless/rt2x00/rt2500pci.c
drivers/net/wireless/rt2x00/rt2500usb.c
drivers/net/wireless/rt2x00/rt2500usb.h
drivers/net/wireless/rt2x00/rt2800pci.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/rt2x00/rt61pci.c
drivers/net/wireless/rt2x00/rt61pci.h
drivers/net/wireless/rt2x00/rt73usb.c
drivers/net/wireless/rt2x00/rt73usb.h
drivers/net/wireless/rtl818x/rtl8187/dev.c
drivers/usb/serial/option.c
kernel/time/timekeeping.c
2012-10-08 10:28:29 +08:00
Flavio Leitner
d482e8f2f8
serial: set correct baud_base for EXSYS EX-41092 Dual 16950
...
commit 26e8220adb upstream.
Apparently the same card model has two IDs, so this patch
complements the commit 39aced68d6
adding the missing one.
Signed-off-by: Flavio Leitner <fbl@redhat.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2012-10-07 08:27:25 -07:00
Linus Walleij
f580d511e9
serial: pl011: handle corruption at high clock speeds
...
commit c5dd553b9f upstream.
This works around a few glitches in the ST version of the PL011
serial driver when using very high baud rates, as we do in the
Ux500: 3, 3.25, 4 and 4.05 Mbps.
Problem Observed/rootcause:
When using high baud-rates, and the baudrate*8 is getting close to
the provided clock frequency (so a division factor close to 1), when
using bursts of characters (so they are abutted), then it seems as if
there is not enough time to detect the beginning of the start-bit which
is a timing reference for the entire character, and thus the sampling
moment of character bits is moving towards the end of each bit, instead
of the middle.
Fix:
Increase slightly the RX baud rate of the UART above the theoretical
baudrate by 5%. This will definitely give more margin time to the
UART_RX to correctly sample the data at the middle of the bit period.
Also fix the ages old copy-paste error in the very stressed comment,
it's referencing the registers used in the PL010 driver rather than
the PL011 ones.
Signed-off-by: Guillaume Jaunet <guillaume.jaunet@stericsson.com >
Signed-off-by: Christophe Arnal <christophe.arnal@stericsson.com >
Signed-off-by: Matthias Locher <matthias.locher@stericsson.com >
Signed-off-by: Rajanikanth HV <rajanikanth.hv@stericsson.com >
Cc: Bibek Basu <bibek.basu@stericsson.com >
Cc: Par-Gunnar Hjalmdahl <par-gunnar.hjalmdahl@stericsson.com >
Signed-off-by: Linus Walleij <linus.walleij@linaro.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2012-10-07 08:27:25 -07:00
Tomoya MORINAGA
b960ba5259
pch_uart: Fix parity setting issue
...
commit 38bd2a1ac7 upstream.
Parity Setting value is reverse.
E.G. In case of setting ODD parity, EVEN value is set.
This patch inverts "if" condition.
Signed-off-by: Tomoya MORINAGA <tomoya.rohm@gmail.com >
Acked-by: Alan Cox <alan@linux.intel.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2012-10-02 09:47:53 -07:00
Tomoya MORINAGA
4b14f6f47a
pch_uart: Fix rx error interrupt setting issue
...
commit 9539dfb7ac upstream.
Rx Error interrupt(E.G. parity error) is not enabled.
So, when parity error occurs, error interrupt is not occurred.
As a result, the received data is not dropped.
This patch adds enable/disable rx error interrupt code.
Signed-off-by: Tomoya MORINAGA <tomoya.rohm@gmail.com >
Acked-by: Alan Cox <alan@linux.intel.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2012-10-02 09:47:53 -07:00
Alan Cox
00b35456c2
pch_uart: Fix missing break for 16 byte fifo
...
commit 9bc03743ff upstream.
Otherwise we fall back to the wrong value.
Reported-by: <dcb314@hotmail.com >
Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=44091
Signed-off-by: Alan Cox <alan@linux.intel.com >
Signed-off-by: Tomoya MORINAGA <tomoya.rohm@gmail.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2012-10-02 09:47:53 -07:00
hhb
259e917910
rk_serial:serial rx use new dma interface rk29_dma_enqueue_ring
2012-08-28 16:34:02 +08:00
hhb
2cb184776c
rk_serial: make when tx dma is only enable work functionally
2012-08-23 10:57:52 +08:00
黄涛
b2be450f10
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
...
Conflicts:
include/net/cfg80211.h
2012-08-21 14:14:24 +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
hhb
68e8ac6ea5
rk_serial: update serial driver
2012-08-09 18:25:20 +08:00
黄涛
a2ad9f9801
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb
...
Conflicts:
drivers/net/usb/asix.c
drivers/net/wireless/iwlwifi/iwl-agn-rs.c
drivers/usb/serial/option.c
2012-07-12 18:46:41 +08:00
黄涛
30be6d7972
Merge remote-tracking branch 'common/android-3.0' into develop-3.0-jb
...
Conflicts:
drivers/cpufreq/cpufreq_interactive.c
drivers/misc/pmem.c
drivers/net/usb/asix.c
drivers/net/wireless/ath/ath9k/ani.c
drivers/net/wireless/ath/ath9k/ar5008_phy.c
drivers/net/wireless/ath/ath9k/ar9002_hw.c
drivers/net/wireless/ath/ath9k/ar9003_calib.c
drivers/net/wireless/ath/ath9k/ar9003_mac.c
drivers/net/wireless/ath/ath9k/ar9003_phy.h
drivers/net/wireless/ath/ath9k/calib.c
drivers/net/wireless/ath/ath9k/hif_usb.c
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/ath/ath9k/hw.h
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/ath9k/rc.c
drivers/net/wireless/ath/ath9k/recv.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/bcm4319/aiutils.c
drivers/net/wireless/bcm4319/bcmsdh.c
drivers/net/wireless/bcm4319/bcmsdh_linux.c
drivers/net/wireless/bcm4319/bcmsdh_sdmmc.c
drivers/net/wireless/bcm4319/bcmsdh_sdmmc_linux.c
drivers/net/wireless/bcm4319/bcmutils.c
drivers/net/wireless/bcm4319/dhd_common.c
drivers/net/wireless/bcm4319/dhd_proto.h
drivers/net/wireless/bcm4319/dhd_sdio.c
drivers/net/wireless/bcm4319/hndpmu.c
drivers/net/wireless/bcm4319/include/aidmp.h
drivers/net/wireless/bcm4319/include/bcmcdc.h
drivers/net/wireless/bcm4319/include/bcmdefs.h
drivers/net/wireless/bcm4319/include/bcmdevs.h
drivers/net/wireless/bcm4319/include/bcmendian.h
drivers/net/wireless/bcm4319/include/bcmpcispi.h
drivers/net/wireless/bcm4319/include/bcmperf.h
drivers/net/wireless/bcm4319/include/bcmsdbus.h
drivers/net/wireless/bcm4319/include/bcmsdh.h
drivers/net/wireless/bcm4319/include/bcmsdh_sdmmc.h
drivers/net/wireless/bcm4319/include/bcmsdpcm.h
drivers/net/wireless/bcm4319/include/bcmsdspi.h
drivers/net/wireless/bcm4319/include/bcmsdstd.h
drivers/net/wireless/bcm4319/include/bcmspi.h
drivers/net/wireless/bcm4319/include/bcmutils.h
drivers/net/wireless/bcm4319/include/bcmwifi.h
drivers/net/wireless/bcm4319/include/dhdioctl.h
drivers/net/wireless/bcm4319/include/epivers.h
drivers/net/wireless/bcm4319/include/hndpmu.h
drivers/net/wireless/bcm4319/include/hndrte_armtrap.h
drivers/net/wireless/bcm4319/include/hndrte_cons.h
drivers/net/wireless/bcm4319/include/hndsoc.h
drivers/net/wireless/bcm4319/include/linux_osl.h
drivers/net/wireless/bcm4319/include/linuxver.h
drivers/net/wireless/bcm4319/include/miniopt.h
drivers/net/wireless/bcm4319/include/msgtrace.h
drivers/net/wireless/bcm4319/include/osl.h
drivers/net/wireless/bcm4319/include/packed_section_end.h
drivers/net/wireless/bcm4319/include/packed_section_start.h
drivers/net/wireless/bcm4319/include/pcicfg.h
drivers/net/wireless/bcm4319/include/proto/802.11e.h
drivers/net/wireless/bcm4319/include/proto/802.1d.h
drivers/net/wireless/bcm4319/include/proto/bcmeth.h
drivers/net/wireless/bcm4319/include/proto/bcmevent.h
drivers/net/wireless/bcm4319/include/proto/bcmip.h
drivers/net/wireless/bcm4319/include/proto/eapol.h
drivers/net/wireless/bcm4319/include/proto/ethernet.h
drivers/net/wireless/bcm4319/include/proto/sdspi.h
drivers/net/wireless/bcm4319/include/proto/vlan.h
drivers/net/wireless/bcm4319/include/proto/wpa.h
drivers/net/wireless/bcm4319/include/sbchipc.h
drivers/net/wireless/bcm4319/include/sbconfig.h
drivers/net/wireless/bcm4319/include/sbhnddma.h
drivers/net/wireless/bcm4319/include/sbpcmcia.h
drivers/net/wireless/bcm4319/include/sbsdio.h
drivers/net/wireless/bcm4319/include/sbsdpcmdev.h
drivers/net/wireless/bcm4319/include/sbsocram.h
drivers/net/wireless/bcm4319/include/sdio.h
drivers/net/wireless/bcm4319/include/sdioh.h
drivers/net/wireless/bcm4319/include/sdiovar.h
drivers/net/wireless/bcm4319/include/siutils.h
drivers/net/wireless/bcm4319/include/trxhdr.h
drivers/net/wireless/bcm4319/include/typedefs.h
drivers/net/wireless/bcm4319/siutils.c
drivers/net/wireless/bcm4319/wl_iw.c
drivers/net/wireless/bcm4319/wl_iw.h
drivers/net/wireless/bcmdhd/Kconfig
drivers/net/wireless/bcmdhd/Makefile
drivers/net/wireless/bcmdhd/bcmevent.c
drivers/net/wireless/bcmdhd/dhd.h
drivers/net/wireless/bcmdhd/dhd_cdc.c
drivers/net/wireless/bcmdhd/dhd_linux.c
drivers/net/wireless/bcmdhd/dhd_wlfc.h
drivers/net/wireless/bcmdhd/include/Makefile
drivers/net/wireless/bcmdhd/include/htsf.h
drivers/net/wireless/bcmdhd/include/proto/802.11.h
drivers/net/wireless/bcmdhd/include/proto/802.11_bta.h
drivers/net/wireless/bcmdhd/include/proto/bt_amp_hci.h
drivers/net/wireless/bcmdhd/include/proto/p2p.h
drivers/net/wireless/bcmdhd/include/wlfc_proto.h
drivers/net/wireless/bcmdhd/include/wlioctl.h
drivers/net/wireless/bcmdhd/linux_osl.c
drivers/net/wireless/bcmdhd/wl_android.c
drivers/net/wireless/bcmdhd/wl_android.h
drivers/net/wireless/bcmdhd/wl_cfg80211.c
drivers/net/wireless/bcmdhd/wl_cfg80211.h
drivers/net/wireless/bcmdhd/wl_cfgp2p.c
drivers/net/wireless/bcmdhd/wl_cfgp2p.h
drivers/net/wireless/bcmdhd/wl_linux_mon.c
drivers/net/wireless/bcmdhd/wldev_common.c
drivers/net/wireless/bcmdhd/wldev_common.h
drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/iwlwifi/iwl-agn-lib.c
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-agn.h
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-hcmd.c
drivers/net/wireless/iwlwifi/iwl-rx.c
drivers/net/wireless/iwlwifi/iwl-tx.c
drivers/net/wireless/libertas/if_spi.c
drivers/net/wireless/p54/p54spi.c
drivers/net/wireless/rt2x00/rt2800lib.c
drivers/net/wireless/rt2x00/rt2800pci.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/rt2x00/rt2x00.h
drivers/net/wireless/rt2x00/rt2x00dev.c
drivers/net/wireless/rt2x00/rt2x00mac.c
drivers/net/wireless/rt2x00/rt2x00queue.c
drivers/usb/serial/option.c
2012-07-12 18:08:01 +08:00
kfx
615c024517
rk2928: uart init
2012-07-11 18:43:53 +08:00
Alan Cox
3c867337cd
tty: Allow uart_register/unregister/register
...
commit 1e66cded33 upstream.
This is legitimate but because we don't clear the drv->state pointer in the
unregister code causes a bogus BUG().
Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=42880
Signed-off-by: Alan Cox <alan@linux.intel.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2012-06-01 15:12:56 +08:00
Lothar Waßmann
e9fecd74e4
Add missing call to uart_update_timeout()
...
commit 8b979f7c6b upstream.
This patch fixes a problem reported here:
http://article.gmane.org/gmane.linux.ports.arm.kernel/155242/match=auart
Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2012-06-01 15:12:56 +08:00
黄涛
082add2ab8
serial: rk30: enable pclk_uart
2012-05-10 21:32:14 +08:00
Todd Poynor
5c15664a86
Merge commit 'v3.0.30' into android-3.0
2012-04-30 15:36:56 -07:00