GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-18 20:54:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'topic/renasas' into for-linus

Browse source
This commit is contained in:
Vinod Koul 2017-11-14 10:33:24 +05:30
commit b683fa223b
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/devicetree/bindings/dma/renesas,usb-dmac.txt
View file

@ -3,6 +3,8 @@
Required Properties: Required Properties:
-compatible: "renesas,<soctype>-usb-dmac", "renesas,usb-dmac" as fallback. -compatible: "renesas,<soctype>-usb-dmac", "renesas,usb-dmac" as fallback.
Examples with soctypes are: Examples with soctypes are:
- "renesas,r8a7743-usb-dmac" (RZ/G1M)
- "renesas,r8a7745-usb-dmac" (RZ/G1E)
- "renesas,r8a7790-usb-dmac" (R-Car H2) - "renesas,r8a7790-usb-dmac" (R-Car H2)
- "renesas,r8a7791-usb-dmac" (R-Car M2-W) - "renesas,r8a7791-usb-dmac" (R-Car M2-W)
- "renesas,r8a7793-usb-dmac" (R-Car M2-N) - "renesas,r8a7793-usb-dmac" (R-Car M2-N)

5
drivers/dma/nbpfaxi.c
View file

@ -1286,7 +1286,6 @@ MODULE_DEVICE_TABLE(of, nbpf_match);
static int nbpf_probe(struct platform_device *pdev) static int nbpf_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
const struct of_device_id *of_id = of_match_device(nbpf_match, dev);
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
struct nbpf_device *nbpf; struct nbpf_device *nbpf;
struct dma_device *dma_dev; struct dma_device *dma_dev;
@ -1300,10 +1299,10 @@ static int nbpf_probe(struct platform_device *pdev)
BUILD_BUG_ON(sizeof(struct nbpf_desc_page) > PAGE_SIZE); BUILD_BUG_ON(sizeof(struct nbpf_desc_page) > PAGE_SIZE);
/* DT only */ /* DT only */
if (!np || !of_id || !of_id->data) if (!np)
return -ENODEV; return -ENODEV;
cfg = of_id->data; cfg = of_device_get_match_data(dev);
num_channels = cfg->num_channels; num_channels = cfg->num_channels;
nbpf = devm_kzalloc(dev, sizeof(*nbpf) + num_channels * nbpf = devm_kzalloc(dev, sizeof(*nbpf) + num_channels *