diff options
author | Christian Gromm | 2017-11-21 15:04:38 +0100 |
---|---|---|
committer | Greg Kroah-Hartman | 2017-11-27 09:20:33 +0100 |
commit | 9249c6a6d3560f09cddd04e2fda856f237b64987 (patch) | |
tree | 38f4a1f5c2eb241d2e2f010e469c4a87877e0f52 /drivers/staging/most | |
parent | staging: most: i2c: rename module (diff) | |
download | kernel-qcow2-linux-9249c6a6d3560f09cddd04e2fda856f237b64987.tar.gz kernel-qcow2-linux-9249c6a6d3560f09cddd04e2fda856f237b64987.tar.xz kernel-qcow2-linux-9249c6a6d3560f09cddd04e2fda856f237b64987.zip |
staging: most: dim2: rename module
This patch renames the folder and source files of the dim2 module. It is
needed to clear the directory layout of the driver.
Signed-off-by: Christian Gromm <christian.gromm@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/most')
-rw-r--r-- | drivers/staging/most/Kconfig | 2 | ||||
-rw-r--r-- | drivers/staging/most/dim2/Kconfig (renamed from drivers/staging/most/hdm-dim2/Kconfig) | 6 | ||||
-rw-r--r-- | drivers/staging/most/dim2/Makefile | 4 | ||||
-rw-r--r-- | drivers/staging/most/dim2/dim2.c (renamed from drivers/staging/most/hdm-dim2/dim2_hdm.c) | 10 | ||||
-rw-r--r-- | drivers/staging/most/dim2/dim2.h (renamed from drivers/staging/most/hdm-dim2/dim2_hdm.h) | 2 | ||||
-rw-r--r-- | drivers/staging/most/dim2/errors.h (renamed from drivers/staging/most/hdm-dim2/dim2_errors.h) | 2 | ||||
-rw-r--r-- | drivers/staging/most/dim2/hal.c (renamed from drivers/staging/most/hdm-dim2/dim2_hal.c) | 8 | ||||
-rw-r--r-- | drivers/staging/most/dim2/hal.h (renamed from drivers/staging/most/hdm-dim2/dim2_hal.h) | 4 | ||||
-rw-r--r-- | drivers/staging/most/dim2/reg.h (renamed from drivers/staging/most/hdm-dim2/dim2_reg.h) | 2 | ||||
-rw-r--r-- | drivers/staging/most/dim2/sysfs.c (renamed from drivers/staging/most/hdm-dim2/dim2_sysfs.c) | 4 | ||||
-rw-r--r-- | drivers/staging/most/dim2/sysfs.h (renamed from drivers/staging/most/hdm-dim2/dim2_sysfs.h) | 2 |
11 files changed, 25 insertions, 21 deletions
diff --git a/drivers/staging/most/Kconfig b/drivers/staging/most/Kconfig index b3393a5f5706..88a415b8d07a 100644 --- a/drivers/staging/most/Kconfig +++ b/drivers/staging/most/Kconfig @@ -25,7 +25,7 @@ source "drivers/staging/most/aim-sound/Kconfig" source "drivers/staging/most/aim-v4l2/Kconfig" -source "drivers/staging/most/hdm-dim2/Kconfig" +source "drivers/staging/most/dim2/Kconfig" source "drivers/staging/most/i2c/Kconfig" diff --git a/drivers/staging/most/hdm-dim2/Kconfig b/drivers/staging/most/dim2/Kconfig index 663bfebff674..e39c4e525cac 100644 --- a/drivers/staging/most/hdm-dim2/Kconfig +++ b/drivers/staging/most/dim2/Kconfig @@ -2,8 +2,8 @@ # MediaLB configuration # -config HDM_DIM2 - tristate "DIM2 HDM" +config MOST_DIM2 + tristate "DIM2" depends on HAS_IOMEM ---help--- @@ -13,4 +13,4 @@ config HDM_DIM2 maintainer of this driver. To compile this driver as a module, choose M here: the - module will be called hdm_dim2. + module will be called most_dim2. diff --git a/drivers/staging/most/dim2/Makefile b/drivers/staging/most/dim2/Makefile new file mode 100644 index 000000000000..66676f5907ee --- /dev/null +++ b/drivers/staging/most/dim2/Makefile @@ -0,0 +1,4 @@ +obj-$(CONFIG_MOST_DIM2) += most_dim2.o + +most_dim2-objs := dim2.o hal.o sysfs.o +ccflags-y += -Idrivers/staging/ diff --git a/drivers/staging/most/hdm-dim2/dim2_hdm.c b/drivers/staging/most/dim2/dim2.c index fedd2d06742a..921db9880d80 100644 --- a/drivers/staging/most/hdm-dim2/dim2_hdm.c +++ b/drivers/staging/most/dim2/dim2.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * dim2_hdm.c - MediaLB DIM2 Hardware Dependent Module + * dim2.c - MediaLB DIM2 Hardware Dependent Module * * Copyright (C) 2015-2016, Microchip Technology Germany II GmbH & Co. KG */ @@ -20,10 +20,10 @@ #include <linux/kthread.h> #include "most/core.h" -#include "dim2_hal.h" -#include "dim2_hdm.h" -#include "dim2_errors.h" -#include "dim2_sysfs.h" +#include "hal.h" +#include "dim2.h" +#include "errors.h" +#include "sysfs.h" #define DMA_CHANNELS (32 - 1) /* channel 0 is a system channel */ diff --git a/drivers/staging/most/hdm-dim2/dim2_hdm.h b/drivers/staging/most/dim2/dim2.h index 5f380b648bd7..6a9fc51a2eb4 100644 --- a/drivers/staging/most/hdm-dim2/dim2_hdm.h +++ b/drivers/staging/most/dim2/dim2.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * dim2_hdm.h - MediaLB DIM2 HDM Header + * dim2.h - MediaLB DIM2 HDM Header * * Copyright (C) 2015, Microchip Technology Germany II GmbH & Co. KG */ diff --git a/drivers/staging/most/hdm-dim2/dim2_errors.h b/drivers/staging/most/dim2/errors.h index 8b90196076d5..3487510fbd2f 100644 --- a/drivers/staging/most/hdm-dim2/dim2_errors.h +++ b/drivers/staging/most/dim2/errors.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * dim2_errors.h - Definitions of errors for DIM2 HAL API + * errors.h - Definitions of errors for DIM2 HAL API * (MediaLB, Device Interface Macro IP, OS62420) * * Copyright (C) 2015, Microchip Technology Germany II GmbH & Co. KG diff --git a/drivers/staging/most/hdm-dim2/dim2_hal.c b/drivers/staging/most/dim2/hal.c index f98ac935729c..17c04e1c5e62 100644 --- a/drivers/staging/most/hdm-dim2/dim2_hal.c +++ b/drivers/staging/most/dim2/hal.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * dim2_hal.c - DIM2 HAL implementation + * hal.c - DIM2 HAL implementation * (MediaLB, Device Interface Macro IP, OS62420) * * Copyright (C) 2015-2016, Microchip Technology Germany II GmbH & Co. KG @@ -8,9 +8,9 @@ /* Author: Andrey Shvetsov <andrey.shvetsov@k2l.de> */ -#include "dim2_hal.h" -#include "dim2_errors.h" -#include "dim2_reg.h" +#include "hal.h" +#include "errors.h" +#include "reg.h" #include <linux/stddef.h> #include <linux/kernel.h> diff --git a/drivers/staging/most/hdm-dim2/dim2_hal.h b/drivers/staging/most/dim2/hal.h index fce9ae96121b..e04a5350f134 100644 --- a/drivers/staging/most/hdm-dim2/dim2_hal.h +++ b/drivers/staging/most/dim2/hal.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * dim2_hal.h - DIM2 HAL interface + * hal.h - DIM2 HAL interface * (MediaLB, Device Interface Macro IP, OS62420) * * Copyright (C) 2015, Microchip Technology Germany II GmbH & Co. KG @@ -10,7 +10,7 @@ #define _DIM2_HAL_H #include <linux/types.h> -#include "dim2_reg.h" +#include "reg.h" /* * The values below are specified in the hardware specification. diff --git a/drivers/staging/most/hdm-dim2/dim2_reg.h b/drivers/staging/most/dim2/reg.h index 2b2fca4f6451..69cbf78239f1 100644 --- a/drivers/staging/most/hdm-dim2/dim2_reg.h +++ b/drivers/staging/most/dim2/reg.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * dim2_reg.h - Definitions for registers of DIM2 + * reg.h - Definitions for registers of DIM2 * (MediaLB, Device Interface Macro IP, OS62420) * * Copyright (C) 2015, Microchip Technology Germany II GmbH & Co. KG diff --git a/drivers/staging/most/hdm-dim2/dim2_sysfs.c b/drivers/staging/most/dim2/sysfs.c index 3a2ad355cab1..ec1f4cecf9e7 100644 --- a/drivers/staging/most/hdm-dim2/dim2_sysfs.c +++ b/drivers/staging/most/dim2/sysfs.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * dim2_sysfs.c - MediaLB sysfs information + * sysfs.c - MediaLB sysfs information * * Copyright (C) 2015, Microchip Technology Germany II GmbH & Co. KG */ @@ -10,7 +10,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/kernel.h> -#include "dim2_sysfs.h" +#include "sysfs.h" struct bus_attr { struct attribute attr; diff --git a/drivers/staging/most/hdm-dim2/dim2_sysfs.h b/drivers/staging/most/dim2/sysfs.h index e46dc4ba3946..a33ebd8b45f5 100644 --- a/drivers/staging/most/hdm-dim2/dim2_sysfs.h +++ b/drivers/staging/most/dim2/sysfs.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * dim2_sysfs.h - MediaLB sysfs information + * sysfs.h - MediaLB sysfs information * * Copyright (C) 2015, Microchip Technology Germany II GmbH & Co. KG */ |