Advertisement
Guest User

Untitled

a guest
Nov 28th, 2013
156
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.99 KB | None | 0 0
  1. diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
  2. index 1824b9a..c54dfa2 100644
  3. --- a/arch/arm/boot/dts/am335x-bone-common.dtsi
  4. +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
  5. @@ -443,7 +443,7 @@
  6. phy_id = <&davinci_mdio>, <1>;
  7. };
  8.  
  9. -&mmc1 {
  10. +&mmc2 {
  11. status = "okay";
  12. vmmc-supply = <&ldo3_reg>;
  13. ti,vcc-aux-disable-is-sleep;
  14. diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
  15. index 1545cca..fa0c43d 100644
  16. --- a/arch/arm/boot/dts/am335x-boneblack.dts
  17. +++ b/arch/arm/boot/dts/am335x-boneblack.dts
  18. @@ -38,11 +38,11 @@
  19. gpio-names = "eMMC_RSTn";
  20. };
  21.  
  22. -&mmc1 {
  23. +&mmc2 {
  24. vmmc-supply = <&vmmcsd_fixed>;
  25. };
  26.  
  27. -&mmc2 {
  28. +&mmc1 {
  29. vmmc-supply = <&vmmcsd_fixed>;
  30. bus-width = <8>;
  31. ti,non-removable;
  32. diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
  33. index 2c52863..a3ee893 100644
  34. --- a/arch/arm/boot/dts/am33xx.dtsi
  35. +++ b/arch/arm/boot/dts/am33xx.dtsi
  36. @@ -244,23 +244,23 @@
  37. status = "disabled";
  38. };
  39.  
  40. - mmc1: mmc@48060000 {
  41. + mmc2: mmc@48060000 {
  42. compatible = "ti,omap3-hsmmc";
  43. - ti,hwmods = "mmc1";
  44. - ti,dual-volt;
  45. + ti,hwmods = "mmc2";
  46. ti,needs-special-reset;
  47. - dmas = <&edma 24
  48. - &edma 25>;
  49. + dmas = <&edma 2
  50. + &edma 3>;
  51. dma-names = "tx", "rx";
  52. status = "disabled";
  53. };
  54.  
  55. - mmc2: mmc@481d8000 {
  56. + mmc1: mmc@481d8000 {
  57. compatible = "ti,omap3-hsmmc";
  58. - ti,hwmods = "mmc2";
  59. + ti,hwmods = "mmc1";
  60. + ti,dual-volt;
  61. ti,needs-special-reset;
  62. - dmas = <&edma 2
  63. - &edma 3>;
  64. + dmas = <&edma 24
  65. + &edma 25>;
  66. dma-names = "tx", "rx";
  67. status = "disabled";
  68. };
  69. diff --git a/firmware/capes/cape-bone-2g-emmc1.dts b/firmware/capes/cape-bone-2g-emmc1.dts
  70. index bf26ae1..0571cd4 100644
  71. --- a/firmware/capes/cape-bone-2g-emmc1.dts
  72. +++ b/firmware/capes/cape-bone-2g-emmc1.dts
  73. @@ -36,7 +36,7 @@
  74. };
  75. };
  76. fragment@1 {
  77. - target = <&mmc2>;
  78. + target = <&mmc1>;
  79. __overlay__ {
  80. pinctrl-names = "default";
  81. pinctrl-0 = <&emmc2_pins>; /* wrong numbering */
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement