提交 · 12197de2cdb2ded83db7b5a3a06f4b275fb8e62c · openeuler / Kernel

27 7月, 2013 25 次提交

pci_ids.h: move PCI_VENDOR_ID_AMCC here · 12197de2

由 Ian Abbott 提交于 7月 16, 2013

PCI_VENDOR_ID_AMCC is defined locally in
"drivers/staging/comedi/comedidev.h" for a few comedi hardware drivers,
namely "adl_pci9118", "addi_apci_1500" and "addi_apci_3120" (also
"addi_apci_1710" but that is not currently built and will probably be
removed soon).  Move the define into "include/linux/pci_ids.h" as it is
shared by several drivers (albeit all comedi drivers currently).

PCI_VENDOR_ID_AMCC happens to have the same value (0x10e8) as
PCI_VENDOR_ID_ADDIDATA_OLD.  The vendor ID is actually assigned to
Applied Micro Circuits Corporation and Addi-Data were using device IDs
assigned by AMCC on some of their earlier PCI boards. The
PCI_VENDOR_ID_ADDIDATA_OLD define is still being used by the "8250_pci"
PCI serial board driver.
Signed-off-by: NIan Abbott <abbotti@mev.co.uk>
Acked-by: NBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

12197de2

serial:st-asc: Add ST ASC driver. · c4b05856

由 Srinivas Kandagatla 提交于 7月 15, 2013

This patch adds support to ASC (asynchronous serial controller)
driver, which is basically a standard serial driver. This IP is common
across all the ST parts for settop box platforms.

ASC is embedded in ST COMMS IP block. It supports Rx & Tx functionality.
It support all industry standard baud rates.
Signed-off-by: NSrinivas Kandagatla <srinivas.kandagatla@st.com>
CC: Stephen Gallimore <stephen.gallimore@st.com>
CC: Stuart Menefy <stuart.menefy@st.com>
CC: Arnd Bergmann <arnd@arndb.de>
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

c4b05856

serial/efm32-uart: make of_device_id array const · 75e66aa6

由 Uwe Kleine-König 提交于 7月 18, 2013

Signed-off-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

75e66aa6

serial/efm32-uart: use COMPILE_TEST symbol to extend compile test coverage · 2f2a0c70

由 Uwe Kleine-König 提交于 7月 17, 2013

The driver fails to build on x86 because writel_relaxed isn't available
there. That function exists on arm, arm64, avr32, hexagon, mips and sh,
but adding all these is overkill so stick to arm only.
Signed-off-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

2f2a0c70

msm_serial: add missing iounmap() on error in msm_request_port() · 195be84a

由 Wei Yongjun 提交于 7月 17, 2013

Add the missing iounmap() before return from msm_request_port()
in the error handling case.
Signed-off-by: NWei Yongjun <yongjun_wei@trendmicro.com.cn>
Reviewed-by: NIvan T. Ivanov <iivanov@mm-sol.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

195be84a

serial: bfin_uart: Remove redundant testing for ifdef CONFIG_SERIAL_BFIN_MODULE · 37e1ceb1

由 Axel Lin 提交于 7月 15, 2013

No idea why we have redundant testing for ifdef CONFIG_SERIAL_BFIN_MODULE,
check it once is enough.
Signed-off-by: NAxel Lin <axel.lin@ingics.com>
Acked-by: NSonic Zhang <sonic.zhang@analog.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

37e1ceb1

pch_uart: Use DMI interface for board detection · 4e323489

由 Darren Hart 提交于 7月 12, 2013

Use the DMI interface rather than manually matching DMI strings.
Signed-off-by: NDarren Hart <dvhart@linux.intel.com>
Cc: Michael Brunner <mibru@gmx.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

4e323489

serial: report base_baud after initialization · 7d12b976

由 Kees Cook 提交于 7月 12, 2013

Some serial ports will not use the standard base baud rate. Report
this after initialization so it might be discovered and used for early
console configuration.
Signed-off-by: NKees Cook <keescook@chromium.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

7d12b976

