summaryrefslogtreecommitdiff
path: root/drivers/serial
AgeCommit message (Collapse)Author
2012-01-19Merge commit 'v2.6.35.14' into del-5.8/mainAlex Gonzalez
Conflicts: arch/arm/plat-mxc/include/mach/gpio.h arch/x86/kernel/cpu/mtrr/main.c drivers/mmc/core/core.c drivers/net/smsc911x.c fs/proc/task_mmu.c include/linux/pm_runtime.h mm/memory.c mm/mlock.c Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
2011-09-012443-serial: rs485 flow control supportHector Palacios
This patch controls RTS line as GPIO to generate RS485 half duplex flow control. RTS is activated (configurable level, default active high) when the TX unit and interrupt are enabled to transmit data. The TX ISR schedules a tasklet that will deactivate RTS line when TX unit and interrupt are disabled and buffer is empty and all data have been transmitted out of the shift register. Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2011-09-01merge: merged changes from 2.6.28Robert Hodaszi
Conflicts: gpio Special handling of PORT A gpios is lost. Some code has been ported but it must be fixed. Signed-off-by: Hector Palacios <hector.palacios@digi.com> Signed-off-by: Robert Hodaszi <robert.hodaszi@digi.com>
2011-08-01SERIAL: SC26xx: Fix link error.Ralf Baechle
[ upstream commit f2eb3cdf14457fccb14ae8c4d7d7cee088cd3957 ] Kconfig allows enabling console support for the SC26xx driver even when it's configured as a module resulting in a: ERROR: "uart_console_device" [drivers/tty/serial/sc26xx.ko] undefined! modpost error since the driver was merged in eea63e0e8a60d00485b47fb6e75d9aa2566b989b [SC26XX: New serial driver for SC2681 uarts] in 2.6.25. Fixed by only allowing console support to be enabled if the driver is builtin. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Cc: linux-serial@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: linux-mips@linux-mips.org Cc: stable <stable@kernel.org> Acked-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Andi Kleen <ak@linux.intel.com>
2011-08-01ccwmx53: Fix compilation after update to FSL 11.05Alex Gonzalez
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
2011-08-01ENGR00140702-3 mxc_uart: refine driver for stable BluetoothZhang Jiejing
- Remove tty_buffer_request_room() in mxcuart_readdma_callback() tty_insert_flip_string will call tty_buffer_request_room() in his loop, but if we call it here, it will return 0, and we will lost some read data. - Remove tasklet when dma_writeback, it's will cause hci lost data when write(tx). since when this dma callback maybe re-order the next buffer data, it will mess up data, make it to a direct call to perpare next dma buffer. Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com> Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
2011-06-29ccxmx51 uart: rs485 mode, change dir line to gpioPedro Perez de Heredia
Signed-off-by: Pedro Perez de Heredia <pedro.perez@digi.com>
2011-06-29xmx51 uart: add support to auto handle RTS for RS485Pedro Perez de Heredia
Signed-off-by: Pedro Perez de Heredia <pedro.perez@digi.com>
2011-06-15cpx2: Do not display message for a long break.Alex Gonzalez
Although the long break is not handled, do not spam the console with a message. Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
2011-04-28serial/imx: read cts state only after acking cts change irqUwe Kleine-König
commit 5680e94148a86e8c31fdc5cb0ea0d5c6810c05b0 upstream. If cts changes between reading the level at the cts input (USR1_RTSS) and acking the irq (USR1_RTSD) the last edge doesn't generate an irq and uart_handle_cts_change is called with a outdated value for cts. The race was introduced by commit ceca629 ([ARM] 2971/1: i.MX uart handle rts irq) Reported-by: Arwed Springer <Arwed.Springer@de.trumpf.com> Tested-by: Arwed Springer <Arwed.Springer@de.trumpf.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Andi Kleen <ak@linux.intel.com>
2011-03-31serial: unbreak billionton CF cardPavel Machek
commit d0694e2aeb815042aa0f3e5036728b3db4446f1d upstream. Unbreak Billionton CF bluetooth card. This actually fixes a regression on zaurus. Signed-off-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Andi Kleen <ak@linux.intel.com>
2011-02-23mx28evk: Fixed compiler warnings and section mismatchesCharles Gordon
Fixed warnings reported by the compiler and section mismatches reported by the linker. This was done as part of the effort to port the mx28evk from the 2.6.31 kernel to the 2.6.35 kernel. Signed-off-by: Charles Gordon <charles.gordon@digi.com>
2011-02-01Merge branch 'hpalacio/2.6.35_merged' into master (2.6.35)Hector Palacios
Conflicts: arch/arm/Kconfig arch/arm/Makefile drivers/mtd/nand/Makefile drivers/net/can/Makefile drivers/net/smsc9118/smsc911x.c drivers/net/wireless/Kconfig drivers/net/wireless/Makefile drivers/spi/Kconfig drivers/spi/Makefile The following files were wrongly merged by git automatic merge tool and have to be reset to v2.6.35 version drivers/net/phy.c include/linux/phy.h Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2011-01-26serial driver: kill off uart_infoHector Palacios
This was moved into uart_state. Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2011-01-26solve merge conflictsHector Palacios
The previous merge commit was a mixed auto-manual merge operation not followed by a compilation. The present commit fixes compilation problems introduced by the merge operation. Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2011-01-25[ccwmx51]: Fix compilation issues.Alejandro Gonzalez
After the manual merge of the Digi patches for the MX51 platform, resolve the compilation errors, warning and mistakes. Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
2011-01-20ccwmx51: Name serial portsAlejandro Gonzalez
Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
2011-01-20Merge branch 'del-2.6.28' into hpalacio/2.6.35_mergedHector Palacios
Conflicts: Documentation/filesystems/squashfs.txt arch/arm/Kconfig arch/arm/configs/ns9xxx_defconfig arch/arm/include/asm/elf.h arch/arm/kernel/module.c arch/arm/mach-ns9xxx/include/mach/system.h arch/arm/mach-ns9xxx/include/mach/uncompress.h arch/arm/mach-ns9xxx/irq.c arch/arm/mach-ns9xxx/plat-serial8250.c arch/arm/mach-s3c2410/include/mach/gpio.h arch/arm/mach-s3c2410/include/mach/map.h arch/arm/mach-s3c2410/include/mach/regs-gpio.h arch/arm/mach-s3c2410/include/mach/regs-gpioj.h arch/arm/mach-s3c2410/include/mach/usb-control.h arch/arm/plat-s3c/Kconfig arch/arm/plat-s3c/include/plat/regs-adc.h arch/arm/plat-s3c/include/plat/regs-serial.h arch/arm/plat-s3c/include/plat/uncompress.h arch/arm/plat-s3c24xx/Kconfig arch/arm/plat-s3c24xx/Makefile arch/arm/plat-s3c24xx/cpu.c arch/arm/plat-s3c24xx/devs.c arch/arm/plat-s3c24xx/dma.c arch/arm/plat-s3c24xx/include/plat/udc.h arch/arm/plat-s3c24xx/pm.c arch/arm/plat-s3c24xx/pwm-clock.c arch/arm/plat-s3c24xx/time.c arch/arm/tools/mach-types crypto/api.c drivers/Makefile drivers/base/sys.c drivers/char/Kconfig drivers/char/keyboard.c drivers/char/mem.c drivers/char/random.c drivers/crypto/Makefile drivers/gpio/gpiolib.c drivers/i2c/busses/Kconfig drivers/i2c/busses/i2c-s3c2410.c drivers/input/touchscreen/Kconfig drivers/input/touchscreen/Makefile drivers/input/touchscreen/ads7846.c drivers/leds/Kconfig drivers/leds/Makefile drivers/leds/leds-pwm.c drivers/mmc/core/mmc.c drivers/mmc/host/Kconfig drivers/mmc/host/s3cmci.c drivers/mtd/chips/cfi_probe.c drivers/mtd/nand/Makefile drivers/mtd/nand/s3c2410.c drivers/net/Kconfig drivers/net/Makefile drivers/net/can/Kconfig drivers/net/can/Makefile drivers/net/can/dev.c drivers/net/can/mcp251x.c drivers/net/can/mscan/Makefile drivers/net/can/mscan/mscan.c drivers/net/can/mscan/mscan.h drivers/net/can/sja1000/Makefile drivers/net/can/sja1000/ems_pci.c drivers/net/can/sja1000/kvaser_pci.c drivers/net/can/sja1000/sja1000.c drivers/net/can/sja1000/sja1000.h drivers/net/can/sja1000/sja1000_platform.c drivers/net/can/vcan.c drivers/net/wireless/Kconfig drivers/net/wireless/Makefile drivers/rtc/Kconfig drivers/rtc/Makefile drivers/scsi/Kconfig drivers/serial/Kconfig drivers/serial/Makefile drivers/serial/samsung.c drivers/serial/serial_core.c drivers/spi/Kconfig drivers/spi/Makefile drivers/usb/gadget/Kconfig drivers/usb/gadget/gadget_chips.h drivers/video/Makefile drivers/watchdog/Kconfig drivers/watchdog/Makefile fs/Kconfig fs/squashfs/Kconfig fs/squashfs/Makefile fs/squashfs/block.c fs/squashfs/cache.c fs/squashfs/dir.c fs/squashfs/export.c fs/squashfs/file.c fs/squashfs/fragment.c fs/squashfs/id.c fs/squashfs/inode.c fs/squashfs/namei.c fs/squashfs/squashfs.h fs/squashfs/squashfs_fs.h fs/squashfs/squashfs_fs_i.h fs/squashfs/squashfs_fs_sb.h fs/squashfs/super.c fs/squashfs/symlink.c include/asm-arm/plat-s3c24xx/mci.h include/linux/can/dev.h include/linux/can/platform/mcp251x.h include/linux/can/platform/sja1000.h include/linux/ieee80211.h include/linux/magic.h include/linux/miscdevice.h include/linux/mmc/host.h include/linux/mtd/cfi.h include/linux/nl80211.h include/linux/random.h include/linux/skbuff.h include/linux/spi/ads7846.h include/net/cfg80211.h include/net/ieee80211.h include/net/mac80211.h include/net/wireless.h include/sound/soc.h init/do_mounts_rd.c init/initramfs.c init/main.c lib/kobject.c net/core/skbuff.c net/ieee80211/Kconfig net/ieee80211/Makefile net/ieee80211/ieee80211_tx.c net/ieee80211/ieee80211_wx.c net/mac80211/Kconfig net/mac80211/cfg.c net/mac80211/debugfs.c net/mac80211/debugfs_netdev.c net/mac80211/debugfs_sta.c net/mac80211/event.c net/mac80211/ht.c net/mac80211/ieee80211_i.h net/mac80211/iface.c net/mac80211/key.c net/mac80211/main.c net/mac80211/mesh.c net/mac80211/mesh_plink.c net/mac80211/mlme.c net/mac80211/rate.c net/mac80211/rate.h net/mac80211/rc80211_minstrel.c net/mac80211/rc80211_pid_algo.c net/mac80211/rx.c net/mac80211/scan.c net/mac80211/sta_info.c net/mac80211/sta_info.h net/mac80211/tx.c net/mac80211/util.c net/mac80211/wep.c net/mac80211/wep.h net/mac80211/wext.c net/mac80211/wme.c net/mac80211/wpa.c net/wireless/Kconfig net/wireless/Makefile net/wireless/core.c net/wireless/core.h net/wireless/lib80211_crypt_ccmp.c net/wireless/lib80211_crypt_tkip.c net/wireless/nl80211.c net/wireless/reg.c net/wireless/reg.h net/wireless/sysfs.c net/wireless/util.c net/wireless/wext-compat.c net/wireless/wext.c scripts/kallsyms.c scripts/mod/modpost.c scripts/setlocalversion scripts/unifdef.c sound/soc/codecs/wm8753.c sound/soc/s3c24xx/Kconfig sound/soc/s3c24xx/Makefile sound/soc/s3c24xx/s3c2412-i2s.c sound/soc/s3c24xx/s3c24xx-pcm.c sound/soc/soc-core.c Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2011-01-17ENGR00133590 UART: let user control HW flow controlZhang Jiejing
HW flow control should be enable/disable by userspace. It can be set by tty option: options.c_cflag of CRTSCTS bit. This bug is found by testing UART BT AR3001 chip, this chip will wake up the chip by set RTS to high, it needs frist disable HW flow control, set RTS, then disable HW flow control. Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com>
2011-01-17ENGR00131982 Serial Core: Fix wrong baud rate after resumeFrank Li
Fix MX28 uart can't work after suspend and resume. The reason is serial core pass down a uninitialized variable termios uport->ops->set_termios(uport, &termios, NULL); Signed-off-by: Frank Li <Frank.Li@freescale.com>
2011-01-17ENGR00126711 mx28:fix wakeup warning messageZhou Jingyu
fix suspend/wakeup warning message Signed-off-by: Zhou Jingyu <Jingyu.Zhou@freescale.com>
2011-01-17ENGR00125875-2 led: add suspend/resume for LED driverZhou Jingyu
add suspend/resume for LED driver disable debug uart for suspend Signed-off-by: Zhou Jingyu <Jingyu.Zhou@freescale.com>
2011-01-17ENGR00127171-5 Kernel Upgrade: Fix all drivers build error for mx23/mx28Frank Li
Fix build error because kernel upgrade Signed-off-by: Frank Li <Frank.Li@freescale.com>
2011-01-17ENGR00126692-3: Upgrade kernel to 2.6.35Dinh Nguyen
This patch contains changes to /drivers files Contains all checkpatch and copyright fixes. Acked-by: Rob Herring <r.herring@freescale.com> Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
2010-11-25ccw9p2443: Fix to allow for the customization of serial baud ratesAlejandro Gonzalez
Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
2010-11-25serial: swap device and driver names in samsung serialHector Palacios
This commit will make the serial devices appear as /dev/ttySACx as specified in 'Documentation/arm/Samsung-S3C24XX/Overview.txt' instead of populating them as s3c2410_serialx (which is the name of the driver). This change must be followed up by a rule change in the file system to correctly map ttySACx to ttySx. Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2010-09-20serial: bfin_sport_uart: restore transmit frame sync fixSonic Zhang
commit 336746918299f2ca16b31490655b4ff7c8824c87 upstream. The large cleanup/rewrite of resources in commit ccf68e59e93181df9353c0cc accidentally reverted an earlier fix in commit a19e8b205915b2925aca75b. So restore it here. Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-08-26sparc: Really fix "console=" for serial consoles.David S. Miller
[ Upstream commit 0a492896ac07336c98f37ad7fab4a6387b6ada78 ] If a video head and keyboard are hooked up, specifying "console=ttyS0" or similar to use a serial console will not work properly. The key issue is that we must register all serial console capable devices with register_console(), otherwise the command line specified device won't be found. The sun serial drivers would only register themselves as console devices if the OpenFirmware specified console device node matched. To fix this part we now unconditionally get the serial console register by setting serial_drv->cons always. Secondarily we must not add_preferred_console() using the firmware provided console setting if the user gaven an override on the kernel command line using "console=" The "primary framebuffer" matching logic was always triggering o n openfirmware device node match, make it not when a command line override was given. Reported-by: Frans Pop <elendil@planet.nl> Tested-by: Frans Pop <elendil@planet.nl> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-08-13serial: add support for OX16PCI958 cardLytochkin Boris
commit e847003f00d5eca3e3b3a6a1199f82b51293faf6 upstream. Signed-off-by: Lytochkin Boris <lytboris@gmail.com> Tested-by: Lytochkin Boris <lytboris@gmail.com> Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-26serial: fix rs485 for atmel_serial on avr32Peter Huewe
This patch fixes a build failure [1-4] in the atmel_serial code introduced by patch the patch ARM: 6092/1: atmel_serial: support for RS485 communications (e8faff7330a3501eafc9bfe5f4f15af444be29f5) The build failure was caused by missing struct field and missing defines for the avr32 board - the patch fixes this. [1] http://kisskb.ellerman.id.au/kisskb/buildresult/2575242/ - first failure in linux-next, may 11th [2] http://kisskb.ellerman.id.au/kisskb/buildresult/2816418/ - still exists as of today [3] http://kisskb.ellerman.id.au/kisskb/buildresult/2617511/ - first failure in Linus' tree - May 20th - did really no one notice this?! [4] http://kisskb.ellerman.id.au/kisskb/buildresult/2813956/ - still exists in Linus' tree as of today Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-21Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: math-emu: correct test for downshifting fraction in _FP_FROM_INT() perf: Add DWARF register lookup for sparc MAINTAINERS: Add SBUS driver path to sparc entry. drivers/sbus: Remove unnecessary casts of private_data sparc: remove homegrown L1_CACHE_ALIGN macro sparc64: fix the build error due to smp_kgdb_capture_client() sparc64: Fix maybe_change_configuration() PCR setting. arch/sparc/kernel: Eliminate what looks like a NULL pointer dereference sparc64: Update defconfig. sunsu: Fix use after free in su_remove(). sunserial: Don't call add_preferred_console() when console= is specified. sparc32: Kill none_mask, it's bogus.
2010-06-30serial: cpm_uart: implement the cpm_uart_early_write() function for console pollDongdong Deng
The cpm_uart_early_write() function which was used for console poll isn't implemented in the cpm uart driver. Implementing this function both fixes the build when CONFIG_CONSOLE_POLL is set and allows kgdboc to work via the cpm uart. Signed-off-by: Dongdong Deng <dongdong.deng@windriver.com> Reviewed-by: Bruce Ashfield <bruce.ashfield@windriver.com> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-27Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (52 commits) phylib: Add autoload support for the LXT973 phy. ISDN: hysdn, fix potential NULL dereference vxge: fix memory leak in vxge_alloc_msix() error path isdn/gigaset: correct CAPI connection state storage isdn/gigaset: encode HLC and BC together isdn/gigaset: correct CAPI DATA_B3 Delivery Confirmation isdn/gigaset: correct CAPI voice connection encoding isdn/gigaset: honor CAPI application's buffer size request cpmac: do not leak struct net_device on phy_connect errors smc91c92_cs: fix the problem that lan & modem does not work simultaneously ipv6: fix NULL reference in proxy neighbor discovery Bluetooth: Bring back var 'i' increment xfrm: check bundle policy existance before dereferencing it sky2: enable rx/tx in sky2_phy_reinit() cnic: Disable statistics initialization for eth clients that do not support statistics net: add dependency on fw class module to qlcnic and netxen_nic snmp: fix SNMP_ADD_STATS() hso: remove setting of low_latency flag udp: Fix bogus UFO packet generation lasi82596: fix netdev_mc_count conversion ...
2010-06-26Merge branch 'master' of /home/davem/src/GIT/linux-2.6/David S. Miller
2010-06-16pcnet_cs: add new id (TOSHIBA Modem/LAN Card)Ken Kawasaki
pcnet_cs: serial_cs: add new id (TOSHIBA Modem/LAN Card) Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp> Signed-off-by: David S. Miller <davem@davemloft.net>
2010-06-04serial: add support for various Titan PCI cardsYegor Yefremov
serial: add support for various Titan PCI cards Models: 200I, 400I, 800I, 400EH, 800EH, 800EHB, 100E, 200E, 400E, 800E, 200EI, 200EISI Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-04serial: altera_uart: Proper section for altera_uart_removeTobias Klauser
altera_uart_remove should be in .devexit.text Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-04altera_uart: Simplify altera_uart_console_putcTobias Klauser
The check for the TRDY flag after writing the character is not needed. Also do a cpu_relax() inside the loop. Pass a struct uart_port to altera_uart_console_putc, so we do not need to get it (and dereference pointers) for every character. Cc: Thomas Chou <thomas@wytron.com.tw> Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-04altera_uart: Don't take spinlock in already protected functionsTobias Klauser
Don't take the port spinlock in uart functions where the serial core already takes care of locking/unlocking them. The code would actually lock up on architectures where spinlocks are implemented (not the case on nios2 where this driver is primarily used for now, thus this bug didn't trigger). Also protect calling altera_uart_rx_chars/altera_uart_tx_chars in the interrupt handler by the port spinlock. Thanks to Ian Abbott for pointing these issues out. Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Thomas Chou <thomas@wytron.com.tw> Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-04serial: bfin_5xx: fix typo in IER checkSonic Zhang
This most likely won't cause problems on systems as people don't typically enable GPIO RTS/CTS if they don't actually use it. Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-04serial: bfin_5xx: IRDA is not affected by anomaly 05000230Graf Yang
Anomaly 05000230 (over sampling of the UART STOP bit) applies only when the peripheral is operating in UART mode. So drop the anomaly handling when the UART is in IRDA mode. Signed-off-by: Graf Yang <graf.yang@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-04serial_cs: add and sort IDs for serial and modem cardsAlexander Kurz
Signed-off-by: Alexander Kurz <linux@kbdbabel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-04msm_serial: fix serial on troutAbhijeet Dharmapurikar
Set the mnd counter based on uartclk. This fixes a problem on 7x30 where the uartclk is 19.2Mhz rather than the usual 4.8Mhz. Trout incorrectly reports uartclk to be running at 19.2Mhz It is actually running at 4.8Mhz. For trout force mnd counter values as if uartclk was fed by tcxo/4. Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org> [dwalker@codeaurora.org: inlined, moved into header, added comments.] Signed-off-by: Daniel Walker <dwalker@codeaurora.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-02powerpc/macio: Fix probing of macio devices by using the right of match tableBenjamin Herrenschmidt
Grant patches added an of mach table to struct device_driver. However, while he changed the macio device code to use that, he left the match table pointer in struct macio_driver and didn't update drivers to use the "new" one, thus breaking the probing. This completes the change by moving all drivers to setup the "new" one, removing all traces of the old one, and while at it (since it changes the exact same locations), I also remove two other duplicates from struct driver which are the name and owner fields. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2010-05-28ARM: S5PV210: serial: Fix section mismatch warningMarek Szyprowski
Rename the structure to avoid the following warning: WARNING: drivers/serial/built-in.o(.data+0x534): Section mismatch in reference from the variable s5p_serial_drv to the function .devexit.text:s3c24xx_serial_remove() The variable s5p_serial_drv references the function __devexit s3c24xx_serial_remove() If the reference is valid then annotate the variable with __exit* (see linux/init.h) or name the variable: *driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console, Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-26sunsu: Fix use after free in su_remove().David S. Miller
Real serial port 'up' objects are statically allocated from an array in the driver. Keyboard and mouse ports, on the other hand, are dynamically allocated. Unfortunately, we free these dynamic 'up' objects before we unmap the I/O registers. Rearrange su_remove() so that this does not happen. Noticed by Julia Lawall. Signed-off-by: David S. Miller <davem@davemloft.net>
2010-05-25sunserial: Don't call add_preferred_console() when console= is specified.David S. Miller
Reported-by: Frans Pop <elendil@planet.nl> Signed-off-by: David S. Miller <davem@davemloft.net>
2010-05-25Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds
* 'next-spi' of git://git.secretlab.ca/git/linux-2.6: spi/xilinx: Fix compile error spi/davinci: Fix clock prescale factor computation spi: move bitbang txrx utility functions to private header spi/mpc5121: Add SPI master driver for MPC5121 PSC powerpc/mpc5121: move PSC FIFO memory init to platform code spi/ep93xx: implemented driver for Cirrus EP93xx SPI controller Documentation/spi/* compile warning fix spi/omap2_mcspi: Check params before dereference or use spi/omap2_mcspi: add turbo mode support spi/omap2_mcspi: change default DMA_MIN_BYTES value to 160 spi/pl022: fix stop queue procedure spi/pl022: add support for the PL023 derivate spi/pl022: fix up differences between ARM and ST versions spi/spi_mpc8xxx: Do not use map_tx_dma to unmap rx_dma spi/spi_mpc8xxx: Fix QE mode Litte Endian spi/spi_mpc8xxx: fix potential memory corruption.
2010-05-25m68knommu: fix broken use of BUAD_TABLE_SIZE in 68328serial driverGreg Ungerer
Commit 8b505ca8e2600eb9e7dd2d6b2682a81717671374 ("serial: 68328serial.c: remove BAUD_TABLE_SIZE macro") misses one use of BAUD_TABLE_SIZE. So the resulting 68328serial.c does not compile: drivers/serial/68328serial.c: In function `m68328_console_setup': drivers/serial/68328serial.c:1439: error: `BAUD_TABLE_SIZE' undeclared (first use in this function) drivers/serial/68328serial.c:1439: error: (Each undeclared identifier is reported only once drivers/serial/68328serial.c:1439: error: for each function it appears in.) Fix that last use of it. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Cc: Thiago Farina <tfransosi@gmail.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-05-25Merge remote branch 'origin' into secretlab/next-spiGrant Likely
generated by cgit v1.2.3 (git 2.0.4) at 2024-11-05 11:48:58 +0000