diff options
author | Shawn Lin <shawn.lin@rock-chips.com> | 2017-07-18 04:31:38 -0400 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2017-07-27 10:11:39 -0400 |
commit | 3f5b4b79d4c0fa71fd7d74c2a44bbc0869c04c9b (patch) | |
tree | 8f8b1b2b028d13add459c1be3899e6129b2d9405 | |
parent | 16f5df8b5d71ef2eaeac067806de7ebd6df3f2d0 (diff) |
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>
5 files changed, 7 insertions, 14 deletions
diff --git a/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt index aad98442788b..a58c173b7ab9 100644 --- a/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt +++ b/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt | |||
@@ -78,7 +78,6 @@ Example: | |||
78 | }; | 78 | }; |
79 | 79 | ||
80 | dwmmc0@12200000 { | 80 | dwmmc0@12200000 { |
81 | num-slots = <1>; | ||
82 | cap-mmc-highspeed; | 81 | cap-mmc-highspeed; |
83 | cap-sd-highspeed; | 82 | cap-sd-highspeed; |
84 | broken-cd; | 83 | broken-cd; |
diff --git a/Documentation/devicetree/bindings/mmc/img-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/img-dw-mshc.txt index 85de99fcaa2f..c54e577eea07 100644 --- a/Documentation/devicetree/bindings/mmc/img-dw-mshc.txt +++ b/Documentation/devicetree/bindings/mmc/img-dw-mshc.txt | |||
@@ -24,6 +24,5 @@ Example: | |||
24 | 24 | ||
25 | fifo-depth = <0x20>; | 25 | fifo-depth = <0x20>; |
26 | bus-width = <4>; | 26 | bus-width = <4>; |
27 | num-slots = <1>; | ||
28 | disable-wp; | 27 | disable-wp; |
29 | }; | 28 | }; |
diff --git a/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt index 8af1afcb86dc..07242d141773 100644 --- a/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt +++ b/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt | |||
@@ -36,7 +36,6 @@ Example: | |||
36 | 36 | ||
37 | /* Board portion */ | 37 | /* Board portion */ |
38 | dwmmc0@fcd03000 { | 38 | dwmmc0@fcd03000 { |
39 | num-slots = <1>; | ||
40 | vmmc-supply = <&ldo12>; | 39 | vmmc-supply = <&ldo12>; |
41 | fifo-depth = <0x100>; | 40 | fifo-depth = <0x100>; |
42 | pinctrl-names = "default"; | 41 | pinctrl-names = "default"; |
@@ -52,7 +51,6 @@ Example: | |||
52 | 51 | ||
53 | dwmmc_1: dwmmc1@f723e000 { | 52 | dwmmc_1: dwmmc1@f723e000 { |
54 | compatible = "hisilicon,hi6220-dw-mshc"; | 53 | compatible = "hisilicon,hi6220-dw-mshc"; |
55 | num-slots = <0x1>; | ||
56 | bus-width = <0x4>; | 54 | bus-width = <0x4>; |
57 | disable-wp; | 55 | disable-wp; |
58 | cap-sd-highspeed; | 56 | cap-sd-highspeed; |
diff --git a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt index 9cb55ca57461..ef3e5f14067a 100644 --- a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt +++ b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt | |||
@@ -12,12 +12,12 @@ Required Properties: | |||
12 | * #address-cells: should be 1. | 12 | * #address-cells: should be 1. |
13 | * #size-cells: should be 0. | 13 | * #size-cells: should be 0. |
14 | 14 | ||
15 | # Slots: The slot specific information are contained within child-nodes with | 15 | # Slots (DEPRECATED): The slot specific information are contained within |
16 | each child-node representing a supported slot. There should be atleast one | 16 | child-nodes with each child-node representing a supported slot. There should |
17 | child node representing a card slot. The name of the child node representing | 17 | be atleast one child node representing a card slot. The name of the child node |
18 | the slot is recommended to be slot@n where n is the unique number of the slot | 18 | representing the slot is recommended to be slot@n where n is the unique number |
19 | connected to the controller. The following are optional properties which | 19 | of the slot connected to the controller. The following are optional properties |
20 | can be included in the slot child node. | 20 | which can be included in the slot child node. |
21 | 21 | ||
22 | * reg: specifies the physical slot number. The valid values of this | 22 | * reg: specifies the physical slot number. The valid values of this |
23 | property is 0 to (num-slots -1), where num-slots is the value | 23 | property is 0 to (num-slots -1), where num-slots is the value |
@@ -63,7 +63,7 @@ Optional properties: | |||
63 | clock(cclk_out). If it's not specified, max is 200MHZ and min is 400KHz by default. | 63 | clock(cclk_out). If it's not specified, max is 200MHZ and min is 400KHz by default. |
64 | (Use the "max-frequency" instead of "clock-freq-min-max".) | 64 | (Use the "max-frequency" instead of "clock-freq-min-max".) |
65 | 65 | ||
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. |
67 | The number of physical slots actually used could be equal or less than the | 67 | The number of physical slots actually used could be equal or less than the |
68 | value specified by num-slots. If this property is not specified, the value | 68 | value specified by num-slots. If this property is not specified, the value |
69 | of num-slot property is assumed to be 1. | 69 | of num-slot property is assumed to be 1. |
@@ -124,7 +124,6 @@ board specific portions as listed below. | |||
124 | dwmmc0@12200000 { | 124 | dwmmc0@12200000 { |
125 | clock-frequency = <400000000>; | 125 | clock-frequency = <400000000>; |
126 | clock-freq-min-max = <400000 200000000>; | 126 | clock-freq-min-max = <400000 200000000>; |
127 | num-slots = <1>; | ||
128 | broken-cd; | 127 | broken-cd; |
129 | fifo-depth = <0x80>; | 128 | fifo-depth = <0x80>; |
130 | card-detect-delay = <200>; | 129 | card-detect-delay = <200>; |
@@ -139,7 +138,6 @@ board specific portions as listed below. | |||
139 | dwmmc0@12200000 { | 138 | dwmmc0@12200000 { |
140 | clock-frequency = <400000000>; | 139 | clock-frequency = <400000000>; |
141 | clock-freq-min-max = <400000 200000000>; | 140 | clock-freq-min-max = <400000 200000000>; |
142 | num-slots = <1>; | ||
143 | broken-cd; | 141 | broken-cd; |
144 | fifo-depth = <0x80>; | 142 | fifo-depth = <0x80>; |
145 | card-detect-delay = <200>; | 143 | card-detect-delay = <200>; |
diff --git a/Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt index eaade0e5adeb..906819a90c2b 100644 --- a/Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt +++ b/Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt | |||
@@ -25,7 +25,6 @@ Example: | |||
25 | clock-frequency = <50000000>; | 25 | clock-frequency = <50000000>; |
26 | clocks = <&topcrm SD0_AHB>, <&topcrm SD0_WCLK>; | 26 | clocks = <&topcrm SD0_AHB>, <&topcrm SD0_WCLK>; |
27 | clock-names = "biu", "ciu"; | 27 | clock-names = "biu", "ciu"; |
28 | num-slots = <1>; | ||
29 | max-frequency = <50000000>; | 28 | max-frequency = <50000000>; |
30 | cap-sdio-irq; | 29 | cap-sdio-irq; |
31 | cap-sd-highspeed; | 30 | cap-sd-highspeed; |