mirror of https://gitee.com/openkylin/linux.git
staging: most: move core files out of the staging area
This patch moves the core module to the /drivers/most directory and makes all necessary changes in order to not break the build. Signed-off-by: Christian Gromm <christian.gromm@microchip.com> Link: https://lore.kernel.org/r/1583845362-26707-2-git-send-email-christian.gromm@microchip.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
22dd4acc80
commit
b276527539
|
@ -228,4 +228,5 @@ source "drivers/interconnect/Kconfig"
|
|||
|
||||
source "drivers/counter/Kconfig"
|
||||
|
||||
source "drivers/most/Kconfig"
|
||||
endmenu
|
||||
|
|
|
@ -186,3 +186,4 @@ obj-$(CONFIG_SIOX) += siox/
|
|||
obj-$(CONFIG_GNSS) += gnss/
|
||||
obj-$(CONFIG_INTERCONNECT) += interconnect/
|
||||
obj-$(CONFIG_COUNTER) += counter/
|
||||
obj-$(CONFIG_MOST) += most/
|
||||
|
|
|
@ -0,0 +1,15 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
menuconfig MOST
|
||||
tristate "MOST support"
|
||||
depends on HAS_DMA && CONFIGFS_FS
|
||||
default n
|
||||
help
|
||||
Say Y here if you want to enable MOST support.
|
||||
This driver needs at least one additional component to enable the
|
||||
desired access from userspace (e.g. character devices) and one that
|
||||
matches the network controller's hardware interface (e.g. USB).
|
||||
|
||||
To compile this driver as a module, choose M here: the
|
||||
module will be called most_core.
|
||||
|
||||
If in doubt, say N here.
|
|
@ -0,0 +1,4 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
obj-$(CONFIG_MOST) += most_core.o
|
||||
most_core-y := core.o \
|
||||
configfs.o
|
|
@ -10,8 +10,7 @@
|
|||
#include <linux/slab.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/configfs.h>
|
||||
|
||||
#include "most.h"
|
||||
#include <linux/most.h>
|
||||
|
||||
#define MAX_STRING_SIZE 80
|
||||
|
|
@ -20,8 +20,7 @@
|
|||
#include <linux/kthread.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/idr.h>
|
||||
|
||||
#include "most.h"
|
||||
#include <linux/most.h>
|
||||
|
||||
#define MAX_CHANNELS 64
|
||||
#define STRING_SIZE 80
|
|
@ -1,7 +1,7 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
menuconfig MOST
|
||||
menuconfig MOST_COMPONENTS
|
||||
tristate "MOST support"
|
||||
depends on HAS_DMA && CONFIGFS_FS
|
||||
depends on HAS_DMA && CONFIGFS_FS && MOST
|
||||
default n
|
||||
help
|
||||
Say Y here if you want to enable MOST support.
|
||||
|
@ -16,7 +16,7 @@ menuconfig MOST
|
|||
|
||||
|
||||
|
||||
if MOST
|
||||
if MOST_COMPONENTS
|
||||
|
||||
source "drivers/staging/most/cdev/Kconfig"
|
||||
|
||||
|
|
|
@ -1,7 +1,4 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
obj-$(CONFIG_MOST) += most_core.o
|
||||
most_core-y := core.o
|
||||
most_core-y += configfs.o
|
||||
|
||||
obj-$(CONFIG_MOST_CDEV) += cdev/
|
||||
obj-$(CONFIG_MOST_NET) += net/
|
||||
|
|
|
@ -16,8 +16,7 @@
|
|||
#include <linux/kfifo.h>
|
||||
#include <linux/uaccess.h>
|
||||
#include <linux/idr.h>
|
||||
|
||||
#include "../most.h"
|
||||
#include <linux/most.h>
|
||||
|
||||
#define CHRDEV_REGION_SIZE 50
|
||||
|
||||
|
|
|
@ -20,8 +20,7 @@
|
|||
#include <linux/dma-mapping.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/kthread.h>
|
||||
|
||||
#include "../most.h"
|
||||
#include <linux/most.h>
|
||||
#include "hal.h"
|
||||
#include "errors.h"
|
||||
#include "sysfs.h"
|
||||
|
|
|
@ -13,8 +13,7 @@
|
|||
#include <linux/i2c.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/err.h>
|
||||
|
||||
#include "../most.h"
|
||||
#include <linux/most.h>
|
||||
|
||||
enum { CH_RX, CH_TX, NUM_CHANNELS };
|
||||
|
||||
|
|
|
@ -15,8 +15,7 @@
|
|||
#include <linux/list.h>
|
||||
#include <linux/wait.h>
|
||||
#include <linux/kobject.h>
|
||||
|
||||
#include "../most.h"
|
||||
#include <linux/most.h>
|
||||
|
||||
#define MEP_HDR_LEN 8
|
||||
#define MDP_HDR_LEN 16
|
||||
|
|
|
@ -17,8 +17,7 @@
|
|||
#include <sound/pcm_params.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/kthread.h>
|
||||
|
||||
#include "../most.h"
|
||||
#include <linux/most.h>
|
||||
|
||||
#define DRIVER_NAME "sound"
|
||||
#define STRING_SIZE 80
|
||||
|
|
|
@ -23,8 +23,7 @@
|
|||
#include <linux/dma-mapping.h>
|
||||
#include <linux/etherdevice.h>
|
||||
#include <linux/uaccess.h>
|
||||
|
||||
#include "../most.h"
|
||||
#include <linux/most.h>
|
||||
|
||||
#define USB_MTU 512
|
||||
#define NO_ISOCHRONOUS_URB 0
|
||||
|
|
|
@ -20,8 +20,7 @@
|
|||
#include <media/v4l2-device.h>
|
||||
#include <media/v4l2-ctrls.h>
|
||||
#include <media/v4l2-fh.h>
|
||||
|
||||
#include "../most.h"
|
||||
#include <linux/most.h>
|
||||
|
||||
#define V4L2_CMP_MAX_INPUT 1
|
||||
|
||||
|
|
Loading…
Reference in New Issue