ARM: tegra: Rename sdhci nodes to mmc · tjh.dev/kernel@32c096c

tjh.dev / kernel

fork atom

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

ARM: tegra: Rename sdhci nodes to mmc

The new json-schema based validation tools require SD/MMC controller
nodes to be named mmc. Rename all references to them.

Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Cc: Philippe Schenker <philippe.schenker@toradex.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

Thierry Reding 5 years ago 32c096c2 afd92390

+64 -64

33 changed files

expand all collapse all

arch

arm

boot

dts

tegra114-dalmore.dts

tegra114-roth.dts

tegra114-tn7.dts

tegra114.dtsi

tegra124-apalis-eval.dts

tegra124-apalis-v1.2-eval.dts

tegra124-apalis-v1.2.dtsi

tegra124-apalis.dtsi

tegra124-jetson-tk1.dts

tegra124-nyan-big.dts

tegra124-nyan.dtsi

tegra124-venice2.dts

tegra124.dtsi

tegra20-colibri-eval-v3.dts

tegra20-colibri-iris.dts

tegra20-harmony.dts

tegra20-paz00.dts

tegra20-seaboard.dts

tegra20-tamonten.dtsi

tegra20-trimslice.dts

tegra20-ventana.dts

tegra20.dtsi

tegra30-apalis-eval.dts

tegra30-apalis-v1.1-eval.dts

tegra30-apalis-v1.1.dtsi

tegra30-apalis.dtsi

tegra30-beaver.dts

tegra30-cardhu-a02.dts

tegra30-cardhu-a04.dts

tegra30-cardhu.dtsi

tegra30-colibri-eval-v3.dts

tegra30-colibri.dtsi

tegra30.dtsi

+2 -2

arch/arm/boot/dts/tegra114-dalmore.dts

reviewed

