diff options
author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2009-02-05 14:04:51 -0500 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2009-02-06 11:48:58 -0500 |
commit | 766d2826728e7233ce6728ee8a8b822ac655af3a (patch) | |
tree | d5b38ed2d8dbb0879054a081e3c04c567b20149d /arch/powerpc/boot | |
parent | 34bcda616e5308a0633d5bfabcc090d7aa09b494 (diff) |
powerpc/83xx: Convert existing sdhc nodes to new bindings
- sdhc node renamed to sdhci ("sdhc" name is confusing since SDHC is
used to name Secure Digital High Capacity cards, while SDHCI is an
interface).
- Get rid of "fsl,esdhc" compatible entry, it's replaced by the
"fsl,<chip>-esdhc" scheme;
- Get rid of `model' property.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/boot')
-rw-r--r-- | arch/powerpc/boot/dts/mpc8377_mds.dts | 7 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8378_mds.dts | 7 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8379_mds.dts | 7 |
3 files changed, 12 insertions, 9 deletions
diff --git a/arch/powerpc/boot/dts/mpc8377_mds.dts b/arch/powerpc/boot/dts/mpc8377_mds.dts index a519e8571e89..3e3ec8fdef49 100644 --- a/arch/powerpc/boot/dts/mpc8377_mds.dts +++ b/arch/powerpc/boot/dts/mpc8377_mds.dts | |||
@@ -313,12 +313,13 @@ | |||
313 | fsl,descriptor-types-mask = <0x3ab0ebf>; | 313 | fsl,descriptor-types-mask = <0x3ab0ebf>; |
314 | }; | 314 | }; |
315 | 315 | ||
316 | sdhc@2e000 { | 316 | sdhci@2e000 { |
317 | model = "eSDHC"; | 317 | compatible = "fsl,mpc8377-esdhc", "fsl,mpc8379-esdhc"; |
318 | compatible = "fsl,esdhc"; | ||
319 | reg = <0x2e000 0x1000>; | 318 | reg = <0x2e000 0x1000>; |
320 | interrupts = <42 0x8>; | 319 | interrupts = <42 0x8>; |
321 | interrupt-parent = <&ipic>; | 320 | interrupt-parent = <&ipic>; |
321 | /* Filled in by U-Boot */ | ||
322 | clock-frequency = <0>; | ||
322 | }; | 323 | }; |
323 | 324 | ||
324 | sata@18000 { | 325 | sata@18000 { |
diff --git a/arch/powerpc/boot/dts/mpc8378_mds.dts b/arch/powerpc/boot/dts/mpc8378_mds.dts index 6bbee4989fbe..c3b212cf9025 100644 --- a/arch/powerpc/boot/dts/mpc8378_mds.dts +++ b/arch/powerpc/boot/dts/mpc8378_mds.dts | |||
@@ -313,12 +313,13 @@ | |||
313 | fsl,descriptor-types-mask = <0x3ab0ebf>; | 313 | fsl,descriptor-types-mask = <0x3ab0ebf>; |
314 | }; | 314 | }; |
315 | 315 | ||
316 | sdhc@2e000 { | 316 | sdhci@2e000 { |
317 | model = "eSDHC"; | 317 | compatible = "fsl,mpc8378-esdhc", "fsl,mpc8379-esdhc"; |
318 | compatible = "fsl,esdhc"; | ||
319 | reg = <0x2e000 0x1000>; | 318 | reg = <0x2e000 0x1000>; |
320 | interrupts = <42 0x8>; | 319 | interrupts = <42 0x8>; |
321 | interrupt-parent = <&ipic>; | 320 | interrupt-parent = <&ipic>; |
321 | /* Filled in by U-Boot */ | ||
322 | clock-frequency = <0>; | ||
322 | }; | 323 | }; |
323 | 324 | ||
324 | /* IPIC | 325 | /* IPIC |
diff --git a/arch/powerpc/boot/dts/mpc8379_mds.dts b/arch/powerpc/boot/dts/mpc8379_mds.dts index acf06c438dbf..1b61cda1eb47 100644 --- a/arch/powerpc/boot/dts/mpc8379_mds.dts +++ b/arch/powerpc/boot/dts/mpc8379_mds.dts | |||
@@ -310,12 +310,13 @@ | |||
310 | fsl,descriptor-types-mask = <0x3ab0ebf>; | 310 | fsl,descriptor-types-mask = <0x3ab0ebf>; |
311 | }; | 311 | }; |
312 | 312 | ||
313 | sdhc@2e000 { | 313 | sdhci@2e000 { |
314 | model = "eSDHC"; | 314 | compatible = "fsl,mpc8379-esdhc"; |
315 | compatible = "fsl,esdhc"; | ||
316 | reg = <0x2e000 0x1000>; | 315 | reg = <0x2e000 0x1000>; |
317 | interrupts = <42 0x8>; | 316 | interrupts = <42 0x8>; |
318 | interrupt-parent = <&ipic>; | 317 | interrupt-parent = <&ipic>; |
318 | /* Filled in by U-Boot */ | ||
319 | clock-frequency = <0>; | ||
319 | }; | 320 | }; |
320 | 321 | ||
321 | sata@18000 { | 322 | sata@18000 { |