diff --git a/drivers/net/wireless/ath/wil6210/Kconfig b/drivers/net/wireless/ath/wil6210/Kconfig index e489425cc698..40210a6bb75e 100644 --- a/drivers/net/wireless/ath/wil6210/Kconfig +++ b/drivers/net/wireless/ath/wil6210/Kconfig @@ -42,6 +42,18 @@ config WIL6210_TRACING If unsure, say Y to make it easier to debug problems. +config WIL6210_PLATFORM_MSM + bool "wil6210 MSM platform specific support" + depends on WIL6210 + depends on ARCH_QCOM + default y + help + Say Y here to enable wil6210 driver support for MSM + Platform driver used to handle msm specific platform + requirement for 11ad chipset connected to msm platform + + If unsure, say N. + config WIL6210_DEBUGFS bool "wil6210 debugfs support" depends on WIL6210 diff --git a/drivers/net/wireless/ath/wil6210/Makefile b/drivers/net/wireless/ath/wil6210/Makefile index 3eedd438678d..9fc8ea40558d 100644 --- a/drivers/net/wireless/ath/wil6210/Makefile +++ b/drivers/net/wireless/ath/wil6210/Makefile @@ -28,3 +28,6 @@ wil6210-y += config.o # for tracing framework to find trace.h CFLAGS_trace.o := -I$(src) + +MSM_11AD_PATH = $(srctree)/drivers/platform/msm/msm_11ad/ +CFLAGS_wil_platform.o := -I$(MSM_11AD_PATH) diff --git a/drivers/net/wireless/ath/wil6210/wil_platform.c b/drivers/net/wireless/ath/wil6210/wil_platform.c index 4eed05bddb60..e64f33f3e1c9 100644 --- a/drivers/net/wireless/ath/wil6210/wil_platform.c +++ b/drivers/net/wireless/ath/wil6210/wil_platform.c @@ -1,29 +1,21 @@ +// SPDX-License-Identifier: ISC /* * Copyright (c) 2014 Qualcomm Atheros, Inc. - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * Copyright (c) 2020, The Linux Foundation. All rights reserved. */ #include #include "wil_platform.h" +#include "msm_11ad.h" int __init wil_platform_modinit(void) { - return 0; + return msm_11ad_modinit(); } void wil_platform_modexit(void) { + msm_11ad_modexit(); } /** @@ -36,7 +28,7 @@ void wil_platform_modexit(void) void *wil_platform_init(struct device *dev, struct wil_platform_ops *ops, const struct wil_platform_rops *rops, void *wil_handle) { - void *handle = ops; /* to return some non-NULL for 'void' impl. */ + void *handle; if (!ops) { dev_err(dev, @@ -44,7 +36,7 @@ void *wil_platform_init(struct device *dev, struct wil_platform_ops *ops, return NULL; } - /* platform specific init functions should be called here */ + handle = msm_11ad_dev_init(dev, ops, rops, wil_handle); return handle; }