Skip to content

Commit f7db192

Browse files
torvaldstorvalds
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

‎arch/arm/boot/dts/am335x-pepper.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@
341341
pinctrl-0 = <&emmc_pins>;
342342
vmmc-supply = <&ldo3_reg>;
343343
bus-width = <8>;
344-
ti,non-removable;
344+
non-removable;
345345
};
346346

347347
&mmc3 {
@@ -351,7 +351,7 @@
351351
pinctrl-0 = <&wireless_pins>;
352352
vmmmc-supply = <&v3v3c_reg>;
353353
bus-width = <4>;
354-
ti,non-removable;
354+
non-removable;
355355
dmas = <&edma_xbar 12 0 1
356356
&edma_xbar 13 0 2>;
357357
dma-names = "tx", "rx";

‎arch/arm/boot/dts/am335x-phycore-som.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
pinctrl-0 = <&emmc_pins>;
7070
vmmc-supply = <&vmmc_reg>;
7171
bus-width = <8>;
72-
ti,non-removable;
72+
non-removable;
7373
status = "disabled";
7474
};
7575

‎arch/arm/boot/dts/am335x-pocketbeagle.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@
8888
AM33XX_PADCONF(AM335X_PIN_MMC0_DAT3, PIN_INPUT_PULLUP, MUX_MODE0)
8989
AM33XX_PADCONF(AM335X_PIN_MMC0_CMD, PIN_INPUT_PULLUP, MUX_MODE0)
9090
AM33XX_PADCONF(AM335X_PIN_MMC0_CLK, PIN_INPUT_PULLUP, MUX_MODE0)
91-
AM33XX_PADCONF(AM335X_PIN_MCASP0_ACLKR, PIN_INPUT, MUX_MODE4) /* (B12) mcasp0_aclkr.mmc0_sdwp */
9291
>;
9392
};
9493

‎arch/arm/boot/dts/am33xx-l4.dtsi

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1335,10 +1335,8 @@
13351335
ranges = <0x0 0x60000 0x1000>;
13361336

13371337
mmc1: mmc@0 {
1338-
compatible = "ti,omap4-hsmmc";
1339-
ti,dual-volt;
1338+
compatible = "ti,am335-sdhci";
13401339
ti,needs-special-reset;
1341-
ti,needs-special-hs-handling;
13421340
dmas = <&edma_xbar 24 0 0
13431341
&edma_xbar 25 0 0>;
13441342
dma-names = "tx", "rx";
@@ -1816,7 +1814,7 @@
18161814
ranges = <0x0 0xd8000 0x1000>;
18171815

18181816
mmc2: mmc@0 {
1819-
compatible = "ti,omap4-hsmmc";
1817+
compatible = "ti,am335-sdhci";
18201818
ti,needs-special-reset;
18211819
dmas = <&edma 2 0
18221820
&edma 3 0>;

‎arch/arm/boot/dts/am33xx.dtsi

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -322,10 +322,11 @@
322322
ranges = <0x0 0x47810000 0x1000>;
323323

324324
mmc3: mmc@0 {
325-
compatible = "ti,omap4-hsmmc";
325+
compatible = "ti,am335-sdhci";
326326
ti,needs-special-reset;
327327
interrupts = <29>;
328328
reg = <0x0 0x1000>;
329+
status = "disabled";
329330
};
330331
};
331332

@@ -335,7 +336,7 @@
335336
<0x47400010 0x4>;
336337
reg-names = "rev", "sysc";
337338
ti,sysc-mask = <(SYSC_OMAP4_FREEEMU |
338-
SYSC_OMAP2_SOFTRESET)>;
339+
SYSC_OMAP4_SOFTRESET)>;
339340
ti,sysc-midle = <SYSC_IDLE_FORCE>,
340341
<SYSC_IDLE_NO>,
341342
<SYSC_IDLE_SMART>;
@@ -347,7 +348,7 @@
347348
clock-names = "fck";
348349
#address-cells = <1>;
349350
#size-cells = <1>;
350-
ranges = <0x0 0x47400000 0x5000>;
351+
ranges = <0x0 0x47400000 0x8000>;
351352

352353
usb0_phy: usb-phy@1300 {
353354
compatible = "ti,am335x-usb-phy";

‎arch/arm/boot/dts/am4372.dtsi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,10 +316,11 @@
316316
ranges = <0x0 0x47810000 0x1000>;
317317

318318
mmc3: mmc@0 {
319-
compatible = "ti,omap4-hsmmc";
319+
compatible = "ti,am437-sdhci";
320320
ti,needs-special-reset;
321321
interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
322322
reg = <0x0 0x1000>;
323+
status = "disabled";
323324
};
324325
};
325326

‎arch/arm/boot/dts/am437x-cm-t43.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@
291291
pinctrl-0 = <&emmc_pins>;
292292
vmmc-supply = <&vmmc_3v3>;
293293
bus-width = <8>;
294-
ti,non-removable;
294+
non-removable;
295295
};
296296

