aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2014-03-18 19:05:37 +0000
committerImre Kaloz <kaloz@openwrt.org>2014-03-18 19:05:37 +0000
commit8a97da18e00ac36bdb5871d903044fc9b0826bfd (patch)
treecdeac076a8efa85bbe64760787c0e0f1305e32c1 /target/linux
parent531dc9fe42ce5baa4d6af991600606e418ea52ca (diff)
downloadupstream-8a97da18e00ac36bdb5871d903044fc9b0826bfd.tar.gz
upstream-8a97da18e00ac36bdb5871d903044fc9b0826bfd.tar.bz2
upstream-8a97da18e00ac36bdb5871d903044fc9b0826bfd.zip
switch the am335x-evmsk to the new wlcore bindings
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 39948
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/omap/patches-3.12/950-am335x-evmsk-wilink-dts.patch19
-rw-r--r--target/linux/omap/patches-3.13/950-am335x-evmsk-wilink-dts.patch21
2 files changed, 13 insertions, 27 deletions
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;
};