diff options
| author | Jaehoon Chung <jh80.chung@samsung.com> | 2014-08-11 16:57:50 -0400 |
|---|---|---|
| committer | Dinh Nguyen <dinguyen@opensource.altera.com> | 2014-09-04 11:15:13 -0400 |
| commit | f5bbe55a270fa153465df23c266f61973c4c7dc0 (patch) | |
| tree | fe5717d461a03e5c2418be761967d7875d40cc8c | |
| parent | ba2b7d0ad59f4e3fb2619f840b8e89060ab5dc61 (diff) | |
ARM: dts: socfpga: unuse the slot-node and deprecate the supports-highspeed for
dw-mmc
dw-mmc controller can support multiple slots.
But, there are no use-cases anywhere. So we don't need to support the
slot-node for dw-mmc controller.
And "supports-highspeed" property in dw-mmc is deprecated.
"supports-highspeed" property can be replaced with "cap-sd/mmc-highspeed".
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: Tushar Behera <trblinux@gmail.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Seungwon Jeon <tgih.jun@samsung.com>
Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
| -rw-r--r-- | arch/arm/boot/dts/socfpga_arria5.dtsi | 9 | ||||
| -rw-r--r-- | arch/arm/boot/dts/socfpga_cyclone5.dtsi | 9 | ||||
| -rw-r--r-- | arch/arm/boot/dts/socfpga_vt.dts | 9 |
3 files changed, 9 insertions, 18 deletions
diff --git a/arch/arm/boot/dts/socfpga_arria5.dtsi b/arch/arm/boot/dts/socfpga_arria5.dtsi index 12d1c2ccaf5b..468fc4cf0742 100644 --- a/arch/arm/boot/dts/socfpga_arria5.dtsi +++ b/arch/arm/boot/dts/socfpga_arria5.dtsi | |||
| @@ -29,13 +29,10 @@ | |||
| 29 | 29 | ||
| 30 | dwmmc0@ff704000 { | 30 | dwmmc0@ff704000 { |
| 31 | num-slots = <1>; | 31 | num-slots = <1>; |
| 32 | supports-highspeed; | ||
| 33 | broken-cd; | 32 | broken-cd; |
| 34 | 33 | bus-width = <4>; | |
| 35 | slot@0 { | 34 | cap-mmc-highspeed; |
| 36 | reg = <0>; | 35 | cap-sd-highspeed; |
| 37 | bus-width = <4>; | ||
| 38 | }; | ||
| 39 | }; | 36 | }; |
| 40 | 37 | ||
| 41 | sysmgr@ffd08000 { | 38 | sysmgr@ffd08000 { |
diff --git a/arch/arm/boot/dts/socfpga_cyclone5.dtsi b/arch/arm/boot/dts/socfpga_cyclone5.dtsi index bf511828729f..1ee03c44fa5e 100644 --- a/arch/arm/boot/dts/socfpga_cyclone5.dtsi +++ b/arch/arm/boot/dts/socfpga_cyclone5.dtsi | |||
| @@ -30,13 +30,10 @@ | |||
| 30 | 30 | ||
| 31 | dwmmc0@ff704000 { | 31 | dwmmc0@ff704000 { |
| 32 | num-slots = <1>; | 32 | num-slots = <1>; |
| 33 | supports-highspeed; | ||
| 34 | broken-cd; | 33 | broken-cd; |
| 35 | 34 | bus-width = <4>; | |
| 36 | slot@0 { | 35 | cap-mmc-highspeed; |
| 37 | reg = <0>; | 36 | cap-sd-highspeed; |
| 38 | bus-width = <4>; | ||
| 39 | }; | ||
| 40 | }; | 37 | }; |
| 41 | 38 | ||
| 42 | ethernet@ff702000 { | 39 | ethernet@ff702000 { |
diff --git a/arch/arm/boot/dts/socfpga_vt.dts b/arch/arm/boot/dts/socfpga_vt.dts index 09792b411110..f9345e02ca49 100644 --- a/arch/arm/boot/dts/socfpga_vt.dts +++ b/arch/arm/boot/dts/socfpga_vt.dts | |||
| @@ -43,13 +43,10 @@ | |||
| 43 | 43 | ||
| 44 | dwmmc0@ff704000 { | 44 | dwmmc0@ff704000 { |
| 45 | num-slots = <1>; | 45 | num-slots = <1>; |
| 46 | supports-highspeed; | ||
| 47 | broken-cd; | 46 | broken-cd; |
| 48 | 47 | bus-width = <4>; | |
| 49 | slot@0 { | 48 | cap-mmc-highspeed; |
| 50 | reg = <0>; | 49 | cap-sd-highspeed; |
| 51 | bus-width = <4>; | ||
| 52 | }; | ||
| 53 | }; | 50 | }; |
| 54 | 51 | ||
| 55 | ethernet@ff700000 { | 52 | ethernet@ff700000 { |