Skip to content

L
linux
Commit 0b4edf11 authored by Faiz Abbas's avatar Faiz Abbas Committed by Tony Lindgren
Browse files
Options

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

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>
parent e88ba436
Show whitespace changes
Inline Side-by-side
Showing with 22 additions and 26 deletions
arch/arm/boot/dts/am335x-baltos.dtsi
View file @ 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";
......
arch/arm/boot/dts/am335x-boneblack-common.dtsi
View file @ 0b4edf11
...@@ -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 {
......
arch/arm/boot/dts/am335x-boneblack-wireless.dts
View file @ 0b4edf11
...@@ -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>;
......
arch/arm/boot/dts/am335x-boneblue.dts
View file @ 0b4edf11
...@@ -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>;
......
arch/arm/boot/dts/am335x-bonegreen-wireless.dts
View file @ 0b4edf11
...@@ -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>;
......
arch/arm/boot/dts/am335x-evm.dts
View file @ 0b4edf11
...@@ -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;
......
arch/arm/boot/dts/am335x-evmsk.dts
View file @ 0b4edf11
...@@ -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;
......
arch/arm/boot/dts/am335x-lxm.dts
View file @ 0b4edf11
...@@ -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";
}; };
arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi
View file @ 0b4edf11
...@@ -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";
}; };
......
arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts
View file @ 0b4edf11
...@@ -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";
}; };
......
arch/arm/boot/dts/am335x-pepper.dts
View file @ 0b4edf11
...@@ -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";
......
arch/arm/boot/dts/am335x-phycore-som.dtsi
View file @ 0b4edf11
...@@ -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";
}; };
......
arch/arm/boot/dts/am33xx-l4.dtsi
View file @ 0b4edf11
...@@ -1337,10 +1337,8 @@ SYSC_OMAP2_SOFTRESET | ...@@ -1337,10 +1337,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";
...@@ -1818,7 +1816,7 @@ SYSC_OMAP2_SOFTRESET | ...@@ -1818,7 +1816,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>;
......
arch/arm/boot/dts/am33xx.dtsi
View file @ 0b4edf11
...@@ -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";
}; };
}; };
......
arch/arm/boot/dts/am4372.dtsi
View file @ 0b4edf11
...@@ -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";
}; };
}; };
......
arch/arm/boot/dts/am437x-cm-t43.dts
View file @ 0b4edf11
...@@ -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 {
......
arch/arm/boot/dts/am437x-gp-evm.dts
View file @ 0b4edf11
...@@ -869,7 +869,7 @@ &mmc2 { ...@@ -869,7 +869,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 {
...@@ -886,7 +886,7 @@ xbar-event-map element */ ...@@ -886,7 +886,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>;
......
arch/arm/boot/dts/am437x-l4.dtsi
View file @ 0b4edf11
...@@ -1086,9 +1086,8 @@ SYSC_OMAP2_SOFTRESET | ...@@ -1086,9 +1086,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>;
...@@ -1601,7 +1600,7 @@ SYSC_OMAP2_SOFTRESET | ...@@ -1601,7 +1600,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>,
......
arch/arm/boot/dts/am437x-sk-evm.dts
View file @ 0b4edf11
...@@ -719,7 +719,7 @@ &mmc3 { ...@@ -719,7 +719,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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7