Unverified Commit bc6772bb authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-fixes-v6.2-rc-take2' of... 

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/761c2ebc-7c93-8504-35ae-3e84ad216bcf@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 89e5dd41 66e45351

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

+2 −2
Original line number Diff line number Diff line
@@ -1886,7 +1886,7 @@ 
			sd_emmc_b: sd@5000 {

				compatible = "amlogic,meson-axg-mmc";

				reg = <0x0 0x5000 0x0 0x800>;

				interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;

				interrupts = <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>;

				status = "disabled";

				clocks = <&clkc CLKID_SD_EMMC_B>,

					<&clkc CLKID_SD_EMMC_B_CLK0>,
@@ -1898,7 +1898,7 @@ 
			sd_emmc_c: mmc@7000 {

				compatible = "amlogic,meson-axg-mmc";

				reg = <0x0 0x7000 0x0 0x800>;

				interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>;

				interrupts = <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>;

				status = "disabled";

				clocks = <&clkc CLKID_SD_EMMC_C>,

					<&clkc CLKID_SD_EMMC_C_CLK0>,

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

+3 −3
Original line number Diff line number Diff line
@@ -2324,7 +2324,7 @@ 
		sd_emmc_a: sd@ffe03000 {

			compatible = "amlogic,meson-axg-mmc";

			reg = <0x0 0xffe03000 0x0 0x800>;

			interrupts = <GIC_SPI 189 IRQ_TYPE_EDGE_RISING>;

			interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

			clocks = <&clkc CLKID_SD_EMMC_A>,

				 <&clkc CLKID_SD_EMMC_A_CLK0>,
@@ -2336,7 +2336,7 @@ 
		sd_emmc_b: sd@ffe05000 {

			compatible = "amlogic,meson-axg-mmc";

			reg = <0x0 0xffe05000 0x0 0x800>;

			interrupts = <GIC_SPI 190 IRQ_TYPE_EDGE_RISING>;

			interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

			clocks = <&clkc CLKID_SD_EMMC_B>,

				 <&clkc CLKID_SD_EMMC_B_CLK0>,
@@ -2348,7 +2348,7 @@ 
		sd_emmc_c: mmc@ffe07000 {

			compatible = "amlogic,meson-axg-mmc";

			reg = <0x0 0xffe07000 0x0 0x800>;

			interrupts = <GIC_SPI 191 IRQ_TYPE_EDGE_RISING>;

			interrupts = <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

			clocks = <&clkc CLKID_SD_EMMC_C>,

				 <&clkc CLKID_SD_EMMC_C_CLK0>,

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

+3 −3
Original line number Diff line number Diff line
@@ -603,21 +603,21 @@ 
			sd_emmc_a: mmc@70000 {

				compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";

				reg = <0x0 0x70000 0x0 0x800>;

				interrupts = <GIC_SPI 216 IRQ_TYPE_EDGE_RISING>;

				interrupts = <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>;

				status = "disabled";

			};



			sd_emmc_b: mmc@72000 {

				compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";

				reg = <0x0 0x72000 0x0 0x800>;

				interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;

				interrupts = <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>;

				status = "disabled";

			};



			sd_emmc_c: mmc@74000 {

				compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";

				reg = <0x0 0x74000 0x0 0x800>;

				interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>;

				interrupts = <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>;

				status = "disabled";

			};

		};