Update source to Armbian-dev-202610.A311Y3
This commit is contained in:
@@ -86,6 +86,7 @@ struct spi_nfc {
|
||||
u8 *info_buf;
|
||||
dma_addr_t daddr;
|
||||
dma_addr_t iaddr;
|
||||
u8 cap_nfc_40bit_dma;
|
||||
};
|
||||
|
||||
struct spi_nand_id {
|
||||
@@ -437,7 +438,7 @@ static int spi_nfc_dma_xfer(struct spi_nfc *spi_nfc,
|
||||
spi_nfc->info_buf, OOB_BUF_SIZE,
|
||||
(read) ? DMA_FROM_DEVICE : DMA_TO_DEVICE);
|
||||
nfc_set_dma_mem_and_info((unsigned long)spi_nfc->daddr,
|
||||
(unsigned long)spi_nfc->iaddr);
|
||||
(unsigned long)spi_nfc->iaddr, spi_nfc->cap_nfc_40bit_dma);
|
||||
|
||||
ret = nfc_start_dma_and_wait_done(n2m_cmd);
|
||||
if (ret || !read) {
|
||||
@@ -670,6 +671,16 @@ static int spi_nfc_probe(struct platform_device *pdev)
|
||||
|
||||
spi_nfc = spi_controller_get_devdata(master);
|
||||
spi_nfc->dev = &pdev->dev;
|
||||
|
||||
if (device_property_read_bool(spi_nfc->dev, "cap-nfc-40bit-dma")) {
|
||||
spi_nfc->cap_nfc_40bit_dma = 1;
|
||||
ret = dma_set_mask_and_coherent(spi_nfc->dev, DMA_BIT_MASK(40));
|
||||
if (ret) {
|
||||
dev_err(spi_nfc->dev, "Failed to set 40-bit DMA mask\n");
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < 3; i++) {
|
||||
base = devm_platform_ioremap_resource(pdev, i);
|
||||
if (IS_ERR(base)) {
|
||||
|
||||
Reference in New Issue
Block a user