serial: omap: enable PM runtime only when its fully configured · 3026d14a

由 Grygorii Strashko 提交于 7月 22, 2013

If earlyprintk is enabled and current UART is console port the platform
code can mark it as RPM_ACTIVE to sync real IP state with PM Runtime and
avoid resuming of already active device, but now, driver initialization
will be performed in the wrong way:

	pm_runtime_enable(&pdev->dev);
    <-- PM runtime alowed (device state RPM_ACTIVE)
	if (omap_up_info->autosuspend_timeout == 0)
		omap_up_info->autosuspend_timeout = -1;
	device_init_wakeup(up->dev, true);
	pm_runtime_use_autosuspend(&pdev->dev);
	<-- update_autosuspend() will be called and it will disable device
        (device state RPM_SUSPENDED)
	pm_runtime_set_autosuspend_delay(&pdev->dev,
			omap_up_info->autosuspend_timeout);
	<-- update_autosuspend() will be called which will re-enable device
        (device state RPM_ACTIVE), because autosuspend_timeout < 0

	pm_runtime_irq_safe(&pdev->dev);
	pm_runtime_get_sync(&pdev->dev);
	<-- will do nothing

Such behavior isn't expected by OMAP serial drivers and causes
unpredictable calls of serial_omap_runtime_suspend() and
serial_omap_runtime_resume().

Hence, fix it by allowing PM runtime only after all its parameters are
configured.

CC: Tony Lindgren <tony@atomide.com>
CC: Rajendra Nayak <rnayak@ti.com>
CC: Felipe Balbi <balbi@ti.com>
CC: Kevin Hilman <khilman@linaro.org>
Tested-by: NMark Jackson <mpfj-list@newflow.co.uk>
Signed-off-by: NGrygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

3026d14a

A
serial: fsl_lpuart: Return proper error on lpuart_serial_init error path · 39c34b09
由 Axel Lin 提交于 7月 22, 2013
```
Signed-off-by: NAxel Lin <axel.lin@ingics.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
```
39c34b09

serial: fsl_lpuart: restore UARTCR2 after watermark setup is done · bc764b8f

由 Shawn Guo 提交于 7月 08, 2013

Function lpuart_setup_watermark() clears some bits in register UARTCR2
before writing FIFO configuration registers as required by hardware.
But it should restore UARTCR2 after that.  Otherwise, we end up changing
UARTCR2 register when setting up watermark, and that is not really
desirable.  At least, when low-level debug and earlyprint is enabled,
serial console is broken due to it.

Fix the problem by restoring UARTCR2 register at the end of function
lpuart_setup_watermark().
Signed-off-by: NShawn Guo <shawn.guo@linaro.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

bc764b8f

serial: omap: Fix IRQ handling return value · 908fd7e5

由 Ruchika Kharwar 提交于 7月 17, 2013

Ensure the Interrupt handling routine return IRQ_HANDLED vs
IRQ_NONE.
Signed-off-by: NRuchika Kharwar <ruchika@ti.com>
Signed-off-by: NAlexander Savchenko <oleksandr.savchenko@ti.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

908fd7e5

serial: omap: Initialize platform_data · a0a490f9

由 Vikram Pandita 提交于 7月 08, 2013

Otherwise serial driver would crash accessing platform_data that was
not initialized in functions like:

        serial_omap_pm(...)
        ...
        if (!state && pdata->enable_wakeup)
                   ^^^^^^^
        ...
Signed-off-by: NVikram Pandita <vikram.pandita@ti.com>
Signed-off-by: NAlexander Savchenko <oleksandr.savchenko@ti.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

a0a490f9

OMAP: UART: Fix the revision register read. · 76bac198

由 Ruchika Kharwar 提交于 7月 08, 2013

The revision register is a 32 bit register. The serial_in() function reads
only the lower 16 bits of the register. This leads to an incorrect computation
of the Module revision.
Signed-off-by: NRuchika Kharwar <ruchika@ti.com>
[oleksandr.savchenko@ti.com: add some whitespaces]
Signed-off-by: NAlexander Savchenko <oleksandr.savchenko@ti.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

