فهرست منبع

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: Jaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Jaehoon Chung 7 سال پیش
والد
کامیت
01b653c219
4فایلهای تغییر یافته به همراه0 افزوده شده و 12 حذف شده
  1. 0 5
      Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
  2. 0 1
      drivers/mmc/host/dw_mmc-pci.c
  3. 0 4
      drivers/mmc/host/dw_mmc.c
  4. 0 2
      drivers/mmc/host/dw_mmc.h

+ 0 - 5
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt

@@ -59,11 +59,6 @@ Optional properties:
   is specified and the ciu clock is specified then we'll try to set the ciu
   is specified and the ciu clock is specified then we'll try to set the ciu
   clock to this at probe time.
   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
 * 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
   specified, the default value of the fifo size is determined from the
   controller registers.
   controller registers.

+ 0 - 1
drivers/mmc/host/dw_mmc-pci.c

@@ -29,7 +29,6 @@
 				MMC_CAP_SDIO_IRQ)
 				MMC_CAP_SDIO_IRQ)
 
 
 static struct dw_mci_board pci_board_data = {
 static struct dw_mci_board pci_board_data = {
-	.num_slots			= 1,
 	.caps				= DW_MCI_CAPABILITIES,
 	.caps				= DW_MCI_CAPABILITIES,
 	.bus_hz				= 33 * 1000 * 1000,
 	.bus_hz				= 33 * 1000 * 1000,
 	.detect_delay_ms		= 200,
 	.detect_delay_ms		= 200,

+ 0 - 4
drivers/mmc/host/dw_mmc.c

@@ -3126,10 +3126,6 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)
 			return ERR_PTR(-EPROBE_DEFER);
 			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))
 	if (device_property_read_u32(dev, "fifo-depth", &pdata->fifo_depth))
 		dev_info(dev,
 		dev_info(dev,
 			 "fifo-depth property not found, using value of FIFOTH register as default\n");
 			 "fifo-depth property not found, using value of FIFOTH register as default\n");

+ 0 - 2
drivers/mmc/host/dw_mmc.h

@@ -251,8 +251,6 @@ struct dma_pdata;
 
 
 /* Board platform data */
 /* Board platform data */
 struct dw_mci_board {
 struct dw_mci_board {
-	u32 num_slots;
-
 	unsigned int bus_hz; /* Clock speed at the cclk_in pad */
 	unsigned int bus_hz; /* Clock speed at the cclk_in pad */
 
 
 	u32 caps;	/* Capabilities */
 	u32 caps;	/* Capabilities */