Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge existing fixes from spi/for-6.18 into new branch
+22
-5
+8
-3
Documentation/devicetree/bindings/spi/spi-cadence.yaml
+8
-3
Documentation/devicetree/bindings/spi/spi-cadence.yaml
···
14
14
15
15
properties:
16
16
compatible:
17
-
enum:
18
-
- cdns,spi-r1p6
19
-
- xlnx,zynq-spi-r1p6
17
+
oneOf:
18
+
- enum:
19
+
- xlnx,zynq-spi-r1p6
20
+
- items:
21
+
- enum:
22
+
- xlnx,zynqmp-spi-r1p6
23
+
- xlnx,versal-net-spi-r1p6
24
+
- const: cdns,spi-r1p6
20
25
21
26
reg:
22
27
maxItems: 1
+3
-1
drivers/spi/spi-dw-mmio.c
+3
-1
drivers/spi/spi-dw-mmio.c
···
358
358
if (IS_ERR(dwsmmio->rstc))
359
359
return PTR_ERR(dwsmmio->rstc);
360
360
361
-
reset_control_deassert(dwsmmio->rstc);
361
+
ret = reset_control_deassert(dwsmmio->rstc);
362
+
if (ret)
363
+
return dev_err_probe(&pdev->dev, ret, "Failed to deassert resets\n");
362
364
363
365
dws->bus_num = pdev->id;
364
366
+11
-1
drivers/spi/spi-rockchip-sfc.c
+11
-1
drivers/spi/spi-rockchip-sfc.c
···
704
704
ret = -ENOMEM;
705
705
goto err_dma;
706
706
}
707
-
sfc->dma_buffer = virt_to_phys(sfc->buffer);
707
+
sfc->dma_buffer = dma_map_single(dev, sfc->buffer,
708
+
sfc->max_iosize, DMA_BIDIRECTIONAL);
709
+
if (dma_mapping_error(dev, sfc->dma_buffer)) {
710
+
ret = -ENOMEM;
711
+
goto err_dma_map;
712
+
}
708
713
}
709
714
710
715
ret = devm_spi_register_controller(dev, host);
···
720
715
721
716
return 0;
722
717
err_register:
718
+
dma_unmap_single(dev, sfc->dma_buffer, sfc->max_iosize,
719
+
DMA_BIDIRECTIONAL);
720
+
err_dma_map:
723
721
free_pages((unsigned long)sfc->buffer, get_order(sfc->max_iosize));
724
722
err_dma:
725
723
pm_runtime_get_sync(dev);
···
744
736
struct spi_controller *host = sfc->host;
745
737
746
738
spi_unregister_controller(host);
739
+
dma_unmap_single(&pdev->dev, sfc->dma_buffer, sfc->max_iosize,
740
+
DMA_BIDIRECTIONAL);
747
741
free_pages((unsigned long)sfc->buffer, get_order(sfc->max_iosize));
748
742
749
743
clk_disable_unprepare(sfc->clk);