History

Merge tag 'tty-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty/serial updates from Greg KH: "Here's the big tty/serial driver update for 4.1-rc1. It was delayed for a bit due to some questions surrounding some of the console command line parsing changes that are in here. There's still one tiny regression for people who were previously putting multiple console command lines and expecting them all to be ignored for some odd reason, but Peter is working on fixing that. If not, I'll send a revert for the offending patch, but I have faith that Peter can address it. Other than the console work here, there's the usual serial driver updates and changes, and a buch of 8250 reworks to try to make that driver easier to maintain over time, and have it support more devices in the future. All of these have been in linux-next for a while" * tag 'tty-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (119 commits) n_gsm: Drop unneeded cast on netdev_priv sc16is7xx: expose RTS inversion in RS-485 mode serial: 8250_pci: port failed after wakeup from S3 earlycon: 8250: Document kernel command line options earlycon: 8250: Fix command line regression earlycon: Fix __earlycon_table stride tty: clean up the tty time logic a bit serial: 8250_dw: only get the clock rate in one place serial: 8250_dw: remove useless ACPI ID check dmaengine: hsu: move memory allocation to GFP_NOWAIT dmaengine: hsu: remove redundant pieces of code serial: 8250_pci: add Intel Tangier support dmaengine: hsu: add Intel Tangier PCI ID serial: 8250_pci: replace switch-case by formula for Intel MID serial: 8250_pci: replace switch-case by formula tty: cpm_uart: replace CONFIG_8xx by CONFIG_CPM1 serial: jsm: some off by one bugs serial: xuartps: Fix check in console_setup(). serial: xuartps: Get rid of register access macros. serial: xuartps: Fix iobase use. ...

Linus Torvalds committed 11 years ago

Commit 41d5e082 parents 8d582b9 5dbc32a79 files · +2357 −4743Browse files

Showing the changes to include/linux/platform_data (3 of 79 files). Show all

Unified · Split

3 files
  1. include/linux/platform_data/dma-hsu.h +25 −0
  2. include/linux/platform_data/msm_serial_hs.h +0 −49
  3. include/linux/platform_data/serial-imx.h +0 −5
include/linux/platform_data/dma-hsu.h+25−0
@@ -0,0 +1,25 @@
1+/*
2+ * Driver for the High Speed UART DMA
3+ *
4+ * Copyright (C) 2015 Intel Corporation
5+ *
6+ * This program is free software; you can redistribute it and/or modify
7+ * it under the terms of the GNU General Public License version 2 as
8+ * published by the Free Software Foundation.
9+ */
10+
11+#ifndef _PLATFORM_DATA_DMA_HSU_H
12+#define _PLATFORM_DATA_DMA_HSU_H
13+
14+#include <linux/device.h>
15+
16+struct hsu_dma_slave {
17+ struct device *dma_dev;
18+ int chan_id;
19+};
20+
21+struct hsu_dma_platform_data {
22+ unsigned short nr_channels;
23+};
24+
25+#endif /* _PLATFORM_DATA_DMA_HSU_H */
include/linux/platform_data/msm_serial_hs.h+0−49
@@ -1,49 +0,0 @@
1−/*
2− * Copyright (C) 2008 Google, Inc.
3− * Author: Nick Pelly <npelly@google.com>
4− *
5− * This software is licensed under the terms of the GNU General Public
6− * License version 2, as published by the Free Software Foundation, and
7− * may be copied, distributed, and modified under those terms.
8− *
9− * This program is distributed in the hope that it will be useful,
10− * but WITHOUT ANY WARRANTY; without even the implied warranty of
11− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12− * GNU General Public License for more details.
13− */
14−
15−#ifndef __ASM_ARCH_MSM_SERIAL_HS_H
16−#define __ASM_ARCH_MSM_SERIAL_HS_H
17−
18−#include <linux/serial_core.h>
19−
20−/* API to request the uart clock off or on for low power management
21− * Clients should call request_clock_off() when no uart data is expected,
22− * and must call request_clock_on() before any further uart data can be
23− * received. */
24−extern void msm_hs_request_clock_off(struct uart_port *uport);
25−extern void msm_hs_request_clock_on(struct uart_port *uport);
26−
27−/**
28− * struct msm_serial_hs_platform_data
29− * @rx_wakeup_irq: Rx activity irq
30− * @rx_to_inject: extra character to be inserted to Rx tty on wakeup
31− * @inject_rx: 1 = insert rx_to_inject. 0 = do not insert extra character
32− * @exit_lpm_cb: function called before every Tx transaction
33− *
34− * This is an optional structure required for UART Rx GPIO IRQ based
35− * wakeup from low power state. UART wakeup can be triggered by RX activity
36− * (using a wakeup GPIO on the UART RX pin). This should only be used if
37− * there is not a wakeup GPIO on the UART CTS, and the first RX byte is
38− * known (eg., with the Bluetooth Texas Instruments HCILL protocol),
39− * since the first RX byte will always be lost. RTS will be asserted even
40− * while the UART is clocked off in this mode of operation.
41− */
42−struct msm_serial_hs_platform_data {
43− int rx_wakeup_irq;
44− unsigned char inject_rx_on_wakeup;
45− char rx_to_inject;
46− void (*exit_lpm_cb)(struct uart_port *);
47−};
48−
49−#endif
include/linux/platform_data/serial-imx.h+0−5
@@ -20,14 +20,9 @@ · 19 unmodified lines
2020 #define ASMARM_ARCH_UART_H
2121
2222 #define IMXUART_HAVE_RTSCTS (1<<0)
23−#define IMXUART_IRDA (1<<1)
2423
2524 struct imxuart_platform_data {
2625 unsigned int flags;
27− void (*irda_enable)(int enable);
28− unsigned int irda_inv_rx:1;
29− unsigned int irda_inv_tx:1;
30− unsigned short transceiver_delay;
3126 };
3227
3328 #endif

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t