Merge "Revert "[Bugfix][ZXW-303][IRQ]fix irq 4 install fail""
diff --git a/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/arch/arm/boot/dts/zx297520v3.dtsi b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/arch/arm/boot/dts/zx297520v3.dtsi
index f8adc55..b5d4bc6 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/arch/arm/boot/dts/zx297520v3.dtsi
+++ b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/arch/arm/boot/dts/zx297520v3.dtsi
@@ -596,13 +596,13 @@
/* interrupts: */
interrupts = <GIC_SPI SD1_INT IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI SD1_DATA1_INT IRQ_TYPE_LEVEL_HIGH>/*,
- <GIC_SPI EX4_INT IRQ_TYPE_LEVEL_HIGH>*/; //jb.qi change for irq 4 fail
+ <GIC_SPI SD1_DATA1_INT IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI EX4_INT IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clkc SD1_WCLK>, <&clkc SD1_HCLK>, <&clkc SD1_CDET>;
clock-names = "ciu", "biu","mmc_cdet";
//cd-gpios = <&bgpio 51 GPIO_ACTIVE_LOW>;
- gpios = /*<&bgpio 51 GPIO_ACTIVE_LOW>,*/<&bgpio 85 GPIO_ACTIVE_LOW>;//jb.qi add for irq 4 fail
+ gpios = <&bgpio 51 GPIO_ACTIVE_LOW>,<&bgpio 85 GPIO_ACTIVE_LOW>;//cd ,emmc en
pinctrl-names = "mmc_pins" ,"mmc_cd_int","mmc_cd_gpio","mmc_vcc_en";
pinctrl-0 = <&sd1_sd1>;
pinctrl-1 = <&sd1_cd_int>;