tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'omap-for-v5.8/dt-missed-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/omap-fixes

Missed sdhci patch for am3 and am4

I forgot to send a pull request earlier for converting am3 and am4 to
use sdhci-omap driver instead of the old omap_hsmmc driver.

There was a display subsystem related suspend and resume regression found
recently and looks like I forgot to send a pull request for this patch
while debugging the regression. This patch has been tested without the
display subsystem, and has been in Linux next for several weeks now, so
would be good to have merged for v5.8.

* tag 'omap-for-v5.8/dt-missed-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: dts: Move am33xx and am43xx mmc nodes to sdhci-omap driver

Link: https://lore.kernel.org/r/pull-1591637467-607254@atomide.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann 8705ed2f 5b75f16f

options
unified split
Changed files
+22 -26
arch
arm
boot
dts
am335x-baltos.dtsi
am335x-boneblack-common.dtsi
am335x-boneblack-wireless.dts
am335x-boneblue.dts
am335x-bonegreen-wireless.dts
am335x-evm.dts
am335x-evmsk.dts
am335x-lxm.dts
am335x-moxa-uc-2100-common.dtsi
am335x-moxa-uc-8100-me-t.dts
am335x-pepper.dts
am335x-phycore-som.dtsi
am33xx-l4.dtsi
am33xx.dtsi
am4372.dtsi
am437x-cm-t43.dts
am437x-gp-evm.dts
am437x-l4.dtsi
am437x-sk-evm.dts
+1 -1
arch/arm/boot/dts/am335x-baltos.dtsi
··· 369 369 &mmc2 { 370 370 status = "okay"; 371 371 vmmc-supply = <&wl12xx_vmmc>; 372 - ti,non-removable; 372 + non-removable; 373 373 bus-width = <4>; 374 374 cap-power-off-card; 375 375 pinctrl-names = "default";
+1
arch/arm/boot/dts/am335x-boneblack-common.dtsi
··· 22 22 pinctrl-0 = <&emmc_pins>; 23 23 bus-width = <8>; 24 24 status = "okay"; 25 + non-removable; 25 26 }; 26 27 27 28 &am33xx_pinmux {
-1
arch/arm/boot/dts/am335x-boneblack-wireless.dts
··· 75 75 bus-width = <4>; 76 76 non-removable; 77 77 cap-power-off-card; 78 - ti,needs-special-hs-handling; 79 78 keep-power-in-suspend; 80 79 pinctrl-names = "default"; 81 80 pinctrl-0 = <&mmc3_pins &wl18xx_pins>;
-1
arch/arm/boot/dts/am335x-boneblue.dts
··· 367 367 bus-width = <4>; 368 368 non-removable; 369 369 cap-power-off-card; 370 - ti,needs-special-hs-handling; 371 370 keep-power-in-suspend; 372 371 pinctrl-names = "default"; 373 372 pinctrl-0 = <&mmc3_pins &wl18xx_pins>;
-1
arch/arm/boot/dts/am335x-bonegreen-wireless.dts
··· 75 75 bus-width = <4>; 76 76 non-removable; 77 77 cap-power-off-card; 78 - ti,needs-special-hs-handling; 79 78 keep-power-in-suspend; 80 79 pinctrl-names = "default"; 81 80 pinctrl-0 = <&mmc3_pins &wl18xx_pins>;
+1 -2
arch/arm/boot/dts/am335x-evm.dts
··· 743 743 bus-width = <4>; 744 744 pinctrl-names = "default"; 745 745 pinctrl-0 = <&mmc3_pins &wlan_pins>; 746 - ti,non-removable; 747 - ti,needs-special-hs-handling; 746 + non-removable; 748 747 cap-power-off-card; 749 748 keep-power-in-suspend; 750 749
+1 -1
arch/arm/boot/dts/am335x-evmsk.dts
··· 655 655 &mmc2 { 656 656 status = "okay"; 657 657 vmmc-supply = <&wl12xx_vmmc>; 658 - ti,non-removable; 658 + non-removable; 659 659 bus-width = <4>; 660 660 cap-power-off-card; 661 661 keep-power-in-suspend;
+1 -1
arch/arm/boot/dts/am335x-lxm.dts
··· 339 339 pinctrl-0 = <&emmc_pins>; 340 340 vmmc-supply = <&vmmcsd_fixed>; 341 341 bus-width = <8>; 342 - ti,non-removable; 342 + non-removable; 343 343 status = "okay"; 344 344 }; 345 345
+1 -1
arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi
··· 159 159 vmmc-supply = <&vmmcsd_fixed>; 160 160 bus-width = <8>; 161 161 pinctrl-0 = <&mmc1_pins_default>; 162 - ti,non-removable; 162 + non-removable; 163 163 status = "okay"; 164 164 }; 165 165
+1 -1
arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts
··· 451 451 vmmc-supply = <&vmmcsd_fixed>; 452 452 bus-width = <8>; 453 453 pinctrl-0 = <&mmc2_pins_default>; 454 - ti,non-removable; 454 + non-removable; 455 455 status = "okay"; 456 456 }; 457 457
+2 -2
arch/arm/boot/dts/am335x-pepper.dts
··· 341 341 pinctrl-0 = <&emmc_pins>; 342 342 vmmc-supply = <&ldo3_reg>; 343 343 bus-width = <8>; 344 - ti,non-removable; 344 + non-removable; 345 345 }; 346 346 347 347 &mmc3 { ··· 351 351 pinctrl-0 = <&wireless_pins>; 352 352 vmmmc-supply = <&v3v3c_reg>; 353 353 bus-width = <4>; 354 - ti,non-removable; 354 + non-removable; 355 355 dmas = <&edma_xbar 12 0 1 356 356 &edma_xbar 13 0 2>; 357 357 dma-names = "tx", "rx";
+1 -1
arch/arm/boot/dts/am335x-phycore-som.dtsi
··· 69 69 pinctrl-0 = <&emmc_pins>; 70 70 vmmc-supply = <&vmmc_reg>; 71 71 bus-width = <8>; 72 - ti,non-removable; 72 + non-removable; 73 73 status = "disabled"; 74 74 }; 75 75
+2 -4
arch/arm/boot/dts/am33xx-l4.dtsi
··· 1335 1335 ranges = <0x0 0x60000 0x1000>; 1336 1336 1337 1337 mmc1: mmc@0 { 1338 - compatible = "ti,omap4-hsmmc"; 1339 - ti,dual-volt; 1338 + compatible = "ti,am335-sdhci"; 1340 1339 ti,needs-special-reset; 1341 - ti,needs-special-hs-handling; 1342 1340 dmas = <&edma_xbar 24 0 0 1343 1341 &edma_xbar 25 0 0>; 1344 1342 dma-names = "tx", "rx"; ··· 1814 1816 ranges = <0x0 0xd8000 0x1000>; 1815 1817 1816 1818 mmc2: mmc@0 { 1817 - compatible = "ti,omap4-hsmmc"; 1819 + compatible = "ti,am335-sdhci"; 1818 1820 ti,needs-special-reset; 1819 1821 dmas = <&edma 2 0 1820 1822 &edma 3 0>;
+2 -1
arch/arm/boot/dts/am33xx.dtsi
··· 322 322 ranges = <0x0 0x47810000 0x1000>; 323 323 324 324 mmc3: mmc@0 { 325 - compatible = "ti,omap4-hsmmc"; 325 + compatible = "ti,am335-sdhci"; 326 326 ti,needs-special-reset; 327 327 interrupts = <29>; 328 328 reg = <0x0 0x1000>; 329 + status = "disabled"; 329 330 }; 330 331 }; 331 332
+2 -1
arch/arm/boot/dts/am4372.dtsi
··· 316 316 ranges = <0x0 0x47810000 0x1000>; 317 317 318 318 mmc3: mmc@0 { 319 - compatible = "ti,omap4-hsmmc"; 319 + compatible = "ti,am437-sdhci"; 320 320 ti,needs-special-reset; 321 321 interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; 322 322 reg = <0x0 0x1000>; 323 + status = "disabled"; 323 324 }; 324 325 }; 325 326
+1 -1
arch/arm/boot/dts/am437x-cm-t43.dts
··· 291 291 pinctrl-0 = <&emmc_pins>; 292 292 vmmc-supply = <&vmmc_3v3>; 293 293 bus-width = <8>; 294 - ti,non-removable; 294 + non-removable; 295 295 }; 296 296 297 297 &spi0 {
+2 -2
arch/arm/boot/dts/am437x-gp-evm.dts
··· 853 853 pinctrl-names = "default", "sleep"; 854 854 pinctrl-0 = <&emmc_pins_default>; 855 855 pinctrl-1 = <&emmc_pins_sleep>; 856 - ti,non-removable; 856 + non-removable; 857 857 }; 858 858 859 859 &mmc3 { ··· 870 870 pinctrl-1 = <&mmc3_pins_sleep>; 871 871 cap-power-off-card; 872 872 keep-power-in-suspend; 873 - ti,non-removable; 873 + non-removable; 874 874 875 875 #address-cells = <1>; 876 876 #size-cells = <0>;
+2 -3
arch/arm/boot/dts/am437x-l4.dtsi
··· 1083 1083 ranges = <0x0 0x60000 0x1000>; 1084 1084 1085 1085 mmc1: mmc@0 { 1086 - compatible = "ti,omap4-hsmmc"; 1086 + compatible = "ti,am437-sdhci"; 1087 1087 reg = <0x0 0x1000>; 1088 - ti,dual-volt; 1089 1088 ti,needs-special-reset; 1090 1089 dmas = <&edma 24 0>, 1091 1090 <&edma 25 0>; ··· 1597 1598 ranges = <0x0 0xd8000 0x1000>; 1598 1599 1599 1600 mmc2: mmc@0 { 1600 - compatible = "ti,omap4-hsmmc"; 1601 + compatible = "ti,am437-sdhci"; 1601 1602 reg = <0x0 0x1000>; 1602 1603 ti,needs-special-reset; 1603 1604 dmas = <&edma 2 0>,
+1 -1
arch/arm/boot/dts/am437x-sk-evm.dts
··· 703 703 pinctrl-1 = <&mmc3_pins_sleep>; 704 704 cap-power-off-card; 705 705 keep-power-in-suspend; 706 - ti,non-removable; 706 + non-removable; 707 707 708 708 #address-cells = <1>; 709 709 #size-cells = <0>;