* linux-next: manual merge of the tty tree with the slave-dma tree
@ 2016-09-05 6:43 Stephen Rothwell
2016-09-05 11:28 ` Vinod Koul
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2016-09-05 6:43 UTC (permalink / raw)
To: Greg KH, Vinod Koul; +Cc: linux-next, linux-kernel, Nandor Han, Dave Jiang
Hi Greg,
Today's linux-next merge of the tty tree got a conflict in:
drivers/dma/imx-sdma.c
between commit:
48dc77e2d4fc ("dmaengine: imx-sdma: convert callback to helper function")
from the slave-dma tree and commit:
15f30f513111 ("dmaengine: imx-sdma - reduce transfer latency for DMA cyclic clients")
from the tty tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/dma/imx-sdma.c
index a6bffbc47ee2,3cb47386fbb9..000000000000
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@@ -689,12 -664,36 +686,35 @@@ static void sdma_update_channel_loop(st
if (bd->mode.status & BD_DONE)
break;
- if (bd->mode.status & BD_RROR)
+ if (bd->mode.status & BD_RROR) {
+ bd->mode.status &= ~BD_RROR;
sdmac->status = DMA_ERROR;
+ error = -EIO;
+ }
+ /*
+ * We use bd->mode.count to calculate the residue, since contains
+ * the number of bytes present in the current buffer descriptor.
+ */
+
+ sdmac->chn_real_count = bd->mode.count;
bd->mode.status |= BD_DONE;
+ bd->mode.count = sdmac->period_len;
+
+ /*
+ * The callback is called from the interrupt context in order
+ * to reduce latency and to avoid the risk of altering the
+ * SDMA transaction status by the time the client tasklet is
+ * executed.
+ */
+
- if (sdmac->desc.callback)
- sdmac->desc.callback(sdmac->desc.callback_param);
++ dmaengine_desc_get_callback_invoke(&sdmac->desc, NULL);
+
sdmac->buf_tail++;
sdmac->buf_tail %= sdmac->num_bd;
+
+ if (error)
+ sdmac->status = old_status;
}
}
@@@ -722,20 -722,10 +743,10 @@@ static void mxc_sdma_handle_channel_nor
sdmac->status = DMA_COMPLETE;
dma_cookie_complete(&sdmac->desc);
- if (sdmac->desc.callback)
- sdmac->desc.callback(sdmac->desc.callback_param);
+
+ dmaengine_desc_get_callback_invoke(&sdmac->desc, NULL);
}
- static void sdma_tasklet(unsigned long data)
- {
- struct sdma_channel *sdmac = (struct sdma_channel *) data;
-
- if (sdmac->flags & IMX_DMA_SG_LOOP)
- sdma_handle_channel_loop(sdmac);
- else
- mxc_sdma_handle_channel_normal(sdmac);
- }
-
static irqreturn_t sdma_int_handler(int irq, void *dev_id)
{
struct sdma_engine *sdma = dev_id;
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: linux-next: manual merge of the tty tree with the slave-dma tree
2016-09-05 6:43 linux-next: manual merge of the tty tree with the slave-dma tree Stephen Rothwell
@ 2016-09-05 11:28 ` Vinod Koul
2016-09-05 11:33 ` Greg KH
0 siblings, 1 reply; 12+ messages in thread
From: Vinod Koul @ 2016-09-05 11:28 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, linux-next, linux-kernel, Nandor Han, Dave Jiang
On Mon, Sep 05, 2016 at 04:43:21PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in:
>
> drivers/dma/imx-sdma.c
>
> between commit:
>
> 48dc77e2d4fc ("dmaengine: imx-sdma: convert callback to helper function")
>
> from the slave-dma tree and commit:
>
> 15f30f513111 ("dmaengine: imx-sdma - reduce transfer latency for DMA cyclic clients")
>
> from the tty tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
Stephen,
The fix looks right to me.
Greg let me know if you would like me to merge this to avoid conflict
--
~Vinod
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: linux-next: manual merge of the tty tree with the slave-dma tree
2016-09-05 11:28 ` Vinod Koul
@ 2016-09-05 11:33 ` Greg KH
2016-09-05 12:43 ` Vinod Koul
0 siblings, 1 reply; 12+ messages in thread
From: Greg KH @ 2016-09-05 11:33 UTC (permalink / raw)
To: Vinod Koul
Cc: Stephen Rothwell, linux-next, linux-kernel, Nandor Han, Dave Jiang
On Mon, Sep 05, 2016 at 04:58:02PM +0530, Vinod Koul wrote:
> On Mon, Sep 05, 2016 at 04:43:21PM +1000, Stephen Rothwell wrote:
> > Hi Greg,
> >
> > Today's linux-next merge of the tty tree got a conflict in:
> >
> > drivers/dma/imx-sdma.c
> >
> > between commit:
> >
> > 48dc77e2d4fc ("dmaengine: imx-sdma: convert callback to helper function")
> >
> > from the slave-dma tree and commit:
> >
> > 15f30f513111 ("dmaengine: imx-sdma - reduce transfer latency for DMA cyclic clients")
> >
> > from the tty tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging. You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
>
> Stephen,
>
> The fix looks right to me.
>
> Greg let me know if you would like me to merge this to avoid conflict
Sure, which way do you want to merge, do you want me to pull your tree
into mine, or do you want to pull my tree into yours? Either is fine
with me.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: linux-next: manual merge of the tty tree with the slave-dma tree
2016-09-05 11:33 ` Greg KH
@ 2016-09-05 12:43 ` Vinod Koul
2016-09-05 13:55 ` Greg KH
0 siblings, 1 reply; 12+ messages in thread
From: Vinod Koul @ 2016-09-05 12:43 UTC (permalink / raw)
To: Greg KH
Cc: Stephen Rothwell, linux-next, linux-kernel, Nandor Han, Dave Jiang
On Mon, Sep 05, 2016 at 01:33:33PM +0200, Greg KH wrote:
> On Mon, Sep 05, 2016 at 04:58:02PM +0530, Vinod Koul wrote:
> > On Mon, Sep 05, 2016 at 04:43:21PM +1000, Stephen Rothwell wrote:
> > > Hi Greg,
> > >
> > > Today's linux-next merge of the tty tree got a conflict in:
> > >
> > > drivers/dma/imx-sdma.c
> > >
> > > between commit:
> > >
> > > 48dc77e2d4fc ("dmaengine: imx-sdma: convert callback to helper function")
> > >
> > > from the slave-dma tree and commit:
> > >
> > > 15f30f513111 ("dmaengine: imx-sdma - reduce transfer latency for DMA cyclic clients")
> > >
> > > from the tty tree.
> > >
> > > I fixed it up (see below) and can carry the fix as necessary. This
> > > is now fixed as far as linux-next is concerned, but any non trivial
> > > conflicts should be mentioned to your upstream maintainer when your tree
> > > is submitted for merging. You may also want to consider cooperating
> > > with the maintainer of the conflicting tree to minimise any particularly
> > > complex conflicts.
> >
> > Stephen,
> >
> > The fix looks right to me.
> >
> > Greg let me know if you would like me to merge this to avoid conflict
>
> Sure, which way do you want to merge, do you want me to pull your tree
> into mine, or do you want to pull my tree into yours? Either is fine
> with me.
Great, I would prefer to pull.
--
~Vinod
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: linux-next: manual merge of the tty tree with the slave-dma tree
2016-09-05 12:43 ` Vinod Koul
@ 2016-09-05 13:55 ` Greg KH
2016-09-05 15:53 ` Vinod Koul
0 siblings, 1 reply; 12+ messages in thread
From: Greg KH @ 2016-09-05 13:55 UTC (permalink / raw)
To: Vinod Koul
Cc: Stephen Rothwell, linux-next, linux-kernel, Nandor Han, Dave Jiang
On Mon, Sep 05, 2016 at 06:13:05PM +0530, Vinod Koul wrote:
> On Mon, Sep 05, 2016 at 01:33:33PM +0200, Greg KH wrote:
> > On Mon, Sep 05, 2016 at 04:58:02PM +0530, Vinod Koul wrote:
> > > On Mon, Sep 05, 2016 at 04:43:21PM +1000, Stephen Rothwell wrote:
> > > > Hi Greg,
> > > >
> > > > Today's linux-next merge of the tty tree got a conflict in:
> > > >
> > > > drivers/dma/imx-sdma.c
> > > >
> > > > between commit:
> > > >
> > > > 48dc77e2d4fc ("dmaengine: imx-sdma: convert callback to helper function")
> > > >
> > > > from the slave-dma tree and commit:
> > > >
> > > > 15f30f513111 ("dmaengine: imx-sdma - reduce transfer latency for DMA cyclic clients")
> > > >
> > > > from the tty tree.
> > > >
> > > > I fixed it up (see below) and can carry the fix as necessary. This
> > > > is now fixed as far as linux-next is concerned, but any non trivial
> > > > conflicts should be mentioned to your upstream maintainer when your tree
> > > > is submitted for merging. You may also want to consider cooperating
> > > > with the maintainer of the conflicting tree to minimise any particularly
> > > > complex conflicts.
> > >
> > > Stephen,
> > >
> > > The fix looks right to me.
> > >
> > > Greg let me know if you would like me to merge this to avoid conflict
> >
> > Sure, which way do you want to merge, do you want me to pull your tree
> > into mine, or do you want to pull my tree into yours? Either is fine
> > with me.
>
> Great, I would prefer to pull.
Do you want a signed tag, or do you just want to pull my tty-next branch
directly into your tree?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: linux-next: manual merge of the tty tree with the slave-dma tree
2016-09-05 13:55 ` Greg KH
@ 2016-09-05 15:53 ` Vinod Koul
2016-09-09 11:53 ` Vinod Koul
0 siblings, 1 reply; 12+ messages in thread
From: Vinod Koul @ 2016-09-05 15:53 UTC (permalink / raw)
To: Greg KH
Cc: Stephen Rothwell, linux-next, linux-kernel, Nandor Han, Dave Jiang
On Mon, Sep 05, 2016 at 03:55:41PM +0200, Greg KH wrote:
> On Mon, Sep 05, 2016 at 06:13:05PM +0530, Vinod Koul wrote:
> > > > Stephen,
> > > >
> > > > The fix looks right to me.
> > > >
> > > > Greg let me know if you would like me to merge this to avoid conflict
> > >
> > > Sure, which way do you want to merge, do you want me to pull your tree
> > > into mine, or do you want to pull my tree into yours? Either is fine
> > > with me.
> >
> > Great, I would prefer to pull.
>
> Do you want a signed tag, or do you just want to pull my tty-next branch
> directly into your tree?
Signed tag would be better
Thanks
--
~Vinod
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: manual merge of the tty tree with the slave-dma tree
2016-09-05 15:53 ` Vinod Koul
@ 2016-09-09 11:53 ` Vinod Koul
2016-09-09 12:20 ` Greg KH
0 siblings, 1 reply; 12+ messages in thread
From: Vinod Koul @ 2016-09-09 11:53 UTC (permalink / raw)
To: Greg KH
Cc: Stephen Rothwell, linux-next, linux-kernel, Nandor Han, Dave Jiang
On Mon, Sep 05, 2016 at 09:23:21PM +0530, Vinod Koul wrote:
> On Mon, Sep 05, 2016 at 03:55:41PM +0200, Greg KH wrote:
> > On Mon, Sep 05, 2016 at 06:13:05PM +0530, Vinod Koul wrote:
> > > > > Stephen,
> > > > >
> > > > > The fix looks right to me.
> > > > >
> > > > > Greg let me know if you would like me to merge this to avoid conflict
> > > >
> > > > Sure, which way do you want to merge, do you want me to pull your tree
> > > > into mine, or do you want to pull my tree into yours? Either is fine
> > > > with me.
> > >
> > > Great, I would prefer to pull.
> >
> > Do you want a signed tag, or do you just want to pull my tty-next branch
> > directly into your tree?
>
> Signed tag would be better
Hi Greg,
Can you please send a tag for this
Thanks
--
~Vinod
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: manual merge of the tty tree with the slave-dma tree
2016-09-09 11:53 ` Vinod Koul
@ 2016-09-09 12:20 ` Greg KH
0 siblings, 0 replies; 12+ messages in thread
From: Greg KH @ 2016-09-09 12:20 UTC (permalink / raw)
To: Vinod Koul
Cc: Stephen Rothwell, linux-next, linux-kernel, Nandor Han, Dave Jiang
On Fri, Sep 09, 2016 at 05:23:54PM +0530, Vinod Koul wrote:
> On Mon, Sep 05, 2016 at 09:23:21PM +0530, Vinod Koul wrote:
> > On Mon, Sep 05, 2016 at 03:55:41PM +0200, Greg KH wrote:
> > > On Mon, Sep 05, 2016 at 06:13:05PM +0530, Vinod Koul wrote:
> > > > > > Stephen,
> > > > > >
> > > > > > The fix looks right to me.
> > > > > >
> > > > > > Greg let me know if you would like me to merge this to avoid conflict
> > > > >
> > > > > Sure, which way do you want to merge, do you want me to pull your tree
> > > > > into mine, or do you want to pull my tree into yours? Either is fine
> > > > > with me.
> > > >
> > > > Great, I would prefer to pull.
> > >
> > > Do you want a signed tag, or do you just want to pull my tty-next branch
> > > directly into your tree?
> >
> > Signed tag would be better
>
> Hi Greg,
>
> Can you please send a tag for this
Oops, sorry for the delay, here it is:
-----------
The following changes since commit c6935931c1894ff857616ff8549b61236a19148f:
Linux 4.8-rc5 (2016-09-04 14:31:46 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git/ tags/tty-for-dma
for you to fetch changes up to b53761e36a509609e91a797fa63648ec43aecc13:
Merge 4.8-rc5 into tty-next (2016-09-05 08:11:21 +0200)
----------------------------------------------------------------
TTY/Serial tree tag to merge into the DMA tree.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----------------------------------------------------------------
Alexander Sverdlin (1):
serial: earlycon: Extend earlycon command line option to support 64-bit addresses
Andy Shevchenko (14):
dmaengine: dw: keep copy of custom slave config in dwc
dmaengine: dw: set polarity of handshake interface
dmaengine: dw: override LLP support if asked in platform data
dmaengine: dw: provide probe(), remove() stubs for users
serial: 8250_dma: switch to new dmaengine_terminate_* API
serial: 8250_dma: adjust DMA address of the UART
serial: 8250: enable AFE on ports where FIFO is 16 bytes
serial: 8250_lpss: split LPSS driver to separate module
serial: 8250_lpss: move Quark code from PCI driver
serial: 8250_lpss: enable MSI for Intel Quark
serial: 8250_lpss: enable DMA on Intel Quark UART
serial: 8250_port: fix runtime PM use in __do_stop_tx_rs485()
serial: 8250_port: unify check of em485 variable
dmaengine: hsu: refactor hsu_dma_do_irq() to return int
Baoyou Xie (1):
tty/serial: mark __init early_smh_setup() static
Bhuvanchandra DV (5):
tty: serial: fsl_lpuart: Fix broken 8m/s1 support
tty: serial: fsl_lpuart: Use cyclic DMA for Rx
tty: serial: fsl_lpuart: Use scatter/gather DMA for Tx
tty: serial: fsl_lpuart: Update suspend/resume for DMA mode
tty: serial: fsl_lpuart: Add support for RS-485
Christophe JAILLET (1):
serial: vt8500_serial: Fix a parameter of find_first_zero_bit.
Eddie Huang (1):
serial: 8250_mtk: support big baud rate.
Florian Vallee (1):
sc16is7xx: make sure device is in suspend once probed
Greg Kroah-Hartman (1):
Merge 4.8-rc5 into tty-next
Julia Lawall (10):
tty/serial: at91: use of_property_read_bool
serial/arc: constify uart_ops structures
serial: st-asc: constify uart_ops structures
tty/serial: at91: constify uart_ops structures
serial: altera: constify uart_ops structures
serial/bcm63xx_uart: constify uart_ops structures
tty: serial: jsm_tty: constify uart_ops structures
tty: serial: constify uart_ops structures
tty: xuartps: constify uart_ops structures
serial-uartlite: constify uart_ops structures
Kefeng Wang (3):
serial: 8250_dw: Check the data->pclk when get apb_pclk
serial: 8250_dw: Use an unified new dev variable in probe
serial: 8250_dw: add ACPI support for uart on Hisilicon Hip05 SoC
Krzysztof Kozlowski (1):
serial: samsung: Register cpufreq notifier only on S3C24xx
Ludovic Desroches (1):
tty/serial: atmel: add fractional baud rate support
Martyn Welch (1):
Allowing UART DMA to be configured on i.MX53
Nandor Han (4):
dmaengine: imx-sdma - reduce transfer latency for DMA cyclic clients
dmaengine: imx-sdma - update the residue calculation for cyclic channels
serial: imx-serial - update UART IMX driver to use cyclic DMA
serial: imx-serial - update RX error counters when DMA is used
Rob Herring (2):
tty: serial_core: convert uart_open to use tty_port_open
tty: serial_core: convert uart_close to use tty_port_close
Shawn Guo (3):
tty: amba-pl011: define flag register bits for ZTE device
tty: amba-pl011: add .get_fifosize for ZTE device
tty: amba-pl011: probe ZTE device from AMBA bus with a pseudo-ID
Stefan Agner (3):
tty: serial: fsl_lpuart: consider TX FIFO too in tx_empty
tty: serial: fsl_lpuart: support suspend/resume
tty: serial: fsl_lpuart: fix clearing of receive flag
drivers/dma/dw/core.c | 39 +-
drivers/dma/dw/regs.h | 5 +-
drivers/dma/hsu/hsu.c | 9 +-
drivers/dma/hsu/pci.c | 6 +-
drivers/dma/imx-sdma.c | 56 +-
drivers/tty/serial/8250/8250.h | 5 +
drivers/tty/serial/8250/8250_core.c | 2 +-
drivers/tty/serial/8250/8250_dma.c | 14 +-
drivers/tty/serial/8250/8250_dw.c | 48 +-
drivers/tty/serial/8250/8250_lpss.c | 378 ++++++++++++++
drivers/tty/serial/8250/8250_mid.c | 8 +-
drivers/tty/serial/8250/8250_mtk.c | 6 +-
drivers/tty/serial/8250/8250_pci.c | 257 +--------
drivers/tty/serial/8250/8250_port.c | 37 +-
drivers/tty/serial/8250/Kconfig | 16 +-
drivers/tty/serial/8250/Makefile | 1 +
drivers/tty/serial/altera_jtaguart.c | 2 +-
drivers/tty/serial/altera_uart.c | 2 +-
drivers/tty/serial/amba-pl011.c | 59 ++-
drivers/tty/serial/arc_uart.c | 2 +-
drivers/tty/serial/atmel_serial.c | 51 +-
drivers/tty/serial/bcm63xx_uart.c | 2 +-
drivers/tty/serial/earlycon-arm-semihost.c | 3 +-
drivers/tty/serial/earlycon.c | 7 +-
drivers/tty/serial/fsl_lpuart.c | 814 +++++++++++++++++------------
drivers/tty/serial/imx.c | 192 ++++---
drivers/tty/serial/jsm/jsm_tty.c | 2 +-
drivers/tty/serial/max3100.c | 2 +-
drivers/tty/serial/men_z135_uart.c | 2 +-
drivers/tty/serial/mxs-auart.c | 2 +-
drivers/tty/serial/pch_uart.c | 2 +-
drivers/tty/serial/samsung.c | 2 +-
drivers/tty/serial/samsung.h | 2 +-
drivers/tty/serial/sc16is7xx.c | 20 +
drivers/tty/serial/serial_core.c | 138 ++---
drivers/tty/serial/sh-sci.c | 2 +-
drivers/tty/serial/st-asc.c | 2 +-
drivers/tty/serial/timbuart.c | 2 +-
drivers/tty/serial/uartlite.c | 2 +-
drivers/tty/serial/vt8500_serial.c | 8 +-
drivers/tty/serial/xilinx_uartps.c | 2 +-
include/linux/amba/bus.h | 6 +
include/linux/amba/serial.h | 9 +
include/linux/atmel_serial.h | 1 +
include/linux/dma/dw.h | 5 +
include/linux/dma/hsu.h | 9 +-
include/linux/platform_data/dma-dw.h | 4 +
include/linux/serial_core.h | 2 +-
48 files changed, 1333 insertions(+), 914 deletions(-)
create mode 100644 drivers/tty/serial/8250/8250_lpss.c
^ permalink raw reply [flat|nested] 12+ messages in thread
* linux-next: manual merge of the tty tree with the slave-dma tree
@ 2015-04-07 9:28 Stephen Rothwell
2015-04-07 9:52 ` Greg KH
2015-04-07 12:27 ` Geert Uytterhoeven
0 siblings, 2 replies; 12+ messages in thread
From: Stephen Rothwell @ 2015-04-07 9:28 UTC (permalink / raw)
To: Greg KH, Vinod Koul; +Cc: linux-next, linux-kernel, Andy Shevchenko, Xuelin Shi
[-- Attachment #1: Type: text/plain, Size: 1356 bytes --]
Hi Greg,
Today's linux-next merge of the tty tree got a conflict in
drivers/dma/Kconfig between commit ad80da658bbc ("dmaengine: Driver
support for FSL RaidEngine device") from the slave-dma tree and commit
2b49e0c56741 ("dmaengine: append hsu DMA driver") from the tty tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/dma/Kconfig
index 38ece743f61d,074ffad334a7..000000000000
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@@ -112,17 -125,8 +112,19 @@@ config FSL_DM
EloPlus is on mpc85xx and mpc86xx and Pxxx parts, and the Elo3 is on
some Txxx and Bxxx parts.
+config FSL_RAID
+ tristate "Freescale RAID engine Support"
+ depends on FSL_SOC && !ASYNC_TX_ENABLE_CHANNEL_SWITCH
+ select DMA_ENGINE
+ select DMA_ENGINE_RAID
+ ---help---
+ Enable support for Freescale RAID Engine. RAID Engine is
+ available on some QorIQ SoCs (like P5020/P5040). It has
+ the capability to offload memcpy, xor and pq computation
+ for raid5/6.
+
+ source "drivers/dma/hsu/Kconfig"
+
config MPC512X_DMA
tristate "Freescale MPC512x built-in DMA engine support"
depends on PPC_MPC512x || PPC_MPC831x
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: linux-next: manual merge of the tty tree with the slave-dma tree
2015-04-07 9:28 Stephen Rothwell
@ 2015-04-07 9:52 ` Greg KH
2015-04-07 12:27 ` Geert Uytterhoeven
1 sibling, 0 replies; 12+ messages in thread
From: Greg KH @ 2015-04-07 9:52 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Vinod Koul, linux-next, linux-kernel, Andy Shevchenko, Xuelin Shi
On Tue, Apr 07, 2015 at 07:28:08PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in
> drivers/dma/Kconfig between commit ad80da658bbc ("dmaengine: Driver
> support for FSL RaidEngine device") from the slave-dma tree and commit
> 2b49e0c56741 ("dmaengine: append hsu DMA driver") from the tty tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good to me, thanks.
greg k-h
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: linux-next: manual merge of the tty tree with the slave-dma tree
2015-04-07 9:28 Stephen Rothwell
2015-04-07 9:52 ` Greg KH
@ 2015-04-07 12:27 ` Geert Uytterhoeven
1 sibling, 0 replies; 12+ messages in thread
From: Geert Uytterhoeven @ 2015-04-07 12:27 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, Vinod Koul, Linux-Next, linux-kernel, Andy Shevchenko,
Xuelin Shi
On Tue, Apr 7, 2015 at 11:28 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> --- a/drivers/dma/Kconfig
> +++ b/drivers/dma/Kconfig
> @@@ -112,17 -125,8 +112,19 @@@ config FSL_DM
> EloPlus is on mpc85xx and mpc86xx and Pxxx parts, and the Elo3 is on
> some Txxx and Bxxx parts.
>
> +config FSL_RAID
> + tristate "Freescale RAID engine Support"
> + depends on FSL_SOC && !ASYNC_TX_ENABLE_CHANNEL_SWITCH
> + select DMA_ENGINE
> + select DMA_ENGINE_RAID
> + ---help---
> + Enable support for Freescale RAID Engine. RAID Engine is
> + available on some QorIQ SoCs (like P5020/P5040). It has
> + the capability to offload memcpy, xor and pq computation
> + for raid5/6.
> +
> + source "drivers/dma/hsu/Kconfig"
> +
> config MPC512X_DMA
> tristate "Freescale MPC512x built-in DMA engine support"
> depends on PPC_MPC512x || PPC_MPC831x
Does anyone care about sort order?
The hsu entry ended up in the middle of the Freescale section.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 12+ messages in thread
* linux-next: manual merge of the tty tree with the slave-dma tree
@ 2014-09-30 7:26 Stephen Rothwell
0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2014-09-30 7:26 UTC (permalink / raw)
To: Greg KH, Vinod Koul
Cc: linux-next, linux-kernel, Alan Cox, Bryan O'Donoghue
[-- Attachment #1: Type: text/plain, Size: 1339 bytes --]
Hi Greg,
Today's linux-next merge of the tty tree got a conflict in
drivers/tty/serial/8250/8250_pci.c between commit 29897087d901 ("Add
new PCI IDs to cover newer Intel SoCs such as Braswell") from the
slave-dma tree and commit 1ede7dcca3c4 ("serial: 8250: Add Quark X1000
to 8250_pci.c") from the tty tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/tty/serial/8250/8250_pci.c
index 85a2eb986ffe,4f1cd296f1b1..000000000000
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@@ -1934,18 -1888,11 +1922,25 @@@ static struct pci_serial_quirk pci_seri
},
{
.vendor = PCI_VENDOR_ID_INTEL,
+ .device = PCI_DEVICE_ID_INTEL_BSW_UART1,
+ .subvendor = PCI_ANY_ID,
+ .subdevice = PCI_ANY_ID,
+ .setup = byt_serial_setup,
+ },
+ {
+ .vendor = PCI_VENDOR_ID_INTEL,
+ .device = PCI_DEVICE_ID_INTEL_BSW_UART2,
+ .subvendor = PCI_ANY_ID,
+ .subdevice = PCI_ANY_ID,
+ .setup = byt_serial_setup,
+ },
++ {
++ .vendor = PCI_VENDOR_ID_INTEL,
+ .device = PCI_DEVICE_ID_INTEL_QRK_UART,
+ .subvendor = PCI_ANY_ID,
+ .subdevice = PCI_ANY_ID,
+ .setup = pci_default_setup,
+ },
/*
* ITE
*/
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2016-09-09 12:20 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-05 6:43 linux-next: manual merge of the tty tree with the slave-dma tree Stephen Rothwell
2016-09-05 11:28 ` Vinod Koul
2016-09-05 11:33 ` Greg KH
2016-09-05 12:43 ` Vinod Koul
2016-09-05 13:55 ` Greg KH
2016-09-05 15:53 ` Vinod Koul
2016-09-09 11:53 ` Vinod Koul
2016-09-09 12:20 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2015-04-07 9:28 Stephen Rothwell
2015-04-07 9:52 ` Greg KH
2015-04-07 12:27 ` Geert Uytterhoeven
2014-09-30 7:26 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).