Commit 33e40d02 authored by Tony Lindgren's avatar Tony Lindgren Committed by Kalle Valo

wlcore: wl18xx: Use chip specific configuration firmware

Use the wl18xx specific config firmware we now have available.
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 3e1ac932
...@@ -1397,25 +1397,24 @@ static int wl18xx_get_pg_ver(struct wl1271 *wl, s8 *ver) ...@@ -1397,25 +1397,24 @@ static int wl18xx_get_pg_ver(struct wl1271 *wl, s8 *ver)
return ret; return ret;
} }
#define WL18XX_CONF_FILE_NAME "ti-connectivity/wl18xx-conf.bin"
static int wl18xx_load_conf_file(struct device *dev, struct wlcore_conf *conf, static int wl18xx_load_conf_file(struct device *dev, struct wlcore_conf *conf,
struct wl18xx_priv_conf *priv_conf) struct wl18xx_priv_conf *priv_conf,
const char *file)
{ {
struct wlcore_conf_file *conf_file; struct wlcore_conf_file *conf_file;
const struct firmware *fw; const struct firmware *fw;
int ret; int ret;
ret = request_firmware(&fw, WL18XX_CONF_FILE_NAME, dev); ret = request_firmware(&fw, file, dev);
if (ret < 0) { if (ret < 0) {
wl1271_error("could not get configuration binary %s: %d", wl1271_error("could not get configuration binary %s: %d",
WL18XX_CONF_FILE_NAME, ret); file, ret);
return ret; return ret;
} }
if (fw->size != WL18XX_CONF_SIZE) { if (fw->size != WL18XX_CONF_SIZE) {
wl1271_error("configuration binary file size is wrong, expected %zu got %zu", wl1271_error("%s configuration binary size is wrong, expected %zu got %zu",
WL18XX_CONF_SIZE, fw->size); file, WL18XX_CONF_SIZE, fw->size);
ret = -EINVAL; ret = -EINVAL;
goto out_release; goto out_release;
} }
...@@ -1448,9 +1447,12 @@ static int wl18xx_load_conf_file(struct device *dev, struct wlcore_conf *conf, ...@@ -1448,9 +1447,12 @@ static int wl18xx_load_conf_file(struct device *dev, struct wlcore_conf *conf,
static int wl18xx_conf_init(struct wl1271 *wl, struct device *dev) static int wl18xx_conf_init(struct wl1271 *wl, struct device *dev)
{ {
struct platform_device *pdev = wl->pdev;
struct wlcore_platdev_data *pdata = dev_get_platdata(&pdev->dev);
struct wl18xx_priv *priv = wl->priv; struct wl18xx_priv *priv = wl->priv;
if (wl18xx_load_conf_file(dev, &wl->conf, &priv->conf) < 0) { if (wl18xx_load_conf_file(dev, &wl->conf, &priv->conf,
pdata->family->cfg_name) < 0) {
wl1271_warning("falling back to default config"); wl1271_warning("falling back to default config");
/* apply driver default configuration */ /* apply driver default configuration */
...@@ -2141,4 +2143,3 @@ MODULE_PARM_DESC(num_rx_desc_param, ...@@ -2141,4 +2143,3 @@ MODULE_PARM_DESC(num_rx_desc_param,
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Luciano Coelho <coelho@ti.com>"); MODULE_AUTHOR("Luciano Coelho <coelho@ti.com>");
MODULE_FIRMWARE(WL18XX_FW_NAME); MODULE_FIRMWARE(WL18XX_FW_NAME);
MODULE_FIRMWARE(WL18XX_CONF_FILE_NAME);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment