Commit 17a9e5bb authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge tag 'wlcore-fix' into fixes

parents 647c8977 087a2b7e

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

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ 
		compatible = "ti,wl1285", "ti,wl1283";

		reg = <2>;

		/* gpio_100 with gpmc_wait2 pad as wakeirq */

		interrupts-extended = <&gpio4 4 IRQ_TYPE_EDGE_RISING>,

		interrupts-extended = <&gpio4 4 IRQ_TYPE_LEVEL_HIGH>,

				      <&omap4_pmx_core 0x4e>;

		interrupt-names = "irq", "wakeup";

		ref-clock-frequency = <26000000>;

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

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ 
		compatible = "ti,wl1271";

		reg = <2>;

		/* gpio_53 with gpmc_ncs3 pad as wakeup */

		interrupts-extended = <&gpio2 21 IRQ_TYPE_EDGE_RISING>,

		interrupts-extended = <&gpio2 21 IRQ_TYPE_LEVEL_HIGH>,

				      <&omap4_pmx_core 0x3a>;

		interrupt-names = "irq", "wakeup";

		ref-clock-frequency = <38400000>;

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

+1 −1
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ 
		compatible = "ti,wl1281";

		reg = <2>;

		interrupt-parent = <&gpio1>;

		interrupts = <21 IRQ_TYPE_EDGE_RISING>; /* gpio 53 */

		interrupts = <21 IRQ_TYPE_LEVEL_HIGH>; /* gpio 53 */

		ref-clock-frequency = <26000000>;

		tcxo-clock-frequency = <26000000>;

	};

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

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
		compatible = "ti,wl1271";

		reg = <2>;

		interrupt-parent = <&gpio2>;

		interrupts = <9 IRQ_TYPE_EDGE_RISING>; /* gpio 41 */

		interrupts = <9 IRQ_TYPE_LEVEL_HIGH>; /* gpio 41 */

		ref-clock-frequency = <38400000>;

	};

};

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

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ 
		pinctrl-names = "default";

		pinctrl-0 = <&wlcore_irq_pin>;

		interrupt-parent = <&gpio1>;

		interrupts = <14 IRQ_TYPE_EDGE_RISING>;	/* gpio 14 */

		interrupts = <14 IRQ_TYPE_LEVEL_HIGH>;	/* gpio 14 */

		ref-clock-frequency = <26000000>;

	};

};