Skip to content

Commit 17a9e5b

Browse files
committed
Merge tag 'wlcore-fix' into fixes
2 parents 647c897 + 087a2b7 commit 17a9e5b

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

arch/arm/boot/dts/omap4-droid4-xt894.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@
369369
compatible = "ti,wl1285", "ti,wl1283";
370370
reg = <2>;
371371
/* gpio_100 with gpmc_wait2 pad as wakeirq */
372-
interrupts-extended = <&gpio4 4 IRQ_TYPE_EDGE_RISING>,
372+
interrupts-extended = <&gpio4 4 IRQ_TYPE_LEVEL_HIGH>,
373373
<&omap4_pmx_core 0x4e>;
374374
interrupt-names = "irq", "wakeup";
375375
ref-clock-frequency = <26000000>;

arch/arm/boot/dts/omap4-panda-common.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@
474474
compatible = "ti,wl1271";
475475
reg = <2>;
476476
/* gpio_53 with gpmc_ncs3 pad as wakeup */
477-
interrupts-extended = <&gpio2 21 IRQ_TYPE_EDGE_RISING>,
477+
interrupts-extended = <&gpio2 21 IRQ_TYPE_LEVEL_HIGH>,
478478
<&omap4_pmx_core 0x3a>;
479479
interrupt-names = "irq", "wakeup";
480480
ref-clock-frequency = <38400000>;

arch/arm/boot/dts/omap4-sdp.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@
512512
compatible = "ti,wl1281";
513513
reg = <2>;
514514
interrupt-parent = <&gpio1>;
515-
interrupts = <21 IRQ_TYPE_EDGE_RISING>; /* gpio 53 */
515+
interrupts = <21 IRQ_TYPE_LEVEL_HIGH>; /* gpio 53 */
516516
ref-clock-frequency = <26000000>;
517517
tcxo-clock-frequency = <26000000>;
518518
};

arch/arm/boot/dts/omap4-var-som-om44-wlan.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
compatible = "ti,wl1271";
7070
reg = <2>;
7171
interrupt-parent = <&gpio2>;
72-
interrupts = <9 IRQ_TYPE_EDGE_RISING>; /* gpio 41 */
72+
interrupts = <9 IRQ_TYPE_LEVEL_HIGH>; /* gpio 41 */
7373
ref-clock-frequency = <38400000>;
7474
};
7575
};

arch/arm/boot/dts/omap5-board-common.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@
362362
pinctrl-names = "default";
363363
pinctrl-0 = <&wlcore_irq_pin>;
364364
interrupt-parent = <&gpio1>;
365-
interrupts = <14 IRQ_TYPE_EDGE_RISING>; /* gpio 14 */
365+
interrupts = <14 IRQ_TYPE_LEVEL_HIGH>; /* gpio 14 */
366366
ref-clock-frequency = <26000000>;
367367
};
368368
};

0 commit comments

Comments
 (0)