Skip to content

Commit f7db192

Browse files
committed
Merge tag 'arm-omap-fixes-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM OMAP fixes from Arnd Bergmann: "The OMAP developers are particularly active at hunting down regressions, so this is a separate branch with OMAP specific fixes for v5.8: As Tony explains "The recent display subsystem (DSS) related platform data changes caused display related regressions for suspend and resume. Looks like I only tested suspend and resume before dropping the legacy platform data, and forgot to test it after dropping it. Turns out the main issue was that we no longer have platform code calling pm_runtime_suspend for DSS like we did for the legacy platform data case, and that fix is still being discussed on the dri-devel list and will get merged separately. The DSS related testing exposed a pile other other display related issues that also need fixing though": - Fix ti-sysc optional clock handling and reset status checks for devices that reset automatically in idle like DSS - Ignore ti-sysc clockactivity bit unless separately requested to avoid unexpected performance issues - Init ti-sysc framedonetv_irq to true and disable for am4 - Avoid duplicate DSS reset for legacy mode with dts data - Remove LCD timings for am4 as they cause warnings now that we're using generic panels Other OMAP changes from Tony include: - Fix omap_prm reset deassert as we still have drivers setting the pm_runtime_irq_safe() flag - Flush posted write for ti-sysc enable and disable - Fix droid4 spi related errors with spi flags - Fix am335x USB range and a typo for softreset - Fix dra7 timer nodes for clocks for IPU and DSP - Drop duplicate mailboxes after mismerge for dra7 - Prevent pocketgeagle header line signal from accidentally setting micro-SD write protection signal by removing the default mux - Fix NFSroot flakeyness after resume for duover by switching the smsc911x gpio interrupt to back to level sensitive - Fix regression for omap4 clockevent source after recent system timer changes - Yet another ethernet regression fix for the "rgmii" vs "rgmii-rxid" phy-mode - One patch to convert am3/am4 DT files to use the regular sdhci-omap driver instead of the old hsmmc driver, this was meant for the merge window but got lost in the process" * tag 'arm-omap-fixes-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (21 commits) ARM: dts: am5729: beaglebone-ai: fix rgmii phy-mode ARM: dts: Fix omap4 system timer source clocks ARM: dts: Fix duovero smsc interrupt for suspend ARM: dts: am335x-pocketbeagle: Fix mmc0 Write Protect Revert "bus: ti-sysc: Increase max softreset wait" ARM: dts: am437x-epos-evm: remove lcd timings ARM: dts: am437x-gp-evm: remove lcd timings ARM: dts: am437x-sk-evm: remove lcd timings ARM: dts: dra7-evm-common: Fix duplicate mailbox nodes ARM: dts: dra7: Fix timer nodes properly for timer_sys_ck clocks ARM: dts: Fix am33xx.dtsi ti,sysc-mask wrong softreset flag ARM: dts: Fix am33xx.dtsi USB ranges length bus: ti-sysc: Increase max softreset wait ARM: OMAP2+: Fix legacy mode dss_reset bus: ti-sysc: Fix uninitialized framedonetv_irq bus: ti-sysc: Ignore clockactivity unless specified as a quirk bus: ti-sysc: Use optional clocks on for enable and wait for softreset bit ARM: dts: omap4-droid4: Fix spi configuration and increase rate bus: ti-sysc: Flush posted write on enable and disable soc: ti: omap-prm: use atomic iopoll instead of sleeping one ...
2 parents e44b59c + d528945 commit f7db192

30 files changed

+125
-148
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)