Skip to content

Commit 3f5b4b7

Browse files
shawn1221storulf
authored andcommitted
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 <[email protected]> Acked-by: Jaehoon Chung <[email protected]> Acked-by: Rob Herring <[email protected]> Fixes: d30a8f7 ("mmc: dw_mmc: deprecated the "num-slots" property") Signed-off-by: Ulf Hansson <[email protected]>
1 parent 16f5df8 commit 3f5b4b7

File tree

5 files changed

+7
-14
lines changed

5 files changed

+7
-14
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ Example:
7878
};
7979

8080
dwmmc0@12200000 {
81-
num-slots = <1>;
8281
cap-mmc-highspeed;
8382
cap-sd-highspeed;
8483
broken-cd;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,5 @@ Example:
2424

2525
fifo-depth = <0x20>;
2626
bus-width = <4>;
27-
num-slots = <1>;
2827
disable-wp;
2928
};

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ Example:
3636

3737
/* Board portion */
3838
dwmmc0@fcd03000 {
39-
num-slots = <1>;
4039
vmmc-supply = <&ldo12>;
4140
fifo-depth = <0x100>;
4241
pinctrl-names = "default";
@@ -52,7 +51,6 @@ Example:
5251

5352
dwmmc_1: dwmmc1@f723e000 {
5453
compatible = "hisilicon,hi6220-dw-mshc";
55-
num-slots = <0x1>;
5654
bus-width = <0x4>;
5755
disable-wp;
5856
cap-sd-highspeed;

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ Required Properties:
1212
* #address-cells: should be 1.
1313
* #size-cells: should be 0.
1414

15-
# Slots: The slot specific information are contained within child-nodes with
16-
each child-node representing a supported slot. There should be atleast one
17-
child node representing a card slot. The name of the child node representing
18-
the slot is recommended to be slot@n where n is the unique number of the slot
19-
connected to the controller. The following are optional properties which
20-
can be included in the slot child node.
15+
# Slots (DEPRECATED): The slot specific information are contained within
16+
child-nodes with each child-node representing a supported slot. There should
17+
be atleast one child node representing a card slot. The name of the child node
18+
representing the slot is recommended to be slot@n where n is the unique number
19+
of the slot connected to the controller. The following are optional properties
20+
which can be included in the slot child node.
2121

2222
* reg: specifies the physical slot number. The valid values of this
2323
property is 0 to (num-slots -1), where num-slots is the value
@@ -63,7 +63,7 @@ Optional properties:
6363
clock(cclk_out). If it's not specified, max is 200MHZ and min is 400KHz by default.
6464
(Use the "max-frequency" instead of "clock-freq-min-max".)
6565

66-
* num-slots: specifies the number of slots supported by the controller.
66+
* num-slots (DEPRECATED): specifies the number of slots supported by the controller.
6767
The number of physical slots actually used could be equal or less than the
6868
value specified by num-slots. If this property is not specified, the value
6969
of num-slot property is assumed to be 1.
@@ -124,7 +124,6 @@ board specific portions as listed below.
124124
dwmmc0@12200000 {
125125
clock-frequency = <400000000>;
126126
clock-freq-min-max = <400000 200000000>;
127-
num-slots = <1>;
128127
broken-cd;
129128
fifo-depth = <0x80>;
130129
card-detect-delay = <200>;
@@ -139,7 +138,6 @@ board specific portions as listed below.
139138
dwmmc0@12200000 {
140139
clock-frequency = <400000000>;
141140
clock-freq-min-max = <400000 200000000>;
142-
num-slots = <1>;
143141
broken-cd;
144142
fifo-depth = <0x80>;
145143
card-detect-delay = <200>;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ Example:
2525
clock-frequency = <50000000>;
2626
clocks = <&topcrm SD0_AHB>, <&topcrm SD0_WCLK>;
2727
clock-names = "biu", "ciu";
28-
num-slots = <1>;
2928
max-frequency = <50000000>;
3029
cap-sdio-irq;
3130
cap-sd-highspeed;

0 commit comments

Comments
 (0)