meta-digi: add atheros wireless support for ccimx6adpt

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
Signed-off-by: Javier Viguera <javier.viguera@digi.com>

meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools_3.4p4.bb

@@ -51,4 +51,4 @@ do_install() {
 }
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "mxs"
+COMPATIBLE_MACHINE = "(mxs|mx6)"

meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb

@@ -51,4 +51,4 @@ FILES_${PN} += " \
 "
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(mxs)"
+COMPATIBLE_MACHINE = "(mxs|mx6)"

meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/ccardimx28js/atheros

@@ -81,7 +81,6 @@ if [ ! -e "${BDATA_LINK}" ] || ! cmp -s "${BDATA_LINK}" "${FIRMWARE_DIR}/${BDATA
 	ln -sf "${BDATA_SOURCE}" "${BDATA_LINK}"
 fi
 
-
 # Load 'cfg80211' and let it settle down (needed by 'ath6kl_sdio')
 modprobe -q cfg80211 && sleep 0.2
 

meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/ccimx6adpt/atheros

@@ -0,0 +1,102 @@
+#!/bin/sh
+#===============================================================================
+#
+#  10-atheros_pre-up
+#
+#  Copyright (C) 2012 by Digi International Inc.
+#  All rights reserved.
+#
+#  This program is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License version 2 as published by
+#  the Free Software Foundation.
+#
+#
+#  !Description: Load Atheros' wireless driver
+#
+#===============================================================================
+
+set -e
+
+[ "${IFACE}" != "wlan0" ] && exit 0
+
+FIRMWARE_DIR="/lib/firmware/ath6k/AR6003/hw2.1.1"
+
+#
+# Get the wlan MAC address from kernel command line.  Use a default
+# value if the address has not been set.
+#
+if [ -f "/proc/device-tree/wireless/mac-address" ]; then
+	MAC_ADDR="$(hexdump -ve '1/1 "%02X" ":"' /proc/device-tree/wireless/mac-address | sed 's/:$//g')"
+else
+	MAC_ADDR="$(sed -ne 's,^.*ethaddr2=\([^[:blank:]]\+\)[:blank:]*.*,\1,g;T;p' /proc/cmdline)"
+fi
+if [ -z "${MAC_ADDR}" -o "${MAC_ADDR}" = "00:00:00:00:00:00" ]; then
+	MAC_ADDR="00:04:F3:4C:B1:D3"
+fi
+
+# We need to write the WLAN MAC address to softmac in the ath6k firmware
+# directory.  However, we don't want to rewrite the file if it already exists
+# and the address is the same because we don't want to wear out NAND flash.
+#
+# So create the file on the RAM DRIVE first and compare the two.  Only update
+# the copy on NAND if the address has changed.
+#
+mac1="$(echo ${MAC_ADDR} | cut -d':' -f1)"
+mac2="$(echo ${MAC_ADDR} | cut -d':' -f2)"
+mac3="$(echo ${MAC_ADDR} | cut -d':' -f3)"
+mac4="$(echo ${MAC_ADDR} | cut -d':' -f4)"
+mac5="$(echo ${MAC_ADDR} | cut -d':' -f5)"
+mac6="$(echo ${MAC_ADDR} | cut -d':' -f6)"
+
+TMP_MACFILE="$(mktemp -t softmac.XXXXXX)"
+printf "\x${mac1}\x${mac2}\x${mac3}\x${mac4}\x${mac5}\x${mac6}" > ${TMP_MACFILE}
+if ! cmp -s ${TMP_MACFILE} ${FIRMWARE_DIR}/softmac; then
+	cp ${TMP_MACFILE} ${FIRMWARE_DIR}/softmac
+fi
+rm -f ${TMP_MACFILE}
+
+# Figure out which wireless region we are in.  The US has rules for
+# what channels can be used and at what power level.  We use a different set of
+# rules for the other regions in the world that we sell into.  The mod_cert field
+# in OTP will be set to 0x0 for the US.  Once we know the region, make sure the
+# appropriate calibration file is loaded.
+#
+MACHINE="$(cat /proc/device-tree/digi,machine,name 2>/dev/null || \
+	   cat /sys/kernel/machine/name)"
+REGION_CODE="$(cat /proc/device-tree/digi,hwid,cert 2>/dev/null || \
+	       cat /sys/kernel/${MACHINE}/mod_cert)"
+US_CODE="0x0"
+BDATA_SOURCE="Digi_6203-6233-World.bin"
+if [ -n "${REGION_CODE}" -a "${US_CODE}" = "${REGION_CODE}" ]; then
+	BDATA_SOURCE="Digi_6203-6233-US.bin"
+	logger -t atheros "Setting US wireless region."
+else
+	logger -t atheros "Setting non-US (world) wireless region."
+fi
+
+# We don't want to rewrite NAND every time we boot so only
+# change the link if it is wrong.
+BDATA_LINK="${FIRMWARE_DIR}/bdata.bin"
+if [ ! -e "${BDATA_LINK}" ] || ! cmp -s "${BDATA_LINK}" "${FIRMWARE_DIR}/${BDATA_SOURCE}"; then
+	ln -sf "${BDATA_SOURCE}" "${BDATA_LINK}"
+fi
+
+# Load 'cfg80211' and let it settle down (needed by 'ath6kl_sdio')
+modprobe -q cfg80211 && sleep 0.2
+
+# ath6kl_sdio.ko
+if ! grep -qs ath6kl_sdio /proc/modules; then
+	RETRIES="5"
+	while [ "${RETRIES}" -gt "0" ]; do
+		modprobe --ignore-install -q ath6kl_sdio || true
+		[ -d "/sys/class/net/wlan0" ] && break
+		RETRIES="$((RETRIES - 1))"
+		rmmod ath6kl_sdio > /dev/null
+		echo "Retrying to load wireless"
+		sleep 2
+	done
+	[ "${RETRIES}" -eq "0" ] && echo "Loading ath6kl_sdio module: [FAILED]"
+fi
+
+# Delay required for the interface 'wlan0' to settle down before trying to configure it.
+sleep 0.5

meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb

@@ -13,6 +13,7 @@ inherit packagegroup
 WIRELESS_MODULE ?= ""
 WIRELESS_MODULE_append_mx5 = "${@base_contains('MACHINE_FEATURES', 'wifi', 'kernel-module-redpine', '', d)}"
 WIRELESS_MODULE_append_mxs = "${@base_contains('MACHINE_FEATURES', 'wifi', 'kernel-module-atheros', '', d)}"
+WIRELESS_MODULE_append_mx6 = "${@base_contains('MACHINE_FEATURES', 'wifi', 'kernel-module-atheros', '', d)}"
 
 RDEPENDS_${PN} = "\
     crda \
@@ -24,3 +25,4 @@ RDEPENDS_${PN} = "\
 "
 
 RDEPENDS_${PN}_append_mxs = " iw ath-prop-tools"
+RDEPENDS_${PN}_append_mx6 = " iw ath-prop-tools"