Skip to content

Commit bc6772b

Browse files
committed
Merge tag 'amlogic-fixes-v6.2-rc-take2' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/fixes
Amlogic fixes for v6.2-rc, take2: - Change MMC controllers interrupts flag to level on all families, fixes irq loss & performance issues when cpu loaded * tag 'amlogic-fixes-v6.2-rc-take2' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux: arm64: dts: meson-gx: Make mmc host controller interrupts level-sensitive arm64: dts: meson-g12-common: Make mmc host controller interrupts level-sensitive arm64: dts: meson-axg: Make mmc host controller interrupts level-sensitive Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 89e5dd4 + 66e4535 commit bc6772b

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

arch/arm64/boot/dts/amlogic/meson-axg.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1886,7 +1886,7 @@
18861886
sd_emmc_b: sd@5000 {
18871887
compatible = "amlogic,meson-axg-mmc";
18881888
reg = <0x0 0x5000 0x0 0x800>;
1889-
interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;
1889+
interrupts = <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>;
18901890
status = "disabled";
18911891
clocks = <&clkc CLKID_SD_EMMC_B>,
18921892
<&clkc CLKID_SD_EMMC_B_CLK0>,
@@ -1898,7 +1898,7 @@
18981898
sd_emmc_c: mmc@7000 {
18991899
compatible = "amlogic,meson-axg-mmc";
19001900
reg = <0x0 0x7000 0x0 0x800>;
1901-
interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>;
1901+
interrupts = <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>;
19021902
status = "disabled";
19031903
clocks = <&clkc CLKID_SD_EMMC_C>,
19041904
<&clkc CLKID_SD_EMMC_C_CLK0>,

arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2324,7 +2324,7 @@
23242324
sd_emmc_a: sd@ffe03000 {
23252325
compatible = "amlogic,meson-axg-mmc";
23262326
reg = <0x0 0xffe03000 0x0 0x800>;
2327-
interrupts = <GIC_SPI 189 IRQ_TYPE_EDGE_RISING>;
2327+
interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
23282328
status = "disabled";
23292329
clocks = <&clkc CLKID_SD_EMMC_A>,
23302330
<&clkc CLKID_SD_EMMC_A_CLK0>,
@@ -2336,7 +2336,7 @@
23362336
sd_emmc_b: sd@ffe05000 {
23372337
compatible = "amlogic,meson-axg-mmc";
23382338
reg = <0x0 0xffe05000 0x0 0x800>;
2339-
interrupts = <GIC_SPI 190 IRQ_TYPE_EDGE_RISING>;
2339+
interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;
23402340
status = "disabled";
23412341
clocks = <&clkc CLKID_SD_EMMC_B>,
23422342
<&clkc CLKID_SD_EMMC_B_CLK0>,
@@ -2348,7 +2348,7 @@
23482348
sd_emmc_c: mmc@ffe07000 {
23492349
compatible = "amlogic,meson-axg-mmc";
23502350
reg = <0x0 0xffe07000 0x0 0x800>;
2351-
interrupts = <GIC_SPI 191 IRQ_TYPE_EDGE_RISING>;
2351+
interrupts = <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>;
23522352
status = "disabled";
23532353
clocks = <&clkc CLKID_SD_EMMC_C>,
23542354
<&clkc CLKID_SD_EMMC_C_CLK0>,

arch/arm64/boot/dts/amlogic/meson-gx.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -603,21 +603,21 @@
603603
sd_emmc_a: mmc@70000 {
604604
compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
605605
reg = <0x0 0x70000 0x0 0x800>;
606-
interrupts = <GIC_SPI 216 IRQ_TYPE_EDGE_RISING>;
606+
interrupts = <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>;
607607
status = "disabled";
608608
};
609609

610610
sd_emmc_b: mmc@72000 {
611611
compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
612612
reg = <0x0 0x72000 0x0 0x800>;
613-
interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;
613+
interrupts = <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>;
614614
status = "disabled";
615615
};
616616

617617
sd_emmc_c: mmc@74000 {
618618
compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
619619
reg = <0x0 0x74000 0x0 0x800>;
620-
interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>;
620+
interrupts = <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>;
621621
status = "disabled";
622622
};
623623
};

0 commit comments

Comments
 (0)