Skip to content

Commit 8705ed2

Browse files
committed
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/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 5b75f16 + 0b4edf1 commit 8705ed2

19 files changed

+22
-26
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@
369369
&mmc2 {
370370
status = "okay";
371371
vmmc-supply = <&wl12xx_vmmc>;
372-
ti,non-removable;
372+
non-removable;
373373
bus-width = <4>;
374374
cap-power-off-card;
375375
pinctrl-names = "default";

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
pinctrl-0 = <&emmc_pins>;
2323
bus-width = <8>;
2424
status = "okay";
25+
non-removable;
2526
};
2627

2728
&am33xx_pinmux {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
bus-width = <4>;
7676
non-removable;
7777
cap-power-off-card;
78-
ti,needs-special-hs-handling;
7978
keep-power-in-suspend;
8079
pinctrl-names = "default";
8180
pinctrl-0 = <&mmc3_pins &wl18xx_pins>;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,6 @@
367367
bus-width = <4>;
368368
non-removable;
369369
cap-power-off-card;
370-
ti,needs-special-hs-handling;
371370
keep-power-in-suspend;
372371
pinctrl-names = "default";
373372
pinctrl-0 = <&mmc3_pins &wl18xx_pins>;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
bus-width = <4>;
7676
non-removable;
7777
cap-power-off-card;
78-
ti,needs-special-hs-handling;
7978
keep-power-in-suspend;
8079
pinctrl-names = "default";
8180
pinctrl-0 = <&mmc3_pins &wl18xx_pins>;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -743,8 +743,7 @@
743743
bus-width = <4>;
744744
pinctrl-names = "default";
745745
pinctrl-0 = <&mmc3_pins &wlan_pins>;
746-
ti,non-removable;
747-
ti,needs-special-hs-handling;
746+
non-removable;
748747
cap-power-off-card;
749748
keep-power-in-suspend;
750749

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@
655655
&mmc2 {
656656
status = "okay";
657657
vmmc-supply = <&wl12xx_vmmc>;
658-
ti,non-removable;
658+
non-removable;
659659
bus-width = <4>;
660660
cap-power-off-card;
661661
keep-power-in-suspend;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@
339339
pinctrl-0 = <&emmc_pins>;
340340
vmmc-supply = <&vmmcsd_fixed>;
341341
bus-width = <8>;
342-
ti,non-removable;
342+
non-removable;
343343
status = "okay";
344344
};
345345

arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
vmmc-supply = <&vmmcsd_fixed>;
160160
bus-width = <8>;
161161
pinctrl-0 = <&mmc1_pins_default>;
162-
ti,non-removable;
162+
non-removable;
163163
status = "okay";
164164
};
165165

arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@
451451
vmmc-supply = <&vmmcsd_fixed>;
452452
bus-width = <8>;
453453
pinctrl-0 = <&mmc2_pins_default>;
454-
ti,non-removable;
454+
non-removable;
455455
status = "okay";
456456
};
457457

0 commit comments

Comments
 (0)