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

Commit 60d920d3 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Boris Brezillon
Browse files

mtd: nand: denali_dt: remove dma-mask DT property 

The driver sets appropriate DMA mask.  Delete the "dma-mask" DT
property.  See [1] for negative comments for this binding.

[1] https://lkml.org/lkml/2016/2/8/57



Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
parent 210a2c87

Documentation/devicetree/bindings/mtd/denali-nand.txt

+0 −2
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ Required properties: 
  - reg : should contain registers location and length for data and reg.

  - reg-names: Should contain the reg names "nand_data" and "denali_reg"

  - interrupts : The interrupt number.

  - dm-mask : DMA bit mask



The device tree may optionally contain sub-nodes describing partitions of the

address space. See partition.txt for more detail.
@@ -20,5 +19,4 @@ nand: nand@ff900000 { 
	reg = <0xff900000 0x100000>, <0xffb80000 0x10000>;

	reg-names = "nand_data", "denali_reg";

	interrupts = <0 144 4>;

	dma-mask = <0xffffffff>;

};

drivers/mtd/nand/denali_dt.c

+0 −9
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ static const struct of_device_id denali_nand_dt_ids[] = { 
};

MODULE_DEVICE_TABLE(of, denali_nand_dt_ids);



static u64 denali_dma_mask;



static int denali_dt_probe(struct platform_device *ofdev)

{

	struct resource *denali_reg, *nand_data;
@@ -83,13 +81,6 @@ static int denali_dt_probe(struct platform_device *ofdev) 
	if (IS_ERR(denali->flash_mem))

		return PTR_ERR(denali->flash_mem);



	if (!of_property_read_u32(ofdev->dev.of_node,

		"dma-mask", (u32 *)&denali_dma_mask)) {

		denali->dev->dma_mask = &denali_dma_mask;

	} else {

		denali->dev->dma_mask = NULL;

	}



	dt->clk = devm_clk_get(&ofdev->dev, NULL);

	if (IS_ERR(dt->clk)) {

		dev_err(&ofdev->dev, "no clk available\n");