Commit 8705ed2f authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'omap-for-v5.8/dt-missed-signed' of...

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.comSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 5b75f16f 0b4edf11
...@@ -369,7 +369,7 @@ &mmc1 { ...@@ -369,7 +369,7 @@ &mmc1 {
&mmc2 { &mmc2 {
status = "okay"; status = "okay";
vmmc-supply = <&wl12xx_vmmc>; vmmc-supply = <&wl12xx_vmmc>;
ti,non-removable; non-removable;
bus-width = <4>; bus-width = <4>;
cap-power-off-card; cap-power-off-card;
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -22,6 +22,7 @@ &mmc2 { ...@@ -22,6 +22,7 @@ &mmc2 {
pinctrl-0 = <&emmc_pins>; pinctrl-0 = <&emmc_pins>;
bus-width = <8>; bus-width = <8>;
status = "okay"; status = "okay";
non-removable;
}; };
&am33xx_pinmux { &am33xx_pinmux {
......
...@@ -75,7 +75,6 @@ &mmc3 { ...@@ -75,7 +75,6 @@ &mmc3 {
bus-width = <4>; bus-width = <4>;
non-removable; non-removable;
cap-power-off-card; cap-power-off-card;
ti,needs-special-hs-handling;
keep-power-in-suspend; keep-power-in-suspend;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins &wl18xx_pins>; pinctrl-0 = <&mmc3_pins &wl18xx_pins>;
......
...@@ -367,7 +367,6 @@ &mmc3 { ...@@ -367,7 +367,6 @@ &mmc3 {
bus-width = <4>; bus-width = <4>;
non-removable; non-removable;
cap-power-off-card; cap-power-off-card;
ti,needs-special-hs-handling;
keep-power-in-suspend; keep-power-in-suspend;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins &wl18xx_pins>; pinctrl-0 = <&mmc3_pins &wl18xx_pins>;
......
...@@ -75,7 +75,6 @@ &mmc3 { ...@@ -75,7 +75,6 @@ &mmc3 {
bus-width = <4>; bus-width = <4>;
non-removable; non-removable;
cap-power-off-card; cap-power-off-card;
ti,needs-special-hs-handling;
keep-power-in-suspend; keep-power-in-suspend;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins &wl18xx_pins>; pinctrl-0 = <&mmc3_pins &wl18xx_pins>;
......
...@@ -743,8 +743,7 @@ xbar-event-map element */ ...@@ -743,8 +743,7 @@ xbar-event-map element */
bus-width = <4>; bus-width = <4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins &wlan_pins>; pinctrl-0 = <&mmc3_pins &wlan_pins>;
ti,non-removable; non-removable;
ti,needs-special-hs-handling;
cap-power-off-card; cap-power-off-card;
keep-power-in-suspend; keep-power-in-suspend;
......
...@@ -655,7 +655,7 @@ &gpio0 { ...@@ -655,7 +655,7 @@ &gpio0 {
&mmc2 { &mmc2 {
status = "okay"; status = "okay";
vmmc-supply = <&wl12xx_vmmc>; vmmc-supply = <&wl12xx_vmmc>;
ti,non-removable; non-removable;
bus-width = <4>; bus-width = <4>;
cap-power-off-card; cap-power-off-card;
keep-power-in-suspend; keep-power-in-suspend;
......
...@@ -339,7 +339,7 @@ &mmc2 { ...@@ -339,7 +339,7 @@ &mmc2 {
pinctrl-0 = <&emmc_pins>; pinctrl-0 = <&emmc_pins>;
vmmc-supply = <&vmmcsd_fixed>; vmmc-supply = <&vmmcsd_fixed>;
bus-width = <8>; bus-width = <8>;
ti,non-removable; non-removable;
status = "okay"; status = "okay";
}; };
...@@ -159,7 +159,7 @@ &mmc2 { ...@@ -159,7 +159,7 @@ &mmc2 {
vmmc-supply = <&vmmcsd_fixed>; vmmc-supply = <&vmmcsd_fixed>;
bus-width = <8>; bus-width = <8>;
pinctrl-0 = <&mmc1_pins_default>; pinctrl-0 = <&mmc1_pins_default>;
ti,non-removable; non-removable;
status = "okay"; status = "okay";
}; };
......
...@@ -451,7 +451,7 @@ &mmc3 { ...@@ -451,7 +451,7 @@ &mmc3 {
vmmc-supply = <&vmmcsd_fixed>; vmmc-supply = <&vmmcsd_fixed>;
bus-width = <8>; bus-width = <8>;
pinctrl-0 = <&mmc2_pins_default>; pinctrl-0 = <&mmc2_pins_default>;
ti,non-removable; non-removable;
status = "okay"; status = "okay";
}; };
......
...@@ -341,7 +341,7 @@ &mmc2 { ...@@ -341,7 +341,7 @@ &mmc2 {
pinctrl-0 = <&emmc_pins>; pinctrl-0 = <&emmc_pins>;
vmmc-supply = <&ldo3_reg>; vmmc-supply = <&ldo3_reg>;
bus-width = <8>; bus-width = <8>;
ti,non-removable; non-removable;
}; };
&mmc3 { &mmc3 {
...@@ -351,7 +351,7 @@ &mmc3 { ...@@ -351,7 +351,7 @@ &mmc3 {
pinctrl-0 = <&wireless_pins>; pinctrl-0 = <&wireless_pins>;
vmmmc-supply = <&v3v3c_reg>; vmmmc-supply = <&v3v3c_reg>;
bus-width = <4>; bus-width = <4>;
ti,non-removable; non-removable;
dmas = <&edma_xbar 12 0 1 dmas = <&edma_xbar 12 0 1
&edma_xbar 13 0 2>; &edma_xbar 13 0 2>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
......
...@@ -69,7 +69,7 @@ &mmc2 { ...@@ -69,7 +69,7 @@ &mmc2 {
pinctrl-0 = <&emmc_pins>; pinctrl-0 = <&emmc_pins>;
vmmc-supply = <&vmmc_reg>; vmmc-supply = <&vmmc_reg>;
bus-width = <8>; bus-width = <8>;
ti,non-removable; non-removable;
status = "disabled"; status = "disabled";
}; };
......
...@@ -1335,10 +1335,8 @@ SYSC_OMAP2_SOFTRESET | ...@@ -1335,10 +1335,8 @@ SYSC_OMAP2_SOFTRESET |
ranges = <0x0 0x60000 0x1000>; ranges = <0x0 0x60000 0x1000>;
mmc1: mmc@0 { mmc1: mmc@0 {
compatible = "ti,omap4-hsmmc"; compatible = "ti,am335-sdhci";
ti,dual-volt;
ti,needs-special-reset; ti,needs-special-reset;
ti,needs-special-hs-handling;
dmas = <&edma_xbar 24 0 0 dmas = <&edma_xbar 24 0 0
&edma_xbar 25 0 0>; &edma_xbar 25 0 0>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
...@@ -1816,7 +1814,7 @@ SYSC_OMAP2_SOFTRESET | ...@@ -1816,7 +1814,7 @@ SYSC_OMAP2_SOFTRESET |
ranges = <0x0 0xd8000 0x1000>; ranges = <0x0 0xd8000 0x1000>;
mmc2: mmc@0 { mmc2: mmc@0 {
compatible = "ti,omap4-hsmmc"; compatible = "ti,am335-sdhci";
ti,needs-special-reset; ti,needs-special-reset;
dmas = <&edma 2 0 dmas = <&edma 2 0
&edma 3 0>; &edma 3 0>;
......
...@@ -322,10 +322,11 @@ SYSC_OMAP2_SOFTRESET | ...@@ -322,10 +322,11 @@ SYSC_OMAP2_SOFTRESET |
ranges = <0x0 0x47810000 0x1000>; ranges = <0x0 0x47810000 0x1000>;
mmc3: mmc@0 { mmc3: mmc@0 {
compatible = "ti,omap4-hsmmc"; compatible = "ti,am335-sdhci";
ti,needs-special-reset; ti,needs-special-reset;
interrupts = <29>; interrupts = <29>;
reg = <0x0 0x1000>; reg = <0x0 0x1000>;
status = "disabled";
}; };
}; };
......
...@@ -316,10 +316,11 @@ SYSC_OMAP2_SOFTRESET | ...@@ -316,10 +316,11 @@ SYSC_OMAP2_SOFTRESET |
ranges = <0x0 0x47810000 0x1000>; ranges = <0x0 0x47810000 0x1000>;
mmc3: mmc@0 { mmc3: mmc@0 {
compatible = "ti,omap4-hsmmc"; compatible = "ti,am437-sdhci";
ti,needs-special-reset; ti,needs-special-reset;
interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
reg = <0x0 0x1000>; reg = <0x0 0x1000>;
status = "disabled";
}; };
}; };
......
...@@ -291,7 +291,7 @@ &mmc2 { ...@@ -291,7 +291,7 @@ &mmc2 {
pinctrl-0 = <&emmc_pins>; pinctrl-0 = <&emmc_pins>;
vmmc-supply = <&vmmc_3v3>; vmmc-supply = <&vmmc_3v3>;
bus-width = <8>; bus-width = <8>;
ti,non-removable; non-removable;
}; };
&spi0 { &spi0 {
......
...@@ -853,7 +853,7 @@ &mmc2 { ...@@ -853,7 +853,7 @@ &mmc2 {
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&emmc_pins_default>; pinctrl-0 = <&emmc_pins_default>;
pinctrl-1 = <&emmc_pins_sleep>; pinctrl-1 = <&emmc_pins_sleep>;
ti,non-removable; non-removable;
}; };
&mmc3 { &mmc3 {
...@@ -870,7 +870,7 @@ xbar-event-map element */ ...@@ -870,7 +870,7 @@ xbar-event-map element */
pinctrl-1 = <&mmc3_pins_sleep>; pinctrl-1 = <&mmc3_pins_sleep>;
cap-power-off-card; cap-power-off-card;
keep-power-in-suspend; keep-power-in-suspend;
ti,non-removable; non-removable;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
......
...@@ -1083,9 +1083,8 @@ SYSC_OMAP2_SOFTRESET | ...@@ -1083,9 +1083,8 @@ SYSC_OMAP2_SOFTRESET |
ranges = <0x0 0x60000 0x1000>; ranges = <0x0 0x60000 0x1000>;
mmc1: mmc@0 { mmc1: mmc@0 {
compatible = "ti,omap4-hsmmc"; compatible = "ti,am437-sdhci";
reg = <0x0 0x1000>; reg = <0x0 0x1000>;
ti,dual-volt;
ti,needs-special-reset; ti,needs-special-reset;
dmas = <&edma 24 0>, dmas = <&edma 24 0>,
<&edma 25 0>; <&edma 25 0>;
...@@ -1598,7 +1597,7 @@ SYSC_OMAP2_SOFTRESET | ...@@ -1598,7 +1597,7 @@ SYSC_OMAP2_SOFTRESET |
ranges = <0x0 0xd8000 0x1000>; ranges = <0x0 0xd8000 0x1000>;
mmc2: mmc@0 { mmc2: mmc@0 {
compatible = "ti,omap4-hsmmc"; compatible = "ti,am437-sdhci";
reg = <0x0 0x1000>; reg = <0x0 0x1000>;
ti,needs-special-reset; ti,needs-special-reset;
dmas = <&edma 2 0>, dmas = <&edma 2 0>,
......
...@@ -703,7 +703,7 @@ &mmc3 { ...@@ -703,7 +703,7 @@ &mmc3 {
pinctrl-1 = <&mmc3_pins_sleep>; pinctrl-1 = <&mmc3_pins_sleep>;
cap-power-off-card; cap-power-off-card;
keep-power-in-suspend; keep-power-in-suspend;
ti,non-removable; non-removable;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment