diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2014-03-18 15:34:04 -0400 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2014-05-12 06:52:40 -0400 |
| commit | 30cdd668bba5260c55f75dee877ac0e21c5df1cf (patch) | |
| tree | 161be40f56a0e7be307f733f5e098e1c7f5ecf28 /arch/arm | |
| parent | d63df63a818bbc114462087f8b88171729208592 (diff) | |
ARM: ux500: Convert to the common mmc DT bindings for highspeed mode
The mmci host driver supports the common mmc DT parser, which enables
us to use the use common names instead.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/ste-ccu9540.dts | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/ste-href.dtsi | 8 | ||||
| -rw-r--r-- | arch/arm/boot/dts/ste-snowball.dts | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/ste-ccu9540.dts b/arch/arm/boot/dts/ste-ccu9540.dts index 229508750890..651c56d400a4 100644 --- a/arch/arm/boot/dts/ste-ccu9540.dts +++ b/arch/arm/boot/dts/ste-ccu9540.dts | |||
| @@ -38,8 +38,8 @@ | |||
| 38 | arm,primecell-periphid = <0x10480180>; | 38 | arm,primecell-periphid = <0x10480180>; |
| 39 | max-frequency = <100000000>; | 39 | max-frequency = <100000000>; |
| 40 | bus-width = <4>; | 40 | bus-width = <4>; |
| 41 | mmc-cap-sd-highspeed; | 41 | cap-sd-highspeed; |
| 42 | mmc-cap-mmc-highspeed; | 42 | cap-mmc-highspeed; |
| 43 | vmmc-supply = <&ab8500_ldo_aux3_reg>; | 43 | vmmc-supply = <&ab8500_ldo_aux3_reg>; |
| 44 | 44 | ||
| 45 | cd-gpios = <&gpio7 6 0x4>; // 230 | 45 | cd-gpios = <&gpio7 6 0x4>; // 230 |
| @@ -63,7 +63,7 @@ | |||
| 63 | arm,primecell-periphid = <0x10480180>; | 63 | arm,primecell-periphid = <0x10480180>; |
| 64 | max-frequency = <100000000>; | 64 | max-frequency = <100000000>; |
| 65 | bus-width = <8>; | 65 | bus-width = <8>; |
| 66 | mmc-cap-mmc-highspeed; | 66 | cap-mmc-highspeed; |
| 67 | vmmc-supply = <&ab8500_ldo_aux2_reg>; | 67 | vmmc-supply = <&ab8500_ldo_aux2_reg>; |
| 68 | 68 | ||
| 69 | status = "okay"; | 69 | status = "okay"; |
diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi index 46dce428b294..3f07c5879600 100644 --- a/arch/arm/boot/dts/ste-href.dtsi +++ b/arch/arm/boot/dts/ste-href.dtsi | |||
| @@ -116,8 +116,8 @@ | |||
| 116 | arm,primecell-periphid = <0x10480180>; | 116 | arm,primecell-periphid = <0x10480180>; |
| 117 | max-frequency = <100000000>; | 117 | max-frequency = <100000000>; |
| 118 | bus-width = <4>; | 118 | bus-width = <4>; |
| 119 | mmc-cap-sd-highspeed; | 119 | cap-sd-highspeed; |
| 120 | mmc-cap-mmc-highspeed; | 120 | cap-mmc-highspeed; |
| 121 | st,sig-dir-dat0; | 121 | st,sig-dir-dat0; |
| 122 | st,sig-dir-dat2; | 122 | st,sig-dir-dat2; |
| 123 | st,sig-dir-cmd; | 123 | st,sig-dir-cmd; |
| @@ -148,7 +148,7 @@ | |||
| 148 | arm,primecell-periphid = <0x10480180>; | 148 | arm,primecell-periphid = <0x10480180>; |
| 149 | max-frequency = <100000000>; | 149 | max-frequency = <100000000>; |
| 150 | bus-width = <8>; | 150 | bus-width = <8>; |
| 151 | mmc-cap-mmc-highspeed; | 151 | cap-mmc-highspeed; |
| 152 | pinctrl-names = "default", "sleep"; | 152 | pinctrl-names = "default", "sleep"; |
| 153 | pinctrl-0 = <&sdi2_default_mode>; | 153 | pinctrl-0 = <&sdi2_default_mode>; |
| 154 | pinctrl-1 = <&sdi2_sleep_mode>; | 154 | pinctrl-1 = <&sdi2_sleep_mode>; |
| @@ -161,7 +161,7 @@ | |||
| 161 | arm,primecell-periphid = <0x10480180>; | 161 | arm,primecell-periphid = <0x10480180>; |
| 162 | max-frequency = <100000000>; | 162 | max-frequency = <100000000>; |
| 163 | bus-width = <8>; | 163 | bus-width = <8>; |
| 164 | mmc-cap-mmc-highspeed; | 164 | cap-mmc-highspeed; |
| 165 | vmmc-supply = <&ab8500_ldo_aux2_reg>; | 165 | vmmc-supply = <&ab8500_ldo_aux2_reg>; |
| 166 | pinctrl-names = "default", "sleep"; | 166 | pinctrl-names = "default", "sleep"; |
| 167 | pinctrl-0 = <&sdi4_default_mode>; | 167 | pinctrl-0 = <&sdi4_default_mode>; |
diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts index a2f632d0be2a..474ef83229cd 100644 --- a/arch/arm/boot/dts/ste-snowball.dts +++ b/arch/arm/boot/dts/ste-snowball.dts | |||
| @@ -156,7 +156,7 @@ | |||
| 156 | arm,primecell-periphid = <0x10480180>; | 156 | arm,primecell-periphid = <0x10480180>; |
| 157 | max-frequency = <100000000>; | 157 | max-frequency = <100000000>; |
| 158 | bus-width = <4>; | 158 | bus-width = <4>; |
| 159 | mmc-cap-mmc-highspeed; | 159 | cap-mmc-highspeed; |
| 160 | vmmc-supply = <&ab8500_ldo_aux3_reg>; | 160 | vmmc-supply = <&ab8500_ldo_aux3_reg>; |
| 161 | vqmmc-supply = <&vmmci>; | 161 | vqmmc-supply = <&vmmci>; |
| 162 | pinctrl-names = "default", "sleep"; | 162 | pinctrl-names = "default", "sleep"; |
| @@ -195,7 +195,7 @@ | |||
| 195 | arm,primecell-periphid = <0x10480180>; | 195 | arm,primecell-periphid = <0x10480180>; |
| 196 | max-frequency = <100000000>; | 196 | max-frequency = <100000000>; |
| 197 | bus-width = <8>; | 197 | bus-width = <8>; |
| 198 | mmc-cap-mmc-highspeed; | 198 | cap-mmc-highspeed; |
| 199 | vmmc-supply = <&ab8500_ldo_aux2_reg>; | 199 | vmmc-supply = <&ab8500_ldo_aux2_reg>; |
| 200 | pinctrl-names = "default", "sleep"; | 200 | pinctrl-names = "default", "sleep"; |
| 201 | pinctrl-0 = <&sdi4_default_mode>; | 201 | pinctrl-0 = <&sdi4_default_mode>; |