297297
&spi0 {

‎arch/arm/boot/dts/am437x-gp-evm.dts

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -91,22 +91,6 @@
9191

9292
backlight = <&lcd_bl>;
9393

94-
panel-timing {
95-
clock-frequency = <33000000>;
96-
hactive = <800>;
97-
vactive = <480>;
98-
hfront-porch = <210>;
99-
hback-porch = <16>;
100-
hsync-len = <30>;
101-
vback-porch = <10>;
102-
vfront-porch = <22>;
103-
vsync-len = <13>;
104-
hsync-active = <0>;
105-
vsync-active = <0>;
106-
de-active = <1>;
107-
pixelclk-active = <1>;
108-
};
109-
11094
port {
11195
lcd_in: endpoint {
11296
remote-endpoint = <&dpi_out>;
@@ -869,7 +853,7 @@
869853
pinctrl-names = "default", "sleep";
870854
pinctrl-0 = <&emmc_pins_default>;
871855
pinctrl-1 = <&emmc_pins_sleep>;
872-
ti,non-removable;
856+
non-removable;
873857
};
874858

875859
&mmc3 {
@@ -886,7 +870,7 @@
886870
pinctrl-1 = <&mmc3_pins_sleep>;
887871
cap-power-off-card;
888872
keep-power-in-suspend;
889-
ti,non-removable;
873+
non-removable;
890874

891875
#address-cells = <1>;
892876
#size-cells = <0>;

‎arch/arm/boot/dts/am437x-l4.dtsi

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,9 +1083,8 @@
10831083
ranges = <0x0 0x60000 0x1000>;
10841084

10851085
mmc1: mmc@0 {
1086-
compatible = "ti,omap4-hsmmc";
1086+
compatible = "ti,am437-sdhci";
10871087
reg = <0x0 0x1000>;
1088-
ti,dual-volt;
10891088
ti,needs-special-reset;
10901089
dmas = <&edma 24 0>,
10911090
<&edma 25 0>;
@@ -1598,7 +1597,7 @@
15981597
ranges = <0x0 0xd8000 0x1000>;
15991598

16001599
mmc2: mmc@0 {
1601-
compatible = "ti,omap4-hsmmc";
1600+
compatible = "ti,am437-sdhci";
16021601
reg = <0x0 0x1000>;
16031602
ti,needs-special-reset;
16041603
dmas = <&edma 2 0>,

‎arch/arm/boot/dts/am437x-sk-evm.dts

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -134,22 +134,6 @@
134134

135135
enable-gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
136136

137-
panel-timing {
138-
clock-frequency = <9000000>;
139-
hactive = <480>;
140-
vactive = <272>;
141-
hfront-porch = <2>;
142-
hback-porch = <2>;
143-
hsync-len = <41>;
144-
vfront-porch = <2>;
145-
vback-porch = <2>;
146-
vsync-len = <10>;
147-
hsync-active = <0>;
148-
vsync-active = <0>;
149-
de-active = <1>;
150-
pixelclk-active = <1>;
151-
};
152-
153137
port {
154138
lcd_in: endpoint {
155139
remote-endpoint = <&dpi_out>;
@@ -719,7 +703,7 @@
719703
pinctrl-1 = <&mmc3_pins_sleep>;
720704
cap-power-off-card;
721705
keep-power-in-suspend;
722-
ti,non-removable;
706+
non-removable;
723707

724708
#address-cells = <1>;
725709
#size-cells = <0>;

‎arch/arm/boot/dts/am43x-epos-evm.dts

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,6 @@
4747

4848
backlight = <&lcd_bl>;
4949

50-
panel-timing {
51-
clock-frequency = <33000000>;
52-
hactive = <800>;
53-
vactive = <480>;
54-
hfront-porch = <210>;
55-
hback-porch = <16>;
56-
hsync-len = <30>;
57-
vback-porch = <10>;
58-
vfront-porch = <22>;
59-
vsync-len = <13>;
60-
hsync-active = <0>;
61-
vsync-active = <0>;
62-
de-active = <1>;
63-
pixelclk-active = <1>;
64-
};
65-
6650
port {
6751
lcd_in: endpoint {
6852
remote-endpoint = <&dpi_out>;

‎arch/arm/boot/dts/am5729-beagleboneai.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@
505505

506506
&cpsw_emac0 {
507507
phy-handle = <&phy0>;
508-
phy-mode = "rgmii";
508+
phy-mode = "rgmii-rxid";
509509
};
510510

511511
&ocp {

‎arch/arm/boot/dts/dra7-evm-common.dtsi

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -245,26 +245,6 @@
245245
rx-num-evt = <32>;
246246
};
247247

248-
&mailbox5 {
249-
status = "okay";
250-
mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {
251-
status = "okay";
252-
};
253-
mbox_dsp1_ipc3x: mbox_dsp1_ipc3x {
254-
status = "okay";
255-
};
256-
};
257-
258-
&mailbox6 {
259-
status = "okay";
260-
mbox_ipu2_ipc3x: mbox_ipu2_ipc3x {
261-
status = "okay";
262-
};
263-
mbox_dsp2_ipc3x: mbox_dsp2_ipc3x {
264-
status = "okay";
265-
};
266-
};
267-
268248
&pcie1_rc {
269249
status = "okay";
270250
};

0 commit comments

Comments
 (0)