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

Commit 01b653c2 authored by Jaehoon Chung's avatar Jaehoon Chung Committed by Ulf Hansson
Browse files

mmc: dw_mmc: remove the deprecated "num-slots" 



'num-slots' property had already deprecated.
Remove the 'nom-slots' property that is kept to maintain the compatibility.

Signed-off-by: default avatarJaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 86b93a48

Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt

+0 −5
Original line number Diff line number Diff line
@@ -59,11 +59,6 @@ Optional properties: 
  is specified and the ciu clock is specified then we'll try to set the ciu

  clock to this at probe time.



* num-slots (DEPRECATED): specifies the number of slots supported by the controller.

  The number of physical slots actually used could be equal or less than the

  value specified by num-slots. If this property is not specified, the value

  of num-slot property is assumed to be 1.



* fifo-depth: The maximum size of the tx/rx fifo's. If this property is not

  specified, the default value of the fifo size is determined from the

  controller registers.

drivers/mmc/host/dw_mmc-pci.c

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
				MMC_CAP_SDIO_IRQ)



static struct dw_mci_board pci_board_data = {

	.num_slots			= 1,

	.caps				= DW_MCI_CAPABILITIES,

	.bus_hz				= 33 * 1000 * 1000,

	.detect_delay_ms		= 200,

drivers/mmc/host/dw_mmc.c

+0 −4
Original line number Diff line number Diff line
@@ -3126,10 +3126,6 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host) 
			return ERR_PTR(-EPROBE_DEFER);

	}



	/* find out number of slots supported */

	if (!device_property_read_u32(dev, "num-slots", &pdata->num_slots))

		dev_info(dev, "'num-slots' was deprecated.\n");



	if (device_property_read_u32(dev, "fifo-depth", &pdata->fifo_depth))

		dev_info(dev,

			 "fifo-depth property not found, using value of FIFOTH register as default\n");

drivers/mmc/host/dw_mmc.h

+0 −2
Original line number Diff line number Diff line
@@ -251,8 +251,6 @@ struct dma_pdata; 


/* Board platform data */

struct dw_mci_board {

	u32 num_slots;



	unsigned int bus_hz; /* Clock speed at the cclk_in pad */



	u32 caps;	/* Capabilities */