Skip to content

Commit

Permalink
ARM: dts: Move am33xx and am43xx mmc nodes to sdhci-omap driver
Browse files Browse the repository at this point in the history 
Move mmc nodes to be compatible with the sdhci-omap driver. The following
modifications are required for omap_hsmmc specific properties:

ti,non-removable: convert to the generic mmc non-removable
ti,needs-special-reset:  co-opted into the sdhci-omap driver
ti,dual-volt: removed. Legacy property not used in am335x or am43xx
ti,needs-special-hs-handling: removed. Legacy property not used in am335x
or am43xx

Also since the sdhci-omap driver does not support runtime PM, explicitly
disable the mmc3 instance in the dtsi.

Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
Faiz Abbas authored and Tony Lindgren committed May 19, 2020
1 parent e88ba43 commit 0b4edf1
Show file tree
Hide file tree
Showing 19 changed files with 22 additions and 26 deletions.
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/am335x-baltos.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@
&mmc2 {
status = "okay";
vmmc-supply = <&wl12xx_vmmc>;
ti,non-removable;
non-removable;
bus-width = <4>;
cap-power-off-card;
pinctrl-names = "default";
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/am335x-boneblack-common.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
pinctrl-0 = <&emmc_pins>;
bus-width = <8>;
status = "okay";
non-removable;
};

&am33xx_pinmux {
Expand Down
1 change: 0 additions & 1 deletion arch/arm/boot/dts/am335x-boneblack-wireless.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@
bus-width = <4>;
non-removable;
cap-power-off-card;
ti,needs-special-hs-handling;
keep-power-in-suspend;
pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins &wl18xx_pins>;
Expand Down
1 change: 0 additions & 1 deletion arch/arm/boot/dts/am335x-boneblue.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,6 @@
bus-width = <4>;
non-removable;
cap-power-off-card;
ti,needs-special-hs-handling;
keep-power-in-suspend;
pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins &wl18xx_pins>;
Expand Down
1 change: 0 additions & 1 deletion arch/arm/boot/dts/am335x-bonegreen-wireless.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@
bus-width = <4>;
non-removable;
cap-power-off-card;
ti,needs-special-hs-handling;
keep-power-in-suspend;
pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins &wl18xx_pins>;
Expand Down
3 changes: 1 addition & 2 deletions arch/arm/boot/dts/am335x-evm.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -743,8 +743,7 @@
bus-width = <4>;
pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins &wlan_pins>;
ti,non-removable;
ti,needs-special-hs-handling;
non-removable;
cap-power-off-card;
keep-power-in-suspend;

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/am335x-evmsk.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@
&mmc2 {
status = "okay";
vmmc-supply = <&wl12xx_vmmc>;
ti,non-removable;
non-removable;
bus-width = <4>;
cap-power-off-card;
keep-power-in-suspend;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/am335x-lxm.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@
pinctrl-0 = <&emmc_pins>;
vmmc-supply = <&vmmcsd_fixed>;
bus-width = <8>;
ti,non-removable;
non-removable;
status = "okay";
};

2 changes: 1 addition & 1 deletion arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
vmmc-supply = <&vmmcsd_fixed>;
bus-width = <8>;
pinctrl-0 = <&mmc1_pins_default>;
ti,non-removable;
non-removable;
status = "okay";
};

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@
vmmc-supply = <&vmmcsd_fixed>;
bus-width = <8>;
pinctrl-0 = <&mmc2_pins_default>;
ti,non-removable;
non-removable;
status = "okay";
};

Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/am335x-pepper.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@
pinctrl-0 = <&emmc_pins>;
vmmc-supply = <&ldo3_reg>;
bus-width = <8>;
ti,non-removable;
non-removable;
};

&mmc3 {
Expand All @@ -351,7 +351,7 @@
pinctrl-0 = <&wireless_pins>;
vmmmc-supply = <&v3v3c_reg>;
bus-width = <4>;
ti,non-removable;
non-removable;
dmas = <&edma_xbar 12 0 1
&edma_xbar 13 0 2>;
dma-names = "tx", "rx";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/am335x-phycore-som.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
pinctrl-0 = <&emmc_pins>;
vmmc-supply = <&vmmc_reg>;
bus-width = <8>;
ti,non-removable;
non-removable;
status = "disabled";
};

Expand Down
6 changes: 2 additions & 4 deletions arch/arm/boot/dts/am33xx-l4.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1337,10 +1337,8 @@
ranges = <0x0 0x60000 0x1000>;

mmc1: mmc@0 {
compatible = "ti,omap4-hsmmc";
ti,dual-volt;
compatible = "ti,am335-sdhci";
ti,needs-special-reset;
ti,needs-special-hs-handling;
dmas = <&edma_xbar 24 0 0
&edma_xbar 25 0 0>;
dma-names = "tx", "rx";
Expand Down Expand Up @@ -1818,7 +1816,7 @@
ranges = <0x0 0xd8000 0x1000>;

mmc2: mmc@0 {
compatible = "ti,omap4-hsmmc";
compatible = "ti,am335-sdhci";
ti,needs-special-reset;
dmas = <&edma 2 0
&edma 3 0>;
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/am33xx.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,10 +322,11 @@
ranges = <0x0 0x47810000 0x1000>;

mmc3: mmc@0 {
compatible = "ti,omap4-hsmmc";
compatible = "ti,am335-sdhci";
ti,needs-special-reset;
interrupts = <29>;
reg = <0x0 0x1000>;
status = "disabled";
};
};

Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/am4372.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,10 +316,11 @@
ranges = <0x0 0x47810000 0x1000>;

mmc3: mmc@0 {
compatible = "ti,omap4-hsmmc";
compatible = "ti,am437-sdhci";
ti,needs-special-reset;
interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
reg = <0x0 0x1000>;
status = "disabled";
};
};

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/am437x-cm-t43.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
pinctrl-0 = <&emmc_pins>;
vmmc-supply = <&vmmc_3v3>;
bus-width = <8>;
ti,non-removable;
non-removable;
};

&spi0 {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/am437x-gp-evm.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -869,7 +869,7 @@
pinctrl-names = "default", "sleep";
pinctrl-0 = <&emmc_pins_default>;
pinctrl-1 = <&emmc_pins_sleep>;
ti,non-removable;
non-removable;
};

&mmc3 {
Expand All @@ -886,7 +886,7 @@
pinctrl-1 = <&mmc3_pins_sleep>;
cap-power-off-card;
keep-power-in-suspend;
ti,non-removable;
non-removable;

#address-cells = <1>;
#size-cells = <0>;
Expand Down
5 changes: 2 additions & 3 deletions arch/arm/boot/dts/am437x-l4.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1086,9 +1086,8 @@
ranges = <0x0 0x60000 0x1000>;

mmc1: mmc@0 {
compatible = "ti,omap4-hsmmc";
compatible = "ti,am437-sdhci";
reg = <0x0 0x1000>;
ti,dual-volt;
ti,needs-special-reset;
dmas = <&edma 24 0>,
<&edma 25 0>;
Expand Down Expand Up @@ -1601,7 +1600,7 @@
ranges = <0x0 0xd8000 0x1000>;

mmc2: mmc@0 {
compatible = "ti,omap4-hsmmc";
compatible = "ti,am437-sdhci";
reg = <0x0 0x1000>;
ti,needs-special-reset;
dmas = <&edma 2 0>,
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/am437x-sk-evm.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@
pinctrl-1 = <&mmc3_pins_sleep>;
cap-power-off-card;
keep-power-in-suspend;
ti,non-removable;
non-removable;

#address-cells = <1>;
#size-cells = <0>;
Expand Down

0 comments on commit 0b4edf1

Please sign in to comment.