From: Imre Kaloz <kaloz@openwrt.org>
Date: Tue, 18 Mar 2014 19:05:37 +0000 (+0000)
Subject: switch the am335x-evmsk to the new wlcore bindings
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8a97da18e00ac36bdb5871d903044fc9b0826bfd;p=openwrt%2Fstaging%2F981213.git

switch the am335x-evmsk to the new wlcore bindings

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 39948
---

diff --git a/target/linux/omap/patches-3.12/950-am335x-evmsk-wilink-dts.patch b/target/linux/omap/patches-3.12/950-am335x-evmsk-wilink-dts.patch
index 00fd0b2c2d..933c059281 100644
--- a/target/linux/omap/patches-3.12/950-am335x-evmsk-wilink-dts.patch
+++ b/target/linux/omap/patches-3.12/950-am335x-evmsk-wilink-dts.patch
@@ -8,7 +8,7 @@
  #include <dt-bindings/pwm/pwm.h>
  
  / {
-@@ -200,6 +201,33 @@
+@@ -200,6 +201,26 @@
  				0x144 (PIN_INPUT_PULLDOWN | MUX_MODE4) /* rmii1_ref_clk.mcasp1_axr3 */
  			>;
  		};
@@ -28,21 +28,14 @@
 +	};
 +	
 +	wlan {
-+		compatible = "ti,wilink6";
-+		interrupt-parent = <&gpio0>;
-+		interrupts = <31 IRQ_TYPE_LEVEL_HIGH>;
-+		clocks = <&refclock>;
-+		clock-names = "refclock";
++		compatible = "wlcore";
++		gpio = <31>;
 +
-+		refclock: refclock {
-+			compatible = "ti,wilink-clock";
-+			#clock-cells = <0>;
-+			clock-frequency = <38400000>;
-+		};
++		board-ref-clock = <4>;
  	};
  
  	ocp {
-@@ -335,6 +363,16 @@
+@@ -335,6 +356,16 @@
  		regulator-boot-on;
  	};
  
@@ -59,7 +52,7 @@
  	leds {
  		pinctrl-names = "default";
  		pinctrl-0 = <&user_leds_s0>;
-@@ -535,6 +573,16 @@
+@@ -535,6 +566,16 @@
  	status = "okay";
  };
  
diff --git a/target/linux/omap/patches-3.13/950-am335x-evmsk-wilink-dts.patch b/target/linux/omap/patches-3.13/950-am335x-evmsk-wilink-dts.patch
index f52773ca25..7ebbbeaec3 100644
--- a/target/linux/omap/patches-3.13/950-am335x-evmsk-wilink-dts.patch
+++ b/target/linux/omap/patches-3.13/950-am335x-evmsk-wilink-dts.patch
@@ -8,28 +8,21 @@
  #include <dt-bindings/pwm/pwm.h>
  
  / {
-@@ -26,6 +27,20 @@
+@@ -26,6 +27,13 @@
  		};
  	};
  
 +	wlan {
-+		compatible = "ti,wilink6";
-+		interrupt-parent = <&gpio0>;
-+		interrupts = <31 IRQ_TYPE_LEVEL_HIGH>;
-+		clocks = <&refclock>;
-+		clock-names = "refclock";
++		compatible = "wlcore";
 +
-+		refclock: refclock {
-+			compatible = "ti,wilink-clock";
-+			#clock-cells = <0>;
-+			clock-frequency = <38400000>;
-+		};
++		gpio = <31>;
++		board-ref-clock = <4>;
 +	};
 +
  	memory {
  		device_type = "memory";
  		reg = <0x80000000 0x10000000>; /* 256 MB */
-@@ -45,6 +60,16 @@
+@@ -45,6 +53,16 @@
  		regulator-boot-on;
  	};
  
@@ -46,7 +39,7 @@
  	leds {
  		pinctrl-names = "default";
  		pinctrl-0 = <&user_leds_s0>;
-@@ -297,6 +322,20 @@
+@@ -297,6 +315,20 @@
  			0x144 (PIN_INPUT_PULLDOWN | MUX_MODE4) /* rmii1_ref_clk.mcasp1_axr3 */
  		>;
  	};
@@ -67,7 +60,7 @@
  };
  
  &uart0 {
-@@ -503,6 +542,16 @@
+@@ -503,6 +535,16 @@
  	ti,no-reset-on-init;
  };