Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b683fa22 authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/renasas' into for-linus

parents c7960fc5 087ffdd2

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

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 
Required Properties:

-compatible: "renesas,<soctype>-usb-dmac", "renesas,usb-dmac" as fallback.

	Examples with soctypes are:

	  - "renesas,r8a7743-usb-dmac" (RZ/G1M)

	  - "renesas,r8a7745-usb-dmac" (RZ/G1E)

	  - "renesas,r8a7790-usb-dmac" (R-Car H2)

	  - "renesas,r8a7791-usb-dmac" (R-Car M2-W)

	  - "renesas,r8a7793-usb-dmac" (R-Car M2-N)

drivers/dma/nbpfaxi.c

+2 −3
Original line number Diff line number Diff line
@@ -1286,7 +1286,6 @@ MODULE_DEVICE_TABLE(of, nbpf_match); 
static int nbpf_probe(struct platform_device *pdev)

{

	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 nbpf_device *nbpf;

	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);



	/* DT only */

	if (!np || !of_id || !of_id->data)

	if (!np)

		return -ENODEV;



	cfg = of_id->data;

	cfg = of_device_get_match_data(dev);

	num_channels = cfg->num_channels;



	nbpf = devm_kzalloc(dev, sizeof(*nbpf) + num_channels *