aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch
blob: a0dc81c28d42b49aa71a1f5b1e87014abf3a46b8 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -38,6 +38,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/clk.h>
 
 #include "rt2x00.h"
 #include "rt2800lib.h"
@@ -6394,13 +6395,14 @@ static int rt2800_probe_rt(struct rt2x00
 
 int rt2800_probe_clk(struct rt2x00_dev *rt2x00dev)
 {
-	struct rt2x00_platform_data *pdata = rt2x00dev->dev->platform_data;
 	struct hw_mode_spec *spec = &rt2x00dev->spec;
+	struct clk *clk = clk_get(rt2x00dev->dev, NULL);
 
-	if (!pdata)
-		return -EINVAL;
+	if (IS_ERR(clk))
+		return PTR_ERR(clk);
 
-	spec->clk_is_20mhz = pdata->clk_is_20mhz;
+	if (clk_get_rate(clk) == 20000000)
+		spec->clk_is_20mhz = 1;
 
 	return 0;
 }
span> ifdef CONFIG_USE_MKLIBS define mklibs rm -rf $(TMP_DIR)/mklibs-progs $(TMP_DIR)/mklibs-out # first find all programs and add them to the mklibs list find $(STAGING_DIR_ROOT) -type f -perm /100 -exec \ file -r -N -F '' {} + | \ awk ' /executable.*dynamically/ { print $$1 }' > $(TMP_DIR)/mklibs-progs # find all loadable objects that are not regular libraries and add them to the list as well find $(STAGING_DIR_ROOT) -type f -name \*.so\* -exec \ file -r -N -F '' {} + | \ awk ' /shared object/ { print $$1 }' > $(TMP_DIR)/mklibs-libs mkdir -p $(TMP_DIR)/mklibs-out $(STAGING_DIR_HOST)/bin/mklibs -D \ -d $(TMP_DIR)/mklibs-out \ --sysroot $(STAGING_DIR_ROOT) \ `cat $(TMP_DIR)/mklibs-libs | sed 's:/*[^/]\+/*$$::' | uniq | sed 's:^$(STAGING_DIR_ROOT):-L :'` \ --ldlib $(patsubst $(STAGING_DIR_ROOT)/%,/%,$(firstword $(wildcard \ $(foreach name,ld-uClibc.so.* ld-linux.so.* ld-*.so ld-musl-*.so.*, \ $(STAGING_DIR_ROOT)/lib/$(name) \ )))) \ --target $(REAL_GNU_TARGET_NAME) \ `cat $(TMP_DIR)/mklibs-progs $(TMP_DIR)/mklibs-libs` 2>&1 $(RSTRIP) $(TMP_DIR)/mklibs-out for lib in `ls $(TMP_DIR)/mklibs-out/*.so.* 2>/dev/null`; do \ LIB="$${lib##*/}"; \ DEST="`ls "$(1)/lib/$$LIB" "$(1)/usr/lib/$$LIB" 2>/dev/null`"; \ [ -n "$$DEST" ] || continue; \ echo "Copying stripped library $$lib to $$DEST"; \ cp "$$lib" "$$DEST" || exit 1; \ done endef endif # where to build (and put) .ipk packages opkg = \ IPKG_NO_SCRIPT=1 \ IPKG_INSTROOT=$(1) \ TMPDIR=$(1)/tmp \ $(STAGING_DIR_HOST)/bin/opkg \ --offline-root $(1) \ --force-postinstall \ --add-dest root:/ \ --add-arch all:100 \ --add-arch $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD)):200 TARGET_DIR_ORIG := $(TARGET_ROOTFS_DIR)/root.orig-$(BOARD) ifdef CONFIG_CLEAN_IPKG define clean_ipkg -find $(1)/usr/lib/opkg/info -type f -and -not -name '*.control' | $(XARGS) rm -rf -sed -i -ne '/^Require-User: /p' $(1)/usr/lib/opkg/info/*.control awk ' \ BEGIN { conffiles = 0; print "Conffiles:" } \ /^Conffiles:/ { conffiles = 1; next } \ !/^ / { conffiles = 0; next } \ conffiles == 1 { print } \ ' $(1)/usr/lib/opkg/status >$(1)/usr/lib/opkg/status.new mv $(1)/usr/lib/opkg/status.new $(1)/usr/lib/opkg/status -find $(1)/usr/lib/opkg -empty | $(XARGS) rm -rf endef endif define prepare_rootfs $(if $(2),@if [ -d '$(2)' ]; then \ $(call file_copy,$(2)/.,$(1)); \ fi) @mkdir -p $(1)/etc/rc.d @mkdir -p $(1)/var/lock @( \ cd $(1); \ for script in ./usr/lib/opkg/info/*.postinst; do \ IPKG_INSTROOT=$(1) $$(which bash) $$script; \ ret=$$?; \ if [ $$ret -ne 0 ]; then \ echo "postinst script $$script has failed with exit code $$ret" >&2; \ exit 1; \ fi; \ done; \ for script in ./etc/init.d/*; do \ grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \ IPKG_INSTROOT=$(1) $$(which bash) ./etc/rc.common $$script enable; \ done || true \ ) $(if $(SOURCE_DATE_EPOCH),sed -i "s/Installed-Time: .*/Installed-Time: $(SOURCE_DATE_EPOCH)/" $(1)/usr/lib/opkg/status) @-find $(1) -name CVS | $(XARGS) rm -rf @-find $(1) -name .svn | $(XARGS) rm -rf @-find $(1) -name .git | $(XARGS) rm -rf @-find $(1) -name '.#*' | $(XARGS) rm -f rm -rf $(1)/tmp/* rm -f $(1)/usr/lib/opkg/lists/* rm -f $(1)/usr/lib/opkg/info/*.postinst* rm -f $(1)/var/lock/*.lock $(call clean_ipkg,$(1)) $(call mklibs,$(1)) endef