76bac198

OMAP: UART: Keep the TX fifo full when possible · c4415084

由 Dmitry Fink 提交于 7月 08, 2013

Current logic results in interrupt storm since the fifo
is constantly below the threshold level. Change the logic
to fill all the available spaces in the fifo as long as
we have data to minimize the possibilty of underflow and
elimiate excessive interrupts.
Signed-off-by: NDmitry Fink <finik@ti.com>
Signed-off-by: NAlexander Savchenko <oleksandr.savchenko@ti.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

c4415084

OMAP2+: UART: enable tx wakeup bit for wer reg · f64ffda6

由 Govindraj.R 提交于 7月 05, 2013

wer has TX wakeup bit available enable the same
by populating the necessary tx wakeup flag for the
applicable module ip blocks and use the same
while configuaring wer reg.

Also wer is not context restored, restore wer when
context is lost.

Cc: Paul Walmsley <paul@pwsan.com>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Kevin Hilman <kevin.hilman@linaro.org>
Acked-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(for drivers/tty changes)
Signed-off-by: NGovindraj.R <govindraj.raja@ti.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

f64ffda6

8250_pci: improve code comments and Kconfig help · 972ce085

由 Stefan Seyfried 提交于 7月 01, 2013

The recent regression about NetMos 9835 Multi-I/O boards indicates
that comment pointing to the parport_serial driver could be helpful.
Signed-off-by: NStefan Seyfried <seife+kernel@b1-systems.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

972ce085

serial: max310x: Add MAX14830 support · 003236d9

由 Alexander Shiyan 提交于 6月 29, 2013

This patch adds support for MAX14830 (advanced quad universal asynchronous
receiver-transmitter) into max310x driver.
Signed-off-by: NAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

003236d9

serial: max310x: Add MAX3109 support · 21fc509f

由 Alexander Shiyan 提交于 6月 29, 2013

This patch adds support for MAX3109 (advanced dual universal asynchronous
receiver-transmitter) into max310x driver.
Signed-off-by: NAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

21fc509f

serial: max310x: Driver rework · 10d8b34a

由 Alexander Shiyan 提交于 6月 29, 2013

This patch rework max310x driver.
Major changes have been made:
- Prepare driver to support ICs with more than one UART.
- Prepare driver to support work with I2C-bus.
The patch changes almost every function and can not be divided into parts.
Signed-off-by: NAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

10d8b34a

serial: imx: add DMA support for imx6q · b4cdc8f6

由 Huang Shijie 提交于 7月 08, 2013

We only enable the DMA support when the following are meet:

  [1] The uart port supports the hardware flow control(CTS/RTS).
      (Some uart port does not support the CTS/RTS.)

  [2] The application enables the CTS/RTS.

  [3] The Soc is imx6q.
      For the sdma's firmware limit, we do not support the DMA except
      the imx6q platform.

  [4] The uart is not used as a console.
Signed-off-by: NHuang Shijie <b32955@freescale.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

b4cdc8f6

serial/imx: fix custom-baudrate handling · 09bd00f6

由 Hubert Feurstein 提交于 7月 18, 2013

It was not possible to set custom-baudrates like 62500.
Signed-off-by: NHubert Feurstein <h.feurstein@gmail.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

09bd00f6

serial: imx: distinguish the imx6q uart from the others · a496e628

由 Huang Shijie 提交于 7月 08, 2013

We will add the DMA support for the imx uart. For the firmware's limit,
only the imx6 serial chips (including the imx6q, imx6dl, imx6sl) can
support the DMA.

This patch adds the necessary macro and helper to distinguish the
imx6q uart from the other imx uart. Other chips can use the "fsl,imx6q-uart"
to enable the DMA support.

This patch also replaces the check "is_imx21_uart()" with "!is_imx1_uart()".
Signed-off-by: NHuang Shijie <b32955@freescale.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

a496e628

serial: imx: remove the uart_console() check · 1cf93e0d

