Эх сурвалжийг харах

Documentation: dw-mshc: deprecate num-slots

dwmmc host driver already deprecate it in the driver
but didn't modify the documentation to reflect the fact.
This patch deprecates it and clean up num-slots from the
examples of all variant host drivers.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
Acked-by: Rob Herring <robh@kernel.org>
Fixes: d30a8f7bdf64 ("mmc: dw_mmc: deprecated the "num-slots" property")
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Shawn Lin 8 жил өмнө
parent
commit
3f5b4b79d4

+ 0 - 1
Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt

@@ -78,7 +78,6 @@ Example:
 	};
 	};
 
 
 	dwmmc0@12200000 {
 	dwmmc0@12200000 {
-		num-slots = <1>;
 		cap-mmc-highspeed;
 		cap-mmc-highspeed;
 		cap-sd-highspeed;
 		cap-sd-highspeed;
 		broken-cd;
 		broken-cd;

+ 0 - 1
Documentation/devicetree/bindings/mmc/img-dw-mshc.txt

@@ -24,6 +24,5 @@ Example:
 
 
 		fifo-depth = <0x20>;
 		fifo-depth = <0x20>;
 		bus-width = <4>;
 		bus-width = <4>;
-		num-slots = <1>;
 		disable-wp;
 		disable-wp;
 	};
 	};

+ 0 - 2
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt

@@ -36,7 +36,6 @@ Example:
 
 
 	/* Board portion */
 	/* Board portion */
 	dwmmc0@fcd03000 {
 	dwmmc0@fcd03000 {
-		num-slots = <1>;
 		vmmc-supply = <&ldo12>;
 		vmmc-supply = <&ldo12>;
 		fifo-depth = <0x100>;
 		fifo-depth = <0x100>;
 		pinctrl-names = "default";
 		pinctrl-names = "default";
@@ -52,7 +51,6 @@ Example:
 
 
 	dwmmc_1: dwmmc1@f723e000 {
 	dwmmc_1: dwmmc1@f723e000 {
 		compatible = "hisilicon,hi6220-dw-mshc";
 		compatible = "hisilicon,hi6220-dw-mshc";
-		num-slots = <0x1>;
 		bus-width = <0x4>;
 		bus-width = <0x4>;
 		disable-wp;
 		disable-wp;
 		cap-sd-highspeed;
 		cap-sd-highspeed;

+ 7 - 9
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt

@@ -12,12 +12,12 @@ Required Properties:
 * #address-cells: should be 1.
 * #address-cells: should be 1.
 * #size-cells: should be 0.
 * #size-cells: should be 0.
 
 
-# Slots: The slot specific information are contained within child-nodes with
-  each child-node representing a supported slot. There should be atleast one
-  child node representing a card slot. The name of the child node representing
-  the slot is recommended to be slot@n where n is the unique number of the slot
-  connected to the controller. The following are optional properties which
-  can be included in the slot child node.
+# Slots (DEPRECATED): The slot specific information are contained within
+  child-nodes with each child-node representing a supported slot. There should
+  be atleast one child node representing a card slot. The name of the child node
+  representing the slot is recommended to be slot@n where n is the unique number
+  of the slot connected to the controller. The following are optional properties
+  which can be included in the slot child node.
 
 
 	* reg: specifies the physical slot number. The valid values of this
 	* reg: specifies the physical slot number. The valid values of this
 	  property is 0 to (num-slots -1), where num-slots is the value
 	  property is 0 to (num-slots -1), where num-slots is the value
@@ -63,7 +63,7 @@ Optional properties:
   clock(cclk_out). If it's not specified, max is 200MHZ and min is 400KHz by default.
   clock(cclk_out). If it's not specified, max is 200MHZ and min is 400KHz by default.
 	  (Use the "max-frequency" instead of "clock-freq-min-max".)
 	  (Use the "max-frequency" instead of "clock-freq-min-max".)
 
 
-* num-slots: specifies the number of slots supported by the controller.
+* 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
   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
   value specified by num-slots. If this property is not specified, the value
   of num-slot property is assumed to be 1.
   of num-slot property is assumed to be 1.
@@ -124,7 +124,6 @@ board specific portions as listed below.
 	dwmmc0@12200000 {
 	dwmmc0@12200000 {
 		clock-frequency = <400000000>;
 		clock-frequency = <400000000>;
 		clock-freq-min-max = <400000 200000000>;
 		clock-freq-min-max = <400000 200000000>;
-		num-slots = <1>;
 		broken-cd;
 		broken-cd;
 		fifo-depth = <0x80>;
 		fifo-depth = <0x80>;
 		card-detect-delay = <200>;
 		card-detect-delay = <200>;
@@ -139,7 +138,6 @@ board specific portions as listed below.
 	dwmmc0@12200000 {
 	dwmmc0@12200000 {
 		clock-frequency = <400000000>;
 		clock-frequency = <400000000>;
 		clock-freq-min-max = <400000 200000000>;
 		clock-freq-min-max = <400000 200000000>;
-		num-slots = <1>;
 		broken-cd;
 		broken-cd;
 		fifo-depth = <0x80>;
 		fifo-depth = <0x80>;
 		card-detect-delay = <200>;
 		card-detect-delay = <200>;

+ 0 - 1
Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt

@@ -25,7 +25,6 @@ Example:
 		clock-frequency = <50000000>;
 		clock-frequency = <50000000>;
 		clocks = <&topcrm SD0_AHB>, <&topcrm SD0_WCLK>;
 		clocks = <&topcrm SD0_AHB>, <&topcrm SD0_WCLK>;
 		clock-names = "biu", "ciu";
 		clock-names = "biu", "ciu";
-		num-slots = <1>;
 		max-frequency = <50000000>;
 		max-frequency = <50000000>;
 		cap-sdio-irq;
 		cap-sdio-irq;
 		cap-sd-highspeed;
 		cap-sd-highspeed;