··· 1108 1108 }; 1109 1109 }; 1110 1110 1111 1111 - sdhci@78000400 { 1111 1111 + mmc@78000400 { 1112 1112 cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>; 1113 1113 wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_HIGH>; 1114 1114 bus-width = <4>; 1115 1115 status = "okay"; 1116 1116 }; 1117 1117 1118 1118 - sdhci@78000600 { 1118 1118 + mmc@78000600 { 1119 1119 bus-width = <8>; 1120 1120 status = "okay"; 1121 1121 non-removable;

+2 -2

arch/arm/boot/dts/tegra114-roth.dts

reviewed

··· 962 962 }; 963 963 964 964 /* SD card */ 965 965 - sdhci@78000400 { 965 965 + mmc@78000400 { 966 966 status = "okay"; 967 967 bus-width = <4>; 968 968 vqmmc-supply = <&vddio_sdmmc3>; ··· 971 971 }; 972 972 973 973 /* eMMC */ 974 974 - sdhci@78000600 { 974 974 + mmc@78000600 { 975 975 status = "okay"; 976 976 bus-width = <8>; 977 977 non-removable;

+1 -1

arch/arm/boot/dts/tegra114-tn7.dts

reviewed

··· 242 242 }; 243 243 244 244 /* eMMC */ 245 245 - sdhci@78000600 { 245 245 + mmc@78000600 { 246 246 status = "okay"; 247 247 bus-width = <8>; 248 248 non-removable;

+4 -4

arch/arm/boot/dts/tegra114.dtsi

reviewed

··· 646 646 #nvidia,mipi-calibrate-cells = <1>; 647 647 }; 648 648 649 649 - sdhci@78000000 { 649 649 + mmc@78000000 { 650 650 compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci"; 651 651 reg = <0x78000000 0x200>; 652 652 interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>; ··· 657 657 status = "disabled"; 658 658 }; 659 659 660 660 - sdhci@78000200 { 660 660 + mmc@78000200 { 661 661 compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci"; 662 662 reg = <0x78000200 0x200>; 663 663 interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; ··· 668 668 status = "disabled"; 669 669 }; 670 670 671 671 - sdhci@78000400 { 671 671 + mmc@78000400 { 672 672 compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci"; 673 673 reg = <0x78000400 0x200>; 674 674 interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>; ··· 679 679 status = "disabled"; 680 680 }; 681 681 682 682 - sdhci@78000600 { 682 682 + mmc@78000600 { 683 683 compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci"; 684 684 reg = <0x78000600 0x200>; 685 685 interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;

+2 -2

arch/arm/boot/dts/tegra124-apalis-eval.dts

reviewed

··· 130 130 }; 131 131 132 132 /* Apalis MMC1 */ 133 133 - sdhci@700b0000 { 133 133 + mmc@700b0000 { 134 134 status = "okay"; 135 135 bus-width = <4>; 136 136 /* MMC1_CD# */ ··· 139 139 }; 140 140 141 141 /* Apalis SD1 */ 142 142 - sdhci@700b0400 { 142 142 + mmc@700b0400 { 143 143 status = "okay"; 144 144 bus-width = <4>; 145 145 /* SD1_CD# */

+2 -2

arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts

reviewed

··· 132 132 }; 133 133 134 134 /* Apalis MMC1 */ 135 135 - sdhci@700b0000 { 135 135 + mmc@700b0000 { 136 136 status = "okay"; 137 137 bus-width = <4>; 138 138 /* MMC1_CD# */ ··· 141 141 }; 142 142 143 143 /* Apalis SD1 */ 144 144 - sdhci@700b0400 { 144 144 + mmc@700b0400 { 145 145 status = "okay"; 146 146 bus-width = <4>; 147 147 /* SD1_CD# */

+1 -1

arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi

reviewed

··· 1916 1916 }; 1917 1917 1918 1918 /* eMMC */ 1919 1919 - sdhci@700b0600 { 1919 1919 + mmc@700b0600 { 1920 1920 status = "okay"; 1921 1921 bus-width = <8>; 1922 1922 non-removable;

+1 -1

arch/arm/boot/dts/tegra124-apalis.dtsi

reviewed

··· 1908 1908 }; 1909 1909 1910 1910 /* eMMC */ 1911 1911 - sdhci@700b0600 { 1911 1911 + mmc@700b0600 { 1912 1912 status = "okay"; 1913 1913 bus-width = <8>; 1914 1914 non-removable;

+2 -2

arch/arm/boot/dts/tegra124-jetson-tk1.dts

reviewed

··· 1804 1804 }; 1805 1805 1806 1806 /* SD card */ 1807 1807 - sdhci@700b0400 { 1807 1807 + mmc@700b0400 { 1808 1808 status = "okay"; 1809 1809 cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>; 1810 1810 power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>; ··· 1814 1814 }; 1815 1815 1816 1816 /* eMMC */ 1817 1817 - sdhci@700b0600 { 1817 1817 + mmc@700b0600 { 1818 1818 status = "okay"; 1819 1819 bus-width = <8>; 1820 1820 non-removable;

+1 -1

arch/arm/boot/dts/tegra124-nyan-big.dts

reviewed

··· 20 20 ddc-i2c-bus = <&dpaux>; 21 21 }; 22 22 23 23 - sdhci@700b0400 { /* SD Card on this bus */ 23 23 + mmc@700b0400 { /* SD Card on this bus */ 24 24 wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_LOW>; 25 25 }; 26 26

+3 -3

arch/arm/boot/dts/tegra124-nyan.dtsi

reviewed

··· 495 495 reset-gpios = <&gpio TEGRA_GPIO(X, 7) GPIO_ACTIVE_LOW>; 496 496 }; 497 497 498 498 - sdhci@700b0000 { /* WiFi/BT on this bus */ 498 498 + mmc@700b0000 { /* WiFi/BT on this bus */ 499 499 status = "okay"; 500 500 bus-width = <4>; 501 501 no-1-8-v; ··· 506 506 keep-power-in-suspend; 507 507 }; 508 508 509 509 - sdhci@700b0400 { /* SD Card on this bus */ 509 509 + mmc@700b0400 { /* SD Card on this bus */ 510 510 status = "okay"; 511 511 cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>; 512 512 power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>; ··· 515 515 vqmmc-supply = <&vddio_sdmmc3>; 516 516 }; 517 517 518 518 - sdhci@700b0600 { /* eMMC on this bus */ 518 518 + mmc@700b0600 { /* eMMC on this bus */ 519 519 status = "okay"; 520 520 bus-width = <8>; 521 521 no-1-8-v;

+2 -2

arch/arm/boot/dts/tegra124-venice2.dts

reviewed

··· 1002 1002 }; 1003 1003 }; 1004 1004 1005 1005 - sdhci@700b0400 { 1005 1005 + mmc@700b0400 { 1006 1006 cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>; 1007 1007 power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>; 1008 1008 wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_LOW>; ··· 1011 1011 vqmmc-supply = <&vddio_sdmmc3>; 1012 1012 }; 1013 1013 1014 1014 - sdhci@700b0600 { 1014 1014 + mmc@700b0600 { 1015 1015 status = "okay"; 1016 1016 bus-width = <8>; 1017 1017 non-removable;

+4 -4

arch/arm/boot/dts/tegra124.dtsi

reviewed

··· 833 833 }; 834 834 }; 835 835 836 836 - sdhci@700b0000 { 836 836 + mmc@700b0000 { 837 837 compatible = "nvidia,tegra124-sdhci"; 838 838 reg = <0x0 0x700b0000 0x0 0x200>; 839 839 interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>; ··· 843 843 status = "disabled"; 844 844 }; 845 845 846 846 - sdhci@700b0200 { 846 846 + mmc@700b0200 { 847 847 compatible = "nvidia,tegra124-sdhci"; 848 848 reg = <0x0 0x700b0200 0x0 0x200>; 849 849 interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; ··· 853 853 status = "disabled"; 854 854 }; 855 855 856 856 - sdhci@700b0400 { 856 856 + mmc@700b0400 { 857 857 compatible = "nvidia,tegra124-sdhci"; 858 858 reg = <0x0 0x700b0400 0x0 0x200>; 859 859 interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>; ··· 863 863 status = "disabled"; 864 864 }; 865 865 866 866 - sdhci@700b0600 { 866 866 + mmc@700b0600 { 867 867 compatible = "nvidia,tegra124-sdhci"; 868 868 reg = <0x0 0x700b0600 0x0 0x200>; 869 869 interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;

+1 -1

arch/arm/boot/dts/tegra20-colibri-eval-v3.dts

reviewed

··· 183 183 }; 184 184 185 185 /* SD/MMC */ 186 186 - sdhci@c8000600 { 186 186 + mmc@c8000600 { 187 187 status = "okay"; 188 188 bus-width = <4>; 189 189 cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>; /* MMCD */

+1 -1

arch/arm/boot/dts/tegra20-colibri-iris.dts

reviewed

··· 171 171 }; 172 172 173 173 /* SD/MMC */ 174 174 - sdhci@c8000600 { 174 174 + mmc@c8000600 { 175 175 status = "okay"; 176 176 bus-width = <4>; 177 177 cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>; /* MMCD */

+2 -2

arch/arm/boot/dts/tegra20-harmony.dts

reviewed

··· 613 613 status = "okay"; 614 614 }; 615 615 616 616 - sdhci@c8000200 { 616 616 + mmc@c8000200 { 617 617 status = "okay"; 618 618 cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>; 619 619 wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>; ··· 621 621 bus-width = <4>; 622 622 }; 623 623 624 624 - sdhci@c8000600 { 624 624 + mmc@c8000600 { 625 625 status = "okay"; 626 626 cd-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_LOW>; 627 627 wp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>;

+2 -2

arch/arm/boot/dts/tegra20-paz00.dts

reviewed

··· 543 543 status = "okay"; 544 544 }; 545 545 546 546 - sdhci@c8000000 { 546 546 + mmc@c8000000 { 547 547 status = "okay"; 548 548 cd-gpios = <&gpio TEGRA_GPIO(V, 5) GPIO_ACTIVE_LOW>; 549 549 wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>; ··· 551 551 bus-width = <4>; 552 552 }; 553 553 554 554 - sdhci@c8000600 { 554 554 + mmc@c8000600 { 555 555 status = "okay"; 556 556 bus-width = <8>; 557 557 non-removable;

+3 -3

arch/arm/boot/dts/tegra20-seaboard.dts

reviewed

··· 760 760 status = "okay"; 761 761 }; 762 762 763 763 - sdhci@c8000000 { 763 763 + mmc@c8000000 { 764 764 status = "okay"; 765 765 power-gpios = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>; 766 766 bus-width = <4>; 767 767 keep-power-in-suspend; 768 768 }; 769 769 770 770 - sdhci@c8000400 { 770 770 + mmc@c8000400 { 771 771 status = "okay"; 772 772 cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>; 773 773 wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>; ··· 775 775 bus-width = <4>; 776 776 }; 777 777 778 778 - sdhci@c8000600 { 778 778 + mmc@c8000600 { 779 779 status = "okay"; 780 780 bus-width = <8>; 781 781 non-removable;

+1 -1

arch/arm/boot/dts/tegra20-tamonten.dtsi

reviewed

··· 495 495 status = "okay"; 496 496 }; 497 497 498 498 - sdhci@c8000600 { 498 498 + mmc@c8000600 { 499 499 cd-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_LOW>; 500 500 wp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>; 501 501 bus-width = <4>;

+2 -2

arch/arm/boot/dts/tegra20-trimslice.dts

reviewed

··· 366 366 status = "okay"; 367 367 }; 368 368 369 369 - sdhci@c8000000 { 369 369 + mmc@c8000000 { 370 370 status = "okay"; 371 371 broken-cd; 372 372 bus-width = <4>; 373 373 }; 374 374 375 375 - sdhci@c8000600 { 375 375 + mmc@c8000600 { 376 376 status = "okay"; 377 377 cd-gpios = <&gpio TEGRA_GPIO(P, 1) GPIO_ACTIVE_LOW>; 378 378 wp-gpios = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>;

+3 -3

arch/arm/boot/dts/tegra20-ventana.dts

reviewed

··· 554 554 status = "okay"; 555 555 }; 556 556 557 557 - sdhci@c8000000 { 557 557 + mmc@c8000000 { 558 558 status = "okay"; 559 559 power-gpios = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>; 560 560 bus-width = <4>; 561 561 keep-power-in-suspend; 562 562 }; 563 563 564 564 - sdhci@c8000400 { 564 564 + mmc@c8000400 { 565 565 status = "okay"; 566 566 cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>; 567 567 wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>; ··· 569 569 bus-width = <4>; 570 570 }; 571 571 572 572 - sdhci@c8000600 { 572 572 + mmc@c8000600 { 573 573 status = "okay"; 574 574 bus-width = <8>; 575 575 non-removable;

+4 -4

arch/arm/boot/dts/tegra20.dtsi

reviewed

··· 807 807 status = "disabled"; 808 808 }; 809 809 810 810 - sdhci@c8000000 { 810 810 + mmc@c8000000 { 811 811 compatible = "nvidia,tegra20-sdhci"; 812 812 reg = <0xc8000000 0x200>; 813 813 interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>; ··· 817 817 status = "disabled"; 818 818 }; 819 819 820 820 - sdhci@c8000200 { 820 820 + mmc@c8000200 { 821 821 compatible = "nvidia,tegra20-sdhci"; 822 822 reg = <0xc8000200 0x200>; 823 823 interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; ··· 827 827 status = "disabled"; 828 828 }; 829 829 830 830 - sdhci@c8000400 { 830 830 + mmc@c8000400 { 831 831 compatible = "nvidia,tegra20-sdhci"; 832 832 reg = <0xc8000400 0x200>; 833 833 interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>; ··· 837 837 status = "disabled"; 838 838 }; 839 839 840 840 - sdhci@c8000600 { 840 840 + mmc@c8000600 { 841 841 compatible = "nvidia,tegra20-sdhci"; 842 842 reg = <0xc8000600 0x200>; 843 843 interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;

+2 -2

arch/arm/boot/dts/tegra30-apalis-eval.dts

reviewed

··· 120 120 }; 121 121 122 122 /* Apalis SD1 */ 123 123 - sdhci@78000000 { 123 123 + mmc@78000000 { 124 124 status = "okay"; 125 125 bus-width = <4>; 126 126 /* SD1_CD# */ ··· 129 129 }; 130 130 131 131 /* Apalis MMC1 */ 132 132 - sdhci@78000400 { 132 132 + mmc@78000400 { 133 133 status = "okay"; 134 134 bus-width = <8>; 135 135 /* MMC1_CD# */

+2 -2

arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts

reviewed

··· 121 121 }; 122 122 123 123 /* Apalis SD1 */ 124 124 - sdhci@78000000 { 124 124 + mmc@78000000 { 125 125 status = "okay"; 126 126 bus-width = <4>; 127 127 /* SD1_CD# */ ··· 130 130 }; 131 131 132 132 /* Apalis MMC1 */ 133 133 - sdhci@78000400 { 133 133 + mmc@78000400 { 134 134 status = "okay"; 135 135 bus-width = <8>; 136 136 /* MMC1_CD# */

+1 -1

arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi

reviewed

··· 1112 1112 }; 1113 1113 1114 1114 /* eMMC */ 1115 1115 - sdhci@78000600 { 1115 1115 + mmc@78000600 { 1116 1116 status = "okay"; 1117 1117 bus-width = <8>; 1118 1118 non-removable;

+1 -1

arch/arm/boot/dts/tegra30-apalis.dtsi

reviewed

··· 1094 1094 }; 1095 1095 1096 1096 /* eMMC */ 1097 1097 - sdhci@78000600 { 1097 1097 + mmc@78000600 { 1098 1098 status = "okay"; 1099 1099 bus-width = <8>; 1100 1100 non-removable;

+2 -2

arch/arm/boot/dts/tegra30-beaver.dts

reviewed

··· 1922 1922 }; 1923 1923 }; 1924 1924 1925 1925 - sdhci@78000000 { 1925 1925 + mmc@78000000 { 1926 1926 status = "okay"; 1927 1927 vqmmc-supply = <&ldo5_reg>; 1928 1928 cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>; ··· 1931 1931 bus-width = <4>; 1932 1932 }; 1933 1933 1934 1934 - sdhci@78000600 { 1934 1934 + mmc@78000600 { 1935 1935 status = "okay"; 1936 1936 bus-width = <8>; 1937 1937 non-removable;

+1 -1

arch/arm/boot/dts/tegra30-cardhu-a02.dts

reviewed

··· 9 9 model = "NVIDIA Tegra30 Cardhu A02 evaluation board"; 10 10 compatible = "nvidia,cardhu-a02", "nvidia,cardhu", "nvidia,tegra30"; 11 11 12 12 - sdhci@78000400 { 12 12 + mmc@78000400 { 13 13 status = "okay"; 14 14 power-gpios = <&gpio TEGRA_GPIO(D, 4) GPIO_ACTIVE_HIGH>; 15 15 bus-width = <4>;

+1 -1

arch/arm/boot/dts/tegra30-cardhu-a04.dts

reviewed

··· 11 11 model = "NVIDIA Tegra30 Cardhu A04 (A05, A06, A07) evaluation board"; 12 12 compatible = "nvidia,cardhu-a04", "nvidia,cardhu", "nvidia,tegra30"; 13 13 14 14 - sdhci@78000400 { 14 14 + mmc@78000400 { 15 15 status = "okay"; 16 16 power-gpios = <&gpio TEGRA_GPIO(D, 3) GPIO_ACTIVE_HIGH>; 17 17 bus-width = <4>;

+2 -2

arch/arm/boot/dts/tegra30-cardhu.dtsi

reviewed

··· 384 384 }; 385 385 }; 386 386 387 387 - sdhci@78000000 { 387 387 + mmc@78000000 { 388 388 status = "okay"; 389 389 cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>; 390 390 wp-gpios = <&gpio TEGRA_GPIO(T, 3) GPIO_ACTIVE_HIGH>; ··· 392 392 bus-width = <4>; 393 393 }; 394 394 395 395 - sdhci@78000600 { 395 395 + mmc@78000600 { 396 396 status = "okay"; 397 397 bus-width = <8>; 398 398 non-removable;

+1 -1

arch/arm/boot/dts/tegra30-colibri-eval-v3.dts

reviewed

··· 98 98 }; 99 99 100 100 /* SD/MMC */ 101 101 - sdhci@78000200 { 101 101 + mmc@78000200 { 102 102 status = "okay"; 103 103 bus-width = <4>; 104 104 cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>; /* MMCD */

+1 -1

arch/arm/boot/dts/tegra30-colibri.dtsi

reviewed

··· 933 933 }; 934 934 935 935 /* eMMC */ 936 936 - sdhci@78000600 { 936 936 + mmc@78000600 { 937 937 status = "okay"; 938 938 bus-width = <8>; 939 939 non-removable;

+4 -4

arch/arm/boot/dts/tegra30.dtsi

reviewed

··· 853 853 }; 854 854 }; 855 855 856 856 - sdhci@78000000 { 856 856 + mmc@78000000 { 857 857 compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci"; 858 858 reg = <0x78000000 0x200>; 859 859 interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>; ··· 863 863 status = "disabled"; 864 864 }; 865 865 866 866 - sdhci@78000200 { 866 866 + mmc@78000200 { 867 867 compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci"; 868 868 reg = <0x78000200 0x200>; 869 869 interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; ··· 873 873 status = "disabled"; 874 874 }; 875 875 876 876 - sdhci@78000400 { 876 876 + mmc@78000400 { 877 877 compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci"; 878 878 reg = <0x78000400 0x200>; 879 879 interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>; ··· 883 883 status = "disabled"; 884 884 }; 885 885 886 886 - sdhci@78000600 { 886 886 + mmc@78000600 { 887 887 compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci"; 888 888 reg = <0x78000600 0x200>; 889 889 interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;