由 Huang Shijie 提交于 6月 28, 2013

The uart_console() check makes the clocks(clk_per and clk_ipg) opened
even when we close the console uart.

This patch enable/disable the clocks in imx_console_write(),
so we can keep the clocks closed when the console uart is closed.

Also remove the clock enable/disable oprations in the probe, we do not
need them any more.
Signed-off-by: NHuang Shijie <b32955@freescale.com>
Acked-by: NShawn Guo <shawn.guo@linaro.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

1cf93e0d

serial: remove unnecessary platform_set_drvdata() · 43b829b3

由 Jingoo Han 提交于 6月 25, 2013

The driver core clears the driver data to NULL after device_release
or on probe failure, since commit 0998d063
(device-core: Ensure drvdata = NULL when no driver is bound).
Thus, it is not needed to manually clear the device driver data to NULL.
Signed-off-by: NJingoo Han <jg1.han@samsung.com>
Acked-by: NBarry Song <baohua.song@csr.com>
Acked-by: NTony Prisk <linux@prisktech.co.nz>
Acked-by: NShawn Guo <shawn.guo@linaro.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

43b829b3

25 7月, 2013 15 次提交

tty/hvc_iucv: Disconnect IUCV connection when lowering DTR · 74b3b4cd

由 Hendrik Brueckner 提交于 7月 02, 2013

Implement the dtr_rts() hvc console callback to improve control when to
disconnect the IUCV connection. Previously, the IUCV connection was
disconnected during the notifier_del() callback, i.e., when the last file
descriptor to the hvc terminal device was closed.

Recent changes in login programs caused undesired disconnects during the
login phase. To prevent these kind of disconnects, implement the dtr_rts
callback to implicitly handle the HUPCL termios control via the hvc_console
driver.
Signed-off-by: NHendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

74b3b4cd

tty/hvc_console: Add DTR/RTS callback to handle HUPCL control · 33e745a1

由 Hendrik Brueckner 提交于 7月 02, 2013

Introduce a new callback to explicitly handle the HUPCL termios control flag.
This prepares for a follow-up commit for the hvc_iucv device driver to
improve handling when to drop an established network connection.

The callback naming is based on the recently added tty_port interface to
facilitate a potential refactoring of the hvc_console to use tty_port
functions.
Signed-off-by: NHendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

33e745a1

drivers/tty/serial: don't use devm_pinctrl_get_select_default() in probe · e84f54fc

由 Wolfram Sang 提交于 7月 10, 2013

Since commit ab78029e (drivers/pinctrl: grab default handles from device core),
we can rely on device core for setting the default pins. Compile tested only.

Acked-by: Linus Walleij <linus.walleij@linaro.org> (personally at LCE13)
Signed-off-by: NWolfram Sang <wsa@the-dreams.de>
Acked-by: NNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

e84f54fc

Drivers: tty: n_gsm.c: fixed 7 errors & 6 warnings that checkpatch complained · f3c909b4

由 Aldo Iljazi 提交于 7月 08, 2013

Specifically:
n_gsm.c:810: ERROR: space required before the open parenthesis '('
n_gsm.c:830: WARNING: line over 80 characters
n_gsm.c:971: ERROR: trailing whitespace
n_gsm.c:984: ERROR: code indent should use tabs where possible
n_gsm.c:984: WARNING: please, no space before tabs
n_gsm.c:984: WARNING: please, no spaces at the start of a line
n_gsm.c:1141: WARNING: space prohibited before semicolon
n_gsm.c:1743: ERROR: space required before the open brace '{'
n_gsm.c:1744: WARNING: line over 80 characters
n_gsm.c:1745: ERROR: code indent should use tabs where possible
n_gsm.c:1746: ERROR: code indent should use tabs where possible
n_gsm.c:2908: WARNING: line over 80 characters
n_gsm.c:2912: ERROR: trailing whitespace
Signed-off-by: NAldo Iljazi <neonsync1@gmail.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

f3c909b4

tty: Fix lock order in tty_do_resize() · dee4a0be