Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
8e75ab9b
Commit
8e75ab9b
authored
Oct 24, 2018
by
Vinod Koul
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'topic/renesas' into for-linus
parents
bfda9020
97d49c59
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
14 additions
and
38 deletions
+14
-38
Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt
Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt
+1
-0
Documentation/devicetree/bindings/dma/renesas,usb-dmac.txt
Documentation/devicetree/bindings/dma/renesas,usb-dmac.txt
+1
-0
drivers/dma/nbpfaxi.c
drivers/dma/nbpfaxi.c
+1
-4
drivers/dma/sh/rcar-dmac.c
drivers/dma/sh/rcar-dmac.c
+3
-0
drivers/dma/sh/shdma-arm.h
drivers/dma/sh/shdma-arm.h
+1
-4
drivers/dma/sh/shdma-base.c
drivers/dma/sh/shdma-base.c
+1
-4
drivers/dma/sh/shdma-of.c
drivers/dma/sh/shdma-of.c
+1
-4
drivers/dma/sh/shdma-r8a73a4.c
drivers/dma/sh/shdma-r8a73a4.c
+1
-4
drivers/dma/sh/shdma.h
drivers/dma/sh/shdma.h
+1
-5
drivers/dma/sh/shdmac.c
drivers/dma/sh/shdmac.c
+1
-5
drivers/dma/sh/sudmac.c
drivers/dma/sh/sudmac.c
+1
-4
drivers/dma/sh/usb-dmac.c
drivers/dma/sh/usb-dmac.c
+1
-4
No files found.
Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt
View file @
8e75ab9b
...
...
@@ -17,6 +17,7 @@ Required Properties:
- compatible: "renesas,dmac-<soctype>", "renesas,rcar-dmac" as fallback.
Examples with soctypes are:
- "renesas,dmac-r8a7743" (RZ/G1M)
- "renesas,dmac-r8a7744" (RZ/G1N)
- "renesas,dmac-r8a7745" (RZ/G1E)
- "renesas,dmac-r8a77470" (RZ/G1C)
- "renesas,dmac-r8a7790" (R-Car H2)
...
...
Documentation/devicetree/bindings/dma/renesas,usb-dmac.txt
View file @
8e75ab9b
...
...
@@ -4,6 +4,7 @@ Required Properties:
-compatible: "renesas,<soctype>-usb-dmac", "renesas,usb-dmac" as fallback.
Examples with soctypes are:
- "renesas,r8a7743-usb-dmac" (RZ/G1M)
- "renesas,r8a7744-usb-dmac" (RZ/G1N)
- "renesas,r8a7745-usb-dmac" (RZ/G1E)
- "renesas,r8a7790-usb-dmac" (R-Car H2)
- "renesas,r8a7791-usb-dmac" (R-Car M2-W)
...
...
drivers/dma/nbpfaxi.c
View file @
8e75ab9b
// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (C) 2013-2014 Renesas Electronics Europe Ltd.
* Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*/
#include <linux/bitmap.h>
...
...
drivers/dma/sh/rcar-dmac.c
View file @
8e75ab9b
...
...
@@ -198,6 +198,7 @@ struct rcar_dmac {
struct
dma_device
engine
;
struct
device
*
dev
;
void
__iomem
*
iomem
;
struct
device_dma_parameters
parms
;
unsigned
int
n_channels
;
struct
rcar_dmac_chan
*
channels
;
...
...
@@ -1792,6 +1793,8 @@ static int rcar_dmac_probe(struct platform_device *pdev)
dmac
->
dev
=
&
pdev
->
dev
;
platform_set_drvdata
(
pdev
,
dmac
);
dmac
->
dev
->
dma_parms
=
&
dmac
->
parms
;
dma_set_max_seg_size
(
dmac
->
dev
,
RCAR_DMATCR_MASK
);
dma_set_mask_and_coherent
(
dmac
->
dev
,
DMA_BIT_MASK
(
40
));
ret
=
rcar_dmac_parse_of
(
&
pdev
->
dev
,
dmac
);
...
...
drivers/dma/sh/shdma-arm.h
View file @
8e75ab9b
/* SPDX-License-Identifier: GPL-2.0 */
/*
* Renesas SuperH DMA Engine support
*
* Copyright (C) 2013 Renesas Electronics, Inc.
*
* This is free software; you can redistribute it and/or modify it under the
* terms of version 2 the GNU General Public License as published by the Free
* Software Foundation.
*/
#ifndef SHDMA_ARM_H
...
...
drivers/dma/sh/shdma-base.c
View file @
8e75ab9b
// SPDX-License-Identifier: GPL-2.0
/*
* Dmaengine driver base library for DMA controllers, found on SH-based SoCs
*
...
...
@@ -7,10 +8,6 @@
* Copyright (C) 2009 Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
* Copyright (C) 2009 Renesas Solutions, Inc. All rights reserved.
* Copyright (C) 2007 Freescale Semiconductor, Inc. All rights reserved.
*
* This is free software; you can redistribute it and/or modify
* it under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*/
#include <linux/delay.h>
...
...
drivers/dma/sh/shdma-of.c
View file @
8e75ab9b
// SPDX-License-Identifier: GPL-2.0
/*
* SHDMA Device Tree glue
*
* Copyright (C) 2013 Renesas Electronics Inc.
* Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*/
#include <linux/dmaengine.h>
...
...
drivers/dma/sh/shdma-r8a73a4.c
View file @
8e75ab9b
// SPDX-License-Identifier: GPL-2.0
/*
* Renesas SuperH DMA Engine support for r8a73a4 (APE6) SoCs
*
* Copyright (C) 2013 Renesas Electronics, Inc.
*
* This is free software; you can redistribute it and/or modify it under the
* terms of version 2 the GNU General Public License as published by the Free
* Software Foundation.
*/
#include <linux/sh_dma.h>
...
...
drivers/dma/sh/shdma.h
View file @
8e75ab9b
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Renesas SuperH DMA Engine support
*
* Copyright (C) 2009 Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
* Copyright (C) 2009 Renesas Solutions, Inc. All rights reserved.
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
*/
#ifndef __DMA_SHDMA_H
#define __DMA_SHDMA_H
...
...
drivers/dma/sh/shdmac.c
View file @
8e75ab9b
// SPDX-License-Identifier: GPL-2.0+
/*
* Renesas SuperH DMA Engine support
*
...
...
@@ -8,11 +9,6 @@
* Copyright (C) 2009 Renesas Solutions, Inc. All rights reserved.
* Copyright (C) 2007 Freescale Semiconductor, Inc. All rights reserved.
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* - DMA of SuperH does not have Hardware DMA chain mode.
* - MAX DMA size is 16MB.
*
...
...
drivers/dma/sh/sudmac.c
View file @
8e75ab9b
// SPDX-License-Identifier: GPL-2.0
/*
* Renesas SUDMAC support
*
...
...
@@ -8,10 +9,6 @@
* Copyright (C) 2009 Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
* Copyright (C) 2009 Renesas Solutions, Inc. All rights reserved.
* Copyright (C) 2007 Freescale Semiconductor, Inc. All rights reserved.
*
* This is free software; you can redistribute it and/or modify
* it under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*/
#include <linux/dmaengine.h>
...
...
drivers/dma/sh/usb-dmac.c
View file @
8e75ab9b
// SPDX-License-Identifier: GPL-2.0
/*
* Renesas USB DMA Controller Driver
*
...
...
@@ -6,10 +7,6 @@
* based on rcar-dmac.c
* Copyright (C) 2014 Renesas Electronics Inc.
* Author: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*/
#include <linux/delay.h>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment