Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0c69c72 authored by Faiz Abbas's avatar Faiz Abbas Committed by Greg Kroah-Hartman
Browse files

ARM: dts: Move am33xx and am43xx mmc nodes to sdhci-omap driver 



[ Upstream commit 0b4edf111870b83ea77b1d7e16b8ceac29f9f388 ]

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: default avatarFaiz Abbas <faiz_abbas@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Stable-dep-of: 2eb502f496f7 ("ARM: dts: am33xx: Fix MMCHS0 dma properties")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d1856528

arch/arm/boot/dts/am335x-baltos.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ 
&mmc2 {

	status = "okay";

	vmmc-supply = <&wl12xx_vmmc>;

	ti,non-removable;

	non-removable;

	bus-width = <4>;

	cap-power-off-card;

	pinctrl-names = "default";

arch/arm/boot/dts/am335x-boneblack-common.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
	pinctrl-0 = <&emmc_pins>;

	bus-width = <8>;

	status = "okay";

	non-removable;

};



&am33xx_pinmux {

arch/arm/boot/dts/am335x-boneblack-wireless.dts

+0 −1
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/am335x-boneblue.dts

+0 −1
Original line number Diff line number Diff line
@@ -389,7 +389,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>;

arch/arm/boot/dts/am335x-bonegreen-wireless.dts

+0 −1
Original line number Diff line number Diff line
@@ -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>;